Author: dkulp
Date: Thu Oct 20 01:10:58 2011
New Revision: 1186592
URL: http://svn.apache.org/viewvc?rev=1186592&view=rev
Log:
Merged revisions 1186487 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1186487 | dkulp | 2011-10-19 16:58:03 -0400 (Wed, 19 Oct 2011) | 1 line
Cleanup a test that keeps randomly failing for me
........
Modified:
cxf/branches/2.4.x-fixes/ (props changed)
cxf/branches/2.4.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/MAPTest.java
cxf/branches/2.4.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/MAPTestBase.java
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.4.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/MAPTest.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/MAPTest.java?rev=1186592&r1=1186591&r2=1186592&view=diff
==============================================================================
---
cxf/branches/2.4.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/MAPTest.java
(original)
+++
cxf/branches/2.4.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/MAPTest.java
Thu Oct 20 01:10:58 2011
@@ -19,14 +19,10 @@
package org.apache.cxf.systest.ws.addressing;
-import java.lang.reflect.UndeclaredThrowableException;
-
import javax.jws.WebService;
-import org.apache.hello_world_soap_http.BadRecordLitFault;
import org.junit.BeforeClass;
-import org.junit.Test;
/**
@@ -69,29 +65,5 @@ public class MAPTest extends MAPTestBase
public static class GreeterImpl extends
org.apache.cxf.systest.ws.addressing.AbstractGreeterImpl {
}
-
- @Test
- public void testUsingKeepAliveConnection() throws Exception {
- if (!"HP-UX".equals(System.getProperty("os.name"))) {
- return;
- }
- int n = 100;
- for (int i = 0; i < n; i++) {
- greeter.greetMeOneWay("oneway on keep-alive connection");
- }
- for (int i = 0; i < n; i++) {
- assertNotNull(greeter.greetMe("twoway on keep-alive connection"));
- }
- for (int i = 0; i < 0; i++) {
- try {
- greeter.testDocLitFault("BadRecordLitFault");
- fail("expected fault from service");
- } catch (BadRecordLitFault brlf) {
- //checkVerification();
- } catch (UndeclaredThrowableException ex) {
- throw (Exception)ex.getCause();
- }
- }
- }
}
Modified:
cxf/branches/2.4.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/MAPTestBase.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/MAPTestBase.java?rev=1186592&r1=1186591&r2=1186592&view=diff
==============================================================================
---
cxf/branches/2.4.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/MAPTestBase.java
(original)
+++
cxf/branches/2.4.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/MAPTestBase.java
Thu Oct 20 01:10:58 2011
@@ -186,8 +186,6 @@ public abstract class MAPTestBase extend
}
@Test
- //@org.junit.Ignore("randomly fails quite often, but not in the "
- // + " debugger so not sure what is going on yet")
public void testExplicitMAPs() throws Exception {
try {
String msgId = "urn:uuid:12345-" + Math.random();
@@ -259,7 +257,6 @@ public abstract class MAPTestBase extend
@Test
- //@org.junit.Ignore("Random failure on Linux")
public void testApplicationFault() throws Exception {
try {
greeter.testDocLitFault("BadRecordLitFault");
