Spring/spring-net
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #77 from twisterino/NUnitTearDownFix

Browse Source 
Prevent TearDown to swallow exceptions
This commit is contained in:
Marko Lahma
2014-07-19 11:24:00 +03:00
parent a32fee13be be24957bb5
commit 2f75149e8c
2 changed files with 56 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Spring/Spring.Testing.NUnit/Testing/NUnit/AbstractDependencyInjectionSpringContextTests.cs
View File

@@ -349,6 +349,7 @@ namespace Spring.Testing.NUnit
catch (Exception ex)
{
logger.Error("OnTearDown error", ex);
throw;
}
}

71
test/Spring/Spring.Testing.NUnit.Tests/Testing/NUnit/AbstractDependencyInjectionSpringContextTestsTests.cs
View File

@@ -1,22 +1,24 @@
#region License
/*
* Copyright 2002-2010 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
/*
* Copyright 2002-2010 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#endregion
#endregion
using System;
using NUnit.Framework;
using Spring.Context;
@@ -127,5 +129,42 @@ namespace Spring.Testing.NUnit
Assert.AreNotSame(fixtureInstance.ApplicationContext, otherFixtureInstance.ApplicationContext);
otherFixtureInstance.TearDown();
}
}
private class TestAbstractDependencyInjectionSpringContextTestsExceptions : AbstractDependencyInjectionSpringContextTests
{
private static readonly string[] CONFIGLOCATIONS = new string[] { "assembly://Spring.Testing.NUnit.Tests/Spring.Testing.NUnit/TestApplicationContext.xml" };
public TestAbstractDependencyInjectionSpringContextTestsExceptions()
{ }
protected override string[] ConfigLocations
{
get { return CONFIGLOCATIONS; }
}
protected override void OnSetUp()
{
throw new Exception("SetUp Exception");
}
protected override void OnTearDown()
{
throw new Exception("TearDown Exception");
}
}
[Test, ExpectedException]
public void ThrowsSetUpException()
{
var testFixture = new TestAbstractDependencyInjectionSpringContextTestsExceptions();
testFixture.SetUp();
}
[Test, ExpectedException]
public void ThrowsTearDownException()
{
var testFixture = new TestAbstractDependencyInjectionSpringContextTestsExceptions();
testFixture.TearDown();
}
}
}