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 2013/06/07 16:52:53 UTC
svn commit: r1490668 - in /airavata/trunk:
modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/
modules/rest/webapp/ tools/registry-tool/src/main/resources/db-scripts/0.8/
Author: chathuri
Date: Fri Jun 7 14:52:53 2013
New Revision: 1490668
URL: http://svn.apache.org/r1490668
Log:
adding test class for GFac Job Data
Added:
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/GFacJobDataResourceTest.java
Modified:
airavata/trunk/modules/rest/webapp/pom.xml
airavata/trunk/tools/registry-tool/src/main/resources/db-scripts/0.8/migrate_derby.sql
Added: airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/GFacJobDataResourceTest.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/GFacJobDataResourceTest.java?rev=1490668&view=auto
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/GFacJobDataResourceTest.java (added)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/GFacJobDataResourceTest.java Fri Jun 7 14:52:53 2013
@@ -0,0 +1,82 @@
+/*
+*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements. See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership. The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied. See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*
+*/
+
+package org.apache.airavata.persistance.registry.jpa;
+
+import org.apache.airavata.persistance.registry.jpa.resources.*;
+
+import java.sql.Timestamp;
+import java.util.Calendar;
+
+public class GFacJobDataResourceTest extends AbstractResourceTest {
+ private GatewayResource gatewayResource;
+ private ExperimentResource experimentResource;
+ private WorkerResource workerResource;
+ private ExperimentDataResource experimentDataResource;
+ private WorkflowDataResource workflowDataResource;
+
+ @Override
+ public void setUp() throws Exception {
+ super.setUp();
+ gatewayResource = super.getGatewayResource();
+ workerResource = super.getWorkerResource();
+
+ 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");
+ experimentDataResource.setUserName(workerResource.getUser());
+ experimentDataResource.save();
+
+ workflowDataResource = (WorkflowDataResource) experimentDataResource.create(ResourceType.WORKFLOW_DATA);
+ workflowDataResource.setWorkflowInstanceID("testWFInstance");
+ workflowDataResource.setTemplateName("testTemplate");
+ workflowDataResource.setExperimentID("testExpID");
+ Calendar calender = Calendar.getInstance();
+ java.util.Date d = calender.getTime();
+ Timestamp timestamp = new Timestamp(d.getTime());
+ workflowDataResource.setLastUpdatedTime(timestamp);
+ workflowDataResource.save();
+ }
+
+ @Override
+ public void tearDown() throws Exception {
+ super.tearDown();
+ }
+
+ public void testSave() throws Exception {
+ GFacJobDataResource resource = (GFacJobDataResource)workflowDataResource.create(ResourceType.GFAC_JOB_DATA);
+ resource.setLocalJobID("testJobID");
+ resource.setApplicationDescID("testApplication");
+ resource.setExperimentDataResource(experimentDataResource);
+ resource.setNodeID("testNode");
+ resource.setHostDescID("testHost");
+ resource.setServiceDescID("testService");
+ resource.setStatus("testStatus");
+ resource.setJobData("testJobData");
+ resource.save();
+ assertTrue("GFac job data saved successfully", workerResource.isGFacJobExists("testJobID"));
+ }
+}
Modified: airavata/trunk/modules/rest/webapp/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/webapp/pom.xml?rev=1490668&r1=1490667&r2=1490668&view=diff
==============================================================================
--- airavata/trunk/modules/rest/webapp/pom.xml (original)
+++ airavata/trunk/modules/rest/webapp/pom.xml Fri Jun 7 14:52:53 2013
@@ -196,18 +196,22 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
+ <version>${org.slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
+ <version>${org.slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
+ <version>${org.slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
+ <version>${org.slf4j.version}</version>
</dependency>
</dependencies>
<properties>
Modified: airavata/trunk/tools/registry-tool/src/main/resources/db-scripts/0.8/migrate_derby.sql
URL: http://svn.apache.org/viewvc/airavata/trunk/tools/registry-tool/src/main/resources/db-scripts/0.8/migrate_derby.sql?rev=1490668&r1=1490667&r2=1490668&view=diff
==============================================================================
--- airavata/trunk/tools/registry-tool/src/main/resources/db-scripts/0.8/migrate_derby.sql (original)
+++ airavata/trunk/tools/registry-tool/src/main/resources/db-scripts/0.8/migrate_derby.sql Fri Jun 7 14:52:53 2013
@@ -61,4 +61,4 @@ create table GFac_Job_Data
INSERT INTO GFac_Job_Data(experiment_ID, workflow_instanceID, node_id, application_descriptor_ID, host_descriptor_ID, service_descriptor_ID,
job_data, local_Job_ID, submitted_time, statusUpdateTime, status, metadata) SELECT null, workflow_instanceID, node_id, null, invoked_host,
-null, rsl, local_Job_ID, null, null, null, null FROM Gram_Data;
\ No newline at end of file
+null, null, local_Job_ID, null, null, null, null FROM Gram_Data;
\ No newline at end of file