You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ch...@apache.org on 2012/10/12 18:25:34 UTC
svn commit: r1397633 - in
/airavata/trunk/modules/registry/airavata-jpa-registry/src:
main/java/org/apache/airavata/persistance/registry/jpa/resources/
test/java/org/apache/airavata/persistance/registry/jpa/
Author: chathuri
Date: Fri Oct 12 16:25:33 2012
New Revision: 1397633
URL: http://svn.apache.org/viewvc?rev=1397633&view=rev
Log:
update test cases
Modified:
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ProjectResource.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ApplicationDescriptorResourceTest.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ConfigurationResourceTest.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ExperimentDataResourceTest.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ExperimentMetadataResourceTest.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ExperimentResourceTest.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/GatewayResourceTest.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/GramDataResourceTest.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/HostDescriptorResourceTest.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/NodeDataResourceTest.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ProjectResourceTest.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/PublishWorkflowResourceTest.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ServiceDescriptorResourceTest.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/UserResourceTest.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/UserWorkflowResourceTest.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/WorkerResourceTest.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/WorkflowDataResourceTest.java
Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ProjectResource.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ProjectResource.java?rev=1397633&r1=1397632&r2=1397633&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ProjectResource.java (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ProjectResource.java Fri Oct 12 16:25:33 2012
@@ -89,8 +89,6 @@ public class ProjectResource extends Abs
em.getTransaction().begin();
if (type == ResourceType.EXPERIMENT) {
QueryGenerator generator = new QueryGenerator(EXPERIMENT);
- generator.setParameter(ExperimentConstants.PROJECT_NAME, name);
- generator.setParameter(ExperimentConstants.USERNAME, getWorker().getUser());
generator.setParameter(ExperimentConstants.EXPERIMENT_ID, name);
Query q = generator.deleteQuery(em);
q.executeUpdate();
Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ApplicationDescriptorResourceTest.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ApplicationDescriptorResourceTest.java?rev=1397633&r1=1397632&r2=1397633&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ApplicationDescriptorResourceTest.java (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ApplicationDescriptorResourceTest.java Fri Oct 12 16:25:33 2012
@@ -44,9 +44,7 @@ public class ApplicationDescriptorResour
applicationDescriptorResouce.setUpdatedUser("testUser");
applicationDescriptorResouce.save();
- if (gatewayResource.isExists(ResourceType.APPLICATION_DESCRIPTOR, "testAppDesc")) {
- assertTrue("application descriptor saved successfully", true);
- }
+ assertTrue("application descriptor saved successfully", gatewayResource.isExists(ResourceType.APPLICATION_DESCRIPTOR, "testAppDesc"));
gatewayResource.remove(ResourceType.APPLICATION_DESCRIPTOR, "testAppDesc");
}
Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ConfigurationResourceTest.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ConfigurationResourceTest.java?rev=1397633&r1=1397632&r2=1397633&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ConfigurationResourceTest.java (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ConfigurationResourceTest.java Fri Oct 12 16:25:33 2012
@@ -45,10 +45,7 @@ public class ConfigurationResourceTest e
configuration.setExpireDate(currentTime);
configuration.save();
- if (ResourceUtils.isConfigurationExist("testConfigKey")) {
- assertTrue("Configuration Save succuessful", true);
- }
-
+ assertTrue("Configuration Save succuessful", ResourceUtils.isConfigurationExist("testConfigKey"));
//remove test configuration
ResourceUtils.removeConfiguration("testConfigKey");
}
Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ExperimentDataResourceTest.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ExperimentDataResourceTest.java?rev=1397633&r1=1397632&r2=1397633&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ExperimentDataResourceTest.java (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ExperimentDataResourceTest.java Fri Oct 12 16:25:33 2012
@@ -72,19 +72,13 @@ public class ExperimentDataResourceTest
}
public void testCreate() throws Exception {
- WorkflowDataResource resource = (WorkflowDataResource) experimentDataResource.create(ResourceType.WORKFLOW_DATA);
- ExperimentMetadataResource metadataResource = (ExperimentMetadataResource) experimentDataResource.create(ResourceType.EXPERIMENT_METADATA);
-
- assertNotNull("workflowdata resource created", resource);
- assertNotNull("experimemt metadata resource created", metadataResource);
+ assertNotNull("workflowdata resource created", workflowDataResource);
+ assertNotNull("experimemt metadata resource created", experimentMetadataResource);
}
public void testGet() throws Exception {
- WorkflowDataResource workflowDataResource = experimentDataResource.getWorkflowInstance("testWorkflowInstance");
- assertNotNull("workflow data retrieved successfully", workflowDataResource);
-
- ExperimentMetadataResource experimentMetadataResource = experimentDataResource.getExperimentMetadata();
- assertNotNull("experiment meta data retrieved successfully", experimentMetadataResource);
+ assertNotNull("workflow data retrieved successfully", experimentDataResource.getWorkflowInstance("testWorkflowInstance"));
+ assertNotNull("experiment meta data retrieved successfully", experimentDataResource.getExperimentMetadata());
}
public void testGetList() throws Exception {
@@ -94,24 +88,33 @@ public class ExperimentDataResourceTest
public void testSave() throws Exception {
experimentDataResource.save();
-
- if (experimentResource.isExists(ResourceType.EXPERIMENT_DATA, "testExpID")) {
- assertTrue("experiment data saved successfully", true);
- }
+ assertTrue("experiment data saved successfully", experimentResource.isExists(ResourceType.EXPERIMENT_DATA, "testExpID"));
//remove experiment data
experimentResource.remove(ResourceType.EXPERIMENT_DATA, "testExpID");
}
public void testRemove() throws Exception {
experimentDataResource.remove(ResourceType.WORKFLOW_DATA, "testWFInstanceID");
- if (!experimentResource.isExists(ResourceType.EXPERIMENT_DATA, "testWFInstanceID")) {
- assertTrue("workflow data resource removed successfully", true);
- }
+ assertTrue("workflow data resource removed successfully", !experimentResource.isExists(ResourceType.EXPERIMENT_DATA, "testWFInstanceID"));
experimentDataResource.remove(ResourceType.EXPERIMENT_METADATA, "testExpID");
- if (!experimentDataResource.isExists(ResourceType.EXPERIMENT_METADATA, "testExpID")) {
- assertTrue("experiment meta data resource removed successfully", true);
- }
+ assertTrue("experiment meta data resource removed successfully", !experimentDataResource.isExists(ResourceType.EXPERIMENT_METADATA, "testExpID"));
+
+ experimentMetadataResource.setExpID("testExpID");
+ experimentMetadataResource.setMetadata("testMetadata");
+ experimentMetadataResource.save();
+
+ workflowDataResource.setExperimentID("testExpID");
+ workflowDataResource.setStatus("testStatus");
+ workflowDataResource.setTemplateName("testWorkflowInstance");
+
+ Calendar calender = Calendar.getInstance();
+ java.util.Date d = calender.getTime();
+ Timestamp currentTime = new Timestamp(d.getTime());
+
+ workflowDataResource.setLastUpdatedTime(currentTime);
+ workflowDataResource.setStartTime(currentTime);
+ workflowDataResource.save();
}
@Override
Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ExperimentMetadataResourceTest.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ExperimentMetadataResourceTest.java?rev=1397633&r1=1397632&r2=1397633&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ExperimentMetadataResourceTest.java (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ExperimentMetadataResourceTest.java Fri Oct 12 16:25:33 2012
@@ -62,9 +62,7 @@ public class ExperimentMetadataResourceT
experimentMetadataResource.setMetadata("testMetadata");
experimentMetadataResource.save();
- if (experimentDataResource.isExists(ResourceType.EXPERIMENT_METADATA, "testExpID")) {
- assertTrue("experiment meta data saved successfully", true);
- }
+ assertTrue("experiment meta data saved successfully", experimentDataResource.isExists(ResourceType.EXPERIMENT_METADATA, "testExpID"));
//remove the metadata
experimentDataResource.remove(ResourceType.EXPERIMENT_METADATA, "testExpID");
Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ExperimentResourceTest.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ExperimentResourceTest.java?rev=1397633&r1=1397632&r2=1397633&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ExperimentResourceTest.java (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ExperimentResourceTest.java Fri Oct 12 16:25:33 2012
@@ -47,12 +47,14 @@ public class ExperimentResourceTest exte
Date currentDate = new Date(d.getTime());
experimentResource.setSubmittedDate(currentDate);
experimentResource.save();
- }
- public void testCreate() throws Exception {
experimentDataResource = (ExperimentDataResource) experimentResource.create(ResourceType.EXPERIMENT_DATA);
experimentDataResource.setExpName("testExp");
experimentDataResource.setUserName(workerResource.getUser());
+ experimentDataResource.save();
+ }
+
+ public void testCreate() throws Exception {
assertNotNull("experiment data resource has being created ", experimentDataResource);
}
@@ -61,22 +63,20 @@ public class ExperimentResourceTest exte
}
public void testSave() throws Exception {
- experimentResource.setWorker(workerResource);
- experimentResource.setProject(new ProjectResource(workerResource, gatewayResource, "testProject"));
experimentResource.save();
-
- if (gatewayResource.isExists(ResourceType.EXPERIMENT, "testExpID")) {
- assertTrue("experiment save successfully", true);
- }
+ assertTrue("experiment save successfully", gatewayResource.isExists(ResourceType.EXPERIMENT, "testExpID"));
//remove experiment
gatewayResource.remove(ResourceType.EXPERIMENT, "testExpID");
}
public void testRemove() throws Exception {
experimentResource.remove(ResourceType.EXPERIMENT_DATA, "testExpID");
- if (!experimentResource.isExists(ResourceType.EXPERIMENT_DATA, "testExpID")) {
- assertTrue("experiment data removed successfully", true);
- }
+ assertTrue("experiment data removed successfully", !experimentResource.isExists(ResourceType.EXPERIMENT_DATA, "testExpID"));
+
+ experimentDataResource = (ExperimentDataResource) experimentResource.create(ResourceType.EXPERIMENT_DATA);
+ experimentDataResource.setExpName("testExp");
+ experimentDataResource.setUserName(workerResource.getUser());
+ experimentDataResource.save();
}
@Override
Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/GatewayResourceTest.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/GatewayResourceTest.java?rev=1397633&r1=1397632&r2=1397633&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/GatewayResourceTest.java (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/GatewayResourceTest.java Fri Oct 12 16:25:33 2012
@@ -109,9 +109,7 @@ public class GatewayResourceTest extends
gatewayResource.save();
boolean gatewayExist = ResourceUtils.isGatewayExist("gateway1");
- if (gatewayExist) {
- assertTrue("The gateway exisits", gatewayExist);
- }
+ assertTrue("The gateway exisits", gatewayExist);
}
Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/GramDataResourceTest.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/GramDataResourceTest.java?rev=1397633&r1=1397632&r2=1397633&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/GramDataResourceTest.java (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/GramDataResourceTest.java Fri Oct 12 16:25:33 2012
@@ -68,9 +68,7 @@ public class GramDataResourceTest extend
gramDataResource.setRsl("testRSL");
gramDataResource.save();
- if (workflowDataResource.isGramDataExists("testNodeID")) {
- assertTrue("gram data saved successfully", true);
- }
+ assertTrue("gram data saved successfully", workflowDataResource.isGramDataExists("testNode"));
//remove the gram data
workflowDataResource.removeGramData("testNodeID");
Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/HostDescriptorResourceTest.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/HostDescriptorResourceTest.java?rev=1397633&r1=1397632&r2=1397633&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/HostDescriptorResourceTest.java (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/HostDescriptorResourceTest.java Fri Oct 12 16:25:33 2012
@@ -43,9 +43,7 @@ public class HostDescriptorResourceTest
public void testSave() throws Exception {
hostDescriptorResource.save();
- if (gatewayResource.isHostDescriptorExists("testHostDesc")) {
- assertTrue("host descriptor saved successfully", true);
- }
+ assertTrue("host descriptor saved successfully", gatewayResource.isHostDescriptorExists("testHostDesc"));
//remove host descriptor
gatewayResource.removeHostDescriptor("testHostDesc");
}
Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/NodeDataResourceTest.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/NodeDataResourceTest.java?rev=1397633&r1=1397632&r2=1397633&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/NodeDataResourceTest.java (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/NodeDataResourceTest.java Fri Oct 12 16:25:33 2012
@@ -68,9 +68,7 @@ public class NodeDataResourceTest extend
nodeDataResource.setStatus("testStatus");
nodeDataResource.save();
- if (workflowDataResource.isNodeExists("testNodeID")) {
- assertTrue("node data resource saved successfully", true);
- }
+ assertTrue("node data resource saved successfully", workflowDataResource.isNodeExists("testNodeID"));
//remove node data
workflowDataResource.removeNodeData("testNodeID");
}
Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ProjectResourceTest.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ProjectResourceTest.java?rev=1397633&r1=1397632&r2=1397633&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ProjectResourceTest.java (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ProjectResourceTest.java Fri Oct 12 16:25:33 2012
@@ -44,9 +44,7 @@ public class ProjectResourceTest extends
projectResource.setGateway(gatewayResource);
projectResource.setWorker(workerResource);
projectResource.save();
- }
- public void testCreate() throws Exception {
experimentResource = projectResource.createExperiment("testExpID");
experimentResource.setGateway(gatewayResource);
experimentResource.setWorker(workerResource);
@@ -56,6 +54,9 @@ public class ProjectResourceTest extends
experimentResource.setSubmittedDate(currentTime);
experimentResource.setProject(projectResource);
experimentResource.save();
+ }
+
+ public void testCreate() throws Exception {
assertNotNull("experiment resource created successfully", experimentResource);
}
@@ -70,10 +71,7 @@ public class ProjectResourceTest extends
public void testSave() throws Exception {
projectResource.save();
-
- if (workerResource.isProjectExists("testProject")) {
- assertTrue("Project saved successfully", true);
- }
+ assertTrue("Project saved successfully", workerResource.isProjectExists("testProject"));
//remove project
workerResource.removeProject("testProject");
}
@@ -81,9 +79,17 @@ public class ProjectResourceTest extends
public void testRemove() throws Exception {
projectResource.removeExperiment("testExpID");
- if (!projectResource.isExperimentExists("testExpID")) {
- assertTrue("experiment removed successfully", true);
- }
+ assertFalse("experiment removed successfully", projectResource.isExperimentExists("testExpID"));
+
+ experimentResource = projectResource.createExperiment("testExpID");
+ experimentResource.setGateway(gatewayResource);
+ experimentResource.setWorker(workerResource);
+ Calendar calender = Calendar.getInstance();
+ java.util.Date d = calender.getTime();
+ Date currentTime = new Date(d.getTime());
+ experimentResource.setSubmittedDate(currentTime);
+ experimentResource.setProject(projectResource);
+ experimentResource.save();
}
@Override
Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/PublishWorkflowResourceTest.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/PublishWorkflowResourceTest.java?rev=1397633&r1=1397632&r2=1397633&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/PublishWorkflowResourceTest.java (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/PublishWorkflowResourceTest.java Fri Oct 12 16:25:33 2012
@@ -46,9 +46,7 @@ public class PublishWorkflowResourceTest
public void testSave() throws Exception {
publishWorkflowResource.save();
- if (gatewayResource.isPublishedWorkflowExists("workflow1")) {
- assertTrue("published workflow saved successfully", true);
- }
+ assertTrue("published workflow saved successfully", gatewayResource.isPublishedWorkflowExists("workflow1"));
//remove workflow
gatewayResource.removePublishedWorkflow("workflow1");
}
Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ServiceDescriptorResourceTest.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ServiceDescriptorResourceTest.java?rev=1397633&r1=1397632&r2=1397633&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ServiceDescriptorResourceTest.java (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ServiceDescriptorResourceTest.java Fri Oct 12 16:25:33 2012
@@ -43,9 +43,7 @@ public class ServiceDescriptorResourceTe
public void testSave() throws Exception {
serviceDescriptorResource.save();
- if (gatewayResource.isServiceDescriptorExists("testServiceDesc")) {
- assertTrue("service descriptor saved successfully", true);
- }
+ assertTrue("service descriptor saved successfully", gatewayResource.isServiceDescriptorExists("testServiceDesc"));
//remove host descriptor
gatewayResource.removeServiceDescriptor("testServiceDesc");
}
Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/UserResourceTest.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/UserResourceTest.java?rev=1397633&r1=1397632&r2=1397633&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/UserResourceTest.java (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/UserResourceTest.java Fri Oct 12 16:25:33 2012
@@ -37,9 +37,7 @@ public class UserResourceTest extends Ab
public void testSave() throws Exception {
userResource.save();
- if (gatewayResource.isExists(ResourceType.USER, "testUser")) {
- assertTrue("user resource saved successfully", true);
- }
+ assertTrue("user resource saved successfully", gatewayResource.isExists(ResourceType.USER, "testUser"));
//remove user
// gatewayResource.remove(ResourceType.USER, "testUser");
}
Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/UserWorkflowResourceTest.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/UserWorkflowResourceTest.java?rev=1397633&r1=1397632&r2=1397633&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/UserWorkflowResourceTest.java (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/UserWorkflowResourceTest.java Fri Oct 12 16:25:33 2012
@@ -50,9 +50,7 @@ public class UserWorkflowResourceTest ex
public void testSave() throws Exception {
userWorkflowResource.save();
- if (workerResource.isWorkflowTemplateExists("workflow1")) {
- assertTrue("user workflow saved successfully", true);
- }
+ assertTrue("user workflow saved successfully", workerResource.isWorkflowTemplateExists("workflow1"));
//remove user workflow
workerResource.removeWorkflowTemplate("workflow1");
}
Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/WorkerResourceTest.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/WorkerResourceTest.java?rev=1397633&r1=1397632&r2=1397633&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/WorkerResourceTest.java (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/WorkerResourceTest.java Fri Oct 12 16:25:33 2012
@@ -30,6 +30,9 @@ public class WorkerResourceTest extends
private GatewayResource gatewayResource;
private WorkerResource workerResource;
private UserResource userResource;
+ private ProjectResource testProject;
+ private UserWorkflowResource userWorkflowResource;
+ private ExperimentResource experimentResource;
@Override
public void setUp() throws Exception {
@@ -37,12 +40,10 @@ public class WorkerResourceTest extends
gatewayResource = super.getGatewayResource();
workerResource = super.getWorkerResource();
userResource = super.getUserResource();
- }
- public void testCreate() throws Exception {
- ProjectResource testProject = workerResource.createProject("testProject");
- UserWorkflowResource userWorkflowResource = workerResource.createWorkflowTemplate("workflow1");
- ExperimentResource experimentResource = (ExperimentResource) workerResource.create(ResourceType.EXPERIMENT);
+ testProject = workerResource.createProject("testProject");
+ userWorkflowResource = workerResource.createWorkflowTemplate("workflow1");
+ experimentResource = (ExperimentResource) workerResource.create(ResourceType.EXPERIMENT);
testProject.setGateway(gatewayResource);
testProject.save();
@@ -59,7 +60,9 @@ public class WorkerResourceTest extends
Date currentTime = new Date(d.getTime());
experimentResource.setSubmittedDate(currentTime);
experimentResource.save();
+ }
+ public void testCreate() throws Exception {
assertNotNull("project resource created successfully", testProject);
assertNotNull("user workflow created successfully", userWorkflowResource);
}
@@ -79,9 +82,7 @@ public class WorkerResourceTest extends
public void testSave() throws Exception {
workerResource.save();
- if (gatewayResource.isExists(ResourceType.USER, "testUser")) {
- assertTrue("worker resource saved successfully", true);
- }
+ assertTrue("worker resource saved successfully", gatewayResource.isExists(ResourceType.USER, "testUser"));
//remove
// ResourceUtils.removeGatewayWorker(gatewayResource, userResource);
// gatewayResource.remove(ResourceType.USER, "testUser");
@@ -92,17 +93,26 @@ public class WorkerResourceTest extends
workerResource.removeWorkflowTemplate("workflow1");
workerResource.removeExperiment("testExpID");
- if (!workerResource.isProjectExists("testProject")) {
- assertTrue("project has been removed successfully", true);
- }
-
- if (!workerResource.isExperimentExists("testExpID")) {
- assertTrue("experiment has been removed successfully", true);
- }
-
- if (!workerResource.isWorkflowTemplateExists("workflow1")) {
- assertTrue("user workflow has been removed successfully", true);
- }
+ assertTrue("project has been removed successfully", !workerResource.isProjectExists("testProject"));
+ assertTrue("experiment has been removed successfully", !workerResource.isExperimentExists("testExpID"));
+ assertTrue("user workflow has been removed successfully", !workerResource.isWorkflowTemplateExists("workflow1"));
+
+ testProject.setGateway(gatewayResource);
+ testProject.save();
+
+ userWorkflowResource.setGateway(gatewayResource);
+ userWorkflowResource.setContent("testContent");
+ userWorkflowResource.save();
+
+ experimentResource.setGateway(gatewayResource);
+ experimentResource.setExpID("testExpID");
+ experimentResource.setProject(testProject);
+ Calendar calender = Calendar.getInstance();
+ java.util.Date d = calender.getTime();
+ Date currentTime = new Date(d.getTime());
+ experimentResource.setSubmittedDate(currentTime);
+ experimentResource.save();
+
}
@Override
Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/WorkflowDataResourceTest.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/WorkflowDataResourceTest.java?rev=1397633&r1=1397632&r2=1397633&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/WorkflowDataResourceTest.java (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/WorkflowDataResourceTest.java Fri Oct 12 16:25:33 2012
@@ -32,6 +32,8 @@ public class WorkflowDataResourceTest ex
private WorkerResource workerResource;
private ExperimentDataResource experimentDataResource;
private WorkflowDataResource workflowDataResource;
+ private NodeDataResource nodeDataResource;
+ private GramDataResource gramDataResource;
@Override
public void setUp() throws Exception {
@@ -42,6 +44,8 @@ public class WorkflowDataResourceTest ex
experimentResource = (ExperimentResource) gatewayResource.create(ResourceType.EXPERIMENT);
experimentResource.setExpID("testExpID");
experimentResource.setWorker(workerResource);
+ experimentResource.setProject(new ProjectResource(workerResource, gatewayResource, "testProject"));
+ experimentResource.save();
experimentDataResource = (ExperimentDataResource) experimentResource.create(ResourceType.EXPERIMENT_DATA);
experimentDataResource.setExpName("testExp");
@@ -56,11 +60,10 @@ public class WorkflowDataResourceTest ex
java.util.Date d = calender.getTime();
Timestamp timestamp = new Timestamp(d.getTime());
workflowDataResource.setLastUpdatedTime(timestamp);
- }
+ workflowDataResource.save();
- public void testCreate() throws Exception {
- NodeDataResource nodeDataResource = workflowDataResource.createNodeData("testNodeID");
- GramDataResource gramDataResource = workflowDataResource.createGramData("testNodeID");
+ nodeDataResource = workflowDataResource.createNodeData("testNodeID");
+ gramDataResource = workflowDataResource.createGramData("testNodeID");
nodeDataResource.setWorkflowDataResource(workflowDataResource);
nodeDataResource.setInputs("testInput");
@@ -71,7 +74,9 @@ public class WorkflowDataResourceTest ex
gramDataResource.setRsl("testRSL");
gramDataResource.setWorkflowDataResource(workflowDataResource);
gramDataResource.save();
+ }
+ public void testCreate() throws Exception {
assertNotNull("node data resource created successfully", nodeDataResource);
assertNotNull("gram data resource created successfully", gramDataResource);
}
@@ -89,19 +94,27 @@ public class WorkflowDataResourceTest ex
public void testRemove() throws Exception {
workflowDataResource.removeNodeData("testNodeID");
workflowDataResource.removeGramData("testNodeID");
- if (!workflowDataResource.isNodeExists("testNodeID")) {
- assertTrue("node date removed successfully", true);
- }
- if (!workflowDataResource.isGramDataExists("testNodeID")) {
- assertTrue("gram date removed successfully", true);
- }
+
+ assertTrue("node date removed successfully", !workflowDataResource.isNodeExists("testNodeID"));
+ assertTrue("gram date removed successfully", !workflowDataResource.isGramDataExists("testNodeID"));
+
+ nodeDataResource = workflowDataResource.createNodeData("testNodeID");
+ gramDataResource = workflowDataResource.createGramData("testNodeID");
+
+ nodeDataResource.setWorkflowDataResource(workflowDataResource);
+ nodeDataResource.setInputs("testInput");
+ nodeDataResource.setOutputs("testOutput");
+ nodeDataResource.setStatus("testStatus");
+ nodeDataResource.save();
+
+ gramDataResource.setRsl("testRSL");
+ gramDataResource.setWorkflowDataResource(workflowDataResource);
+ gramDataResource.save();
}
public void testSave() throws Exception {
workflowDataResource.save();
- if (experimentDataResource.isWorkflowInstancePresent("testWFInstance")) {
- assertTrue("workflow data saved successfully", true);
- }
+ assertTrue("workflow data saved successfully", experimentDataResource.isWorkflowInstancePresent("testWFInstance"));
}
@Override