http://git-wip-us.apache.org/repos/asf/airavata/blob/5a648a60/modules/registry/registry-core/src/test/java/org/apache/airavata/app/catalog/ComputeResourceTest.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/test/java/org/apache/airavata/app/catalog/ComputeResourceTest.java b/modules/registry/registry-core/src/test/java/org/apache/airavata/app/catalog/ComputeResourceTest.java deleted file mode 100644 index a0034a7..0000000 --- a/modules/registry/registry-core/src/test/java/org/apache/airavata/app/catalog/ComputeResourceTest.java +++ /dev/null @@ -1,297 +0,0 @@ -/* - * - * 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.app.catalog.test; - - -import org.airavata.appcatalog.cpi.AppCatalog; -import org.airavata.appcatalog.cpi.AppCatalogException; -import org.airavata.appcatalog.cpi.ComputeResource; -import org.apache.aiaravata.application.catalog.data.impl.AppCatalogFactory; -import org.apache.aiaravata.application.catalog.data.resources.AbstractResource; -import org.apache.airavata.app.catalog.test.util.Initialize; -import org.apache.airavata.model.appcatalog.computeresource.*; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.*; - -import static org.junit.Assert.assertTrue; - -public class ComputeResourceTest { - private static Initialize initialize; - private static AppCatalog appcatalog; - private static final Logger logger = LoggerFactory.getLogger(ComputeResourceTest.class); - - @Before - public void setUp() { - try { - initialize = new Initialize("appcatalog-derby.sql"); - initialize.initializeDB(); - appcatalog = AppCatalogFactory.getAppCatalog(); - } catch (AppCatalogException e) { - logger.error(e.getMessage(), e); - } - } - - @After - public void tearDown() throws Exception { - System.out.println("********** TEAR DOWN ************"); - initialize.stopDerbyServer(); - - } - - @Test - public void testAddComputeResource (){ - try { - ComputeResource computeResource = appcatalog.getComputeResource(); - ComputeResourceDescription description = new ComputeResourceDescription(); - - description.setHostName("localhost"); - description.setResourceDescription("test compute resource"); - List<String> ipdaresses = new ArrayList<String>(); - ipdaresses.add("222.33.43.444"); - ipdaresses.add("23.344.44.454"); - description.setIpAddresses(ipdaresses); -// List<String> aliases = new ArrayList<String>(); -// aliases.add("test.alias1"); -// aliases.add("test.alias2"); -// description.setHostAliases(aliases); - String sshsubmissionId = addSSHJobSubmission(); - System.out.println("**** SSH Submission id ****** :" + sshsubmissionId); -// String gsiSSHsubmissionId = addGSISSHJobSubmission(); -// System.out.println("**** GSISSH Submission id ****** :" + gsiSSHsubmissionId); -// String globusSubmissionId = addGlobusJobSubmission(); -// System.out.println("**** Globus Submission id ****** :" + globusSubmissionId); - JobSubmissionInterface sshSubmissionInt = new JobSubmissionInterface(); - sshSubmissionInt.setJobSubmissionInterfaceId(sshsubmissionId); - sshSubmissionInt.setPriorityOrder(1); - sshSubmissionInt.setJobSubmissionProtocol(JobSubmissionProtocol.SSH); -// JobSubmissionInterface globusSubInt = new JobSubmissionInterface(); -// globusSubInt.setJobSubmissionInterfaceId(globusSubmissionId); -// globusSubInt.setPriorityOrder(2); -// globusSubInt.setJobSubmissionProtocol(JobSubmissionProtocol.GLOBUS); - List<JobSubmissionInterface> interfaceList = new ArrayList<JobSubmissionInterface>(); - interfaceList.add(sshSubmissionInt); -// interfaceList.add(globusSubInt); - description.setJobSubmissionInterfaces(interfaceList); - - String scpDataMoveId = addSCPDataMovement(); - System.out.println("**** SCP DataMoveId****** :" + scpDataMoveId); - String gridFTPDataMoveId = addGridFTPDataMovement(); - System.out.println("**** grid FTP DataMoveId****** :" + gridFTPDataMoveId); - - List<DataMovementInterface> dataMovementInterfaces = new ArrayList<DataMovementInterface>(); - DataMovementInterface scpInterface = new DataMovementInterface(); - scpInterface.setDataMovementInterfaceId(scpDataMoveId); - scpInterface.setDataMovementProtocol(DataMovementProtocol.SCP); - scpInterface.setPriorityOrder(1); - - DataMovementInterface gridFTPMv = new DataMovementInterface(); - gridFTPMv.setDataMovementInterfaceId(gridFTPDataMoveId); - gridFTPMv.setDataMovementProtocol(DataMovementProtocol.GridFTP); - gridFTPMv.setPriorityOrder(2); - - description.setDataMovementInterfaces(dataMovementInterfaces); - - BatchQueue batchQueue1 = new BatchQueue(); - batchQueue1.setQueueName("queue1"); - batchQueue1.setQueueDescription("que1Desc1"); - batchQueue1.setMaxRunTime(10); - batchQueue1.setMaxNodes(4); - batchQueue1.setMaxJobsInQueue(1); - - BatchQueue batchQueue2 = new BatchQueue(); - batchQueue2.setQueueName("queue2"); - batchQueue2.setQueueDescription("que1Desc2"); - batchQueue2.setMaxRunTime(10); - batchQueue2.setMaxNodes(4); - batchQueue2.setMaxJobsInQueue(1); - - List<BatchQueue> batchQueueList = new ArrayList<BatchQueue>(); - batchQueueList.add(batchQueue1); - batchQueueList.add(batchQueue2); - description.setBatchQueues(batchQueueList); - - Map<FileSystems, String> fileSysMap = new HashMap<FileSystems, String>(); - fileSysMap.put(FileSystems.HOME, "/home"); - fileSysMap.put(FileSystems.SCRATCH, "/tmp"); - description.setFileSystems(fileSysMap); - - String resourceId = computeResource.addComputeResource(description); - System.out.println("**********Resource id ************* : " + resourceId); - ComputeResourceDescription host = null; - if (computeResource.isComputeResourceExists(resourceId)){ - host = computeResource.getComputeResource(resourceId); - List<BatchQueue> batchQueues = host.getBatchQueues(); - for (BatchQueue queue : batchQueues){ - System.out.println("%%%%%%%%%%%%%%%% queue description : %%%%%%%%%%%%%%%%%%% : " + queue.getQueueDescription()); - } - List<String> hostAliases = host.getHostAliases(); - if (hostAliases != null && !hostAliases.isEmpty()){ - for (String alias : hostAliases){ - System.out.println("%%%%%%%%%%%%%%%% alias value : %%%%%%%%%%%%%%%%%%% : " + alias); - } - } - host.addToHostAliases("abc"); - computeResource.updateComputeResource(resourceId, host); - List<String> hostAliases1 = computeResource.getComputeResource(resourceId).getHostAliases(); - for (String alias : hostAliases1){ - System.out.println("%%%%%%%%%%%%%%%% alias value : %%%%%%%%%%%%%%%%%%% : " + alias); - } - System.out.println("**********Resource name ************* : " + host.getHostName()); - } - - SSHJobSubmission sshJobSubmission = computeResource.getSSHJobSubmission(sshsubmissionId); - System.out.println("**********SSH Submission resource job manager ************* : " + sshJobSubmission.getResourceJobManager().toString()); - System.out.println("**********Monitor mode ************* : " + sshJobSubmission.getMonitorMode().toString()); - -// GlobusJobSubmission globusJobSubmission = computeResource.get(globusSubmissionId); -// System.out.println("**********Globus Submission resource job manager ************* : " + globusJobSubmission.getResourceJobManager().toString()); - - SCPDataMovement scpDataMovement = computeResource.getSCPDataMovement(scpDataMoveId); - System.out.println("**********SCP Data Move Security protocol ************* : " + scpDataMovement.getSecurityProtocol().toString()); - - GridFTPDataMovement gridFTPDataMovement = computeResource.getGridFTPDataMovement(gridFTPDataMoveId); - System.out.println("**********GRID FTP Data Move Security protocol ************* : " + gridFTPDataMovement.getSecurityProtocol().toString()); - - description.setHostName("localhost2"); - computeResource.updateComputeResource(resourceId, description); - if (computeResource.isComputeResourceExists(resourceId)){ - host = computeResource.getComputeResource(resourceId); - System.out.println("**********Updated Resource name ************* : " + host.getHostName()); - } - - Map<String, String> cfilters = new HashMap<String, String>(); - cfilters.put(AbstractResource.ComputeResourceConstants.HOST_NAME, "localhost2"); - List<ComputeResourceDescription> computeResourceList = computeResource.getComputeResourceList(cfilters); - System.out.println("**********Size of compute resources ************* : " + computeResourceList.size()); - - List<ComputeResourceDescription> allComputeResourceList = computeResource.getAllComputeResourceList(); - System.out.println("**********Size of all compute resources ************* : " + allComputeResourceList.size()); - - Map<String, String> allComputeResourceIdList = computeResource.getAllComputeResourceIdList(); - System.out.println("**********Size of all compute resources ids ************* : " + allComputeResourceIdList.size()); - -// Map<String, String> globusfilters = new HashMap<String, String>(); -// globusfilters.put(AbstractResource.GlobusJobSubmissionConstants.RESOURCE_JOB_MANAGER, ResourceJobManager.PBS.toString()); -// List<GlobusJobSubmission> gList = computeResource.getGlobusJobSubmissionList(globusfilters); -// System.out.println("**********Size of globus jobs ************* : " + gList.size()); - -// Map<String, String> sshfilters = new HashMap<String, String>(); -// sshfilters.put(AbstractResource.SSHSubmissionConstants.RESOURCE_JOB_MANAGER, ResourceJobManager.PBS.toString()); -// List<SSHJobSubmission> sshList = computeResource.getSS(sshfilters); -// System.out.println("**********Size of SSH jobs ************* : " + sshList.size()); - -// Map<String, String> gsishfilters = new HashMap<String, String>(); -// gsishfilters.put(AbstractResource.GSISSHSubmissionConstants.RESOURCE_JOB_MANAGER, ResourceJobManager.PBS.toString()); -// List<GSISSHJobSubmission> gsisshList = computeResource.getGSISSHJobSubmissionList(gsishfilters); -// System.out.println("**********Size of GSISSH jobs ************* : " + gsisshList.size()); - -// Map<String, String> scpfilters = new HashMap<String, String>(); -// scpfilters.put(AbstractResource.SCPDataMovementConstants.SECURITY_PROTOCOL, SecurityProtocol.SSH_KEYS.toString()); -// List<SCPDataMovement> scpDataMovementList = computeResource.getSCPDataMovementList(scpfilters); -// System.out.println("**********Size of SCP DM list ************* : " + scpDataMovementList.size()); -// -// Map<String, String> ftpfilters = new HashMap<String, String>(); -// ftpfilters.put(AbstractResource.GridFTPDataMovementConstants.SECURITY_PROTOCOL, SecurityProtocol.SSH_KEYS.toString()); -// List<GridFTPDataMovement> ftpDataMovementList = computeResource.getGridFTPDataMovementList(ftpfilters); -// System.out.println("**********Size of FTP DM list ************* : " + ftpDataMovementList.size()); - - assertTrue("Compute resource save successfully", host != null); - } catch (AppCatalogException e) { - logger.error(e.getMessage(), e); - } - } - - public String addSSHJobSubmission (){ - try { - SSHJobSubmission jobSubmission = new SSHJobSubmission(); - jobSubmission.setSshPort(22); - jobSubmission.setSecurityProtocol(SecurityProtocol.GSI); - ResourceJobManager jobManager = new ResourceJobManager(); - jobManager.setResourceJobManagerType(ResourceJobManagerType.PBS); - jobManager.setPushMonitoringEndpoint("monitor ep"); - jobManager.setJobManagerBinPath("/bin"); - Map<JobManagerCommand, String> commands = new HashMap<JobManagerCommand, String>(); - commands.put(JobManagerCommand.SUBMISSION, "Sub command"); - commands.put(JobManagerCommand.SHOW_QUEUE, "show q command"); - jobManager.setJobManagerCommands(commands); - jobSubmission.setMonitorMode(MonitorMode.POLL_JOB_MANAGER); -// String jobManagerID = appcatalog.getComputeResource().addResourceJobManager(jobManager); -// jobManager.setResourceJobManagerId(jobManagerID); - jobSubmission.setResourceJobManager(jobManager); - return appcatalog.getComputeResource().addSSHJobSubmission(jobSubmission); - } catch (AppCatalogException e) { - logger.error(e.getMessage(), e); - } - return null; - } - -// public String addGlobusJobSubmission (){ -// try { -// GlobusJobSubmission jobSubmission = new GlobusJobSubmission(); -// jobSubmission.setSecurityProtocol(SecurityProtocol.GSI); -// jobSubmission.setResourceJobManager(ResourceJobManager.PBS); -// List<String> endPoints = new ArrayList<String>(); -// endPoints.add("222.33.43.444"); -// endPoints.add("23.344.44.454"); -// jobSubmission.setGlobusGateKeeperEndPoint(endPoints); -// return appcatalog.getComputeResource().addGlobusJobSubmission(jobSubmission); -// } catch (AppCatalogException e) { -// e.printStackTrace(); -// } -// return null; -// } - - public String addSCPDataMovement (){ - try { - SCPDataMovement dataMovement = new SCPDataMovement(); - dataMovement.setSshPort(22); - dataMovement.setSecurityProtocol(SecurityProtocol.SSH_KEYS); - return appcatalog.getComputeResource().addScpDataMovement(dataMovement); - }catch (AppCatalogException e) { - logger.error(e.getMessage(), e); - } - return null; - } - - public String addGridFTPDataMovement (){ - try { - GridFTPDataMovement dataMovement = new GridFTPDataMovement(); - dataMovement.setSecurityProtocol(SecurityProtocol.SSH_KEYS); - List<String> endPoints = new ArrayList<String>(); - endPoints.add("222.33.43.444"); - endPoints.add("23.344.44.454"); - dataMovement.setGridFTPEndPoints(endPoints); - return appcatalog.getComputeResource().addGridFTPDataMovement(dataMovement); - }catch (AppCatalogException e) { - logger.error(e.getMessage(), e); - } - return null; - } - - -} -
http://git-wip-us.apache.org/repos/asf/airavata/blob/5a648a60/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/AbstractResourceTest.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/AbstractResourceTest.java b/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/AbstractResourceTest.java index 0dd9d8f..14bde6e 100644 --- a/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/AbstractResourceTest.java +++ b/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/AbstractResourceTest.java @@ -19,10 +19,10 @@ * */ -package org.apache.airavata.experiment.catalog; +package org.apache.airavata.registry.core.experiment.catalog; import org.apache.airavata.common.utils.ServerSettings; -import org.apache.airavata.experiment.catalog.util.Initialize; +import org.apache.airavata.registry.core.experiment.catalog.util.Initialize; import org.apache.airavata.registry.core.experiment.catalog.ExpCatResourceUtils; import org.apache.airavata.registry.core.experiment.catalog.resources.*; import org.apache.airavata.registry.core.experiment.catalog.resources.GatewayExperimentCatResource; http://git-wip-us.apache.org/repos/asf/airavata/blob/5a648a60/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/ComputationalSchedulingTest.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/ComputationalSchedulingTest.java b/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/ComputationalSchedulingTest.java index e6c162c..d6f0191 100644 --- a/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/ComputationalSchedulingTest.java +++ b/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/ComputationalSchedulingTest.java @@ -19,7 +19,7 @@ * */ -package org.apache.airavata.experiment.catalog; +package org.apache.airavata.registry.core.experiment.catalog; import org.apache.airavata.registry.core.experiment.catalog.ResourceType; import org.apache.airavata.registry.core.experiment.catalog.resources.ComputationSchedulingExperimentCatResource; http://git-wip-us.apache.org/repos/asf/airavata/blob/5a648a60/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/ConfigurationExperimentCatResourceTest.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/ConfigurationExperimentCatResourceTest.java b/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/ConfigurationExperimentCatResourceTest.java index 57dddbe..9636454 100644 --- a/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/ConfigurationExperimentCatResourceTest.java +++ b/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/ConfigurationExperimentCatResourceTest.java @@ -19,7 +19,7 @@ * */ -package org.apache.airavata.experiment.catalog; +package org.apache.airavata.registry.core.experiment.catalog; import static org.junit.Assert.*; import org.apache.airavata.registry.core.experiment.catalog.ExpCatResourceUtils; http://git-wip-us.apache.org/repos/asf/airavata/blob/5a648a60/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/ConfigurationResourceTest.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/ConfigurationResourceTest.java b/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/ConfigurationResourceTest.java deleted file mode 100644 index 66f025e..0000000 --- a/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/ConfigurationResourceTest.java +++ /dev/null @@ -1,58 +0,0 @@ -/* -* -* 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.experiment.catalog; - -import static org.junit.Assert.*; - -import org.apache.airavata.experiment.catalog.resources.ConfigurationResource; -import org.junit.After; -import org.junit.Test; - -import java.sql.Timestamp; -import java.util.Calendar; - -public class ConfigurationResourceTest extends AbstractResourceTest { - - @Override - public void setUp() throws Exception { - super.setUp(); - } - @Test - public void testSave() throws Exception { - ConfigurationResource configuration = ResourceUtils.createConfiguration("testConfigKey"); - configuration.setConfigVal("testConfigValue"); - Calendar calender = Calendar.getInstance(); - java.util.Date d = calender.getTime(); - Timestamp currentTime = new Timestamp(d.getTime()); - configuration.setExpireDate(currentTime); - configuration.setCategoryID("SYSTEM"); - configuration.save(); - - assertTrue("Configuration Save succuessful", ResourceUtils.isConfigurationExist("testConfigKey")); - //remove test configuration - ResourceUtils.removeConfiguration("testConfigKey"); - } - - @After - public void tearDown() throws Exception { - } -} http://git-wip-us.apache.org/repos/asf/airavata/blob/5a648a60/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/ExecutionErrorResourceTest.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/ExecutionErrorResourceTest.java b/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/ExecutionErrorResourceTest.java deleted file mode 100644 index b61a16c..0000000 --- a/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/ExecutionErrorResourceTest.java +++ /dev/null @@ -1,95 +0,0 @@ -///* -//* -//* 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.experiment.registry.jpa; -// -//import org.apache.airavata.experiment.registry.jpa.resources.*; -// -//import java.sql.Timestamp; -//import java.util.Calendar; -// -//public class ExecutionErrorResourceTest extends AbstractResourceTest { -// private WorkflowDataResource workflowDataResource; -// private NodeDataResource nodeDataResource; -// private ExperimentMetadataResource experimentResource; -// -// @Override -// public void setUp() throws Exception { -// super.setUp(); -// GatewayResource gatewayResource = super.getGatewayResource(); -// WorkerResource workerResource = super.getWorkerResource(); -// -// ProjectResource project = new ProjectResource(workerResource, gatewayResource, "testProject"); -// project.save(); -// -// experimentResource = (ExperimentMetadataResource) gatewayResource.create(ResourceType.EXPERIMENT_METADATA); -// experimentResource.setExpID("testExpID"); -// experimentResource.setExecutionUser(workerResource.getUser()); -// -// experimentResource.setProject(project); -// experimentResource.setDescription("testDescription"); -// experimentResource.setExperimentName("textExpID"); -// experimentResource.setSubmittedDate(getCurrentTimestamp()); -// experimentResource.setShareExp(true); -// experimentResource.save(); -// -// workflowDataResource = (WorkflowDataResource) experimentResource.create(ResourceType.WORKFLOW_DATA); -// workflowDataResource.setWorkflowInstanceID("testWFInstance"); -// workflowDataResource.setTemplateName("testTemplate"); -// workflowDataResource.setExperimentID("testExpID"); -// Timestamp timestamp = getCurrentTimestamp(); -// workflowDataResource.setLastUpdatedTime(timestamp); -// workflowDataResource.save(); -// -// nodeDataResource = workflowDataResource.createNodeData("testNodeID"); -// nodeDataResource.setWorkflowDataResource(workflowDataResource); -// nodeDataResource.setInputs("testInput"); -// nodeDataResource.setOutputs("testOutput"); -// nodeDataResource.setStatus("testStatus"); -// nodeDataResource.save(); -// } -// -// -// public void testSave() throws Exception { -// ExecutionErrorResource executionErrorResource = (ExecutionErrorResource) workflowDataResource.create(ResourceType.EXECUTION_ERROR); -// executionErrorResource.setErrorCode("testErrorCode"); -// executionErrorResource.setActionTaken("testAction"); -// executionErrorResource.setErrorLocation("testErrorLocation"); -// executionErrorResource.setErrorReference(0); -// executionErrorResource.setWorkflowDataResource(workflowDataResource); -// -// executionErrorResource.setMetadataResource(experimentResource); -// executionErrorResource.setNodeID(nodeDataResource.getNodeID()); -// executionErrorResource.setGfacJobID("testGfacJobID"); -// executionErrorResource.setErrorDes("testDes"); -// executionErrorResource.setErrorMsg("errorMsg"); -// executionErrorResource.save(); -// System.out.println(executionErrorResource.getErrorID()); -// -// assertTrue("Execution Error saved successfully", workflowDataResource.isExists(ResourceType.EXECUTION_ERROR, executionErrorResource.getErrorID())); -// -// } -// -// @Override -// public void tearDown() throws Exception { -// super.tearDown(); -// } -//} http://git-wip-us.apache.org/repos/asf/airavata/blob/5a648a60/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/ExperimentCatalogUseCaseTest.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/ExperimentCatalogUseCaseTest.java b/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/ExperimentCatalogUseCaseTest.java index f790c8f..d66dd16 100644 --- a/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/ExperimentCatalogUseCaseTest.java +++ b/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/ExperimentCatalogUseCaseTest.java @@ -18,7 +18,7 @@ * under the License. * */ -package org.apache.airavata.experiment.catalog; +package org.apache.airavata.registry.core.experiment.catalog; import junit.framework.Assert; import org.apache.airavata.common.exception.ApplicationSettingsException; @@ -27,8 +27,8 @@ import org.apache.airavata.model.appcatalog.appinterface.InputDataObjectType; import org.apache.airavata.model.appcatalog.appinterface.OutputDataObjectType; import org.apache.airavata.model.workspace.Project; import org.apache.airavata.model.workspace.experiment.*; -import org.apache.airavata.experiment.catalog.impl.RegistryFactory; -import org.apache.airavata.experiment.catalog.util.Initialize; +import org.apache.airavata.registry.core.experiment.catalog.impl.RegistryFactory; +import org.apache.airavata.registry.core.experiment.catalog.util.Initialize; import org.apache.airavata.registry.cpi.*; import org.apache.airavata.registry.cpi.utils.Constants; import org.junit.BeforeClass; http://git-wip-us.apache.org/repos/asf/airavata/blob/5a648a60/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/ExperimentDataResourceTest.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/ExperimentDataResourceTest.java b/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/ExperimentDataResourceTest.java deleted file mode 100644 index 1df8091..0000000 --- a/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/ExperimentDataResourceTest.java +++ /dev/null @@ -1,107 +0,0 @@ -///* -//* -//* 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.experiment.registry.jpa; -// -//import org.apache.airavata.experiment.registry.jpa.resources.*; -// -//import java.sql.Timestamp; -//import java.util.Calendar; -// -//public class ExperimentDataResourceTest extends AbstractResourceTest { -// private ExperimentDataResource experimentDataResource; -// private ExperimentResource experimentResource; -// private WorkflowDataResource workflowDataResource; -// private ExperimentMetadataResource experimentMetadataResource; -// -// @Override -// public void setUp() throws Exception { -// super.setUp(); -// GatewayResource gatewayResource = super.getGatewayResource(); -// WorkerResource 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("testExpID"); -// experimentDataResource.setUserName(workerResource.getUser()); -// experimentDataResource.save(); -// -// experimentMetadataResource = experimentDataResource.createExperimentMetadata(); -// workflowDataResource = experimentDataResource.createWorkflowInstanceResource("testWorkflowInstance"); -// -// 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(); -// } -// -// public void testCreate() throws Exception { -// assertNotNull("workflowdata resource created", workflowDataResource); -// assertNotNull("experimemt metadata resource created", experimentMetadataResource); -// } -// -// public void testGet() throws Exception { -// assertNotNull("workflow data retrieved successfully", experimentDataResource.getWorkflowInstance("testWorkflowInstance")); -// assertNotNull("experiment meta data retrieved successfully", experimentDataResource.getExperimentMetadata()); -// } -// -// public void testGetList() throws Exception { -// assertNotNull("workflow data retrieved successfully", experimentDataResource.get(ResourceType.WORKFLOW_DATA)); -// assertNotNull("experiment meta data retrieved successfully", experimentDataResource.get(ResourceType.EXPERIMENT_METADATA)); -// } -// -// public void testSave() throws Exception { -// experimentDataResource.save(); -// assertTrue("experiment data saved successfully", experimentResource.isExists(ResourceType.EXPERIMENT_DATA, "testExpID")); -// } -// -// public void testRemove() throws Exception { -// experimentDataResource.remove(ResourceType.WORKFLOW_DATA, "testWFInstanceID"); -// assertTrue("workflow data resource removed successfully", !experimentResource.isExists(ResourceType.EXPERIMENT_DATA, "testWFInstanceID")); -// -// experimentDataResource.remove(ResourceType.EXPERIMENT_METADATA, "testExpID"); -// assertTrue("experiment meta data resource removed successfully", !experimentDataResource.isExists(ResourceType.EXPERIMENT_METADATA, "testExpID")); -// -// } -// -// @Override -// public void tearDown() throws Exception { -// super.tearDown(); -// } -// -// -//} http://git-wip-us.apache.org/repos/asf/airavata/blob/5a648a60/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/ExperimentExperimentCatResourceTest.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/ExperimentExperimentCatResourceTest.java b/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/ExperimentExperimentCatResourceTest.java index d10e4ec..e59d842 100644 --- a/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/ExperimentExperimentCatResourceTest.java +++ b/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/ExperimentExperimentCatResourceTest.java @@ -19,7 +19,7 @@ * */ -package org.apache.airavata.experiment.catalog; +package org.apache.airavata.registry.core.experiment.catalog; import static org.junit.Assert.*; http://git-wip-us.apache.org/repos/asf/airavata/blob/5a648a60/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/ExperimentInputExperimentCatResourceTest.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/ExperimentInputExperimentCatResourceTest.java b/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/ExperimentInputExperimentCatResourceTest.java index d5c23be..0ec3566 100644 --- a/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/ExperimentInputExperimentCatResourceTest.java +++ b/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/ExperimentInputExperimentCatResourceTest.java @@ -19,7 +19,7 @@ * */ -package org.apache.airavata.experiment.catalog; +package org.apache.airavata.registry.core.experiment.catalog; import org.apache.airavata.registry.core.experiment.catalog.ResourceType; import org.apache.airavata.registry.core.experiment.catalog.resources.ExperimentExperimentCatResource; http://git-wip-us.apache.org/repos/asf/airavata/blob/5a648a60/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/ExperimentInputResourceTest.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/ExperimentInputResourceTest.java b/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/ExperimentInputResourceTest.java deleted file mode 100644 index 5372877..0000000 --- a/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/ExperimentInputResourceTest.java +++ /dev/null @@ -1,75 +0,0 @@ -/* -* -* 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.experiment.catalog; - -import org.apache.airavata.experiment.catalog.resources.*; -import org.junit.After; -import org.junit.Test; - -import java.util.List; - -import static org.junit.Assert.assertTrue; - - -public class ExperimentInputResourceTest extends AbstractResourceTest { - private ExperimentResource experimentResource; - private String experimentID = "testExpID"; - ExperimentInputResource experimentInputResource; - - @Override - public void setUp() throws Exception { - super.setUp(); - experimentResource = (ExperimentResource) getGatewayResource().create(ResourceType.EXPERIMENT); - experimentResource.setExpID(experimentID); - experimentResource.setExecutionUser(getWorkerResource().getUser()); - experimentResource.setProjectId(getProjectResource().getId()); - experimentResource.setCreationTime(getCurrentTimestamp()); - experimentResource.setApplicationId("testApplication"); - experimentResource.setApplicationVersion("1.0"); - experimentResource.setDescription("Test Application"); - experimentResource.setExpName("TestExperiment"); - experimentResource.save(); - - experimentInputResource = (ExperimentInputResource)experimentResource.create(ResourceType.EXPERIMENT_INPUT); - experimentInputResource.setExperimentId(experimentID); - experimentInputResource.setExperimentKey("testKey"); - experimentInputResource.setValue("testValue"); - experimentInputResource.setDataType("string"); - experimentInputResource.save(); - } - - @Test - public void testSave() throws Exception { - assertTrue("Experiment Input saved successfully", experimentResource.isExists(ResourceType.EXPERIMENT_INPUT, experimentID)); - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testGet () throws Exception { - List<ExperimentInputResource> experimentInputs = experimentResource.getExperimentInputs(); - System.out.println("input counts : " + experimentInputs.size()); - assertTrue("Experiment input retrieved successfully...", experimentInputs.size() > 0); - } -} http://git-wip-us.apache.org/repos/asf/airavata/blob/5a648a60/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/ExperimentMetadataResourceTest.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/ExperimentMetadataResourceTest.java b/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/ExperimentMetadataResourceTest.java deleted file mode 100644 index 86ca3d6..0000000 --- a/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/ExperimentMetadataResourceTest.java +++ /dev/null @@ -1,87 +0,0 @@ -///* -//* -//* 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.experiment.registry.jpa; -// -// -//import org.apache.airavata.experiment.registry.jpa.resources.*; -// -//import java.sql.Date; -//import java.sql.Timestamp; -//import java.util.Calendar; -// -//public class ExperimentMetadataResourceTest extends AbstractResourceTest { -// -// private GatewayResource gatewayResource; -// private WorkflowDataResource workflowDataResource; -// private ExperimentMetadataResource experimentResource; -// -// @Override -// public void setUp() throws Exception { -// super.setUp(); -// gatewayResource = super.getGatewayResource(); -// WorkerResource workerResource = super.getWorkerResource(); -// experimentResource = (ExperimentMetadataResource) gatewayResource.create(ResourceType.EXPERIMENT_METADATA); -// experimentResource.setExpID("testExpID"); -// experimentResource.setExecutionUser("admin"); -// experimentResource.setProject(new ProjectResource(workerResource, gatewayResource, "testProject")); -// experimentResource.setDescription("testDescription"); -// experimentResource.setExperimentName("textExpID"); -// experimentResource.setSubmittedDate(getCurrentTimestamp()); -// experimentResource.setShareExp(true); -// experimentResource.save(); -// -// ExperimentConfigDataResource exConfig = (ExperimentConfigDataResource)experimentResource.create(ResourceType.EXPERIMENT_CONFIG_DATA); -// exConfig.setExpID("testExpID"); -// exConfig.setNodeCount(5); -// exConfig.setCpuCount(10); -// exConfig.setApplicationID("testApp"); -// exConfig.setApplicationVersion("testAppVersion"); -// exConfig.save(); -// -// workflowDataResource = experimentResource.createWorkflowInstanceResource("testWFInstance"); -// workflowDataResource.setExperimentID("testExpID"); -// workflowDataResource.setStatus("testStatus"); -// workflowDataResource.setTemplateName("testWFInstance"); -// workflowDataResource.setLastUpdatedTime(getCurrentTimestamp()); -// workflowDataResource.setStartTime(getCurrentTimestamp()); -// workflowDataResource.save(); -// } -// -// public void testSave() throws Exception { -// assertTrue("experiment meta data saved successfully", gatewayResource.isExists(ResourceType.EXPERIMENT_METADATA, "testExpID")); -// -// } -// -// public void testRemove() throws Exception { -// experimentResource.remove(ResourceType.WORKFLOW_DATA, "testWFInstance"); -// assertTrue("workflow data resource removed successfully", !experimentResource.isExists(ResourceType.WORKFLOW_DATA, "testWFInstance")); -// } -// -// public void testGet() throws Exception { -// assertNotNull("experiment configuration retrieved successfully...", experimentResource.get(ResourceType.EXPERIMENT_CONFIG_DATA, "testExpID")); -// } -// -// @Override -// public void tearDown() throws Exception { -// super.tearDown(); -// } -//} http://git-wip-us.apache.org/repos/asf/airavata/blob/5a648a60/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/ExperimentOutputExperimentCatResourceTest.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/ExperimentOutputExperimentCatResourceTest.java b/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/ExperimentOutputExperimentCatResourceTest.java index 6475bed..7fd3d71 100644 --- a/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/ExperimentOutputExperimentCatResourceTest.java +++ b/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/ExperimentOutputExperimentCatResourceTest.java @@ -19,7 +19,7 @@ * */ -package org.apache.airavata.experiment.catalog; +package org.apache.airavata.registry.core.experiment.catalog; import org.apache.airavata.registry.core.experiment.catalog.ResourceType; import org.apache.airavata.registry.core.experiment.catalog.resources.ExperimentExperimentCatResource; http://git-wip-us.apache.org/repos/asf/airavata/blob/5a648a60/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/ExperimentOutputResourceTest.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/ExperimentOutputResourceTest.java b/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/ExperimentOutputResourceTest.java deleted file mode 100644 index 605b0ae..0000000 --- a/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/ExperimentOutputResourceTest.java +++ /dev/null @@ -1,76 +0,0 @@ -/* -* -* 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.experiment.catalog; - -import org.apache.airavata.experiment.catalog.resources.ExperimentOutputResource; -import org.apache.airavata.experiment.catalog.resources.ExperimentResource; -import org.junit.After; -import org.junit.Test; - -import java.util.List; - -import static org.junit.Assert.assertTrue; - - -public class ExperimentOutputResourceTest extends AbstractResourceTest { - private ExperimentResource experimentResource; - private String experimentID = "testExpID"; - ExperimentOutputResource outputResource; - - @Override - public void setUp() throws Exception { - super.setUp(); - experimentResource = (ExperimentResource) getGatewayResource().create(ResourceType.EXPERIMENT); - experimentResource.setExpID(experimentID); - experimentResource.setExecutionUser(getWorkerResource().getUser()); - experimentResource.setProjectId(getProjectResource().getId()); - experimentResource.setCreationTime(getCurrentTimestamp()); - experimentResource.setApplicationId("testApplication"); - experimentResource.setApplicationVersion("1.0"); - experimentResource.setDescription("Test Application"); - experimentResource.setExpName("TestExperiment"); - experimentResource.save(); - - outputResource = (ExperimentOutputResource)experimentResource.create(ResourceType.EXPERIMENT_OUTPUT); - outputResource.setExperimentId(experimentResource.getExpID()); - outputResource.setExperimentKey("testKey"); - outputResource.setValue("testValue"); - outputResource.setDataType("string"); - outputResource.save(); - } - - @Test - public void testSave() throws Exception { - assertTrue("Experiment output saved successfully", experimentResource.isExists(ResourceType.EXPERIMENT_OUTPUT, experimentID)); - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testGet () throws Exception { - List<ExperimentOutputResource> outputs = experimentResource.getExperimentOutputs(); - System.out.println("output counts : " + outputs.size()); - assertTrue("Experiment output retrieved successfully...", outputs.size() > 0); - } -} http://git-wip-us.apache.org/repos/asf/airavata/blob/5a648a60/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/ExperimentResourceTest.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/ExperimentResourceTest.java b/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/ExperimentResourceTest.java deleted file mode 100644 index ac39f41..0000000 --- a/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/ExperimentResourceTest.java +++ /dev/null @@ -1,77 +0,0 @@ -/* -* -* 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.experiment.catalog; - -import static org.junit.Assert.*; - -import java.sql.Timestamp; -import java.util.Date; - -import org.apache.airavata.experiment.catalog.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(); - experimentResource = (ExperimentResource) getGatewayResource().create(ResourceType.EXPERIMENT); - experimentResource.setExpID(experimentID); - experimentResource.setExecutionUser(getWorkerResource().getUser()); - experimentResource.setProjectId(getProjectResource().getId()); - Timestamp currentDate = new Timestamp(new Date().getTime()); - experimentResource.setCreationTime(currentDate); - experimentResource.setApplicationId("testApplication"); - experimentResource.setApplicationVersion("1.0"); - experimentResource.setDescription("Test Application"); - experimentResource.setExpName("TestExperiment"); - 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); - assertFalse("experiment data removed successfully", getGatewayResource().isExists(ResourceType.EXPERIMENT, experimentID)); - } - - @After - public void tearDown() throws Exception { - } -} http://git-wip-us.apache.org/repos/asf/airavata/blob/5a648a60/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/GFacJobDataResourceTest.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/GFacJobDataResourceTest.java b/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/GFacJobDataResourceTest.java deleted file mode 100644 index c546aca..0000000 --- a/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/GFacJobDataResourceTest.java +++ /dev/null @@ -1,77 +0,0 @@ -///* -//* -//* 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.experiment.registry.jpa; -// -//import org.apache.airavata.experiment.registry.jpa.resources.*; -// -//import java.sql.Timestamp; -//import java.util.Calendar; -// -//public class GFacJobDataResourceTest extends AbstractResourceTest { -// private WorkerResource workerResource; -// private WorkflowDataResource workflowDataResource; -// private ExperimentMetadataResource experimentResource; -// -// @Override -// public void setUp() throws Exception { -// super.setUp(); -// GatewayResource gatewayResource = super.getGatewayResource(); -// workerResource = super.getWorkerResource(); -// -// experimentResource = (ExperimentMetadataResource) gatewayResource.create(ResourceType.EXPERIMENT_METADATA); -// experimentResource.setExpID("testExpID"); -// experimentResource.setExperimentName("testExpID"); -// experimentResource.setExecutionUser(workerResource.getUser()); -// experimentResource.setProject(new ProjectResource(workerResource, gatewayResource, "testProject")); -// experimentResource.save(); -// -// workflowDataResource = (WorkflowDataResource) experimentResource.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.setMetadataResource(experimentResource); -// 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")); -//// workflowDataResource.remove(ResourceType.GFAC_JOB_DATA, "testJobID"); -// } -//} http://git-wip-us.apache.org/repos/asf/airavata/blob/5a648a60/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/GFacJobStatusResourceTest.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/GFacJobStatusResourceTest.java b/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/GFacJobStatusResourceTest.java deleted file mode 100644 index 9cf648e..0000000 --- a/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/GFacJobStatusResourceTest.java +++ /dev/null @@ -1,87 +0,0 @@ -///* -//* -//* 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.experiment.registry.jpa; -// -//import org.apache.airavata.experiment.registry.jpa.resources.*; -// -//import java.sql.Timestamp; -//import java.util.Calendar; -//import java.util.List; -// -//public class GFacJobStatusResourceTest extends AbstractResourceTest { -// private GFacJobDataResource gFacJobDataResource; -// -// @Override -// public void setUp() throws Exception { -// super.setUp(); -// GatewayResource gatewayResource = super.getGatewayResource(); -// WorkerResource workerResource = super.getWorkerResource(); -// -// ExperimentMetadataResource experimentResource = (ExperimentMetadataResource) gatewayResource.create(ResourceType.EXPERIMENT_METADATA); -// experimentResource.setExpID("testExpID"); -// experimentResource.setExperimentName("testExpID"); -// experimentResource.setExecutionUser(workerResource.getUser()); -// experimentResource.setProject(new ProjectResource(workerResource, gatewayResource, "testProject")); -// experimentResource.save(); -// -// -// WorkflowDataResource workflowDataResource = (WorkflowDataResource) experimentResource.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(); -// -// gFacJobDataResource = (GFacJobDataResource) workflowDataResource.create(ResourceType.GFAC_JOB_DATA); -// gFacJobDataResource.setLocalJobID("testJobID"); -// gFacJobDataResource.setApplicationDescID("testApplication"); -// gFacJobDataResource.setMetadataResource(experimentResource); -// gFacJobDataResource.setNodeID("testNode"); -// gFacJobDataResource.setHostDescID("testHost"); -// gFacJobDataResource.setServiceDescID("testService"); -// gFacJobDataResource.setStatus("testStatus"); -// gFacJobDataResource.setJobData("testJobData"); -// gFacJobDataResource.save(); -// -// } -// -// @Override -// public void tearDown() throws Exception { -// super.tearDown(); -// } -// -// public void testSave() throws Exception { -// GFacJobStatusResource resource = (GFacJobStatusResource)gFacJobDataResource.create(ResourceType.GFAC_JOB_STATUS); -// resource.setStatus("testStatus"); -// resource.setgFacJobDataResource(gFacJobDataResource); -// Calendar calender = Calendar.getInstance(); -// java.util.Date d = calender.getTime(); -// Timestamp timestamp = new Timestamp(d.getTime()); -// resource.setStatusUpdateTime(timestamp); -// resource.save(); -// List<Resource> resources = gFacJobDataResource.get(ResourceType.GFAC_JOB_STATUS); -// assertTrue("GFac job status saved successfully", resources.size() != 0); -// } -//} http://git-wip-us.apache.org/repos/asf/airavata/blob/5a648a60/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/GatewayExperimentCatResourceTest.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/GatewayExperimentCatResourceTest.java b/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/GatewayExperimentCatResourceTest.java index 18d469e..6f8f92a 100644 --- a/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/GatewayExperimentCatResourceTest.java +++ b/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/GatewayExperimentCatResourceTest.java @@ -19,7 +19,7 @@ * */ -package org.apache.airavata.experiment.catalog; +package org.apache.airavata.registry.core.experiment.catalog; import static org.junit.Assert.*; http://git-wip-us.apache.org/repos/asf/airavata/blob/5a648a60/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/GatewayResourceTest.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/GatewayResourceTest.java b/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/GatewayResourceTest.java deleted file mode 100644 index bd11353..0000000 --- a/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/GatewayResourceTest.java +++ /dev/null @@ -1,120 +0,0 @@ -/* -* -* 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.experiment.catalog; - -import static org.junit.Assert.*; - -import org.apache.airavata.common.utils.ServerSettings; -import org.apache.airavata.experiment.catalog.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 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(ServerSettings.getDefaultUserGateway()); - } - projectResource = (ProjectResource) gatewayResource.create(ResourceType.PROJECT); - projectResource.setId("testProject"); - projectResource.setName("testProject"); - projectResource.setWorker(workerResource); - projectResource.save(); - - experimentResource = (ExperimentResource) gatewayResource.create(ResourceType.EXPERIMENT); - - experimentResource.setExpID("testExpID"); - experimentResource.setExecutionUser(getWorkerResource().getUser()); - experimentResource.setProjectId(getProjectResource().getId()); - 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.setDomain("owner1"); - gatewayResource.save(); - - boolean gatewayExist = ResourceUtils.isGatewayExist(ServerSettings.getDefaultUserGateway()); - 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("experiment resource cannot be null", experimentResource); - } - - @Test - public void testIsExists() throws Exception { - assertTrue(gatewayResource.isExists(ResourceType.GATEWAY_WORKER, ServerSettings.getDefaultUser())); - assertTrue(gatewayResource.isExists(ResourceType.EXPERIMENT, "testExpID")); - } - - @Test - public void testGet() throws Exception { - assertNotNull(gatewayResource.get(ResourceType.GATEWAY_WORKER, ServerSettings.getDefaultUser())); - 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.EXPERIMENT)); - } - - @Test - public void testRemove() throws Exception { - - gatewayResource.remove(ResourceType.EXPERIMENT, "testExpID"); - assertFalse(gatewayResource.isExists(ResourceType.EXPERIMENT, "testExpID")); - - } - - @After - public void tearDown() throws Exception { - } -} http://git-wip-us.apache.org/repos/asf/airavata/blob/5a648a60/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/GramDataResourceTest.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/GramDataResourceTest.java b/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/GramDataResourceTest.java deleted file mode 100644 index 47f8399..0000000 --- a/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/GramDataResourceTest.java +++ /dev/null @@ -1,72 +0,0 @@ -///* -//* -//* 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.experiment.registry.jpa; -// -//import org.apache.airavata.experiment.registry.jpa.resources.*; -// -//import java.sql.Timestamp; -//import java.util.Calendar; -// -//public class GramDataResourceTest extends AbstractResourceTest { -// private WorkflowDataResource workflowDataResource; -// -// @Override -// public void setUp() throws Exception { -// super.setUp(); -// GatewayResource gatewayResource = super.getGatewayResource(); -// WorkerResource workerResource = super.getWorkerResource(); -// -// ExperimentMetadataResource experimentResource = (ExperimentMetadataResource) gatewayResource.create(ResourceType.EXPERIMENT_METADATA); -// experimentResource.setExpID("testExpID"); -// experimentResource.setExperimentName("testExpID"); -// experimentResource.setExecutionUser(workerResource.getUser()); -// experimentResource.setProject(new ProjectResource(workerResource, gatewayResource, "testProject")); -// experimentResource.save(); -// -// workflowDataResource = (WorkflowDataResource) experimentResource.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(); -// } -// -// public void testSave() throws Exception { -// GramDataResource gramDataResource = workflowDataResource.createGramData("testNode"); -// gramDataResource.setWorkflowDataResource(workflowDataResource); -// gramDataResource.setInvokedHost("testhost"); -// gramDataResource.setRsl("testRSL"); -// gramDataResource.save(); -// -// assertTrue("gram data saved successfully", workflowDataResource.isGramDataExists("testNode")); -// -// } -// -// @Override -// public void tearDown() throws Exception { -// super.tearDown(); -// } -// -//} http://git-wip-us.apache.org/repos/asf/airavata/blob/5a648a60/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/NodeDataResourceTest.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/NodeDataResourceTest.java b/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/NodeDataResourceTest.java deleted file mode 100644 index e13c1ff..0000000 --- a/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/NodeDataResourceTest.java +++ /dev/null @@ -1,72 +0,0 @@ -///* -//* -//* 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.experiment.registry.jpa; -// -//import org.apache.airavata.experiment.registry.jpa.resources.*; -// -//import java.sql.Timestamp; -//import java.util.Calendar; -// -//public class NodeDataResourceTest extends AbstractResourceTest { -// private WorkflowDataResource workflowDataResource; -// -// @Override -// public void setUp() throws Exception { -// super.setUp(); -// GatewayResource gatewayResource = super.getGatewayResource(); -// WorkerResource workerResource = super.getWorkerResource(); -// -// ExperimentMetadataResource experimentResource = (ExperimentMetadataResource) gatewayResource.create(ResourceType.EXPERIMENT_METADATA); -// experimentResource.setExpID("testExpID"); -// experimentResource.setExperimentName("testExpID"); -// experimentResource.setExecutionUser(workerResource.getUser()); -// experimentResource.setProject(new ProjectResource(workerResource, gatewayResource, "testProject")); -// experimentResource.save(); -// -// workflowDataResource = (WorkflowDataResource) experimentResource.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(); -// } -// -// public void testSave() throws Exception { -// NodeDataResource nodeDataResource = workflowDataResource.createNodeData("testNodeID"); -// nodeDataResource.setInputs("testInput"); -// -// nodeDataResource.setStatus("testStatus"); -// nodeDataResource.setExecutionIndex(0); -// nodeDataResource.save(); -// -// assertTrue("node data resource saved successfully", workflowDataResource.isNodeExists("testNodeID")); -// } -// -// @Override -// public void tearDown() throws Exception { -// super.tearDown(); -// } -// -//} http://git-wip-us.apache.org/repos/asf/airavata/blob/5a648a60/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/OrchestratorDataResourceTest.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/OrchestratorDataResourceTest.java b/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/OrchestratorDataResourceTest.java deleted file mode 100644 index e545965..0000000 --- a/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/OrchestratorDataResourceTest.java +++ /dev/null @@ -1,69 +0,0 @@ -///* -// * -// * 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.experiment.registry.jpa; -// -//import java.util.UUID; -// -//import org.apache.airavata.common.utils.AiravataJobState; -//import org.apache.airavata.experiment.registry.jpa.resources.*; -// -//public class OrchestratorDataResourceTest extends AbstractResourceTest{ -// private OrchestratorDataResource dataResource; -// private ExperimentMetadataResource experimentResource; -// private WorkerResource workerResource; -//// private String experimentID = UUID.randomUUID().toString(); -// private String applicationName = "echo_test"; -// private GatewayResource gatewayResource; -// -// @Override -// public void setUp() throws Exception { -// super.setUp(); -// gatewayResource = super.getGatewayResource(); -// workerResource = super.getWorkerResource(); -// -// experimentResource = (ExperimentMetadataResource) gatewayResource.create(ResourceType.EXPERIMENT_METADATA); -// experimentResource.setExpID("testExpID"); -// experimentResource.setExperimentName("testExpID"); -// experimentResource.setExecutionUser(workerResource.getUser()); -// experimentResource.setProject(new ProjectResource(workerResource, gatewayResource, "testProject")); -// experimentResource.save(); -// -// dataResource = (OrchestratorDataResource) gatewayResource.create(ResourceType.ORCHESTRATOR); -// -// } -// -// public void testSave() throws Exception { -// dataResource.setExperimentID("testExpID"); -// dataResource.setStatus(AiravataJobState.State.CREATED.toString()); -// dataResource.setApplicationName(applicationName); -// dataResource.save(); -// assertNotNull("Orchestrator data resource created successfully", dataResource); -// // Get saved data -// assertNotNull("Orchestrator data resource get successfully", gatewayResource.get(ResourceType.ORCHESTRATOR, "testExpID")); -// } -// -// @Override -// public void tearDown() throws Exception { -// super.tearDown(); -// } -// -// -//} http://git-wip-us.apache.org/repos/asf/airavata/blob/5a648a60/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/TaskDetailExperimentCatResourceTest.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/TaskDetailExperimentCatResourceTest.java b/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/TaskDetailExperimentCatResourceTest.java index 6b60beb..d1b7e6e 100644 --- a/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/TaskDetailExperimentCatResourceTest.java +++ b/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/TaskDetailExperimentCatResourceTest.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.airavata.experiment.catalog; +package org.apache.airavata.registry.core.experiment.catalog; import static org.junit.Assert.*; http://git-wip-us.apache.org/repos/asf/airavata/blob/5a648a60/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/TaskDetailResourceTest.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/TaskDetailResourceTest.java b/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/TaskDetailResourceTest.java deleted file mode 100644 index 916f03e..0000000 --- a/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/TaskDetailResourceTest.java +++ /dev/null @@ -1,93 +0,0 @@ -/** - * 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.experiment.catalog; - -import static org.junit.Assert.*; - -import java.sql.Timestamp; -import java.util.Date; - -import org.apache.airavata.experiment.catalog.resources.ExperimentResource; -import org.apache.airavata.experiment.catalog.resources.TaskDetailResource; -import org.apache.airavata.experiment.catalog.resources.WorkflowNodeDetailResource; -import org.junit.Before; -import org.junit.Test; - -public class TaskDetailResourceTest extends AbstractResourceTest{ - - private ExperimentResource experimentResource; - private TaskDetailResource taskDetailResource; - private WorkflowNodeDetailResource nodeDetailResource; - private String experimentID = "testExpID"; - private String applicationID = "testAppID"; - private String taskID = "testTask"; - private String nodeID = "testNode"; - - - @Before - public void setUp() throws Exception { - super.setUp(); - Timestamp creationTime = new Timestamp(new Date().getTime()); - - experimentResource = (ExperimentResource) getGatewayResource().create(ResourceType.EXPERIMENT); - experimentResource.setExpID(experimentID); - experimentResource.setExecutionUser(getWorkerResource().getUser()); - experimentResource.setProjectId(getProjectResource().getId()); - experimentResource.setCreationTime(creationTime); - experimentResource.save(); - - nodeDetailResource = (WorkflowNodeDetailResource) experimentResource.create(ResourceType.WORKFLOW_NODE_DETAIL); - nodeDetailResource.setExperimentId(experimentResource.getExpID()); - nodeDetailResource.setNodeInstanceId(nodeID); - nodeDetailResource.setNodeName(nodeID); - nodeDetailResource.setCreationTime(creationTime); - nodeDetailResource.save(); - - taskDetailResource = (TaskDetailResource)nodeDetailResource.create(ResourceType.TASK_DETAIL); - taskDetailResource.setNodeId(nodeDetailResource.getNodeInstanceId()); - taskDetailResource.setTaskId(taskID); - taskDetailResource.setApplicationId(applicationID); - taskDetailResource.setApplicationVersion("1.0"); - taskDetailResource.setCreationTime(creationTime); - taskDetailResource.save(); - } - - - @Test - public void testCreate() throws Exception { - assertNotNull("task data resource has being created ", taskDetailResource); - } - - @Test - public void testSave() throws Exception { - assertTrue("task save successfully", nodeDetailResource.isExists(ResourceType.TASK_DETAIL, taskID)); - } - - @Test - public void testGet() throws Exception { - assertNotNull("task data retrieved successfully", nodeDetailResource.get(ResourceType.TASK_DETAIL, taskID)); - } - - @Test - public void testRemove() throws Exception { - nodeDetailResource.remove(ResourceType.TASK_DETAIL, taskID); - assertFalse("task data removed successfully", nodeDetailResource.isExists(ResourceType.TASK_DETAIL, taskID)); - } -} http://git-wip-us.apache.org/repos/asf/airavata/blob/5a648a60/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/UserExperimentCatResourceTest.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/UserExperimentCatResourceTest.java b/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/UserExperimentCatResourceTest.java index 63408b4..102f6fa 100644 --- a/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/UserExperimentCatResourceTest.java +++ b/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/UserExperimentCatResourceTest.java @@ -19,7 +19,7 @@ * */ -package org.apache.airavata.experiment.catalog; +package org.apache.airavata.registry.core.experiment.catalog; import static org.junit.Assert.*; http://git-wip-us.apache.org/repos/asf/airavata/blob/5a648a60/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/UserResourceTest.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/UserResourceTest.java b/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/UserResourceTest.java deleted file mode 100644 index dfd45b1..0000000 --- a/modules/registry/registry-core/src/test/java/org/apache/airavata/experiment/catalog/UserResourceTest.java +++ /dev/null @@ -1,54 +0,0 @@ -/* -* -* 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.experiment.catalog; - -import static org.junit.Assert.*; - -import org.apache.airavata.experiment.catalog.resources.GatewayResource; -import org.apache.airavata.experiment.catalog.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 { - assertTrue("user resource saved successfully", gatewayResource.isExists(ResourceType.USER, "admin")); - } - - @After - public void tearDown() throws Exception { - } -}
