Updated tests to removed ExpectedException and replace it with NUnit'…

…s 2.5 approach to doing this, described at http://mint.litemedia.se/2009/05/30/new-expectedexception-model-in-nunit-25/. Also updated a couple of version references within csproj files.
tpolyak · Jun 16, 2009 · c819067 · c819067
1 parent 68a3a56
commit c819067
Show file tree

Hide file tree

Showing 25 changed files with 17 additions and 12 deletions.
diff --git a/bin/SharpArch.Core.NHibernateValidator.dll b/bin/SharpArch.Core.NHibernateValidator.dll
diff --git a/bin/SharpArch.Core.NHibernateValidator.pdb b/bin/SharpArch.Core.NHibernateValidator.pdb
diff --git a/bin/SharpArch.Core.dll b/bin/SharpArch.Core.dll
diff --git a/bin/SharpArch.Core.pdb b/bin/SharpArch.Core.pdb
diff --git a/bin/SharpArch.Data.dll b/bin/SharpArch.Data.dll
diff --git a/bin/SharpArch.Data.pdb b/bin/SharpArch.Data.pdb
diff --git a/bin/SharpArch.Testing.NUnit.dll b/bin/SharpArch.Testing.NUnit.dll
diff --git a/bin/SharpArch.Testing.NUnit.pdb b/bin/SharpArch.Testing.NUnit.pdb
diff --git a/bin/SharpArch.Testing.dll b/bin/SharpArch.Testing.dll
diff --git a/bin/SharpArch.Testing.pdb b/bin/SharpArch.Testing.pdb
diff --git a/bin/SharpArch.Wcf.dll b/bin/SharpArch.Wcf.dll
diff --git a/bin/SharpArch.Wcf.pdb b/bin/SharpArch.Wcf.pdb
diff --git a/bin/SharpArch.WcfClient.Castle.dll b/bin/SharpArch.WcfClient.Castle.dll
diff --git a/bin/SharpArch.WcfClient.Castle.pdb b/bin/SharpArch.WcfClient.Castle.pdb
diff --git a/bin/SharpArch.Web.Castle.dll b/bin/SharpArch.Web.Castle.dll
diff --git a/bin/SharpArch.Web.Castle.pdb b/bin/SharpArch.Web.Castle.pdb
diff --git a/bin/SharpArch.Web.dll b/bin/SharpArch.Web.dll
diff --git a/bin/SharpArch.Web.pdb b/bin/SharpArch.Web.pdb
diff --git a/src/SharpArch/SharpArch.Core.NHibernateValidator/SharpArch.Core.NHibernateValidator.csproj b/src/SharpArch/SharpArch.Core.NHibernateValidator/SharpArch.Core.NHibernateValidator.csproj
@@ -33,7 +33,7 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="NHibernate.Validator, Version=1.0.0.4000, Culture=neutral, PublicKeyToken=70154e18752585bd, processorArchitecture=MSIL">
+    <Reference Include="NHibernate.Validator, Version=1.2.0.1004, Culture=neutral, PublicKeyToken=70154e18752585bd, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\bin\NHibernate.Validator.dll</HintPath>
     </Reference>

diff --git a/src/SharpArch/SharpArch.Core/DomainModel/ValueObject.cs b/src/SharpArch/SharpArch.Core/DomainModel/ValueObject.cs
@@ -29,7 +29,7 @@ public abstract class ValueObject : BaseObject
             IEnumerable<PropertyInfo> invalidlyDecoratedProperties = GetType().GetProperties()
                 .Where(p => Attribute.IsDefined(p, typeof(DomainSignatureAttribute), true));
 
-            Check.Ensure(!invalidlyDecoratedProperties.Any(),
+            Check.Require(!invalidlyDecoratedProperties.Any(),
                 "Properties were found within " + GetType() + @" having the
                 [DomainSignature] attribute. The domain signature of a value object includes all
                 of the properties of the object by convention; consequently, adding [DomainSignature]

diff --git a/src/SharpArch/SharpArch.Data/SharpArch.Data.csproj b/src/SharpArch/SharpArch.Data/SharpArch.Data.csproj
@@ -37,7 +37,7 @@
 			<SpecificVersion>False</SpecificVersion>
 			<HintPath>..\..\..\bin\FluentNHibernate.dll</HintPath>
 		</Reference>
-		<Reference Include="NHibernate, Version=2.0.1.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
+		<Reference Include="NHibernate, Version=2.1.0.2001, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
 			<SpecificVersion>False</SpecificVersion>
 			<HintPath>..\..\..\bin\NHibernate.dll</HintPath>
 		</Reference>

diff --git a/...rpArch.Core/CommonValidator/NHibernateValidator/HasUniqueEntitySignatureValidatorTests.cs b/...rpArch.Core/CommonValidator/NHibernateValidator/HasUniqueEntitySignatureValidatorTests.cs
@@ -70,11 +70,13 @@ public class HasUniqueObjectSignatureValidatorTests
         }
 
         [Test]
-        [ExpectedException(typeof(PreconditionException))]
         public void MayNotUseValidatorWithEntityHavingDifferentIdType() {
             ObjectWithStringIdAndValidatorForIntId invalidCombination = 
                 new ObjectWithStringIdAndValidatorForIntId() { Name = "whatever" };
-            IEnumerable<IValidationResult> invalidValues = invalidCombination.ValidationResults();
+
+            Assert.Throws<PreconditionException>(
+                () => invalidCombination.ValidationResults()
+            );
         }
 
         private class DuplicateCheckerStub : IEntityDuplicateChecker

diff --git a/src/SharpArch/SharpArch.Tests/SharpArch.Core/DesignByContractTests.cs b/src/SharpArch/SharpArch.Tests/SharpArch.Core/DesignByContractTests.cs
@@ -13,15 +13,17 @@ public class DesignByContractTests
         }
 
         [Test]
-        [ExpectedException(typeof(PreconditionException))]
         public void CanEnforcePrecondition() {
-            Assert.AreEqual("-20%", ConvertToPercentage(-.2m));
+            Assert.Throws<PreconditionException>(
+                () => ConvertToPercentage(-.2m)
+            );
         }
 
         [Test]
-        [ExpectedException(typeof(PostconditionException))]
         public void CanEnforcePostcondition() {
-            Assert.AreEqual("200%", ConvertToPercentage(2m));
+            Assert.Throws<PostconditionException>(
+                () => ConvertToPercentage(2m)
+            );
         }
 
         private string ConvertToPercentage(decimal fractionalPercentage) {

diff --git a/src/SharpArch/SharpArch.Tests/SharpArch.Core/DomainModel/ValueObjectTests.cs b/src/SharpArch/SharpArch.Tests/SharpArch.Core/DomainModel/ValueObjectTests.cs
@@ -8,12 +8,13 @@ namespace Tests.SharpArch.Core.DomainModel
     public class ValueObjectTests
     {
         [Test]
-        [ExpectedException(typeof(PostconditionException))]
         public void CannotHaveValueObjectWithDomainSignatureProperties() {
             ValueObjectWithDomainSignature invalidValueObject =
                 new ValueObjectWithDomainSignature();
 
-            invalidValueObject.GetSignatureProperties();
+            Assert.Throws<PreconditionException>(
+                () => invalidValueObject.GetSignatureProperties()
+            );
         }
 
         [Test]

diff --git a/src/SharpArch/SharpArch.Web/SharpArch.Web.csproj b/src/SharpArch/SharpArch.Web/SharpArch.Web.csproj
@@ -43,7 +43,7 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\bin\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="NHibernate, Version=2.0.0.2001, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
+    <Reference Include="NHibernate, Version=2.1.0.2001, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\bin\NHibernate.dll</HintPath>
     </Reference>