svn commit: r1430686 - in /airavata/trunk/modules/integration-tests/src/test/java/org/apache/airavata/integration: BaseCaseIT.java TestMonitorListener.java

[amilaj]

Author: amilaj
Date: Wed Jan  9 05:27:55 2013
New Revision: 1430686

URL: http://svn.apache.org/viewvc?rev=1430686&view=rev
Log:
Making tests fail if returned lists are empty

Modified:
    
airavata/trunk/modules/integration-tests/src/test/java/org/apache/airavata/integration/BaseCaseIT.java
    
airavata/trunk/modules/integration-tests/src/test/java/org/apache/airavata/integration/TestMonitorListener.java

Modified: 
airavata/trunk/modules/integration-tests/src/test/java/org/apache/airavata/integration/BaseCaseIT.java
URL: 
http://svn.apache.org/viewvc/airavata/trunk/modules/integration-tests/src/test/java/org/apache/airavata/integration/BaseCaseIT.java?rev=1430686&r1=1430685&r2=1430686&view=diff
==============================================================================
--- 
airavata/trunk/modules/integration-tests/src/test/java/org/apache/airavata/integration/BaseCaseIT.java
 (original)
+++ 
airavata/trunk/modules/integration-tests/src/test/java/org/apache/airavata/integration/BaseCaseIT.java
 Wed Jan  9 05:27:55 2013
@@ -287,7 +287,7 @@ public class BaseCaseIT {
     }
 
     @Test(groups = { "echoGroup" }/*, dependsOnMethods = { "testEchoService" 
}*/)
-    public void testUpdateEchoService() throws AiravataAPIInvocationException, 
IOException, ComponentException, GraphException {
+    public void testUpdateEchoService() throws Exception {
 
         DescriptorBuilder descriptorBuilder = 
airavataAPI.getDescriptorBuilder();
 
@@ -370,6 +370,7 @@ public class BaseCaseIT {
                runWorkFlowWithoutMonitor(workflow, 
Arrays.asList("echo_output=Airavata_Test"));
         } catch (Exception e) {
             log.error("An error occurred while invoking workflow", e);
+            throw e;
         }
     }
 
@@ -424,9 +425,14 @@ public class BaseCaseIT {
 
         List<WorkflowExecutionDataImpl> workflowInstanceData = 
experimentData.getWorkflowExecutionDataList();
 
+        Assert.assertFalse("Workflow instance data cannot be empty !", 
workflowInstanceData.isEmpty());
+
         for(WorkflowExecutionDataImpl data:workflowInstanceData){
             List<NodeExecutionData> nodeDataList = data.getNodeDataList();
             for(NodeExecutionData nodeData:nodeDataList){
+
+                Assert.assertFalse("Node execution data list cannot be empty 
!", nodeDataList.isEmpty());
+
                System.out.print("******************************");
                System.out.println(nodeData.getOutputData().get(0).getValue());
                 Assert.assertEquals("Airavata_Test", 
nodeData.getOutputData().get(0).getValue());

Modified: 
airavata/trunk/modules/integration-tests/src/test/java/org/apache/airavata/integration/TestMonitorListener.java
URL: 
http://svn.apache.org/viewvc/airavata/trunk/modules/integration-tests/src/test/java/org/apache/airavata/integration/TestMonitorListener.java?rev=1430686&r1=1430685&r2=1430686&view=diff
==============================================================================
--- 
airavata/trunk/modules/integration-tests/src/test/java/org/apache/airavata/integration/TestMonitorListener.java
 (original)
+++ 
airavata/trunk/modules/integration-tests/src/test/java/org/apache/airavata/integration/TestMonitorListener.java
 Wed Jan  9 05:27:55 2013
@@ -42,7 +42,7 @@ public class TestMonitorListener impleme
                 verifyOutput("echo_output=Airavata_Test");
             } catch (Exception e) {
                 log.error("Error verifying output", e);
-                throw new RuntimeException(e);
+                Assert.fail("Error occurred while verifying output.");
             }finally{
                 getExperimentMonitor().stopMonitoring();
             }
@@ -56,14 +56,20 @@ public class TestMonitorListener impleme
 
         ExperimentData experimentData = 
airavataAPI.getProvenanceManager().getExperimentData(this.experimentId);
 
+        Assert.assertNotNull(experimentData);
+
         log.info("Verifying output ...");
 
         List<WorkflowExecutionDataImpl> workflowInstanceData = 
experimentData.getWorkflowExecutionDataList();
 
-//        List<WorkflowInstanceData> workflowInstanceData = 
experimentData.getWorkflowInstanceData();
+        Assert.assertNotNull(workflowInstanceData);
+        Assert.assertFalse("Workflow instance data cannot be empty !", 
workflowInstanceData.isEmpty());
 
         for(WorkflowExecutionDataImpl data:workflowInstanceData){
             List<NodeExecutionData> nodeDataList = data.getNodeDataList();
+
+            Assert.assertFalse("Node execution data list cannot be empty !", 
nodeDataList.isEmpty());
+
             for(NodeExecutionData nodeData:nodeDataList){
                 Assert.assertEquals("Airavata_Test", 
nodeData.getOutputData().get(0).getValue());
                 Assert.assertEquals(outputVerifyingString, 
nodeData.getInputData().get(0).getValue());