Author: Grid.Qian
Date: 2010-12-09 05:03:02 -0500 (Thu, 09 Dec 2010)
New Revision: 27263
Removed:
trunk/ws/tests/org.jboss.tools.ws.creation.core.test/projects/ClientTest/build/classes/org/
trunk/ws/tests/org.jboss.tools.ws.creation.core.test/projects/JavaFirstTestProject/build/classes/org/
Modified:
trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/AbstractJBossWSGenerationTest.java
trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/JBossWSClientSampleCreationCommandTest.java
trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/JBossWSJavaFirstCommandTest.java
trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/JBossWSMergeWebXMLCommandTest.java
trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/JBossWSTopDownCommandTest.java
Log:
JBIDE-6581: modify thes ws tests
Modified:
trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/AbstractJBossWSGenerationTest.java
===================================================================
---
trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/AbstractJBossWSGenerationTest.java 2010-12-09
09:09:15 UTC (rev 27262)
+++
trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/AbstractJBossWSGenerationTest.java 2010-12-09
10:03:02 UTC (rev 27263)
@@ -8,6 +8,7 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IStatus;
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
import org.eclipse.wst.common.project.facet.core.IFacetedProject;
import org.eclipse.wst.common.project.facet.core.IProjectFacet;
@@ -92,7 +93,11 @@
IServerWorkingCopy serverWC = currentServer.createWorkingCopy();
serverWC.modifyModules(modules, null, null);
serverWC.save(true, null).publish(0, null);
- currentServer.publish(IServer.PUBLISH_FULL, null);
+ IStatus status = currentServer.publish(IServer.PUBLISH_FULL, null);
+ int i = 0;
+ while(!status.isOK() && i++ <30){
+ JobUtils.delay(500);
+ }
}
private boolean isServerSupplied() {
Modified:
trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/JBossWSClientSampleCreationCommandTest.java
===================================================================
---
trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/JBossWSClientSampleCreationCommandTest.java 2010-12-09
09:09:15 UTC (rev 27262)
+++
trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/JBossWSClientSampleCreationCommandTest.java 2010-12-09
10:03:02 UTC (rev 27263)
@@ -43,18 +43,15 @@
try {
JobUtils.delay(500);
try {
- System.out.println("Deleting " + prj);
prj.delete(true, null);
JobUtils.delay(500);
} catch (Exception e) {
- System.out.println("Error deleting " + prj);
e.printStackTrace();
last = e;
}
} finally {
ResourcesUtils.setBuildAutomatically(oldAutoBuilding);
}
-
if (last != null)
throw last;
super.tearDown();
Modified:
trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/JBossWSJavaFirstCommandTest.java
===================================================================
---
trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/JBossWSJavaFirstCommandTest.java 2010-12-09
09:09:15 UTC (rev 27262)
+++
trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/JBossWSJavaFirstCommandTest.java 2010-12-09
10:03:02 UTC (rev 27263)
@@ -77,10 +77,8 @@
project.refreshLocal(IResource.DEPTH_INFINITE, null);
project.build(IncrementalProjectBuilder.FULL_BUILD, null);
- publishWebProject();
- assertTrue(currentServer.getModules().length > 0);
startup(currentServer);
- JobUtils.delay(12000);
+ publishWebProject();
String webServiceUrl =
"http://127.0.0.1:8080/JavaFirstTestProject/HelloWorld?wsdl";
URL url = new URL(webServiceUrl);
URLConnection conn = url.openConnection();
Modified:
trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/JBossWSMergeWebXMLCommandTest.java
===================================================================
---
trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/JBossWSMergeWebXMLCommandTest.java 2010-12-09
09:09:15 UTC (rev 27262)
+++
trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/JBossWSMergeWebXMLCommandTest.java 2010-12-09
10:03:02 UTC (rev 27263)
@@ -44,11 +44,9 @@
try {
JobUtils.delay(500);
try {
- System.out.println("Deleting " + prj);
prj.delete(true, null);
JobUtils.delay(500);
} catch (Exception e) {
- System.out.println("Error deleting " + prj);
e.printStackTrace();
last = e;
}
Modified:
trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/JBossWSTopDownCommandTest.java
===================================================================
---
trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/JBossWSTopDownCommandTest.java 2010-12-09
09:09:15 UTC (rev 27262)
+++
trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/JBossWSTopDownCommandTest.java 2010-12-09
10:03:02 UTC (rev 27263)
@@ -63,9 +63,8 @@
fproject.getProject().refreshLocal(IResource.DEPTH_INFINITE, null);
fproject.getProject().build(IncrementalProjectBuilder.FULL_BUILD, null);
- publishWebProject();
startup(currentServer);
- JobUtils.delay(12000);
+ publishWebProject();
assertTrue(currentServer.getModules().length > 0);
String webServiceUrl =
"http://127.0.0.1:8080/JBossWSTestProject/Greeter?wsdl";
URL url = new URL(webServiceUrl);