Repository: airavata
Updated Branches:
refs/heads/master d91a0133d -> 3b77227ea
fixed the models and utils based on unit testing and added new tests. AIRAVATA-1025
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/3b77227e
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/3b77227e
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/3b77227e
Branch: refs/heads/master
Commit: 3b77227eabf1995d03ca0d137acc70b447c8af09
Parents: d91a013
Author: raminder <raminder@apache.org>
Authored: Fri Feb 21 13:47:27 2014 -0500
Committer: raminder <raminder@apache.org>
Committed: Fri Feb 21 13:47:27 2014 -0500
----------------------------------------------------------------------
.../registry/jpa/model/ErrorDetail.java | 19 +-
.../registry/jpa/model/TaskDetail.java | 2 -
.../jpa/resources/AbstractResource.java | 76 ++--
.../jpa/resources/ErrorDetailResource.java | 4 +-
.../jpa/resources/ExperimentResource.java | 7 +-
.../registry/jpa/resources/Utils.java | 2 +-
.../resources/WorkflowNodeDetailResource.java | 4 +-
.../src/main/resources/registry-derby.sql | 22 +-
.../registry/jpa/AbstractResourceTest.java | 32 +-
.../jpa/ApplicationDescriptorResourceTest.java | 8 +-
.../registry/jpa/ConfigurationResourceTest.java | 9 +-
.../registry/jpa/ExperimentResourceTest.java | 26 +-
.../registry/jpa/GatewayResourceTest.java | 367 ++++++++++---------
.../jpa/HostDescriptorResourceTest.java | 10 +-
.../jpa/PublishWorkflowResourceTest.java | 8 +-
.../jpa/ServiceDescriptorResourceTest.java | 11 +-
.../registry/jpa/TaskDetailResourceTest.java | 1 -
.../registry/jpa/UserResourceTest.java | 15 +-
.../registry/jpa/UserWorkflowResourceTest.java | 8 +-
.../registry/jpa/util/Initialize.java | 7 +
.../src/test/resources/registry-derby.sql | 7 +-
21 files changed, 340 insertions(+), 305 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/3b77227e/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/ErrorDetail.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/ErrorDetail.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/ErrorDetail.java
index a99aa70..2b407e1 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/ErrorDetail.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/ErrorDetail.java
@@ -22,6 +22,7 @@
package org.apache.airavata.persistance.registry.jpa.model;
import javax.persistence.*;
+
import java.sql.Timestamp;
@Entity
@@ -39,8 +40,10 @@ public class ErrorDetail {
private String nodeId;
@Column(name = "CREATION_TIME")
private Timestamp creationTime;
+ @Lob
@Column(name = "ACTUAL_ERROR_MESSAGE")
- private String actualErrorMsg;
+ private char[] actualErrorMsg;
+
@Column(name = "USER_FRIEDNLY_ERROR_MSG")
private String userFriendlyErrorMsg;
@Column(name = "TRANSIENT_OR_PERSISTENT")
@@ -107,15 +110,15 @@ public class ErrorDetail {
this.creationTime = creationTime;
}
- public String getActualErrorMsg() {
- return actualErrorMsg;
- }
+ public char[] getActualErrorMsg() {
+ return actualErrorMsg;
+ }
- public void setActualErrorMsg(String actualErrorMsg) {
- this.actualErrorMsg = actualErrorMsg;
- }
+ public void setActualErrorMsg(char[] actualErrorMsg) {
+ this.actualErrorMsg = actualErrorMsg;
+ }
- public String getUserFriendlyErrorMsg() {
+ public String getUserFriendlyErrorMsg() {
return userFriendlyErrorMsg;
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/3b77227e/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/TaskDetail.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/TaskDetail.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/TaskDetail.java
index 0d962a9..e58e25e 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/TaskDetail.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/TaskDetail.java
@@ -21,8 +21,6 @@
package org.apache.airavata.persistance.registry.jpa.model;
-import org.apache.airavata.registry.api.workflow.WorkflowNodeType;
-
import javax.persistence.*;
import java.sql.Timestamp;
http://git-wip-us.apache.org/repos/asf/airavata/blob/3b77227e/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/AbstractResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/AbstractResource.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/AbstractResource.java
index 1e6adcb..ff21c16 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/AbstractResource.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/AbstractResource.java
@@ -42,21 +42,21 @@ public abstract class AbstractResource implements Resource {
public static final String EXPERIMENT_CONFIG_DATA = "Configuration_Data";
public static final String EXPERIMENT_INPUT = "Experiment_Input";
public static final String EXPERIMENT_OUTPUT = "Experiment_Output";
- public static final String WORKFLOW_NODE_DETAIL = "Workflow_Node_Details";
- public static final String TASK_DETAIL = "Task_Detail";
- public static final String ERROR_DETAIL = "Error_Detail";
- public static final String APPLICATION_INPUT = "Application_Input";
- public static final String APPLICATION_OUTPUT = "Application_Output";
- public static final String NODE_INPUT = "Node_Input";
- public static final String NODE_OUTPUT = "Node_Output";
- public static final String JOB_DETAIL = "Job_Detail";
- public static final String DATA_TRANSFER_DETAIL = "Data_Transfer_Detail";
+ public static final String WORKFLOW_NODE_DETAIL = "WorkflowNodeDetail";
+ public static final String TASK_DETAIL = "TaskDetail";
+ public static final String ERROR_DETAIL = "ErrorDetail";
+ public static final String APPLICATION_INPUT = "ApplicationInput";
+ public static final String APPLICATION_OUTPUT = "ApplicationOutput";
+ public static final String NODE_INPUT = "NodeInput";
+ public static final String NODE_OUTPUT = "NodeOutput";
+ public static final String JOB_DETAIL = "JobDetail";
+ public static final String DATA_TRANSFER_DETAIL = "DataTransferDetail";
public static final String STATUS = "Status";
public static final String CONFIG_DATA = "Config_Data";
public static final String COMPUTATIONAL_RESOURCE_SCHEDULING = "Computation_Resource_Scheduling";
- public static final String ADVANCE_INPUT_DATA_HANDLING = "Advance_Input_Data_Handling";
- public static final String ADVANCE_OUTPUT_DATA_HANDLING = "Advance_Output_Data_Handling";
- public static final String QOS_PARAMS = "Qos_Params";
+ public static final String ADVANCE_INPUT_DATA_HANDLING = "AdvanceInputDataHandling";
+ public static final String ADVANCE_OUTPUT_DATA_HANDLING = "AdvanceOutputDataHandling";
+ public static final String QOS_PARAMS = "QosParams";
// Gateway Table
@@ -159,7 +159,7 @@ public abstract class AbstractResource implements Resource {
// Experiment Configuration Data table
public final class ExperimentConfigurationDataConstants {
- public static final String EXPERIMENT_ID = "experiment_id";
+ public static final String EXPERIMENT_ID = "expId";
public static final String AIRAVATA_AUTO_SCHEDULE = "airavata_auto_schedule";
public static final String OVERRIDE_MANUAL_SCHEDULE = "override_manual_schedule";
public static final String SHARE_EXPERIMENT = "share_experiment";
@@ -167,7 +167,7 @@ public abstract class AbstractResource implements Resource {
//Experiment Input table
public final class ExperimentInputConstants {
- public static final String EXPERIMENT_ID = "experiment_id";
+ public static final String EXPERIMENT_ID = "expId";
public static final String EXPERIMENT_INPUT_KEY = "input_key";
public static final String EXPERIMENT_INPUT_VAL = "value";
public static final String INPUT_TYPE = "input_type";
@@ -176,7 +176,7 @@ public abstract class AbstractResource implements Resource {
//Experiment Output table
public final class ExperimentOutputConstants {
- public static final String EXPERIMENT_ID = "experiment_id";
+ public static final String EXPERIMENT_ID = "expId";
public static final String EXPERIMENT_OUTPUT_KEY = "output_key";
public static final String EXPERIMENT_OUTPUT_VAL = "value";
public static final String OUTPUT_TYPE = "output_type";
@@ -186,15 +186,15 @@ public abstract class AbstractResource implements Resource {
// Workflow_Data table
public final class WorkflowNodeDetailsConstants {
public static final String EXPERIMENT_ID = "experiment_ID";
- public static final String NODE_INSTANCE_ID = "node_instance_id";
+ public static final String NODE_INSTANCE_ID = "nodeId";
public static final String CREATION_TIME = "creation_time";
public static final String NODE_NAME = "node_name";
}
// TaskDetail table
public final class TaskDetailConstants {
- public static final String TASK_ID = "task_id";
- public static final String NODE_INSTANCE_ID = "node_instance_id";
+ public static final String TASK_ID = "taskId";
+ public static final String NODE_INSTANCE_ID = "nodeId";
public static final String CREATION_TIME = "creation_type";
public static final String APPLICATION_ID = "application_id";
public static final String APPLICATION_VERSION = "application_version";
@@ -203,10 +203,10 @@ public abstract class AbstractResource implements Resource {
// ErrorDetails table
public final class ErrorDetailConstants {
public static final String ERROR_ID = "error_id";
- public static final String EXPERIMENT_ID = "experiment_id";
- public static final String TASK_ID = "task_id";
+ public static final String EXPERIMENT_ID = "expId";
+ public static final String TASK_ID = "taskId";
public static final String JOB_ID = "job_id";
- public static final String NODE_INSTANCE_ID = "node_instance_id";
+ public static final String NODE_INSTANCE_ID = "nodeId";
public static final String CREATION_TIME = "creation_time";
public static final String ACTUAL_ERROR_MESSAGE = "actual_error_message";
public static final String USER_FRIEDNLY_ERROR_MSG = "user_friendly_error_msg";
@@ -218,7 +218,7 @@ public abstract class AbstractResource implements Resource {
// ApplicationInput table
public final class ApplicationInputConstants {
- public static final String TASK_ID = "task_id";
+ public static final String TASK_ID = "taskId";
public static final String INPUT_KEY = "input_key";
public static final String INPUT_KEY_TYPE = "input_key_type";
public static final String METADATA = "metadata";
@@ -227,7 +227,7 @@ public abstract class AbstractResource implements Resource {
// ApplicationOutput table
public final class ApplicationOutputConstants {
- public static final String TASK_ID = "task_id";
+ public static final String TASK_ID = "taskId";
public static final String OUTPUT_KEY = "output_key";
public static final String OUTPUT_KEY_TYPE = "output_key_type";
public static final String METADATA = "metadata";
@@ -236,7 +236,7 @@ public abstract class AbstractResource implements Resource {
// NodeInput table
public final class NodeInputConstants {
- public static final String NODE_INSTANCE_ID = "node_instance_id";
+ public static final String NODE_INSTANCE_ID = "nodeId";
public static final String INPUT_KEY = "input_key";
public static final String INPUT_KEY_TYPE = "input_key_type";
public static final String METADATA = "metadata";
@@ -245,7 +245,7 @@ public abstract class AbstractResource implements Resource {
// NodeOutput table
public final class NodeOutputConstants {
- public static final String NODE_INSTANCE_ID = "node_instance_id";
+ public static final String NODE_INSTANCE_ID = "nodeId";
public static final String OUTPUT_KEY = "output_key";
public static final String OUTPUT_KEY_TYPE = "output_key_type";
public static final String METADATA = "metadata";
@@ -255,7 +255,7 @@ public abstract class AbstractResource implements Resource {
// Job Details table constants
public final class JobDetailConstants{
public static final String JOB_ID = "job_id";
- public static final String TASK_ID = "task_id";
+ public static final String TASK_ID = "taskId";
public static final String JOB_DESCRIPTION = "job_description";
public static final String CREATION_TIME = "creation_time";
}
@@ -263,7 +263,7 @@ public abstract class AbstractResource implements Resource {
// Data transfer Details table constants
public final class DataTransferDetailConstants{
public static final String TRANSFER_ID = "transfer_id";
- public static final String TASK_ID = "task_id";
+ public static final String TASK_ID = "taskId";
public static final String TRANSFER_DESC = "transfer_description";
public static final String CREATION_TIME = "creation_time";
}
@@ -271,10 +271,10 @@ public abstract class AbstractResource implements Resource {
// Status table constants
public final class StatusConstants {
public static final String STATUS_ID = "status_id";
- public static final String EXPERIMENT_ID = "experiment_id";
- public static final String NODE_INSTANCE_ID = "node_instance_id";
+ public static final String EXPERIMENT_ID = "expId";
+ public static final String NODE_INSTANCE_ID = "nodeId";
public static final String TRANSFER_ID = "transfer_id";
- public static final String TASK_ID = "task_id";
+ public static final String TASK_ID = "taskId";
public static final String JOB_ID = "job_id";
public static final String STATE = "state";
public static final String STATUS_UPDATE_TIME = "status_update_time";
@@ -283,8 +283,8 @@ public abstract class AbstractResource implements Resource {
public static final class ComputationalResourceSchedulingConstants{
public static final String RESOURCE_SCHEDULING_ID = "resource_scheduling_id";
- public static final String EXPERIMENT_ID = "experiment_id";
- public static final String TASK_ID = "task_id";
+ public static final String EXPERIMENT_ID = "expId";
+ public static final String TASK_ID = "taskId";
public static final String RESOURCE_HOST_ID = "resource_host_id";
public static final String CPU_COUNT = "cpu_count";
public static final String NODE_COUNT = "node_count";
@@ -298,8 +298,8 @@ public abstract class AbstractResource implements Resource {
public static final class AdvancedInputDataHandlingConstants {
public static final String INPUT_DATA_HANDLING_ID = "input_data_handling_id";
- public static final String EXPERIMENT_ID = "experiment_id";
- public static final String TASK_ID = "task_id";
+ public static final String EXPERIMENT_ID = "expId";
+ public static final String TASK_ID = "taskId";
public static final String WORKING_DIR_PARENT = "working_dir_parent";
public static final String UNIQUE_WORKING_DIR = "unique_working_dir";
public static final String STAGE_INPUT_FILES_TO_WORKING_DIR = "stage_input_files_to_working_dir";
@@ -308,8 +308,8 @@ public abstract class AbstractResource implements Resource {
public static final class AdvancedOutputDataHandlingConstants {
public static final String OUTPUT_DATA_HANDLING_ID = "output_data_handling_id";
- public static final String EXPERIMENT_ID = "experiment_id";
- public static final String TASK_ID = "task_id";
+ public static final String EXPERIMENT_ID = "expId";
+ public static final String TASK_ID = "taskId";
public static final String OUTPUT_DATA_DIR = "output_data_dir";
public static final String DATA_REG_URL = "data_reg_url";
public static final String PERSIST_OUTPUT_DATA = "persist_output_data";
@@ -317,8 +317,8 @@ public abstract class AbstractResource implements Resource {
public static final class QosParamsConstants {
public static final String QOS_ID = "qos_id";
- public static final String EXPERIMENT_ID = "experiment_id";
- public static final String TASK_ID = "task_id";
+ public static final String EXPERIMENT_ID = "expId";
+ public static final String TASK_ID = "taskId";
public static final String START_EXECUTION_AT = "start_execution_at";
public static final String EXECUTE_BEFORE = "execute_before";
public static final String NO_OF_RETRIES = "no_of_retries";
http://git-wip-us.apache.org/repos/asf/airavata/blob/3b77227e/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ErrorDetailResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ErrorDetailResource.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ErrorDetailResource.java
index 3b958db..06e37f4 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ErrorDetailResource.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ErrorDetailResource.java
@@ -187,7 +187,7 @@ public class ErrorDetailResource extends AbstractResource {
WorkflowNodeDetail workflowNodeDetail = em.find(WorkflowNodeDetail.class, nodeDetail.getNodeInstanceId());
errorDetail.setNodeDetails(workflowNodeDetail);
errorDetail.setCreationTime(creationTime);
- errorDetail.setActualErrorMsg(actualErrorMsg);
+ errorDetail.setActualErrorMsg(actualErrorMsg.toCharArray());
errorDetail.setUserFriendlyErrorMsg(userFriendlyErrorMsg);
errorDetail.setTransientPersistent(transientPersistent);
errorDetail.setErrorCategory(errorCategory);
@@ -200,7 +200,7 @@ public class ErrorDetailResource extends AbstractResource {
existingErrorDetail.setTask(taskDetail);
existingErrorDetail.setNodeDetails(workflowNodeDetail);
existingErrorDetail.setCreationTime(creationTime);
- existingErrorDetail.setActualErrorMsg(actualErrorMsg);
+ existingErrorDetail.setActualErrorMsg(actualErrorMsg.toCharArray());
existingErrorDetail.setUserFriendlyErrorMsg(userFriendlyErrorMsg);
existingErrorDetail.setTransientPersistent(transientPersistent);
existingErrorDetail.setErrorCategory(errorCategory);
http://git-wip-us.apache.org/repos/asf/airavata/blob/3b77227e/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentResource.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentResource.java
index 71b33b2..a14c193 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentResource.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentResource.java
@@ -203,7 +203,7 @@ public class ExperimentResource extends AbstractResource {
break;
case WORKFLOW_NODE_DETAIL:
generator = new QueryGenerator(WORKFLOW_NODE_DETAIL);
- generator.setParameter(WorkflowNodeDetailsConstants.EXPERIMENT_ID, name);
+ generator.setParameter(WorkflowNodeDetailsConstants.NODE_INSTANCE_ID, name);
q = generator.deleteQuery(em);
q.executeUpdate();
break;
@@ -289,7 +289,7 @@ public class ExperimentResource extends AbstractResource {
return outputResource;
case WORKFLOW_NODE_DETAIL:
generator = new QueryGenerator(WORKFLOW_NODE_DETAIL);
- generator.setParameter(WorkflowNodeDetailsConstants.EXPERIMENT_ID, name);
+ generator.setParameter(WorkflowNodeDetailsConstants.NODE_INSTANCE_ID, name);
q = generator.selectQuery(em);
WorkflowNodeDetail workflowNodeDetail = (WorkflowNodeDetail)q.getSingleResult();
WorkflowNodeDetailResource nodeDetailResource = (WorkflowNodeDetailResource)Utils.getResource(ResourceType.WORKFLOW_NODE_DETAIL, workflowNodeDetail);
@@ -645,4 +645,7 @@ public class ExperimentResource extends AbstractResource {
public ConfigDataResource getUserConfigData(String expID){
return (ConfigDataResource)get(ResourceType.CONFIG_DATA, expID);
}
+ public WorkflowNodeDetailResource getWorkflowNode (String nodeId){
+ return (WorkflowNodeDetailResource)get(ResourceType.WORKFLOW_NODE_DETAIL, nodeId);
+ }
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/3b77227e/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java
index e823ed9..7626a41 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java
@@ -638,7 +638,7 @@ public class Utils {
errorDetailResource.setErrorId(o.getErrorID());
errorDetailResource.setJobId(o.getJobId());
errorDetailResource.setCreationTime(o.getCreationTime());
- errorDetailResource.setActualErrorMsg(o.getActualErrorMsg());
+ errorDetailResource.setActualErrorMsg(new String(o.getActualErrorMsg()));
errorDetailResource.setUserFriendlyErrorMsg(o.getUserFriendlyErrorMsg());
errorDetailResource.setTransientPersistent(o.isTransientPersistent());
errorDetailResource.setErrorCategory(o.getErrorCategory());
http://git-wip-us.apache.org/repos/asf/airavata/blob/3b77227e/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/WorkflowNodeDetailResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/WorkflowNodeDetailResource.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/WorkflowNodeDetailResource.java
index 48ae4e6..240a1a3 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/WorkflowNodeDetailResource.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/WorkflowNodeDetailResource.java
@@ -113,7 +113,7 @@ public class WorkflowNodeDetailResource extends AbstractResource {
switch (type){
case TASK_DETAIL:
generator = new QueryGenerator(TASK_DETAIL);
- generator.setParameter(TaskDetailConstants.NODE_INSTANCE_ID, name);
+ generator.setParameter(TaskDetailConstants.TASK_ID, name);
q = generator.deleteQuery(em);
q.executeUpdate();
break;
@@ -158,7 +158,7 @@ public class WorkflowNodeDetailResource extends AbstractResource {
switch (type) {
case TASK_DETAIL:
generator = new QueryGenerator(TASK_DETAIL);
- generator.setParameter(TaskDetailConstants.NODE_INSTANCE_ID, name);
+ generator.setParameter(TaskDetailConstants.TASK_ID, name);
q = generator.selectQuery(em);
TaskDetail taskDetail = (TaskDetail)q.getSingleResult();
TaskDetailResource taskDetailResource = (TaskDetailResource)Utils.getResource(ResourceType.TASK_DETAIL, taskDetail);
http://git-wip-us.apache.org/repos/asf/airavata/blob/3b77227e/modules/registry/airavata-jpa-registry/src/main/resources/registry-derby.sql
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/resources/registry-derby.sql b/modules/registry/airavata-jpa-registry/src/main/resources/registry-derby.sql
index 6fccc31..d65118c 100644
--- a/modules/registry/airavata-jpa-registry/src/main/resources/registry-derby.sql
+++ b/modules/registry/airavata-jpa-registry/src/main/resources/registry-derby.sql
@@ -194,7 +194,7 @@ CREATE TABLE ERROR_DETAIL
TASK_ID VARCHAR(255),
NODE_INSTANCE_ID VARCHAR(255),
CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
- ACTUAL_ERROR_MESSAGE BLOB,
+ ACTUAL_ERROR_MESSAGE CLOB,
USER_FRIEDNLY_ERROR_MSG VARCHAR(255),
TRANSIENT_OR_PERSISTENT SMALLINT,
ERROR_CATEGORY VARCHAR(255),
@@ -271,26 +271,6 @@ CREATE TABLE DATA_TRANSFER_DETAIL
FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE
);
-CREATE TABLE ERROR_DETAIL
-(
- ERROR_ID INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY,
- EXPERIMENT_ID VARCHAR(255),
- TASK_ID VARCHAR(255),
- NODE_INSTANCE_ID VARCHAR(255),
- JOB_ID VARCHAR(255),
- CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,,
- ACTUAL_ERROR_MESSAGE CLOB,
- USER_FRIEDNLY_ERROR_MSG VARCHAR(255),
- TRANSIENT_OR_PERSISTENT SMALLINT,
- ERROR_CATEGORY VARCHAR(255),
- CORRECTIVE_ACTION VARCHAR(255),
- ACTIONABLE_GROUP VARCHAR(255),
- PRIMARY KEY(ERROR_ID),
- FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE,
- FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE,
- FOREIGN KEY (NODE_INSTANCE_ID) REFERENCES WORKFLOW_NODE_DETAIL(NODE_INSTANCE_ID) ON DELETE CASCADE
-);
-
CREATE TABLE STATUS
(
STATUS_ID INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY,
http://git-wip-us.apache.org/repos/asf/airavata/blob/3b77227e/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/AbstractResourceTest.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/AbstractResourceTest.java b/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/AbstractResourceTest.java
index 160e1fc..1b13f3c 100644
--- a/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/AbstractResourceTest.java
+++ b/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/AbstractResourceTest.java
@@ -29,30 +29,34 @@ import org.apache.airavata.persistance.registry.jpa.resources.UserResource;
import org.apache.airavata.persistance.registry.jpa.resources.WorkerResource;
import org.apache.airavata.persistance.registry.jpa.util.Initialize;
import org.apache.airavata.registry.api.util.RegistrySettings;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
import java.sql.Timestamp;
import java.util.Calendar;
-public abstract class AbstractResourceTest extends TestCase {
+public abstract class AbstractResourceTest {
private GatewayResource gatewayResource;
private WorkerResource workerResource;
private UserResource userResource;
private ProjectResource projectResource;
- private Initialize initialize;
- @Override
+ private static Initialize initialize;
+
+ @BeforeClass
+ public static void setUpBeforeClass() throws Exception {
+ initialize = new Initialize("registry-derby.sql");
+ initialize.initializeDB();
+ }
+ @Before
public void setUp() throws Exception {
- initialize = new Initialize("registry-derby.sql");
- initialize.initializeDB();
gatewayResource = (GatewayResource)ResourceUtils.getGateway("default");
workerResource = (WorkerResource)ResourceUtils.getWorker(gatewayResource.getGatewayName(), "admin");
userResource = (UserResource)ResourceUtils.getUser(RegistrySettings.getSetting("default.registry.user"));
- projectResource = (ProjectResource)workerResource.create(ResourceType.PROJECT);
- projectResource.setGateway(gatewayResource);
- projectResource.setName("default");
- projectResource.setWorker(workerResource);
- projectResource.save();
+ projectResource = (ProjectResource) workerResource.getProject("default");
}
public Timestamp getCurrentTimestamp() {
@@ -60,11 +64,11 @@ public abstract class AbstractResourceTest extends TestCase {
java.util.Date d = calender.getTime();
return new Timestamp(d.getTime());
}
-
- @Override
- public void tearDown() throws Exception {
+ @AfterClass
+ public static void tearDownAfterClass() throws Exception {
initialize.stopDerbyServer();
- }
+ }
+
public GatewayResource getGatewayResource() {
return gatewayResource;
http://git-wip-us.apache.org/repos/asf/airavata/blob/3b77227e/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ApplicationDescriptorResourceTest.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ApplicationDescriptorResourceTest.java b/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ApplicationDescriptorResourceTest.java
index 6983c45..0f2ee31 100644
--- a/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ApplicationDescriptorResourceTest.java
+++ b/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ApplicationDescriptorResourceTest.java
@@ -21,8 +21,12 @@
package org.apache.airavata.persistance.registry.jpa;
+import static org.junit.Assert.*;
+
import org.apache.airavata.persistance.registry.jpa.resources.ApplicationDescriptorResource;
import org.apache.airavata.persistance.registry.jpa.resources.GatewayResource;
+import org.junit.After;
+import org.junit.Test;
public class ApplicationDescriptorResourceTest extends AbstractResourceTest {
private GatewayResource gatewayResource;
@@ -33,6 +37,7 @@ public class ApplicationDescriptorResourceTest extends AbstractResourceTest {
gatewayResource = super.getGatewayResource();
}
+ @Test
public void testSave() throws Exception {
ApplicationDescriptorResource applicationDescriptorResouce = (ApplicationDescriptorResource) gatewayResource.create(ResourceType.APPLICATION_DESCRIPTOR);
applicationDescriptorResouce.setHostDescName("testHostDesc");
@@ -47,8 +52,7 @@ public class ApplicationDescriptorResourceTest extends AbstractResourceTest {
gatewayResource.remove(ResourceType.APPLICATION_DESCRIPTOR, "testAppDesc");
}
- @Override
+ @After
public void tearDown() throws Exception {
- super.tearDown();
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/3b77227e/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ConfigurationResourceTest.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ConfigurationResourceTest.java b/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ConfigurationResourceTest.java
index 27e0d24..693b130 100644
--- a/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ConfigurationResourceTest.java
+++ b/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ConfigurationResourceTest.java
@@ -21,7 +21,11 @@
package org.apache.airavata.persistance.registry.jpa;
+import static org.junit.Assert.*;
+
import org.apache.airavata.persistance.registry.jpa.resources.ConfigurationResource;
+import org.junit.After;
+import org.junit.Test;
import java.sql.Timestamp;
import java.util.Calendar;
@@ -32,7 +36,7 @@ public class ConfigurationResourceTest extends AbstractResourceTest {
public void setUp() throws Exception {
super.setUp();
}
-
+ @Test
public void testSave() throws Exception {
ConfigurationResource configuration = ResourceUtils.createConfiguration("testConfigKey");
configuration.setConfigVal("testConfigValue");
@@ -48,8 +52,7 @@ public class ConfigurationResourceTest extends AbstractResourceTest {
ResourceUtils.removeConfiguration("testConfigKey");
}
- @Override
+ @After
public void tearDown() throws Exception {
- super.tearDown();
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/3b77227e/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ExperimentResourceTest.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ExperimentResourceTest.java b/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ExperimentResourceTest.java
index c8d1851..2a458ce 100644
--- a/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ExperimentResourceTest.java
+++ b/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ExperimentResourceTest.java
@@ -21,15 +21,20 @@
package org.apache.airavata.persistance.registry.jpa;
-import org.apache.airavata.persistance.registry.jpa.resources.*;
+import static org.junit.Assert.*;
import java.sql.Timestamp;
import java.util.Calendar;
+import java.util.Date;
+
+import org.apache.airavata.persistance.registry.jpa.resources.ExperimentResource;
+import org.junit.After;
+import org.junit.Test;
public class ExperimentResourceTest extends AbstractResourceTest {
private ExperimentResource experimentResource;
private String experimentID = "testExpID";
-
+
@Override
public void setUp() throws Exception {
super.setUp();
@@ -37,9 +42,7 @@ public class ExperimentResourceTest extends AbstractResourceTest {
experimentResource.setExpID(experimentID);
experimentResource.setWorker(getWorkerResource());
experimentResource.setProject(getProjectResource());
- Calendar calender = Calendar.getInstance();
- java.util.Date d = calender.getTime();
- Timestamp currentDate = new Timestamp(d.getTime());
+ Timestamp currentDate = new Timestamp(new Date().getTime());
experimentResource.setCreationTime(currentDate);
experimentResource.setApplicationId("testApplication");
experimentResource.setApplicationVersion("1.0");
@@ -48,25 +51,28 @@ public class ExperimentResourceTest extends AbstractResourceTest {
experimentResource.save();
}
-
+ @Test
public void testCreate() throws Exception {
assertNotNull("experiment data resource has being created ", experimentResource);
}
-
+
+ @Test
public void testSave() throws Exception {
assertTrue("experiment save successfully", getGatewayResource().isExists(ResourceType.EXPERIMENT, experimentID));
}
+
+ @Test
public void testGet() throws Exception {
assertNotNull("experiment data retrieved successfully", getGatewayResource().get(ResourceType.EXPERIMENT, experimentID));
}
+ @Test
public void testRemove() throws Exception {
getGatewayResource().remove(ResourceType.EXPERIMENT, experimentID);
- assertTrue("experiment data removed successfully", !getGatewayResource().isExists(ResourceType.EXPERIMENT, experimentID));
+ assertFalse("experiment data removed successfully", getGatewayResource().isExists(ResourceType.EXPERIMENT, experimentID));
}
- @Override
+ @After
public void tearDown() throws Exception {
- super.tearDown();
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/3b77227e/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/GatewayResourceTest.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/GatewayResourceTest.java b/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/GatewayResourceTest.java
index 72a7854..83f0a9f 100644
--- a/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/GatewayResourceTest.java
+++ b/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/GatewayResourceTest.java
@@ -1,181 +1,186 @@
-///*
-//*
-//* 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 GatewayResourceTest extends AbstractResourceTest {
-// private GatewayResource gatewayResource;
-// private ProjectResource projectResource;
-// private UserResource userResource;
-// private WorkerResource workerResource;
-// private PublishWorkflowResource publishWorkflowResource;
-// private UserWorkflowResource userWorkflowResource;
-// private HostDescriptorResource hostDescriptorResource;
-// private ServiceDescriptorResource serviceDescriptorResource;
-// private ApplicationDescriptorResource applicationDescriptorResource;
-// private ExperimentMetadataResource experimentResource;
-//
-//
-// @Override
-// public void setUp() throws Exception {
-// super.setUp();
-// gatewayResource = super.getGatewayResource();
-// workerResource = super.getWorkerResource();
-// userResource = super.getUserResource();
-// if (gatewayResource == null) {
-// gatewayResource = (GatewayResource) ResourceUtils.getGateway("default");
-// }
-// projectResource = (ProjectResource) gatewayResource.create(ResourceType.PROJECT);
-// projectResource.setName("testProject");
-// projectResource.setWorker(workerResource);
-// projectResource.save();
-//
-// publishWorkflowResource = (PublishWorkflowResource) gatewayResource.create(ResourceType.PUBLISHED_WORKFLOW);
-// userWorkflowResource = (UserWorkflowResource) gatewayResource.create(ResourceType.USER_WORKFLOW);
-// hostDescriptorResource = (HostDescriptorResource) gatewayResource.create(ResourceType.HOST_DESCRIPTOR);
-// serviceDescriptorResource = (ServiceDescriptorResource) gatewayResource.create(ResourceType.SERVICE_DESCRIPTOR);
-// applicationDescriptorResource = (ApplicationDescriptorResource) gatewayResource.create(ResourceType.APPLICATION_DESCRIPTOR);
-// experimentResource = (ExperimentMetadataResource) gatewayResource.create(ResourceType.EXPERIMENT_METADATA);
-//
-// hostDescriptorResource.setUserName(workerResource.getUser());
-// hostDescriptorResource.setHostDescName("testHostDesc");
-// hostDescriptorResource.setContent("testContent");
-// hostDescriptorResource.save();
-//
-// serviceDescriptorResource.setUserName(workerResource.getUser());
-// serviceDescriptorResource.setServiceDescName("testServiceDesc");
-// serviceDescriptorResource.setContent("testContent");
-// serviceDescriptorResource.save();
-//
-// applicationDescriptorResource.setHostDescName(hostDescriptorResource.getHostDescName());
-// applicationDescriptorResource.setServiceDescName(serviceDescriptorResource.getServiceDescName());
-// applicationDescriptorResource.setUpdatedUser(workerResource.getUser());
-// applicationDescriptorResource.setName("testAppDesc");
-// applicationDescriptorResource.setContent("testContent");
-// applicationDescriptorResource.save();
-//
-// Calendar calender = Calendar.getInstance();
-// java.util.Date d = calender.getTime();
-// Timestamp currentTime = new Timestamp(d.getTime());
-// userWorkflowResource.setName("workflow1");
-// userWorkflowResource.setLastUpdateDate(currentTime);
-// userWorkflowResource.setWorker(workerResource);
-// userWorkflowResource.setContent("testContent");
-// userWorkflowResource.save();
-//
-// publishWorkflowResource.setName("pubworkflow1");
-// publishWorkflowResource.setCreatedUser("admin");
-// publishWorkflowResource.setContent("testContent");
-// Calendar c = Calendar.getInstance();
-// java.util.Date da = c.getTime();
-// Timestamp time = new Timestamp(da.getTime());
-// publishWorkflowResource.setPublishedDate(time);
-// publishWorkflowResource.save();
-//
-// experimentResource.setExpID("testExpID");
-// experimentResource.setExperimentName("testExpID");
-// experimentResource.setProject(projectResource);
-// experimentResource.setExecutionUser(workerResource.getUser());
-// experimentResource.setGateway(gatewayResource);
-// experimentResource.setSubmittedDate(currentTime);
-// experimentResource.save();
-// }
-//
-// public void testSave() throws Exception {
-// gatewayResource.setOwner("owner1");
-// gatewayResource.save();
-//
-// boolean gatewayExist = ResourceUtils.isGatewayExist("default");
-// assertTrue("The gateway exisits", gatewayExist);
-//
-// }
-//
-// public void testCreate() throws Exception {
-// assertNotNull("project resource cannot be null", projectResource);
-// assertNotNull("user resource cannot be null", userResource);
-// assertNotNull("worker resource cannot be null", workerResource);
-// assertNotNull("publish workflow resource cannot be null", publishWorkflowResource);
-// assertNotNull("user workflow resource cannot be null", userWorkflowResource);
-// assertNotNull("host descriptor resource cannot be null", hostDescriptorResource);
-// assertNotNull("service descriptor resource cannot be null", serviceDescriptorResource);
-// assertNotNull("application descriptor resource cannot be null", applicationDescriptorResource);
-// assertNotNull("experiment resource cannot be null", experimentResource);
-// }
-//
-// public void testIsExists() throws Exception {
-// assertTrue(gatewayResource.isExists(ResourceType.USER, "admin"));
-// assertTrue(gatewayResource.isExists(ResourceType.PUBLISHED_WORKFLOW, "pubworkflow1"));
-// assertTrue(gatewayResource.isExists(ResourceType.HOST_DESCRIPTOR, "testHostDesc"));
-// assertTrue(gatewayResource.isExists(ResourceType.SERVICE_DESCRIPTOR, "testServiceDesc"));
-// assertTrue(gatewayResource.isExists(ResourceType.APPLICATION_DESCRIPTOR, "testAppDesc"));
-// assertTrue(gatewayResource.isExists(ResourceType.EXPERIMENT_METADATA, "testExpID"));
-// }
-//
-// public void testGet() throws Exception {
-// assertNotNull(gatewayResource.get(ResourceType.USER, "admin"));
-// assertNotNull(gatewayResource.get(ResourceType.PUBLISHED_WORKFLOW, "pubworkflow1"));
-// assertNotNull(gatewayResource.get(ResourceType.HOST_DESCRIPTOR, "testHostDesc"));
-// assertNotNull(gatewayResource.get(ResourceType.SERVICE_DESCRIPTOR, "testServiceDesc"));
-// assertNotNull(gatewayResource.get(ResourceType.APPLICATION_DESCRIPTOR, "testAppDesc"));
-// assertNotNull(gatewayResource.get(ResourceType.EXPERIMENT_METADATA, "testExpID"));
-// }
-//
-// public void testGetList() throws Exception {
-// assertNotNull(gatewayResource.get(ResourceType.GATEWAY_WORKER));
-// assertNotNull(gatewayResource.get(ResourceType.PROJECT));
-// assertNotNull(gatewayResource.get(ResourceType.PUBLISHED_WORKFLOW));
-// assertNotNull(gatewayResource.get(ResourceType.HOST_DESCRIPTOR));
-// assertNotNull(gatewayResource.get(ResourceType.SERVICE_DESCRIPTOR));
-// assertNotNull(gatewayResource.get(ResourceType.APPLICATION_DESCRIPTOR));
-// assertNotNull(gatewayResource.get(ResourceType.EXPERIMENT_METADATA));
-// }
-//
-// public void testRemove() throws Exception {
-//
-// gatewayResource.remove(ResourceType.PUBLISHED_WORKFLOW, "pubworkflow1");
-// boolean exists = gatewayResource.isExists(ResourceType.PUBLISHED_WORKFLOW, "pubworkflow1");
-// assertFalse(exists);
-//
-// gatewayResource.remove(ResourceType.HOST_DESCRIPTOR, "testHostDesc");
-// assertFalse(gatewayResource.isExists(ResourceType.HOST_DESCRIPTOR, "testHostDesc"));
-//
-// gatewayResource.remove(ResourceType.SERVICE_DESCRIPTOR, "testServiceDesc");
-// assertFalse(gatewayResource.isExists(ResourceType.SERVICE_DESCRIPTOR, "testServiceDesc"));
-//
-// gatewayResource.remove(ResourceType.EXPERIMENT_METADATA, "testExpID");
-// assertFalse(gatewayResource.isExists(ResourceType.EXPERIMENT_METADATA, "testExpID"));
-//
-// gatewayResource.remove(ResourceType.APPLICATION_DESCRIPTOR, "testAppDesc");
-// assertFalse(gatewayResource.isExists(ResourceType.APPLICATION_DESCRIPTOR, "testAppDesc"));
-//
-// }
-//
-// @Override
-// public void tearDown() throws Exception {
-// super.tearDown();
-// }
-//}
+/*
+*
+* 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 static org.junit.Assert.*;
+
+import org.apache.airavata.persistance.registry.jpa.resources.*;
+import org.junit.After;
+import org.junit.Test;
+
+import java.sql.Timestamp;
+import java.util.Date;
+
+
+public class GatewayResourceTest extends AbstractResourceTest {
+ private GatewayResource gatewayResource;
+ private ProjectResource projectResource;
+ private UserResource userResource;
+ private WorkerResource workerResource;
+ private PublishWorkflowResource publishWorkflowResource;
+ private UserWorkflowResource userWorkflowResource;
+ private HostDescriptorResource hostDescriptorResource;
+ private ServiceDescriptorResource serviceDescriptorResource;
+ private ApplicationDescriptorResource applicationDescriptorResource;
+ private ExperimentResource experimentResource;
+
+
+ @Override
+ public void setUp() throws Exception {
+ super.setUp();
+ Timestamp currentDate = new Timestamp(new Date().getTime());
+
+ gatewayResource = super.getGatewayResource();
+ workerResource = super.getWorkerResource();
+ userResource = super.getUserResource();
+ if (gatewayResource == null) {
+ gatewayResource = (GatewayResource) ResourceUtils.getGateway("default");
+ }
+ projectResource = (ProjectResource) gatewayResource.create(ResourceType.PROJECT);
+ projectResource.setName("testProject");
+ projectResource.setWorker(workerResource);
+ projectResource.save();
+
+ publishWorkflowResource = (PublishWorkflowResource) gatewayResource.create(ResourceType.PUBLISHED_WORKFLOW);
+ userWorkflowResource = (UserWorkflowResource) gatewayResource.create(ResourceType.USER_WORKFLOW);
+ hostDescriptorResource = (HostDescriptorResource) gatewayResource.create(ResourceType.HOST_DESCRIPTOR);
+ serviceDescriptorResource = (ServiceDescriptorResource) gatewayResource.create(ResourceType.SERVICE_DESCRIPTOR);
+ applicationDescriptorResource = (ApplicationDescriptorResource) gatewayResource.create(ResourceType.APPLICATION_DESCRIPTOR);
+ experimentResource = (ExperimentResource) gatewayResource.create(ResourceType.EXPERIMENT);
+
+ hostDescriptorResource.setUserName(workerResource.getUser());
+ hostDescriptorResource.setHostDescName("testHostDesc");
+ hostDescriptorResource.setContent("testContent");
+ hostDescriptorResource.save();
+
+ serviceDescriptorResource.setUserName(workerResource.getUser());
+ serviceDescriptorResource.setServiceDescName("testServiceDesc");
+ serviceDescriptorResource.setContent("testContent");
+ serviceDescriptorResource.save();
+
+ applicationDescriptorResource.setHostDescName(hostDescriptorResource.getHostDescName());
+ applicationDescriptorResource.setServiceDescName(serviceDescriptorResource.getServiceDescName());
+ applicationDescriptorResource.setUpdatedUser(workerResource.getUser());
+ applicationDescriptorResource.setName("testAppDesc");
+ applicationDescriptorResource.setContent("testContent");
+ applicationDescriptorResource.save();
+
+ userWorkflowResource.setName("workflow1");
+ userWorkflowResource.setLastUpdateDate(currentDate);
+ userWorkflowResource.setWorker(workerResource);
+ userWorkflowResource.setContent("testContent");
+ userWorkflowResource.save();
+
+ publishWorkflowResource.setName("pubworkflow1");
+ publishWorkflowResource.setCreatedUser("admin");
+ publishWorkflowResource.setContent("testContent");
+ publishWorkflowResource.setPublishedDate(currentDate);
+ publishWorkflowResource.save();
+
+ experimentResource.setExpID("testExpID");
+ experimentResource.setWorker(getWorkerResource());
+ experimentResource.setProject(getProjectResource());
+ experimentResource.setCreationTime(currentDate);
+ experimentResource.setApplicationId("testApplication");
+ experimentResource.setApplicationVersion("1.0");
+ experimentResource.setDescription("Test Application");
+ experimentResource.setExpName("TestExperiment");
+ experimentResource.save();
+ }
+ @Test
+ public void testSave() throws Exception {
+ gatewayResource.setOwner("owner1");
+ gatewayResource.save();
+
+ boolean gatewayExist = ResourceUtils.isGatewayExist("default");
+ assertTrue("The gateway exisits", gatewayExist);
+
+ }
+
+ @Test
+ public void testCreate() throws Exception {
+ assertNotNull("project resource cannot be null", projectResource);
+ assertNotNull("user resource cannot be null", userResource);
+ assertNotNull("worker resource cannot be null", workerResource);
+ assertNotNull("publish workflow resource cannot be null", publishWorkflowResource);
+ assertNotNull("user workflow resource cannot be null", userWorkflowResource);
+ assertNotNull("host descriptor resource cannot be null", hostDescriptorResource);
+ assertNotNull("service descriptor resource cannot be null", serviceDescriptorResource);
+ assertNotNull("application descriptor resource cannot be null", applicationDescriptorResource);
+ assertNotNull("experiment resource cannot be null", experimentResource);
+ }
+
+ @Test
+ public void testIsExists() throws Exception {
+ assertTrue(gatewayResource.isExists(ResourceType.USER, "admin"));
+ assertTrue(gatewayResource.isExists(ResourceType.PUBLISHED_WORKFLOW, "pubworkflow1"));
+ assertTrue(gatewayResource.isExists(ResourceType.HOST_DESCRIPTOR, "testHostDesc"));
+ assertTrue(gatewayResource.isExists(ResourceType.SERVICE_DESCRIPTOR, "testServiceDesc"));
+ assertTrue(gatewayResource.isExists(ResourceType.APPLICATION_DESCRIPTOR, "testAppDesc"));
+ assertTrue(gatewayResource.isExists(ResourceType.EXPERIMENT, "testExpID"));
+ }
+
+ @Test
+ public void testGet() throws Exception {
+ assertNotNull(gatewayResource.get(ResourceType.USER, "admin"));
+ assertNotNull(gatewayResource.get(ResourceType.PUBLISHED_WORKFLOW, "pubworkflow1"));
+ assertNotNull(gatewayResource.get(ResourceType.HOST_DESCRIPTOR, "testHostDesc"));
+ assertNotNull(gatewayResource.get(ResourceType.SERVICE_DESCRIPTOR, "testServiceDesc"));
+ assertNotNull(gatewayResource.get(ResourceType.APPLICATION_DESCRIPTOR, "testAppDesc"));
+ assertNotNull(gatewayResource.get(ResourceType.EXPERIMENT, "testExpID"));
+ }
+
+ @Test
+ public void testGetList() throws Exception {
+ assertNotNull(gatewayResource.get(ResourceType.GATEWAY_WORKER));
+ assertNotNull(gatewayResource.get(ResourceType.PROJECT));
+ assertNotNull(gatewayResource.get(ResourceType.PUBLISHED_WORKFLOW));
+ assertNotNull(gatewayResource.get(ResourceType.HOST_DESCRIPTOR));
+ assertNotNull(gatewayResource.get(ResourceType.SERVICE_DESCRIPTOR));
+ assertNotNull(gatewayResource.get(ResourceType.APPLICATION_DESCRIPTOR));
+ assertNotNull(gatewayResource.get(ResourceType.EXPERIMENT));
+ }
+
+ @Test
+ public void testRemove() throws Exception {
+
+ gatewayResource.remove(ResourceType.PUBLISHED_WORKFLOW, "pubworkflow1");
+ assertFalse(gatewayResource.isExists(ResourceType.PUBLISHED_WORKFLOW, "pubworkflow1"));
+
+ gatewayResource.remove(ResourceType.HOST_DESCRIPTOR, "testHostDesc");
+ assertFalse(gatewayResource.isExists(ResourceType.HOST_DESCRIPTOR, "testHostDesc"));
+
+ gatewayResource.remove(ResourceType.SERVICE_DESCRIPTOR, "testServiceDesc");
+ assertFalse(gatewayResource.isExists(ResourceType.SERVICE_DESCRIPTOR, "testServiceDesc"));
+
+ gatewayResource.remove(ResourceType.EXPERIMENT, "testExpID");
+ assertFalse(gatewayResource.isExists(ResourceType.EXPERIMENT, "testExpID"));
+
+ gatewayResource.remove(ResourceType.APPLICATION_DESCRIPTOR, "testAppDesc");
+ assertFalse(gatewayResource.isExists(ResourceType.APPLICATION_DESCRIPTOR, "testAppDesc"));
+
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ }
+}
http://git-wip-us.apache.org/repos/asf/airavata/blob/3b77227e/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/HostDescriptorResourceTest.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/HostDescriptorResourceTest.java b/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/HostDescriptorResourceTest.java
index c849b2b..4f5c6e5 100644
--- a/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/HostDescriptorResourceTest.java
+++ b/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/HostDescriptorResourceTest.java
@@ -21,8 +21,12 @@
package org.apache.airavata.persistance.registry.jpa;
+import static org.junit.Assert.*;
+
import org.apache.airavata.persistance.registry.jpa.resources.GatewayResource;
import org.apache.airavata.persistance.registry.jpa.resources.HostDescriptorResource;
+import org.junit.After;
+import org.junit.Test;
public class HostDescriptorResourceTest extends AbstractResourceTest {
private GatewayResource gatewayResource;
@@ -37,10 +41,11 @@ public class HostDescriptorResourceTest extends AbstractResourceTest {
hostDescriptorResource.setContent("testContent");
}
+ @Test
public void testGetList() throws Exception {
assertNotNull("application data being retrieved successfully", hostDescriptorResource.get(ResourceType.APPLICATION_DESCRIPTOR));
}
-
+ @Test
public void testSave() throws Exception {
hostDescriptorResource.save();
assertTrue("host descriptor saved successfully", gatewayResource.isHostDescriptorExists("testHostDesc"));
@@ -48,8 +53,7 @@ public class HostDescriptorResourceTest extends AbstractResourceTest {
gatewayResource.removeHostDescriptor("testHostDesc");
}
- @Override
+ @After
public void tearDown() throws Exception {
- super.tearDown();
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/3b77227e/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/PublishWorkflowResourceTest.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/PublishWorkflowResourceTest.java b/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/PublishWorkflowResourceTest.java
index 72b252a..67142e4 100644
--- a/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/PublishWorkflowResourceTest.java
+++ b/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/PublishWorkflowResourceTest.java
@@ -21,8 +21,12 @@
package org.apache.airavata.persistance.registry.jpa;
+import static org.junit.Assert.*;
+
import org.apache.airavata.persistance.registry.jpa.resources.GatewayResource;
import org.apache.airavata.persistance.registry.jpa.resources.PublishWorkflowResource;
+import org.junit.After;
+import org.junit.Test;
import java.sql.Timestamp;
import java.util.Calendar;
@@ -44,6 +48,7 @@ public class PublishWorkflowResourceTest extends AbstractResourceTest {
publishWorkflowResource.setPublishedDate(currentTime);
}
+ @Test
public void testSave() throws Exception {
publishWorkflowResource.save();
assertTrue("published workflow saved successfully", gatewayResource.isPublishedWorkflowExists("workflow1"));
@@ -51,8 +56,7 @@ public class PublishWorkflowResourceTest extends AbstractResourceTest {
gatewayResource.removePublishedWorkflow("workflow1");
}
- @Override
+ @After
public void tearDown() throws Exception {
- super.tearDown();
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/3b77227e/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ServiceDescriptorResourceTest.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ServiceDescriptorResourceTest.java b/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ServiceDescriptorResourceTest.java
index d22ad1c..02cd943 100644
--- a/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ServiceDescriptorResourceTest.java
+++ b/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ServiceDescriptorResourceTest.java
@@ -21,8 +21,12 @@
package org.apache.airavata.persistance.registry.jpa;
+import static org.junit.Assert.*;
+
import org.apache.airavata.persistance.registry.jpa.resources.GatewayResource;
import org.apache.airavata.persistance.registry.jpa.resources.ServiceDescriptorResource;
+import org.junit.After;
+import org.junit.Test;
public class ServiceDescriptorResourceTest extends AbstractResourceTest {
private GatewayResource gatewayResource;
@@ -37,10 +41,11 @@ public class ServiceDescriptorResourceTest extends AbstractResourceTest {
serviceDescriptorResource.setContent("testContent");
}
+ @Test
public void testGetList() throws Exception {
assertNotNull("application data being retrieved successfully", serviceDescriptorResource.get(ResourceType.APPLICATION_DESCRIPTOR));
}
-
+ @Test
public void testSave() throws Exception {
serviceDescriptorResource.save();
assertTrue("service descriptor saved successfully", gatewayResource.isServiceDescriptorExists("testServiceDesc"));
@@ -48,9 +53,7 @@ public class ServiceDescriptorResourceTest extends AbstractResourceTest {
gatewayResource.removeServiceDescriptor("testServiceDesc");
}
- @Override
+ @After
public void tearDown() throws Exception {
- super.tearDown();
-
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/3b77227e/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/TaskDetailResourceTest.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/TaskDetailResourceTest.java b/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/TaskDetailResourceTest.java
index f7dc517..caec113 100644
--- a/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/TaskDetailResourceTest.java
+++ b/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/TaskDetailResourceTest.java
@@ -8,7 +8,6 @@ import java.util.Date;
import org.apache.airavata.persistance.registry.jpa.resources.ExperimentResource;
import org.apache.airavata.persistance.registry.jpa.resources.TaskDetailResource;
import org.apache.airavata.persistance.registry.jpa.resources.WorkflowNodeDetailResource;
-import org.junit.After;
import org.junit.Before;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/airavata/blob/3b77227e/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/UserResourceTest.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/UserResourceTest.java b/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/UserResourceTest.java
index ad5befe..4facbc7 100644
--- a/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/UserResourceTest.java
+++ b/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/UserResourceTest.java
@@ -21,29 +21,34 @@
package org.apache.airavata.persistance.registry.jpa;
+import static org.junit.Assert.*;
+
import org.apache.airavata.persistance.registry.jpa.resources.GatewayResource;
import org.apache.airavata.persistance.registry.jpa.resources.UserResource;
+import org.junit.After;
+import org.junit.Test;
public class UserResourceTest extends AbstractResourceTest {
private UserResource userResource;
private GatewayResource gatewayResource;
+ private String userName = "testUser";
@Override
public void setUp() throws Exception {
super.setUp();
gatewayResource = super.getGatewayResource();
userResource = super.getUserResource();
+ userResource.setUserName(userName);
+ userResource.setPassword("testPassword");
+ userResource.save();
}
+ @Test
public void testSave() throws Exception {
- userResource.save();
assertTrue("user resource saved successfully", gatewayResource.isExists(ResourceType.USER, "admin"));
- //remove user
-// gatewayResource.remove(ResourceType.USER, "testUser");
}
- @Override
+ @After
public void tearDown() throws Exception {
- super.tearDown();
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/3b77227e/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/UserWorkflowResourceTest.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/UserWorkflowResourceTest.java b/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/UserWorkflowResourceTest.java
index 494f2fa..d55e96b 100644
--- a/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/UserWorkflowResourceTest.java
+++ b/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/UserWorkflowResourceTest.java
@@ -21,9 +21,13 @@
package org.apache.airavata.persistance.registry.jpa;
+import static org.junit.Assert.*;
+
import org.apache.airavata.persistance.registry.jpa.resources.GatewayResource;
import org.apache.airavata.persistance.registry.jpa.resources.UserWorkflowResource;
import org.apache.airavata.persistance.registry.jpa.resources.WorkerResource;
+import org.junit.After;
+import org.junit.Test;
import java.sql.Date;
import java.sql.Timestamp;
@@ -48,6 +52,7 @@ public class UserWorkflowResourceTest extends AbstractResourceTest {
userWorkflowResource.setLastUpdateDate(currentTime);
}
+ @Test
public void testSave() throws Exception {
userWorkflowResource.save();
assertTrue("user workflow saved successfully", workerResource.isWorkflowTemplateExists("workflow1"));
@@ -55,8 +60,7 @@ public class UserWorkflowResourceTest extends AbstractResourceTest {
workerResource.removeWorkflowTemplate("workflow1");
}
- @Override
+ @After
public void tearDown() throws Exception {
- super.tearDown();
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/3b77227e/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/util/Initialize.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/util/Initialize.java b/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/util/Initialize.java
index 6dd0697..936ab67 100644
--- a/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/util/Initialize.java
+++ b/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/util/Initialize.java
@@ -157,6 +157,13 @@ public class Initialize {
WorkerResource workerResource = (WorkerResource) gatewayResource.create(ResourceType.GATEWAY_WORKER);
workerResource.setUser(userResource.getUserName());
workerResource.save();
+
+ ProjectResource projectResource = (ProjectResource)workerResource.create(ResourceType.PROJECT);
+ projectResource.setGateway(gatewayResource);
+ projectResource.setName("default");
+ projectResource.setWorker(workerResource);
+ projectResource.save();
+
} catch (RegistrySettingsException e) {
logger.error("Unable to read properties", e);
http://git-wip-us.apache.org/repos/asf/airavata/blob/3b77227e/modules/registry/airavata-jpa-registry/src/test/resources/registry-derby.sql
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/test/resources/registry-derby.sql b/modules/registry/airavata-jpa-registry/src/test/resources/registry-derby.sql
index 53c5bf4..d65118c 100644
--- a/modules/registry/airavata-jpa-registry/src/test/resources/registry-derby.sql
+++ b/modules/registry/airavata-jpa-registry/src/test/resources/registry-derby.sql
@@ -194,7 +194,7 @@ CREATE TABLE ERROR_DETAIL
TASK_ID VARCHAR(255),
NODE_INSTANCE_ID VARCHAR(255),
CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
- ACTUAL_ERROR_MESSAGE BLOB,
+ ACTUAL_ERROR_MESSAGE CLOB,
USER_FRIEDNLY_ERROR_MSG VARCHAR(255),
TRANSIENT_OR_PERSISTENT SMALLINT,
ERROR_CATEGORY VARCHAR(255),
@@ -256,6 +256,7 @@ CREATE TABLE JOB_DETAIL
TASK_ID VARCHAR(255),
JOB_DESCRIPTION VARCHAR(255),
CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+ COMPUTE_RESOURCE_CONSUMED VARCHAR(255),
PRIMARY KEY (TASK_ID, JOB_ID),
FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE
);
@@ -373,4 +374,6 @@ CREATE TABLE CREDENTIALS
PORTAL_USER_ID VARCHAR(256) NOT NULL,
TIME_PERSISTED TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
PRIMARY KEY (GATEWAY_ID, TOKEN_ID)
-);
\ No newline at end of file
+);
+
+
|