Author: veithen
Date: Sat Jun 4 20:06:58 2016
New Revision: 1746849
URL: http://svn.apache.org/viewvc?rev=1746849&view=rev
Log:
Upgrade JUnit and stabilize a flaky unit test (that no longer exists on the
trunk).
Modified:
axis/axis2/java/core/branches/1_7/ (props changed)
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/OMElementDispatchTest.java
axis/axis2/java/core/branches/1_7/modules/testutils/src/main/java/org/apache/axis2/testutils/RuntimeIgnoreRunNotifier.java
axis/axis2/java/core/branches/1_7/pom.xml
Propchange: axis/axis2/java/core/branches/1_7/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jun 4 20:06:58 2016
@@ -1,4 +1,4 @@
/axis/axis2/java/core/branches/1_6:1295540
/axis/axis2/java/core/branches/AXIOM-420:1334386-1336397
/axis/axis2/java/core/branches/AXIS2-4318:1230452,1295542,1324772,1327468,1329571,1332141,1335355,1335357,1340985
-/axis/axis2/java/core/trunk:1726494,1726509,1726513,1727171,1727174,1727177,1727180,1729891,1730095,1730139,1730180,1730186,1730195,1730197,1730222,1730300,1730308,1730310,1730317,1730322,1730335,1730369,1730427,1730618,1731425,1731441,1731446,1731448,1732354,1733137,1733663,1733713,1733766,1733770,1733773,1733850,1734176,1735331,1735795,1736512,1736543,1737030,1737567,1739001,1739186,1739343,1739346,1739348,1739493,1739815,1739826,1740693-1740694,1743824,1745826,1745860,1745869,1745875,1745912,1745924,1745929,1745941,1746001,1746028,1746109
+/axis/axis2/java/core/trunk:1726494,1726509,1726513,1727171,1727174,1727177,1727180,1729891,1730095,1730139,1730180,1730186,1730195,1730197,1730222,1730300,1730308,1730310,1730317,1730322,1730335,1730369,1730427,1730618,1731425,1731441,1731446,1731448,1732354,1733137,1733663,1733713,1733766,1733770,1733773,1733850,1734176,1735331,1735795,1736512,1736543,1737030,1737567,1739001,1739186,1739343,1739346,1739348,1739493,1739592,1739594,1739815,1739826,1740693-1740694,1743824,1745826,1745860,1745869,1745875,1745912,1745924,1745929,1745941,1746001,1746028,1746109
Modified:
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/OMElementDispatchTest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/OMElementDispatchTest.java?rev=1746849&r1=1746848&r2=1746849&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/OMElementDispatchTest.java
(original)
+++
axis/axis2/java/core/branches/1_7/modules/jaxws-integration/test/org/apache/axis2/jaxws/dispatch/OMElementDispatchTest.java
Sat Jun 4 20:06:58 2016
@@ -53,11 +53,14 @@ import org.apache.axis2.jaxws.framework.
import org.apache.axis2.jaxws.message.databinding.ParsedEntityReader;
import org.apache.axis2.jaxws.message.factory.ParsedEntityReaderFactory;
import org.apache.axis2.jaxws.registry.FactoryRegistry;
+import org.junit.FixMethodOrder;
+import org.junit.runners.MethodSorters;
/**
* This class uses the JAX-WS Dispatch API to test sending and receiving
* messages using SOAP 1.2.
*/
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class OMElementDispatchTest extends AbstractTestCase {
private static final QName QNAME_SERVICE = new QName(
Modified:
axis/axis2/java/core/branches/1_7/modules/testutils/src/main/java/org/apache/axis2/testutils/RuntimeIgnoreRunNotifier.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/testutils/src/main/java/org/apache/axis2/testutils/RuntimeIgnoreRunNotifier.java?rev=1746849&r1=1746848&r2=1746849&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_7/modules/testutils/src/main/java/org/apache/axis2/testutils/RuntimeIgnoreRunNotifier.java
(original)
+++
axis/axis2/java/core/branches/1_7/modules/testutils/src/main/java/org/apache/axis2/testutils/RuntimeIgnoreRunNotifier.java
Sat Jun 4 20:06:58 2016
@@ -87,7 +87,7 @@ class RuntimeIgnoreRunNotifier extends R
}
@Override
- public void testAborted(Description description, Throwable cause) {
- target.testAborted(description, cause);
+ public void fireTestAssumptionFailed(Failure failure) {
+ target.fireTestAssumptionFailed(failure);
}
}
\ No newline at end of file
Modified: axis/axis2/java/core/branches/1_7/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/pom.xml?rev=1746849&r1=1746848&r2=1746849&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_7/pom.xml (original)
+++ axis/axis2/java/core/branches/1_7/pom.xml Sat Jun 4 20:06:58 2016
@@ -513,8 +513,6 @@
<jaxbri.version>2.2.6</jaxbri.version>
<jettison.version>1.3</jettison.version>
<jibx.version>1.2</jibx.version>
- <junit.version-jdk1.4>3.8.2</junit.version-jdk1.4>
- <junit.version>4.4</junit.version>
<log4j.version>1.2.15</log4j.version>
<maven.archiver.version>2.2</maven.archiver.version>
<maven.artifact.version>2.0.8</maven.artifact.version>
@@ -859,7 +857,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${junit.version}</version>
+ <version>4.12</version>
</dependency>
<dependency>
<groupId>org.apache.xmlbeans</groupId>
