SPRNET-1206 - Upgrade to NUnit 2.5

This commit is contained in:
markpollack
2009-07-22 20:27:38 +00:00
parent 522d55ca2a
commit 31ef1727d6
33 changed files with 51 additions and 53 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -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();

View File

@@ -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) });

View File

@@ -24,7 +24,7 @@
using System;
using System.Collections.Generic;
using NUnit.Framework;
using NUnit.Framework.SyntaxHelpers;
//using NUnit.Framework.SyntaxHelpers;
#endregion

View File

@@ -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();

View File

@@ -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;

View File

@@ -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()
{

View File

@@ -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();

View File

@@ -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();

View File

@@ -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();

View File

@@ -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();

View File

@@ -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

View File

@@ -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();

View File

@@ -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();

View File

@@ -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();

View File

@@ -1534,8 +1534,7 @@ namespace Spring.Objects.Factory
/// to the ctor, it should (must) choke.
/// </summary>
[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()

View File

@@ -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);

View File

@@ -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()

View File

@@ -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();

View File

@@ -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();

View File

@@ -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 ();

View File

@@ -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);

View File

@@ -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() );

View File

@@ -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();

View File

@@ -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";

View File

@@ -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());

View File

@@ -252,7 +252,7 @@ namespace Spring.Scheduling.Quartz
}
[Test]
[ExpectedException(ExceptionType = typeof(ArgumentException))]
[ExpectedException(typeof(ArgumentException))]
public void TestSchedulerFactoryType_InvalidType()
{
TestSchedulerFactory.Mockery.ReplayAll();

View File

@@ -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";