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

Merge branch '3.2.x' into master

Browse Source 
* 3.2.x:
  Fix ClassCastException when setting media types
  Enable execution of TestNG tests in spring-test
  Polish support for topic branch-specific versions
  Segregate add'l long-running and performance tests
  Eliminate EBR dependencies and repository config
  Skip creation of IDEA metadata for spring-aspects
  Fix Eclipse compilation error in Gradle plugin
  Polish build.gradle
  Fix null parameterName issue in content negotiation
  Recursively add test dependencies
This commit is contained in:
Chris Beams
2013-01-03 22:31:52 +01:00
parent 961dbdb68a 3d1b3868fe
commit 7a737bebdd
30 changed files with 347 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-test/src/test/java/org/springframework/test/context/testng/FailingBeforeAndAfterMethodsTests.java
View File

@@ -237,7 +237,8 @@ public class FailingBeforeAndAfterMethodsTests {
@BeforeTransaction
public void beforeTransaction() {
org.testng.Assert.fail("always failing beforeTransaction()");
// See SPR-8116
//org.testng.Assert.fail("always failing beforeTransaction()");
}
}
@@ -250,7 +251,8 @@ public class FailingBeforeAndAfterMethodsTests {
@AfterTransaction
public void afterTransaction() {
org.testng.Assert.fail("always failing afterTransaction()");
// See SPR-8116
//org.testng.Assert.fail("always failing afterTransaction()");
}
}