You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by he...@apache.org on 2012/01/31 17:45:33 UTC
svn commit: r1238689 -
/incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/
Author: heshan
Date: Tue Jan 31 16:45:32 2012
New Revision: 1238689
URL: http://svn.apache.org/viewvc?rev=1238689&view=rev
Log:
Fix for AIRAVATA-266. Added a test suite to run all the tests. Earlier simple axis server was started each time for each test. This removes it.
Added:
incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/XBayaConsolidatedTestSuite.java
Modified:
incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ComplexMathWorkflowTest.java
incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/CrossProductWorkflowTest.java
incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ForEachWorkflowTest.java
incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/SimpleMathWorkflowTest.java
incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/WorkflowTest.java
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ComplexMathWorkflowTest.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ComplexMathWorkflowTest.java?rev=1238689&r1=1238688&r2=1238689&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ComplexMathWorkflowTest.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ComplexMathWorkflowTest.java Tue Jan 31 16:45:32 2012
@@ -25,7 +25,6 @@ import org.apache.airavata.xbaya.XBayaEx
import org.apache.airavata.xbaya.interpreter.utils.WorkflowTestUtils;
import org.apache.airavata.xbaya.interpretor.WorkflowInterpreter;
import org.apache.airavata.xbaya.wf.Workflow;
-import org.apache.axis2.engine.ListenerManager;
import org.junit.Test;
import java.io.IOException;
@@ -39,10 +38,8 @@ public class ComplexMathWorkflowTest {
public void testScheduleDynamically() throws IOException, URISyntaxException, XBayaException {
URL systemResource = this.getClass().getClassLoader().getSystemResource("ComplexMath.xwf");
Workflow workflow = new Workflow(WorkflowTestUtils.readWorkflow(systemResource));
- ListenerManager manager = WorkflowTestUtils.axis2ServiceStarter();
WorkflowInterpreter interpretor = new WorkflowInterpreter(WorkflowTestUtils.getConfiguration(), UUID.randomUUID().toString(),
workflow, "NA", "NA",true);
interpretor.scheduleDynamically();
- manager.stop();
}
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/CrossProductWorkflowTest.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/CrossProductWorkflowTest.java?rev=1238689&r1=1238688&r2=1238689&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/CrossProductWorkflowTest.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/CrossProductWorkflowTest.java Tue Jan 31 16:45:32 2012
@@ -25,7 +25,6 @@ import org.apache.airavata.xbaya.XBayaEx
import org.apache.airavata.xbaya.interpreter.utils.WorkflowTestUtils;
import org.apache.airavata.xbaya.interpretor.WorkflowInterpreter;
import org.apache.airavata.xbaya.wf.Workflow;
-import org.apache.axis2.engine.ListenerManager;
import org.junit.Test;
import java.io.IOException;
@@ -34,14 +33,13 @@ import java.net.URL;
import java.util.UUID;
public class CrossProductWorkflowTest {
+
@Test
public void testScheduleDynamically() throws IOException, URISyntaxException, XBayaException {
URL systemResource = this.getClass().getClassLoader().getSystemResource("ForeachCrossProductLevenshteinDistance.xwf");
Workflow workflow = new Workflow(WorkflowTestUtils.readWorkflow(systemResource));
- ListenerManager manager = WorkflowTestUtils.axis2ServiceStarter();
WorkflowInterpreter interpretor = new WorkflowInterpreter(WorkflowTestUtils.getConfiguration(), UUID.randomUUID().toString(),
workflow, "NA", "NA",true);
interpretor.scheduleDynamically();
- manager.stop();
}
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ForEachWorkflowTest.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ForEachWorkflowTest.java?rev=1238689&r1=1238688&r2=1238689&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ForEachWorkflowTest.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ForEachWorkflowTest.java Tue Jan 31 16:45:32 2012
@@ -25,7 +25,6 @@ import org.apache.airavata.xbaya.graph.s
import org.apache.airavata.xbaya.interpreter.utils.WorkflowTestUtils;
import org.apache.airavata.xbaya.interpretor.WorkflowInterpreter;
import org.apache.airavata.xbaya.wf.Workflow;
-import org.apache.axis2.engine.ListenerManager;
import org.junit.Test;
import java.io.IOException;
@@ -34,15 +33,14 @@ import java.net.URL;
import java.util.UUID;
public class ForEachWorkflowTest {
- @Test
+
+ @Test
public void testScheduleDynamically() throws IOException, URISyntaxException, XBayaException {
URL systemResource = this.getClass().getClassLoader().getSystemResource("SimpleEcho.xwf");
Workflow workflow = new Workflow(WorkflowTestUtils.readWorkflow(systemResource));
- ListenerManager manager = WorkflowTestUtils.axis2ServiceStarter();
((InputNode) workflow.getGraph().getNode("input")).setDefaultValue("1");
WorkflowInterpreter interpretor = new WorkflowInterpreter(WorkflowTestUtils.getConfiguration(), UUID.randomUUID().toString(),
workflow, "NA", "NA",true);
interpretor.scheduleDynamically();
- manager.stop();
}
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/SimpleMathWorkflowTest.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/SimpleMathWorkflowTest.java?rev=1238689&r1=1238688&r2=1238689&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/SimpleMathWorkflowTest.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/SimpleMathWorkflowTest.java Tue Jan 31 16:45:32 2012
@@ -25,7 +25,6 @@ import org.apache.airavata.xbaya.XBayaEx
import org.apache.airavata.xbaya.interpreter.utils.WorkflowTestUtils;
import org.apache.airavata.xbaya.interpretor.WorkflowInterpreter;
import org.apache.airavata.xbaya.wf.Workflow;
-import org.apache.axis2.engine.ListenerManager;
import org.junit.Test;
import java.io.IOException;
@@ -35,15 +34,13 @@ import java.util.UUID;
public class SimpleMathWorkflowTest {
- @Test
+ @Test
public void testScheduleDynamically() throws IOException, URISyntaxException, XBayaException {
URL systemResource = this.getClass().getClassLoader().getSystemResource("SimpleMath.xwf");
Workflow workflow = new Workflow(WorkflowTestUtils.readWorkflow(systemResource));
- ListenerManager manager = WorkflowTestUtils.axis2ServiceStarter();
WorkflowInterpreter interpretor = new WorkflowInterpreter(WorkflowTestUtils.getConfiguration(), UUID.randomUUID().toString(),
workflow, "NA", "NA",true);
interpretor.scheduleDynamically();
- manager.stop();
}
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/WorkflowTest.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/WorkflowTest.java?rev=1238689&r1=1238688&r2=1238689&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/WorkflowTest.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/WorkflowTest.java Tue Jan 31 16:45:32 2012
@@ -21,30 +21,27 @@
package org.apache.airavata.xbaya.interpreter;
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.UUID;
-
import org.apache.airavata.xbaya.XBayaException;
import org.apache.airavata.xbaya.graph.system.InputNode;
import org.apache.airavata.xbaya.interpreter.utils.WorkflowTestUtils;
-import org.apache.airavata.xbaya.interpretor.*;
+import org.apache.airavata.xbaya.interpretor.WorkflowInterpreter;
import org.apache.airavata.xbaya.wf.Workflow;
-import org.apache.axis2.engine.ListenerManager;
import org.junit.Test;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.UUID;
+
public class WorkflowTest{
- @Test
+ @Test
public void testScheduleDynamically() throws IOException, URISyntaxException, XBayaException {
URL systemResource = this.getClass().getClassLoader().getSystemResource("SimpleEcho.xwf");
Workflow workflow = new Workflow(WorkflowTestUtils.readWorkflow(systemResource));
- ListenerManager manager = WorkflowTestUtils.axis2ServiceStarter();
((InputNode) workflow.getGraph().getNode("input")).setDefaultValue("1");
WorkflowInterpreter interpretor = new WorkflowInterpreter(WorkflowTestUtils.getConfiguration(), UUID.randomUUID().toString(),
workflow, "NA", "NA",true);
interpretor.scheduleDynamically();
- manager.stop();
}
}
Added: incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/XBayaConsolidatedTestSuite.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/XBayaConsolidatedTestSuite.java?rev=1238689&view=auto
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/XBayaConsolidatedTestSuite.java (added)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/XBayaConsolidatedTestSuite.java Tue Jan 31 16:45:32 2012
@@ -0,0 +1,29 @@
+package org.apache.airavata.xbaya.interpreter;
+
+import org.apache.airavata.xbaya.interpreter.utils.WorkflowTestUtils;
+import org.apache.axis2.AxisFault;
+import org.apache.axis2.engine.ListenerManager;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+
+@RunWith(Suite.class)
+@Suite.SuiteClasses({XBayaClientTest.class, SimpleMathWorkflowTest.class, WorkflowTest.class,
+ ComplexMathWorkflowTest.class, CrossProductWorkflowTest.class, ForEachWorkflowTest.class,
+ WorkflowTrackingTest.class, RegistryServiceTest.class})
+public class XBayaConsolidatedTestSuite {
+ static ListenerManager manager = null;
+
+ @BeforeClass
+ public static void startServer() throws AxisFault {
+ manager = WorkflowTestUtils.axis2ServiceStarter();
+ }
+
+ @AfterClass
+ public static void stopServer() throws AxisFault {
+ manager.stop();
+ }
+
+}