Switched almost entirely over to Code Contracts across the entire library.

But some unit tests still fail, and there are other issues.

1 files changed, 7 insertions, 5 deletions

diff --git a/src/DotNetOpenAuth.Test/Messaging/CollectionAssert.cs b/src/DotNetOpenAuth.Test/Messaging/CollectionAssert.cs
index f9e569a..db136f5 100644
--- a/src/DotNetOpenAuth.Test/Messaging/CollectionAssert.cs
+++ b/src/DotNetOpenAuth.Test/Messaging/CollectionAssert.cs
@@ -5,16 +5,18 @@
 //-----------------------------------------------------------------------
 
 namespace DotNetOpenAuth.Test.Messaging {
+	using System;
 	using System.Collections;
 	using System.Collections.Generic;
+	using System.Diagnostics.Contracts;
 	using System.Linq;
 	using DotNetOpenAuth.Messaging;
 	using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 	internal class CollectionAssert<T> {
 		internal static void AreEquivalent(ICollection<T> expected, ICollection<T> actual) {
-			ErrorUtilities.VerifyArgumentNotNull(expected, "expected");
-			ErrorUtilities.VerifyArgumentNotNull(actual, "actual");
+			Contract.Requires<ArgumentNullException>(expected != null);
+			Contract.Requires<ArgumentNullException>(actual != null);
 
 			ICollection expectedNonGeneric = new List<T>(expected);
 			ICollection actualNonGeneric = new List<T>(actual);
@@ -22,8 +24,8 @@ namespace DotNetOpenAuth.Test.Messaging {
 		}
 
 		internal static void AreEquivalentByEquality(ICollection<T> expected, ICollection<T> actual) {
-			ErrorUtilities.VerifyArgumentNotNull(expected, "expected");
-			ErrorUtilities.VerifyArgumentNotNull(actual, "actual");
+			Contract.Requires<ArgumentNullException>(expected != null);
+			Contract.Requires<ArgumentNullException>(actual != null);
 
 			Assert.AreEqual(expected.Count, actual.Count);
 			foreach (T value in expected) {
@@ -32,7 +34,7 @@ namespace DotNetOpenAuth.Test.Messaging {
 		}
 
 		internal static void Contains(IEnumerable<T> sequence, T element) {
-			ErrorUtilities.VerifyArgumentNotNull(sequence, "sequence");
+			Contract.Requires<ArgumentNullException>(sequence != null);
 
 			if (!sequence.Contains(element)) {
 				Assert.Fail("Sequence did not include expected element '{0}'.", element);