diff --git a/lib/Net/1.1/nunit.core.dll b/lib/Net/1.1/nunit.core.dll index 3f06941f..934f29df 100644 Binary files a/lib/Net/1.1/nunit.core.dll and b/lib/Net/1.1/nunit.core.dll differ diff --git a/lib/Net/1.1/nunit.core.interfaces.dll b/lib/Net/1.1/nunit.core.interfaces.dll index aca4c6d5..f146fa9e 100644 Binary files a/lib/Net/1.1/nunit.core.interfaces.dll and b/lib/Net/1.1/nunit.core.interfaces.dll differ diff --git a/lib/Net/1.1/nunit.framework.dll b/lib/Net/1.1/nunit.framework.dll index 42cc12cf..424f7369 100644 Binary files a/lib/Net/1.1/nunit.framework.dll and b/lib/Net/1.1/nunit.framework.dll differ diff --git a/lib/Net/2.0/nunit.core.dll b/lib/Net/2.0/nunit.core.dll index 3f06941f..96068142 100644 Binary files a/lib/Net/2.0/nunit.core.dll and b/lib/Net/2.0/nunit.core.dll differ diff --git a/lib/Net/2.0/nunit.core.interfaces.dll b/lib/Net/2.0/nunit.core.interfaces.dll index aca4c6d5..caf4a598 100644 Binary files a/lib/Net/2.0/nunit.core.interfaces.dll and b/lib/Net/2.0/nunit.core.interfaces.dll differ diff --git a/lib/Net/2.0/nunit.framework.dll b/lib/Net/2.0/nunit.framework.dll index 42cc12cf..1c87f11b 100644 Binary files a/lib/Net/2.0/nunit.framework.dll and b/lib/Net/2.0/nunit.framework.dll differ diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/DecoratorAopProxyTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/DecoratorAopProxyTests.cs index 27762c27..786e1145 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/DecoratorAopProxyTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/DecoratorAopProxyTests.cs @@ -225,7 +225,7 @@ namespace Spring.Aop.Framework.DynamicProxy } [Test] - [ExpectedException(typeof(AopConfigException), "Cannot create decorator-based IAopProxy for a non visible class [Spring.Aop.Framework.DynamicProxy.AbstractAopProxyTests+InternalRefOutTestObject]")] + [ExpectedException(typeof(AopConfigException), ExpectedMessage="Cannot create decorator-based IAopProxy for a non visible class [Spring.Aop.Framework.DynamicProxy.AbstractAopProxyTests+InternalRefOutTestObject]")] public override void ProxyMethodWithRefOutParametersWithStandardReflection() { base.ProxyMethodWithRefOutParametersWithStandardReflection(); @@ -233,7 +233,7 @@ namespace Spring.Aop.Framework.DynamicProxy #if NET_2_0 [Test] - [ExpectedException(typeof(AopConfigException), "Cannot create decorator-based IAopProxy for a non visible class [Spring.Aop.Framework.DynamicProxy.AbstractAopProxyTests+InternalRefOutGenericTestObject]")] + [ExpectedException(typeof(AopConfigException), ExpectedMessage="Cannot create decorator-based IAopProxy for a non visible class [Spring.Aop.Framework.DynamicProxy.AbstractAopProxyTests+InternalRefOutGenericTestObject]")] public override void ProxyGenericMethodWithRefOutParametersWithStandardReflection() { base.ProxyGenericMethodWithRefOutParametersWithStandardReflection(); diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/DefaultAopProxyFactoryTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/DefaultAopProxyFactoryTests.cs index 1cc24b03..88f26769 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/DefaultAopProxyFactoryTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/DefaultAopProxyFactoryTests.cs @@ -43,14 +43,14 @@ namespace Spring.Aop.Framework.DynamicProxy } [Test] - [ExpectedException(typeof(AopConfigException), "Cannot create IAopProxy with null ProxyConfig")] + [ExpectedException(typeof(AopConfigException), ExpectedMessage="Cannot create IAopProxy with null ProxyConfig")] public void NullConfig() { CreateAopProxy(null); } [Test] - [ExpectedException(typeof(AopConfigException), "Cannot create IAopProxy with no advisors and no target source")] + [ExpectedException(typeof(AopConfigException), ExpectedMessage="Cannot create IAopProxy with no advisors and no target source")] public void NoInterceptorsAndNoTarget() { AdvisedSupport advisedSupport = new AdvisedSupport(new Type[] { typeof(ITestObject) }); diff --git a/test/Spring/Spring.Core.Tests/Collections/Generic/ReadOnlyDictionaryTests.cs b/test/Spring/Spring.Core.Tests/Collections/Generic/ReadOnlyDictionaryTests.cs index 4bdba5e4..63ffb3b1 100644 --- a/test/Spring/Spring.Core.Tests/Collections/Generic/ReadOnlyDictionaryTests.cs +++ b/test/Spring/Spring.Core.Tests/Collections/Generic/ReadOnlyDictionaryTests.cs @@ -24,7 +24,7 @@ using System; using System.Collections.Generic; using NUnit.Framework; -using NUnit.Framework.SyntaxHelpers; +//using NUnit.Framework.SyntaxHelpers; #endregion diff --git a/test/Spring/Spring.Core.Tests/Core/TypeConversion/RegistryKeyConverterTests.cs b/test/Spring/Spring.Core.Tests/Core/TypeConversion/RegistryKeyConverterTests.cs index 4b0417f8..8b77d33e 100644 --- a/test/Spring/Spring.Core.Tests/Core/TypeConversion/RegistryKeyConverterTests.cs +++ b/test/Spring/Spring.Core.Tests/Core/TypeConversion/RegistryKeyConverterTests.cs @@ -71,7 +71,7 @@ namespace Spring.Core.TypeConversion } [Test] - [ExpectedException(typeof(ArgumentException), @"Registry key [HKEY_CURRENT_USER\sdgsdfgsdfgxadas] does not exist.")] + [ExpectedException(typeof(ArgumentException), ExpectedMessage = @"Registry key [HKEY_CURRENT_USER\sdgsdfgsdfgxadas] does not exist.")] public void ConvertFromBadKeyString() { RegistryKeyConverter rkc = new RegistryKeyConverter(); @@ -79,7 +79,7 @@ namespace Spring.Core.TypeConversion } [Test] - [ExpectedException(typeof(ArgumentException), "Invalid root hive name [HKEY_ERROR].")] + [ExpectedException(typeof(ArgumentException), ExpectedMessage="Invalid root hive name [HKEY_ERROR].")] public void ConvertFromBadHiveString() { RegistryKeyConverter rkc = new RegistryKeyConverter(); diff --git a/test/Spring/Spring.Core.Tests/Expressions/ExpressionEvaluatorTests.cs b/test/Spring/Spring.Core.Tests/Expressions/ExpressionEvaluatorTests.cs index c0520841..d640bdaa 100644 --- a/test/Spring/Spring.Core.Tests/Expressions/ExpressionEvaluatorTests.cs +++ b/test/Spring/Spring.Core.Tests/Expressions/ExpressionEvaluatorTests.cs @@ -36,7 +36,7 @@ using System.Web.Services; using antlr; using antlr.collections; using NUnit.Framework; -using NUnit.Framework.SyntaxHelpers; +//using NUnit.Framework.SyntaxHelpers; using Spring.Collections; using Spring.Context; using Spring.Context.Support; diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ConfigurationReaderTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ConfigurationReaderTests.cs index 268d1dc8..8a800f5f 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ConfigurationReaderTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ConfigurationReaderTests.cs @@ -228,9 +228,9 @@ namespace Spring.Objects.Factory.Config [Test] #if !NET_2_0 - [ExpectedException(typeof(ConfigurationException), "Cannot read properties; config section 'ELNOMBRE' not found.")] + [ExpectedException(typeof(ConfigurationException), ExpectedMessage = "Cannot read properties; config section 'ELNOMBRE' not found.")] #else - [ExpectedException(typeof(ConfigurationErrorsException), "Cannot read properties; config section 'ELNOMBRE' not found.")] + [ExpectedException(typeof(ConfigurationErrorsException), ExpectedMessage = "Cannot read properties; config section 'ELNOMBRE' not found.")] #endif public void TryReadFromNonExistantConfigSection() { diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/DictionaryFactoryObjectTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/DictionaryFactoryObjectTests.cs index dfa50086..87d48879 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/DictionaryFactoryObjectTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/DictionaryFactoryObjectTests.cs @@ -36,7 +36,7 @@ namespace Spring.Objects.Factory.Config public sealed class DictionaryFactoryObjectTests { [Test] - [ExpectedException(typeof (ArgumentException), "The Type passed to the TargetDictionaryType property must implement the 'System.Collections.IDictionary' interface.")] + [ExpectedException(typeof (ArgumentException), ExpectedMessage="The Type passed to the TargetDictionaryType property must implement the 'System.Collections.IDictionary' interface.")] public void SetTargetDictionaryTypeToNonDictionaryType() { DictionaryFactoryObject dfo = new DictionaryFactoryObject(); @@ -44,7 +44,7 @@ namespace Spring.Objects.Factory.Config } [Test] - [ExpectedException(typeof (ArgumentException), "The Type passed to the TargetDictionaryType property cannot be an interface; it must be a concrete class that implements the 'System.Collections.IDictionary' interface.")] + [ExpectedException(typeof (ArgumentException), ExpectedMessage="The Type passed to the TargetDictionaryType property cannot be an interface; it must be a concrete class that implements the 'System.Collections.IDictionary' interface.")] public void SetTargetDictionaryTypeToDerivedIDictionaryInterfaceType() { DictionaryFactoryObject dfo = new DictionaryFactoryObject(); @@ -52,7 +52,7 @@ namespace Spring.Objects.Factory.Config } [Test] - [ExpectedException(typeof (ArgumentException), "The Type passed to the TargetDictionaryType property cannot be abstract (MustInherit in VisualBasic.NET); it must be a concrete class that implements the 'System.Collections.IDictionary' interface.")] + [ExpectedException(typeof (ArgumentException), ExpectedMessage="The Type passed to the TargetDictionaryType property cannot be abstract (MustInherit in VisualBasic.NET); it must be a concrete class that implements the 'System.Collections.IDictionary' interface.")] public void SetTargetDictionaryTypeToAbstractIDictionaryInterfaceType() { DictionaryFactoryObject dfo = new DictionaryFactoryObject(); @@ -76,7 +76,7 @@ namespace Spring.Objects.Factory.Config } [Test] - [ExpectedException(typeof (ArgumentException), "The 'SourceDictionary' property cannot be null (Nothing in Visual Basic.NET).")] + [ExpectedException(typeof (ArgumentException), ExpectedMessage="The 'SourceDictionary' property cannot be null (Nothing in Visual Basic.NET).")] public void GetObjectWithoutSupplyingASourceDictionary() { DictionaryFactoryObject dfo = new DictionaryFactoryObject(); diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ListFactoryObjectTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ListFactoryObjectTests.cs index 6e95696c..265e5640 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ListFactoryObjectTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ListFactoryObjectTests.cs @@ -36,7 +36,7 @@ namespace Spring.Objects.Factory.Config public sealed class ListFactoryObjectTests { [Test] - [ExpectedException(typeof (ArgumentException), "The Type passed to the TargetListType property must implement the 'System.Collections.IList' interface.")] + [ExpectedException(typeof (ArgumentException), ExpectedMessage="The Type passed to the TargetListType property must implement the 'System.Collections.IList' interface.")] public void SetTargetListTypeToNonListType() { ListFactoryObject lfo = new ListFactoryObject(); @@ -44,7 +44,7 @@ namespace Spring.Objects.Factory.Config } [Test] - [ExpectedException(typeof (ArgumentException), "The Type passed to the TargetListType property cannot be an interface; it must be a concrete class that implements the 'System.Collections.IList' interface.")] + [ExpectedException(typeof (ArgumentException), ExpectedMessage="The Type passed to the TargetListType property cannot be an interface; it must be a concrete class that implements the 'System.Collections.IList' interface.")] public void SetTargetListTypeToDerivedIListInterfaceType() { ListFactoryObject lfo = new ListFactoryObject(); @@ -52,7 +52,7 @@ namespace Spring.Objects.Factory.Config } [Test] - [ExpectedException(typeof (ArgumentException), "The Type passed to the TargetListType property cannot be abstract (MustInherit in VisualBasic.NET); it must be a concrete class that implements the 'System.Collections.IList' interface.")] + [ExpectedException(typeof (ArgumentException), ExpectedMessage="The Type passed to the TargetListType property cannot be abstract (MustInherit in VisualBasic.NET); it must be a concrete class that implements the 'System.Collections.IList' interface.")] public void SetTargetListTypeToAbstractIListInterfaceType() { ListFactoryObject lfo = new ListFactoryObject(); @@ -76,7 +76,7 @@ namespace Spring.Objects.Factory.Config } [Test] - [ExpectedException(typeof (ArgumentException), "The 'SourceList' property cannot be null (Nothing in Visual Basic.NET).")] + [ExpectedException(typeof (ArgumentException), ExpectedMessage="The 'SourceList' property cannot be null (Nothing in Visual Basic.NET).")] public void GetObjectWithoutSupplyingASourceList() { ListFactoryObject lfo = new ListFactoryObject(); diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/LogFactoryObjectTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/LogFactoryObjectTests.cs index ae7f3377..04ca7947 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/LogFactoryObjectTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/LogFactoryObjectTests.cs @@ -102,7 +102,7 @@ namespace Spring.Objects.Factory.Config } [Test] - [ExpectedException(typeof (ArgumentException), "The 'LogName' property has not been set.")] + [ExpectedException(typeof (ArgumentException), ExpectedMessage="The 'LogName' property has not been set.")] public void CheckAfterPropertiesSetBlowsUpIfNotCorrectlyConfigured() { LogFactoryObject fac = new LogFactoryObject(); diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/MethodInvokingFactoryObjectTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/MethodInvokingFactoryObjectTests.cs index 2a77ba77..fca82c96 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/MethodInvokingFactoryObjectTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/MethodInvokingFactoryObjectTests.cs @@ -138,7 +138,7 @@ namespace Spring.Objects.Factory.Config } [Test] - [ExpectedException(typeof (ArgumentException), "Unable to determine which exact method to call; found '2' matches.")] + [ExpectedException(typeof (ArgumentException), ExpectedMessage="Unable to determine which exact method to call; found '2' matches.")] public void GetSupertypesTooManyArgs() { MethodInvokingFactoryObject mcfo = new MethodInvokingFactoryObject(); @@ -200,7 +200,7 @@ namespace Spring.Objects.Factory.Config } [Test] - [ExpectedException(typeof (ArgumentException), "The 'TargetMethod' property is required.")] + [ExpectedException(typeof (ArgumentException), ExpectedMessage="The 'TargetMethod' property is required.")] public void BailsIfTheTargetMethodPropertyAintSet() { MethodInvokingFactoryObject mcfo = new MethodInvokingFactoryObject(); diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ObjectFactoryCreatingFactoryObjectTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ObjectFactoryCreatingFactoryObjectTests.cs index c435115f..cdeffeda 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ObjectFactoryCreatingFactoryObjectTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ObjectFactoryCreatingFactoryObjectTests.cs @@ -91,7 +91,7 @@ namespace Spring.Objects.Factory.Config [Test] [ExpectedException(typeof (ArgumentException), - "The 'TargetObjectName' property must have a value.")] + ExpectedMessage = "The 'TargetObjectName' property must have a value.")] public void WithMissingObjectName() { ObjectFactoryCreatingFactoryObject factory diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/PropertyPlaceholderConfigurerTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/PropertyPlaceholderConfigurerTests.cs index ff0e91a4..d1a8848c 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/PropertyPlaceholderConfigurerTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/PropertyPlaceholderConfigurerTests.cs @@ -223,7 +223,7 @@ namespace Spring.Objects.Factory.Config [Test] [ExpectedException(typeof (ObjectDefinitionStoreException), - "Error registering object with name 'to' defined in '' : Could not resolve placeholder 'PROCESSOR_ARCHITECTURE'.")] + ExpectedMessage = "Error registering object with name 'to' defined in '' : Could not resolve placeholder 'PROCESSOR_ARCHITECTURE'.")] public void WithUnresolvableEnvironmentProperty() { StaticApplicationContext ac = new StaticApplicationContext(); diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/PropertyRetrievingFactoryObjectTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/PropertyRetrievingFactoryObjectTests.cs index eda10aae..ceee7280 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/PropertyRetrievingFactoryObjectTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/PropertyRetrievingFactoryObjectTests.cs @@ -233,7 +233,7 @@ namespace Spring.Objects.Factory.Config } [Test] - [ExpectedException(typeof (ArgumentException), "One of the TargetType or TargetObject properties must be set.")] + [ExpectedException(typeof (ArgumentException), ExpectedMessage="One of the TargetType or TargetObject properties must be set.")] public void BailsWhenNotConfigured() { PropertyRetrievingFactoryObject fac = new PropertyRetrievingFactoryObject(); @@ -259,7 +259,7 @@ namespace Spring.Objects.Factory.Config } [Test] - [ExpectedException(typeof (ArgumentException), "The TargetProperty property is required.")] + [ExpectedException(typeof (ArgumentException), ExpectedMessage="The TargetProperty property is required.")] public void BailsWhenJustTargetObjectIsSet() { PropertyRetrievingFactoryObject fac = new PropertyRetrievingFactoryObject(); diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/SetFactoryObjectTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/SetFactoryObjectTests.cs index d1ca8c49..160edf73 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/SetFactoryObjectTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/SetFactoryObjectTests.cs @@ -36,8 +36,9 @@ namespace Spring.Objects.Factory.Config [TestFixture] public sealed class SetFactoryObjectTests { + [Test] - [ExpectedException(typeof (ArgumentException), "The Type passed to the TargetSetType property must implement the 'Spring.Collections.ISet' interface.")] + [ExpectedException(typeof (ArgumentException), ExpectedMessage = "The Type passed to the TargetSetType property must implement the 'Spring.Collections.ISet' interface.")] public void SetTargetSetTypeToNonSetType() { SetFactoryObject lfo = new SetFactoryObject(); @@ -45,7 +46,7 @@ namespace Spring.Objects.Factory.Config } [Test] - [ExpectedException(typeof (ArgumentException), "The Type passed to the TargetSetType property cannot be an interface; it must be a concrete class that implements the 'Spring.Collections.ISet' interface.")] + [ExpectedException(typeof (ArgumentException), ExpectedMessage="The Type passed to the TargetSetType property cannot be an interface; it must be a concrete class that implements the 'Spring.Collections.ISet' interface.")] public void SetTargetSetTypeToDerivedISetInterfaceType() { SetFactoryObject lfo = new SetFactoryObject(); @@ -53,7 +54,7 @@ namespace Spring.Objects.Factory.Config } [Test] - [ExpectedException(typeof (ArgumentException), "The Type passed to the TargetSetType property cannot be abstract (MustInherit in VisualBasic.NET); it must be a concrete class that implements the 'Spring.Collections.ISet' interface.")] + [ExpectedException(typeof (ArgumentException), ExpectedMessage="The Type passed to the TargetSetType property cannot be abstract (MustInherit in VisualBasic.NET); it must be a concrete class that implements the 'Spring.Collections.ISet' interface.")] public void SetTargetSetTypeToAbstractISetInterfaceType() { SetFactoryObject lfo = new SetFactoryObject(); @@ -77,7 +78,7 @@ namespace Spring.Objects.Factory.Config } [Test] - [ExpectedException(typeof (ArgumentException), "The 'SourceSet' property cannot be null (Nothing in Visual Basic.NET).")] + [ExpectedException(typeof (ArgumentException), ExpectedMessage="The 'SourceSet' property cannot be null (Nothing in Visual Basic.NET).")] public void GetObjectWithoutSupplyingASourceSet() { SetFactoryObject lfo = new SetFactoryObject(); diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/DefaultListableObjectFactoryTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/DefaultListableObjectFactoryTests.cs index 74e5d2cc..f5e4e9ed 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/DefaultListableObjectFactoryTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/DefaultListableObjectFactoryTests.cs @@ -1534,8 +1534,7 @@ namespace Spring.Objects.Factory /// to the ctor, it should (must) choke. /// [Test] - [ExpectedException(typeof(UnsatisfiedDependencyException), - "Error creating object with name 'foo' : Unsatisfied dependency " + + [ExpectedException(typeof(UnsatisfiedDependencyException), ExpectedMessage="Error creating object with name 'foo' : Unsatisfied dependency " + "expressed through constructor argument with index 1 of type [System.Boolean] : " + "No unique object of type [System.Boolean] is defined : Unsatisfied dependency of type [System.Boolean]: expected at least 1 matching object to wire the [b2] parameter on the constructor of object [foo]")] public void DoubleBooleanAutowire() diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/ObjectFactoryUtilsTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/ObjectFactoryUtilsTests.cs index 99a42a4e..f5c46e50 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/ObjectFactoryUtilsTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/ObjectFactoryUtilsTests.cs @@ -218,7 +218,7 @@ namespace Spring.Objects.Factory [Test] [ExpectedException(typeof (NoSuchObjectDefinitionException), - "No unique object of type [Spring.Objects.ITestObject] is defined : Expected single object but found 4")] + ExpectedMessage = "No unique object of type [Spring.Objects.ITestObject] is defined : Expected single object but found 4")] public void ObjectOfTypeIncludingAncestorsWithMoreThanOneObjectOfType() { ObjectFactoryUtils.ObjectOfTypeIncludingAncestors(_factory, typeof (ITestObject), true, true); diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Support/AutowireUtilsTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Support/AutowireUtilsTests.cs index 9b154db3..b782e4c2 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Support/AutowireUtilsTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Support/AutowireUtilsTests.cs @@ -131,8 +131,7 @@ namespace Spring.Objects.Factory.Support return pickedCtor; } - [ExpectedException(typeof (ArgumentException), - "Cannot calculate the type difference weight for argument types and arguments with differing lengths.")] + [ExpectedException(typeof (ArgumentException), ExpectedMessage="Cannot calculate the type difference weight for argument types and arguments with differing lengths.")] [Test] [Ignore("Investigate details of new type weight algorithm")] public void GetTypeDifferenceWeightWithMismatchedLengths() diff --git a/test/Spring/Spring.Core.Tests/Objects/Support/MethodInvokerTests.cs b/test/Spring/Spring.Core.Tests/Objects/Support/MethodInvokerTests.cs index 374ed6d7..816804c0 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Support/MethodInvokerTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Support/MethodInvokerTests.cs @@ -54,7 +54,7 @@ namespace Spring.Objects.Support } [Test] - [ExpectedException(typeof (ArgumentException), "One of either the 'TargetType' or 'TargetObject' properties is required.")] + [ExpectedException(typeof (ArgumentException), ExpectedMessage="One of either the 'TargetType' or 'TargetObject' properties is required.")] public void PrepareWithOnlyTargetMethodSet() { MethodInvoker vkr = new MethodInvoker(); @@ -181,7 +181,7 @@ namespace Spring.Objects.Support [Test] [ExpectedException( typeof (ArgumentException), - "The named argument 'southpaw' could not be found on the 'GrowOlder' method of class [Spring.Objects.Support.MethodInvokerTests+Foo].")] + ExpectedMessage = "The named argument 'southpaw' could not be found on the 'GrowOlder' method of class [Spring.Objects.Support.MethodInvokerTests+Foo].")] public void InvokeWithNamedArgumentThatDoesNotExist() { Foo foo = new Foo(); @@ -213,7 +213,7 @@ namespace Spring.Objects.Support } [Test] - [ExpectedException(typeof (MethodInvocationException), "At least one of the arguments passed to this MethodInvoker was incompatible with the signature of the invoked method.")] + [ExpectedException(typeof (MethodInvocationException), ExpectedMessage="At least one of the arguments passed to this MethodInvoker was incompatible with the signature of the invoked method.")] public void InvokeWithArgumentOfWrongType() { Foo foo = new Foo(); diff --git a/test/Spring/Spring.Core.Tests/Proxy/CompositionProxyTypeBuilderTests.cs b/test/Spring/Spring.Core.Tests/Proxy/CompositionProxyTypeBuilderTests.cs index 09b1c061..cb3e8153 100644 --- a/test/Spring/Spring.Core.Tests/Proxy/CompositionProxyTypeBuilderTests.cs +++ b/test/Spring/Spring.Core.Tests/Proxy/CompositionProxyTypeBuilderTests.cs @@ -35,8 +35,7 @@ namespace Spring.Proxy public class CompositionProxyTypeBuilderTests : AbstractProxyTypeBuilderTests { [Test] - [ExpectedException(typeof (ArgumentException), - "Composition proxy target must implement at least one interface.")] + [ExpectedException(typeof (ArgumentException), ExpectedMessage="Composition proxy target must implement at least one interface.")] public void OnClassThatDoesntImplementAnyInterfaces() { IProxyTypeBuilder builder = GetProxyBuilder(); diff --git a/test/Spring/Spring.Core.Tests/Util/EventRaiserTests.cs b/test/Spring/Spring.Core.Tests/Util/EventRaiserTests.cs index 3e45653f..b80840e7 100644 --- a/test/Spring/Spring.Core.Tests/Util/EventRaiserTests.cs +++ b/test/Spring/Spring.Core.Tests/Util/EventRaiserTests.cs @@ -65,7 +65,7 @@ namespace Spring.Util Assert.AreEqual (string.Empty, dude.Soda); } - [Test][ExpectedException (typeof (FormatException), "Iron Brew")] + [Test][ExpectedException (typeof (FormatException), ExpectedMessage="Iron Brew")] public void RaiseWithAnEventHandlerThatThrowsAnException () { OneThirstyDude dude = new OneThirstyDude (); diff --git a/test/Spring/Spring.Core.Tests/Util/ReflectionUtilsMemberwiseCopyTests.cs b/test/Spring/Spring.Core.Tests/Util/ReflectionUtilsMemberwiseCopyTests.cs index 76d9bec1..cf3c275e 100644 --- a/test/Spring/Spring.Core.Tests/Util/ReflectionUtilsMemberwiseCopyTests.cs +++ b/test/Spring/Spring.Core.Tests/Util/ReflectionUtilsMemberwiseCopyTests.cs @@ -25,7 +25,7 @@ namespace Spring.Util } [Test] - [ExpectedException(typeof (ArgumentException), "object types are not related")] + [ExpectedException(typeof (ArgumentException), ExpectedMessage="object types are not related")] public void DifferentTypesForbidden() { ReflectionUtils.MemberwiseCopy("test", 2); diff --git a/test/Spring/Spring.Core.Tests/Util/ReflectionUtilsTests.cs b/test/Spring/Spring.Core.Tests/Util/ReflectionUtilsTests.cs index 1984bee9..10aae038 100644 --- a/test/Spring/Spring.Core.Tests/Util/ReflectionUtilsTests.cs +++ b/test/Spring/Spring.Core.Tests/Util/ReflectionUtilsTests.cs @@ -437,7 +437,7 @@ namespace Spring.Util [Test] [ExpectedException( typeof( ArgumentException ), - "[Spring.Util.ReflectionUtilsTests] does not derive from the [System.Attribute] class." )] + ExpectedMessage = "[Spring.Util.ReflectionUtilsTests] does not derive from the [System.Attribute] class." )] public void CreateCustomAttributeForNonAttributeType() { ReflectionUtils.CreateCustomAttribute( GetType() ); diff --git a/test/Spring/Spring.Data.Tests/Transaction/Support/AbstractPlatformTransactionManagerTests.cs b/test/Spring/Spring.Data.Tests/Transaction/Support/AbstractPlatformTransactionManagerTests.cs index 1a01a600..87c49ab5 100644 --- a/test/Spring/Spring.Data.Tests/Transaction/Support/AbstractPlatformTransactionManagerTests.cs +++ b/test/Spring/Spring.Data.Tests/Transaction/Support/AbstractPlatformTransactionManagerTests.cs @@ -43,7 +43,7 @@ namespace Spring.Transaction.Support Assert.IsTrue(_mockTxnMgr.RollbackOnCommitFailure); } [Test] - [ExpectedException(typeof(InvalidTimeoutException), "Invalid transaction timeout")] + [ExpectedException(typeof(InvalidTimeoutException), ExpectedMessage="Invalid transaction timeout")] public void DefinitionInvalidTimeoutException() { MockTxnDefinition def = new MockTxnDefinition(); @@ -51,7 +51,7 @@ namespace Spring.Transaction.Support _mockTxnMgr.GetTransaction( def ); } [Test] - [ExpectedException(typeof(IllegalTransactionStateException), "Transaction propagation 'mandatory' but no existing transaction found")] + [ExpectedException(typeof(IllegalTransactionStateException), ExpectedMessage="Transaction propagation 'mandatory' but no existing transaction found")] public void DefinitionInvalidPropagationState() { MockTxnDefinition def = new MockTxnDefinition(); @@ -60,7 +60,7 @@ namespace Spring.Transaction.Support } [Test] - [ExpectedException(typeof(IllegalTransactionStateException), "Transaction propagation 'never' but existing transaction found.")] + [ExpectedException(typeof(IllegalTransactionStateException), ExpectedMessage="Transaction propagation 'never' but existing transaction found.")] public void NeverPropagateState() { MockTxnDefinition def = new MockTxnDefinition(); @@ -69,7 +69,7 @@ namespace Spring.Transaction.Support _mockTxnMgr.GetTransaction(def); } [Test] - [ExpectedException(typeof(NestedTransactionNotSupportedException), "Transaction manager does not allow nested transactions by default - specify 'NestedTransactionsAllowed' property with value 'true'")] + [ExpectedException(typeof(NestedTransactionNotSupportedException), ExpectedMessage="Transaction manager does not allow nested transactions by default - specify 'NestedTransactionsAllowed' property with value 'true'")] public void NoNestedTransactionsAllowed() { MockTxnDefinition def = new MockTxnDefinition(); diff --git a/test/Spring/Spring.Scheduling.Quartz.Tests/Scheduling/Quartz/JobDetailObjectTest.cs b/test/Spring/Spring.Scheduling.Quartz.Tests/Scheduling/Quartz/JobDetailObjectTest.cs index 7536556a..5a0549b9 100644 --- a/test/Spring/Spring.Scheduling.Quartz.Tests/Scheduling/Quartz/JobDetailObjectTest.cs +++ b/test/Spring/Spring.Scheduling.Quartz.Tests/Scheduling/Quartz/JobDetailObjectTest.cs @@ -42,7 +42,7 @@ namespace Spring.Scheduling.Quartz } [Test] - [ExpectedException(ExceptionType = typeof(ArgumentException))] + [ExpectedException(typeof(ArgumentException))] public void TestJobType_Null() { jobDetail.JobType = null; @@ -65,7 +65,7 @@ namespace Spring.Scheduling.Quartz [Test] - [ExpectedException(ExceptionType = typeof(ArgumentException))] + [ExpectedException(typeof(ArgumentException))] public void TestJobDataAsMap_Null() { jobDetail.JobDataAsMap = null; @@ -123,7 +123,7 @@ namespace Spring.Scheduling.Quartz } [Test] - [ExpectedException(ExceptionType = typeof(ArgumentException))] + [ExpectedException(typeof(ArgumentException))] public void TestAfterPropertiesSet_ApplicationContextJobDataKeySetWithoutApplicationContext() { const string objectName = "springJobDetailObject"; diff --git a/test/Spring/Spring.Scheduling.Quartz.Tests/Scheduling/Quartz/MethodInvokingJobTest.cs b/test/Spring/Spring.Scheduling.Quartz.Tests/Scheduling/Quartz/MethodInvokingJobTest.cs index 93869430..cc4d813f 100644 --- a/test/Spring/Spring.Scheduling.Quartz.Tests/Scheduling/Quartz/MethodInvokingJobTest.cs +++ b/test/Spring/Spring.Scheduling.Quartz.Tests/Scheduling/Quartz/MethodInvokingJobTest.cs @@ -45,14 +45,14 @@ namespace Spring.Scheduling.Quartz } [Test] - [ExpectedException(ExceptionType = typeof(ArgumentException))] + [ExpectedException(typeof(ArgumentException))] public void TestMethodInvoker_SetWithNull() { methodInvokingJob.MethodInvoker = null; } [Test] - [ExpectedException(ExceptionType = typeof(JobExecutionException))] + [ExpectedException(typeof(JobExecutionException))] public void TestMethodInvocation_NullMethodInvokder() { methodInvokingJob.Execute(CreateMinimalJobExecutionContext()); diff --git a/test/Spring/Spring.Scheduling.Quartz.Tests/Scheduling/Quartz/SchedulerFactoryObjectTest.cs b/test/Spring/Spring.Scheduling.Quartz.Tests/Scheduling/Quartz/SchedulerFactoryObjectTest.cs index 327b3e97..28983766 100644 --- a/test/Spring/Spring.Scheduling.Quartz.Tests/Scheduling/Quartz/SchedulerFactoryObjectTest.cs +++ b/test/Spring/Spring.Scheduling.Quartz.Tests/Scheduling/Quartz/SchedulerFactoryObjectTest.cs @@ -252,7 +252,7 @@ namespace Spring.Scheduling.Quartz } [Test] - [ExpectedException(ExceptionType = typeof(ArgumentException))] + [ExpectedException(typeof(ArgumentException))] public void TestSchedulerFactoryType_InvalidType() { TestSchedulerFactory.Mockery.ReplayAll(); diff --git a/test/Spring/Spring.Web.Tests/Web/Services/WebServiceExporterTests.cs b/test/Spring/Spring.Web.Tests/Web/Services/WebServiceExporterTests.cs index c156288c..2466c2b6 100644 --- a/test/Spring/Spring.Web.Tests/Web/Services/WebServiceExporterTests.cs +++ b/test/Spring/Spring.Web.Tests/Web/Services/WebServiceExporterTests.cs @@ -64,7 +64,7 @@ namespace Spring.Web.Services } [Test] - [ExpectedException(typeof(ArgumentException), "The TargetName property is required.")] + [ExpectedException(typeof(ArgumentException), ExpectedMessage="The TargetName property is required.")] public void NullConfig() { wse.ObjectName = "NullConfig";