You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ra...@apache.org on 2014/01/14 18:02:16 UTC
svn commit: r1558110 - in /airavata/trunk/modules:
orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/
registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/
registry/airavata-jp...
Author: raminder
Date: Tue Jan 14 17:02:16 2014
New Revision: 1558110
URL: http://svn.apache.org/r1558110
Log:
added unittest for create and get
Added:
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Orchestrator_Data.java
- copied, changed from r1558084, airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/OrchestratorData.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/OrchestratorDataResourceTest.java
Removed:
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/OrchestratorData.java
Modified:
airavata/trunk/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/AbstractOrchestratorTest.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/OrchestratorDataResource.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/resources/META-INF/persistence.xml
Modified: airavata/trunk/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/AbstractOrchestratorTest.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/AbstractOrchestratorTest.java?rev=1558110&r1=1558109&r2=1558110&view=diff
==============================================================================
--- airavata/trunk/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/AbstractOrchestratorTest.java (original)
+++ airavata/trunk/modules/orchestrator/orchestrator-core/src/test/java/org/apache/airavata/orchestrator/core/AbstractOrchestratorTest.java Tue Jan 14 17:02:16 2014
@@ -24,7 +24,7 @@ import junit.framework.TestCase;
import org.apache.airavata.orchestrator.core.util.Initialize;
import org.apache.airavata.persistance.registry.jpa.ResourceType;
import org.apache.airavata.persistance.registry.jpa.ResourceUtils;
-import org.apache.airavata.persistance.registry.jpa.model.OrchestratorData;
+import org.apache.airavata.persistance.registry.jpa.model.Orchestrator_Data;
import org.apache.airavata.persistance.registry.jpa.resources.GatewayResource;
import org.apache.airavata.persistance.registry.jpa.resources.OrchestratorDataResource;
import org.apache.airavata.persistance.registry.jpa.resources.UserResource;
Copied: airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Orchestrator_Data.java (from r1558084, airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/OrchestratorData.java)
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Orchestrator_Data.java?p2=airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Orchestrator_Data.java&p1=airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/OrchestratorData.java&r1=1558084&r2=1558110&rev=1558110&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/OrchestratorData.java (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Orchestrator_Data.java Tue Jan 14 17:02:16 2014
@@ -3,9 +3,11 @@ package org.apache.airavata.persistance.
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
+import javax.persistence.Table;
@Entity
-public class OrchestratorData {
+@Table(name = "Orchestrator_Data")
+public class Orchestrator_Data {
@Id
private String experiment_ID;
Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/OrchestratorDataResource.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/OrchestratorDataResource.java?rev=1558110&r1=1558109&r2=1558110&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/OrchestratorDataResource.java (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/OrchestratorDataResource.java Tue Jan 14 17:02:16 2014
@@ -9,7 +9,7 @@ import javax.persistence.Query;
import org.apache.airavata.persistance.registry.jpa.Resource;
import org.apache.airavata.persistance.registry.jpa.ResourceType;
import org.apache.airavata.persistance.registry.jpa.ResourceUtils;
-import org.apache.airavata.persistance.registry.jpa.model.OrchestratorData;
+import org.apache.airavata.persistance.registry.jpa.model.Orchestrator_Data;
import org.apache.airavata.persistance.registry.jpa.utils.QueryGenerator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -112,9 +112,9 @@ public class OrchestratorDataResource ex
switch (type) {
case ORCHESTRATOR_DATA:
generator = new QueryGenerator(ORCHESTRATORDATA);
- generator.setParameter(OrchestratorDataConstants.ORCHESTRATOR_ID, name);
+ generator.setParameter(OrchestratorDataConstants.EXPERIMENT_ID, name);
q = generator.selectQuery(em);
- OrchestratorData orchestrator_data = (OrchestratorData)q.getSingleResult();
+ Orchestrator_Data orchestrator_data = (Orchestrator_Data)q.getSingleResult();
OrchestratorDataResource orchestratorDataResource = (OrchestratorDataResource)Utils.getResource(ResourceType.ORCHESTRATOR_DATA, orchestrator_data);
em.getTransaction().commit();
em.close();
@@ -140,7 +140,7 @@ public class OrchestratorDataResource ex
List<?> results = q.getResultList();
if (results.size() != 0) {
for (Object result : results) {
- OrchestratorData orchestratorData = (OrchestratorData) result;
+ Orchestrator_Data orchestratorData = (Orchestrator_Data) result;
OrchestratorDataResource orchestratorDataResource = (OrchestratorDataResource)
Utils.getResource(ResourceType.ORCHESTRATOR_DATA, orchestratorData);
resourceList.add(orchestratorDataResource);
@@ -158,13 +158,13 @@ public class OrchestratorDataResource ex
@Override
public void save() {
EntityManager em = ResourceUtils.getEntityManager();
- OrchestratorData existingOrchestratorData = em.find(OrchestratorData.class,
+ Orchestrator_Data existingOrchestratorData = em.find(Orchestrator_Data.class,
experimentID);
em.close();
em = ResourceUtils.getEntityManager();
em.getTransaction().begin();
- OrchestratorData orchestratorData = new OrchestratorData();
+ Orchestrator_Data orchestratorData = new Orchestrator_Data();
orchestratorData.setExperiment_ID(experimentID);
orchestratorData.setUser(userName);
orchestratorData.setGfacEPR(gfacEPR);
Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/main/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/resources/META-INF/persistence.xml?rev=1558110&r1=1558109&r2=1558110&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/main/resources/META-INF/persistence.xml (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/main/resources/META-INF/persistence.xml Tue Jan 14 17:02:16 2014
@@ -42,7 +42,7 @@
<class>org.apache.airavata.persistance.registry.jpa.model.Execution_Error</class>
<class>org.apache.airavata.persistance.registry.jpa.model.GFac_Job_Data</class>
<class>org.apache.airavata.persistance.registry.jpa.model.GFac_Job_Status</class>
- <class>org.apache.airavata.persistance.registry.jpa.model.OrchestratorData</class>
+ <class>org.apache.airavata.persistance.registry.jpa.model.Orchestrator_Data</class>
<!--properties>
<property name="openjpa.ConnectionURL"
value="jdbc:mysql://localhost:3306/persitant_data" />
Added: airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/OrchestratorDataResourceTest.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/OrchestratorDataResourceTest.java?rev=1558110&view=auto
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/OrchestratorDataResourceTest.java (added)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/OrchestratorDataResourceTest.java Tue Jan 14 17:02:16 2014
@@ -0,0 +1,38 @@
+package org.apache.airavata.persistance.registry.jpa;
+
+import java.util.UUID;
+
+import org.apache.airavata.common.utils.AiravataJobState;
+import org.apache.airavata.persistance.registry.jpa.resources.GatewayResource;
+import org.apache.airavata.persistance.registry.jpa.resources.OrchestratorDataResource;
+
+public class OrchestratorDataResourceTest extends AbstractResourceTest{
+ private OrchestratorDataResource dataResource;
+ private String experimentID = UUID.randomUUID().toString();
+
+ @Override
+ public void setUp() throws Exception {
+ super.setUp();
+ GatewayResource gatewayResource = super.getGatewayResource();
+ dataResource = (OrchestratorDataResource) gatewayResource.create(ResourceType.ORCHESTRATOR_DATA);
+
+ }
+
+ public void testSave() throws Exception {
+ dataResource.setExperimentID(experimentID);
+ dataResource.setStatus(AiravataJobState.State.CREATED.toString());
+ dataResource.save();
+ assertNotNull("Orchestrator data resource created successfully", dataResource);
+ }
+
+ public void testGet() throws Exception {
+// dataResource.get(ResourceType.ORCHESTRATOR_DATA, experimentID);
+// assertNotNull("Orchestrator data resource created successfully", dataResource);
+ }
+ @Override
+ public void tearDown() throws Exception {
+ super.tearDown();
+ }
+
+
+}