This is an automated email from the git hooks/post-receive script. eugene-guest pushed a commit to annotated tag testng-6.9.5 in repository testng.
commit 9fdab352d4250ae7bd77ec8926d8676b40f55c73 Merge: 3942a10 20d2778 Author: Julien Herr <[email protected]> Date: Fri May 29 09:55:20 2015 +0200 Merge remote-tracking branch 'origin/master' into issue-465 Conflicts: CHANGES.txt .classpath | 21 +- .gitignore | 28 +- .travis.yml | 4 +- CHANGES.txt | 15 +- build-ant.xml => ant/build-ant.xml | 148 ++-- build-tests.xml => ant/build-tests.xml | 0 build.xml => ant/build.xml | 934 ++++++++++----------- build-with-gradle | 1 + build.gradle | 130 +++ doc/documentation-main.html | 7 +- doc/download.html | 51 +- doc/index.html | 4 +- gigaspaces/.classpath | 12 - gigaspaces/.project | 17 - gigaspaces/3rdparty/JSpaces.jar | Bin 5446503 -> 0 bytes .../3rdparty/common/backport-util-concurrent.jar | Bin 327810 -> 0 bytes gigaspaces/3rdparty/jini/jsk-lib.jar | Bin 291877 -> 0 bytes gigaspaces/3rdparty/jini/jsk-platform.jar | Bin 995179 -> 0 bytes gigaspaces/build.xml | 101 --- .../src/org/testng/gigaspaces/ResultEntry.java | 44 - .../org/testng/gigaspaces/SpaceMasterAdapter.java | 153 ---- .../org/testng/gigaspaces/SpaceWorkerAdapter.java | 113 --- .../src/org/testng/gigaspaces/SuiteEntry.java | 59 -- .../test/src/test/gigaspaces/DistributedTest.java | 171 ---- gigaspaces/test/src/test/gigaspaces/Test1.java | 15 - gigaspaces/test/src/test/gigaspaces/Test2.java | 14 - gradle/buildWithTravis.sh | 1 + gradle/publishing.gradle | 171 ++++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 52141 bytes gradle/wrapper/gradle-wrapper.properties | 6 + gradlew | 164 ++++ gradlew.bat | 90 ++ local.properties | 6 + maven/build-with-maven | 25 + maven/bundle-pom.xml | 59 ++ maven/plugin-resources/junitRpt-failed.jsl | 307 ------- maven/plugin-resources/junitRpt.jsl | 375 --------- maven/plugin.jelly | 88 -- maven/plugin.properties | 5 - pom-test.xml => maven/pom-test.xml | 0 maven/project.properties | 3 - maven/project.xml | 97 --- pom.xml | 220 +++-- spring/.classpath | 15 - spring/.cvsignore | 3 - spring/.project | 17 - spring/3rdparty/commons-logging-1.0.4.jar | Bin 38015 -> 0 bytes spring/3rdparty/spring-mock.jar | Bin 99358 -> 0 bytes spring/3rdparty/spring.jar | Bin 2593850 -> 0 bytes spring/LICENSE.txt | 201 ----- spring/README.TXT | 23 - spring/build.xml | 94 --- ...tractDependencyInjectionSpringContextTests.java | 259 ------ .../spring/test/AbstractSpringContextTests.java | 140 --- ...tTransactionalDataSourceSpringContextTests.java | 175 ---- .../AbstractTransactionalSpringContextTests.java | 328 -------- .../src/common/org/testng/spring/test/package.html | 14 - .../test/AbstractSingleSpringContextTests.java | 192 ----- .../AbstractAnnotationAwareTransactionalTests.java | 67 -- .../test/AbstractSingleSpringContextTests.java | 194 ----- .../java/org/testng/internal/VersionTemplateJava} | 2 +- src/main/java/org/testng/Assert.java | 16 +- src/main/java/org/testng/ISuite.java | 2 + src/main/java/org/testng/SuiteRunner.java | 5 + src/main/java/org/testng/TestNG.java | 5 +- src/main/java/org/testng/TestRunner.java | 2 +- .../java/org/testng/annotations/BeforeMethod.java | 4 +- .../java/org/testng/annotations/BeforeSuite.java | 2 +- .../java/org/testng/annotations/Configuration.java | 2 +- src/main/java/org/testng/asserts/Assertion.java | 782 ++--------------- src/main/java/org/testng/asserts/IAssert.java | 6 +- .../java/org/testng/asserts/IAssertLifecycle.java | 12 +- .../java/org/testng/asserts/LoggingAssert.java | 2 +- src/main/java/org/testng/asserts/SoftAssert.java | 6 +- .../java/org/testng/internal/BaseClassFinder.java | 2 +- src/main/java/org/testng/internal/ClassImpl.java | 12 +- .../java/org/testng/internal/ClassInfoMap.java | 2 +- src/main/java/org/testng/internal/Invoker.java | 14 +- .../annotations/JDK15AnnotationFinder.java | 12 +- .../java/org/testng/remote/SuiteDispatcher.java | 1 + .../java/org/testng/xml/TestNGContentHandler.java | 4 + src/main/java/org/testng/xml/XmlClass.java | 13 +- src/main/java/org/testng/xml/XmlSuite.java | 13 + .../internal/{Version.java => VersionTemplateJava} | 2 +- src/main/resources/testng-1.0.dtd | 4 + src/test/java/org/testng/AssertTest.java | 68 ++ .../AnnotationTransformerTest.java | 20 + .../annotationtransformer/MyParamTransformer.java | 30 + src/test/java/test/assertion/AssertionTest.java | 29 + src/test/java/test/assertion/MyRawAssertion.java | 72 ++ src/test/java/test/enable/A.java | 28 + src/test/java/test/enable/B.java | 28 + src/test/java/test/enable/C.java | 28 + src/test/java/test/enable/EnableTest.java | 49 +- .../java/test/enable/Issue420BaseTestCase.java | 19 + src/test/java/test/enable/Issue420FirstSample.java | 10 + .../java/test/enable/Issue420SecondSample.java | 10 + .../expectedexceptions/ExpectedExceptionsTest.java | 2 +- .../test/expectedexceptions/SampleExceptions2.java | 5 + .../java/test/methodinterceptors/Issue392.java | 17 + .../java/test/methodinterceptors/Issue392Test.java | 43 + .../java/test/serviceloader/ServiceLoaderTest.java | 13 +- src/test/resources/testng.xml | 1 + 103 files changed, 2060 insertions(+), 4720 deletions(-) diff --cc CHANGES.txt index e503e56,0d5b260..f93cd16 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,4 -1,17 +1,18 @@@ Current + + Fixed: The ServiceLoaderTest on Windows (Mathieu Sebire) + Fixed: GITHUB-691: Fix classloading issue when using TestNG 6.9.4 and JMockit. (Mathieu Sebire) + Fixed: GITHUB-686: IAnnotationTransformer.transform is called for methods with testClass populated. (Łukasz Rekucki & Julien Herr) + Fixed: GITHUB-420: Before/AfterSuite methods may not run, when use inheritance, and enabled=false (Jakub Tokaj & Julien Herr) ++Fixed: GITHUB-465: assertEquals(Collection, Collection) prints "null" when collections are different sizes (Michael Diamond) + + Eclipse: + + Fixed: The 57% freeze bug (Patrick Hensley and @denyska) + + 6.9.4: + 2015/05/09 + Added: GITHUB-631: Avoid the static limitation of external DataProvider. (Julien Herr) Added: GITHUB-631: Allow to use Guice injection in DataProvider. (Julien Herr) Added: Drop support of Java6 and previous. @@@ -30,7 -43,8 +44,6 @@@ New: GITHUB-645: TestNG project on Goog Fixed: GITHUB-310: Upgrade Guice (kronar & Julien Herr) Fixed: GITHUB-87: @BeforeSuite/@BeforeTest methods happens to be disabled by mistake (romlom & Julien Herr) Fixed: GITHUB-425: Wrong invocation order with lastTimeOnly (Rafael Winterhalter & Julien Herr) - Fixed: GITHUB-465: assertEquals(Collection, Collection) prints "null" when collections are different sizes (Michael Diamond) -Fixed: GITHUB-417: Expected Exceptions Message fails to match multi-line messages (Michael Diamond) -New: GITHUB-663: Add Guice Stage configuration for a suite (Clément Guillaume) 6.8.21: 2015/02/02 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/testng.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
