Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/AuthorizationTestBase.cs
===================================================================
diff -u -r4539 -r4625
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/AuthorizationTestBase.cs	(.../AuthorizationTestBase.cs)	(revision 4539)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/AuthorizationTestBase.cs	(.../AuthorizationTestBase.cs)	(revision 4625)
@@ -41,7 +41,7 @@
             var asm = Assembly.GetAssembly(typeof(DAuthClient));
             byte[] pktb = asm.GetName().GetPublicKeyToken();
             string pkt = BitConverter.ToString(pktb).Replace("-", "").ToLowerInvariant();
-            Assert.AreEqual(expected, pkt);
+            Assert.That(pkt, Is.EqualTo(expected));
         }
 
         [Test]
@@ -94,7 +94,7 @@
             {
                 var awres = "";
                 Assert.IsTrue(aw.GetVendor(GetFeature(), ref awres));
-                Assert.AreEqual("Deltares", awres);
+                Assert.That(awres, Is.EqualTo("Deltares"));
             }
         }
 
@@ -105,7 +105,7 @@
             {
                 var awres = "";
                 Assert.IsTrue(aw.GetDistributor(GetFeature(), ref awres));
-                Assert.AreEqual("Deltares", awres);
+                Assert.That(awres, Is.EqualTo("Deltares"));
             }
         }
 
@@ -116,7 +116,7 @@
             {
                 String awres = null;
                 Assert.IsTrue(aw.GetNotice(GetFeature(), ref awres));
-                Assert.AreEqual("This product is licensed to Stichting Deltares.", awres);
+                Assert.That(awres, Is.EqualTo("This product is licensed to Stichting Deltares."));
             }
         }
 
@@ -127,7 +127,7 @@
             {
                 String awres = null;
                 Assert.IsTrue(aw.GetUsername(GetFeature(), ref awres));
-                Assert.AreEqual("Stichting Deltares", awres);
+                Assert.That(awres, Is.EqualTo("Stichting Deltares"));
             }
         }
 
@@ -142,10 +142,10 @@
                 Assert.IsTrue(aw.CheckOut(GetFeature(), GetSupportedFeatureVersions().First()));
                 int secondCount = -1;
                 aw.GetCount(GetFeature(), ref secondCount);
-                Assert.AreEqual(firstCount + 1, secondCount);
+                Assert.That(secondCount, Is.EqualTo(firstCount + 1));
                 Assert.IsTrue(aw.CheckIn(GetFeature()));
                 aw.GetCount(GetFeature(), ref secondCount);
-                Assert.AreEqual(firstCount, secondCount);
+                Assert.That(secondCount, Is.EqualTo(firstCount));
             }
         }
 
@@ -156,7 +156,7 @@
             {
                 var expiration = new DateTime(1900, 1, 1, 0, 0, 0);
                 aw.GetExpiration(GetFeature(), ref expiration);
-                Assert.AreEqual(2000, expiration.Year);
+                Assert.That(expiration.Year, Is.EqualTo(2000));
             }
         }
 
@@ -184,11 +184,11 @@
                 int count = -1;
                 string feature = GetFeature();
                 Assert.IsTrue(aw.GetUsedLicenses(feature, Environment.UserName, ref count));
-                Assert.AreEqual(0, count);
+                Assert.That(count, Is.EqualTo(0));
 
                 Assert.IsTrue(aw.CheckOut(feature, GetSupportedFeatureVersions().First()));
                 Assert.IsTrue(aw.GetUsedLicenses(feature, Environment.UserName, ref count));
-                Assert.AreEqual(1, count);
+                Assert.That(count, Is.EqualTo(1));
                 Assert.IsTrue(aw.CheckIn(feature));
             }
         }
@@ -200,7 +200,7 @@
             {
                 var count = 0;
                 Assert.IsTrue(aw.GetAvailableLicenses(GetFeature(), ref count));
-                Assert.AreEqual(500, count);
+                Assert.That(count, Is.EqualTo(500));
             }
         }