Author: keith
Date: Sun May 11 06:46:38 2008
New Revision: 16798
Log:
Another potential fix for test failures on windows
Modified:
trunk/mashup/java/modules/integration/test/org/wso2/mashup/integration/AnnotatedSchemaIntegrationTest.java
trunk/mashup/java/modules/integration/test/org/wso2/mashup/integration/E4XTest.java
trunk/mashup/java/modules/integration/test/org/wso2/mashup/integration/HttpUnitBasedIntegrationTest.java
trunk/mashup/java/modules/integration/test/org/wso2/mashup/integration/IntegrationTest.java
trunk/mashup/java/modules/integration/test/org/wso2/mashup/integration/IntegrationTestSuite.java
trunk/mashup/java/modules/integration/test/org/wso2/mashup/integration/SchemaIntegrationTest.java
trunk/mashup/java/modules/integration/test/org/wso2/mashup/integration/ScraperTest.java
trunk/mashup/java/modules/integration/test/org/wso2/mashup/integration/SystemHostObjectIntegrationTest.java
Modified:
trunk/mashup/java/modules/integration/test/org/wso2/mashup/integration/AnnotatedSchemaIntegrationTest.java
==============================================================================
---
trunk/mashup/java/modules/integration/test/org/wso2/mashup/integration/AnnotatedSchemaIntegrationTest.java
(original)
+++
trunk/mashup/java/modules/integration/test/org/wso2/mashup/integration/AnnotatedSchemaIntegrationTest.java
Sun May 11 06:46:38 2008
@@ -36,8 +36,7 @@
sender = new ServiceClient();
annotatedSchemaEPR =
new EndpointReference(host + ":" + port + "/" + serviceRoot +
"/system/annotatedSchema");
- IntegrationTestSuite.testConnect(
- new EndpointReference(host + ":" + port + "/" + serviceRoot +
"/system/annotatedSchema"));
+
}
/**
Modified:
trunk/mashup/java/modules/integration/test/org/wso2/mashup/integration/E4XTest.java
==============================================================================
---
trunk/mashup/java/modules/integration/test/org/wso2/mashup/integration/E4XTest.java
(original)
+++
trunk/mashup/java/modules/integration/test/org/wso2/mashup/integration/E4XTest.java
Sun May 11 06:46:38 2008
@@ -42,8 +42,7 @@
new EndpointReference(host + ":" + port + "/" + serviceRoot +
"/system/E4XTest");
// Tests weather the server has started
- IntegrationTestSuite.testConnect(
- new EndpointReference(host + ":" + port + "/" + serviceRoot +
"/system/E4XTest"));
+
}
/**
Modified:
trunk/mashup/java/modules/integration/test/org/wso2/mashup/integration/HttpUnitBasedIntegrationTest.java
==============================================================================
---
trunk/mashup/java/modules/integration/test/org/wso2/mashup/integration/HttpUnitBasedIntegrationTest.java
(original)
+++
trunk/mashup/java/modules/integration/test/org/wso2/mashup/integration/HttpUnitBasedIntegrationTest.java
Sun May 11 06:46:38 2008
@@ -27,8 +27,7 @@
public void setUp() throws java.lang.Exception {
super.setUp();
- IntegrationTestSuite.testConnect(
- new EndpointReference(host + ":" + port + "/" + serviceRoot +
"/system/version"));
+
}
// public void testTryIt() throws Exception {
Modified:
trunk/mashup/java/modules/integration/test/org/wso2/mashup/integration/IntegrationTest.java
==============================================================================
---
trunk/mashup/java/modules/integration/test/org/wso2/mashup/integration/IntegrationTest.java
(original)
+++
trunk/mashup/java/modules/integration/test/org/wso2/mashup/integration/IntegrationTest.java
Sun May 11 06:46:38 2008
@@ -54,8 +54,7 @@
host + ":" + port + "/" + serviceRoot +
"/system/transportSessionService");
proxyGWSRServiceEPR =
new EndpointReference(host + ":" + port + "/" + serviceRoot +
"/system/proxyglobalWS");
- IntegrationTestSuite.testConnect(
- new EndpointReference(host + ":" + port + "/" + serviceRoot +
"/system/version"));
+
}
/**
Modified:
trunk/mashup/java/modules/integration/test/org/wso2/mashup/integration/IntegrationTestSuite.java
==============================================================================
---
trunk/mashup/java/modules/integration/test/org/wso2/mashup/integration/IntegrationTestSuite.java
(original)
+++
trunk/mashup/java/modules/integration/test/org/wso2/mashup/integration/IntegrationTestSuite.java
Sun May 11 06:46:38 2008
@@ -23,7 +23,6 @@
import junit.framework.TestSuite;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.impl.builder.StAXOMBuilder;
-import org.apache.axis2.addressing.EndpointReference;
import org.wso2.wsas.Main;
import org.wso2.wsas.ServerConstants;
@@ -63,6 +62,7 @@
main = new Main();
main.startServer();
+ testConnect(host + ":" + port + "/" + serviceRoot +
"/system/version/getVersion");
}
public void tearDown() throws Exception {
@@ -70,11 +70,11 @@
};
}
- public static void testConnect(EndpointReference epr)
+ public static void testConnect(String epr)
throws Exception {
URL url;
try {
- url = new URL(epr.getAddress());
+ url = new URL(epr);
} catch (MalformedURLException e) {
throw new Exception(e);
}
Modified:
trunk/mashup/java/modules/integration/test/org/wso2/mashup/integration/SchemaIntegrationTest.java
==============================================================================
---
trunk/mashup/java/modules/integration/test/org/wso2/mashup/integration/SchemaIntegrationTest.java
(original)
+++
trunk/mashup/java/modules/integration/test/org/wso2/mashup/integration/SchemaIntegrationTest.java
Sun May 11 06:46:38 2008
@@ -57,8 +57,6 @@
sender = new ServiceClient();
schemaTestEPR =
new EndpointReference(host + ":" + port + "/" + serviceRoot +
"/system/schemaTest");
- IntegrationTestSuite.testConnect(
- new EndpointReference(host + ":" + port + "/" + serviceRoot +
"/system/schemaTest"));
}
public void testEchoJSstring() throws Exception {
Modified:
trunk/mashup/java/modules/integration/test/org/wso2/mashup/integration/ScraperTest.java
==============================================================================
---
trunk/mashup/java/modules/integration/test/org/wso2/mashup/integration/ScraperTest.java
(original)
+++
trunk/mashup/java/modules/integration/test/org/wso2/mashup/integration/ScraperTest.java
Sun May 11 06:46:38 2008
@@ -39,7 +39,6 @@
String address = host + ":" + port + "/" + serviceRoot +
"/system/scraperTest";
scraperTestEPR = new EndpointReference(address);
resourcePath = address + "/wso2Builder.html";
- IntegrationTestSuite.testConnect(new EndpointReference(address));
}
public void testScraperXPathTest() throws Exception {
Modified:
trunk/mashup/java/modules/integration/test/org/wso2/mashup/integration/SystemHostObjectIntegrationTest.java
==============================================================================
---
trunk/mashup/java/modules/integration/test/org/wso2/mashup/integration/SystemHostObjectIntegrationTest.java
(original)
+++
trunk/mashup/java/modules/integration/test/org/wso2/mashup/integration/SystemHostObjectIntegrationTest.java
Sun May 11 06:46:38 2008
@@ -40,7 +40,6 @@
sender = new ServiceClient();
proxyServiceEPR =
new EndpointReference(host + ":" + port + "/" + serviceRoot +
"/system/hostObjectService");
- IntegrationTestSuite.testConnect(proxyServiceEPR);
}
public void testSystemHostObjectWait() throws Exception {
_______________________________________________
Mashup-dev mailing list
[email protected]
http://www.wso2.org/cgi-bin/mailman/listinfo/mashup-dev
