This is an automated email from the ASF dual-hosted git repository. machristie pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/airavata.git
commit 9b6a7e8f4825afd8b55aca8fce9d9f22486ae737 Author: Marcus Christie <[email protected]> AuthorDate: Thu Dec 13 08:49:51 2018 -0500 AIRAVATA-2616 Fix entity getter/setter to match data model --- .../entities/expcatalog/ExperimentInputEntity.java | 4 +- .../entities/expcatalog/ProcessInputEntity.java | 4 +- .../expcatalog/ExperimentRepositoryTest.java | 101 +++++++++++++++++++++ 3 files changed, 105 insertions(+), 4 deletions(-) diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentInputEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentInputEntity.java index d9b28fb..33ad224 100644 --- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentInputEntity.java +++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentInputEntity.java @@ -159,11 +159,11 @@ public class ExperimentInputEntity implements Serializable { this.inputOrder = inputOrder; } - public boolean isRequired() { + public boolean isIsRequired() { return isRequired; } - public void setRequired(boolean isRequired) { + public void setIsRequired(boolean isRequired) { this.isRequired = isRequired; } diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessInputEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessInputEntity.java index 7bafe45..8c3e7de 100644 --- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessInputEntity.java +++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessInputEntity.java @@ -159,11 +159,11 @@ public class ProcessInputEntity implements Serializable { this.inputOrder = inputOrder; } - public boolean isRequired() { + public boolean isIsRequired() { return isRequired; } - public void setRequired(boolean required) { + public void setIsRequired(boolean required) { isRequired = required; } diff --git a/modules/registry-refactoring/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentRepositoryTest.java b/modules/registry-refactoring/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentRepositoryTest.java index 7bb28e3..c8690a4 100644 --- a/modules/registry-refactoring/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentRepositoryTest.java +++ b/modules/registry-refactoring/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentRepositoryTest.java @@ -20,6 +20,8 @@ */ package org.apache.airavata.registry.core.repositories.expcatalog; +import org.apache.airavata.model.application.io.DataType; +import org.apache.airavata.model.application.io.InputDataObjectType; import org.apache.airavata.model.experiment.ExperimentModel; import org.apache.airavata.model.experiment.ExperimentType; import org.apache.airavata.model.experiment.UserConfigurationDataModel; @@ -137,4 +139,103 @@ public class ExperimentRepositoryTest extends TestBase { projectRepository.removeProject(projectId); } + @Test + public void testExperimentInputs() throws RegistryException { + + Gateway gateway = new Gateway(); + gateway.setGatewayId("gateway"); + gateway.setDomain("SEAGRID"); + gateway.setEmailAddress("[email protected]"); + String gatewayId = gatewayRepository.addGateway(gateway); + + Project project = new Project(); + project.setName("projectName"); + project.setOwner("user"); + project.setGatewayId(gatewayId); + + String projectId = projectRepository.addProject(project, gatewayId); + + ExperimentModel experimentModel = new ExperimentModel(); + experimentModel.setProjectId(projectId); + experimentModel.setGatewayId(gatewayId); + experimentModel.setExperimentType(ExperimentType.SINGLE_APPLICATION); + experimentModel.setUserName("user"); + experimentModel.setExperimentName("name"); + experimentModel.setGatewayInstanceId("gateway-instance-id"); + + InputDataObjectType input1 = new InputDataObjectType(); + input1.setName("name1"); + input1.setIsRequired(true); + input1.setType(DataType.STRING); + input1.setInputOrder(0); + input1.setApplicationArgument("-arg1"); + input1.setDataStaged(true); + input1.setIsReadOnly(true); + input1.setMetaData("{\"foo\": 123}"); + input1.setRequiredToAddedToCommandLine(true); + input1.setStandardInput(true); + input1.setStorageResourceId("storageResourceId"); + input1.setUserFriendlyDescription("First argument"); + input1.setValue("value1"); + experimentModel.addToExperimentInputs(input1); + + String experimentId = experimentRepository.addExperiment(experimentModel); + assertTrue(experimentId != null); + + ExperimentModel retrievedExperimentModel = experimentRepository.getExperiment(experimentId); + assertEquals(1, retrievedExperimentModel.getExperimentInputsSize()); + InputDataObjectType retrievedInput1 = retrievedExperimentModel.getExperimentInputs().get(0); + assertEquals("name1", retrievedInput1.getName()); + assertTrue(retrievedInput1.isIsRequired()); + assertEquals(DataType.STRING, retrievedInput1.getType()); + assertEquals(0, retrievedInput1.getInputOrder()); + assertEquals("-arg1", retrievedInput1.getApplicationArgument()); + assertTrue(retrievedInput1.isDataStaged()); + assertTrue(retrievedInput1.isIsReadOnly()); + assertEquals("{\"foo\": 123}", retrievedInput1.getMetaData()); + assertTrue(retrievedInput1.isRequiredToAddedToCommandLine()); + assertTrue(retrievedInput1.isStandardInput()); + assertEquals("storageResourceId", retrievedInput1.getStorageResourceId()); + assertEquals("First argument", retrievedInput1.getUserFriendlyDescription()); + assertEquals("value1", retrievedInput1.getValue()); + + // Update values of the input + retrievedInput1.setIsRequired(false); + retrievedInput1.setType(DataType.URI); + retrievedInput1.setInputOrder(1); + retrievedInput1.setApplicationArgument("-arg1a"); + retrievedInput1.setDataStaged(false); + retrievedInput1.setIsReadOnly(false); + retrievedInput1.setMetaData("{\"bar\": 456}"); + retrievedInput1.setRequiredToAddedToCommandLine(false); + retrievedInput1.setStandardInput(false); + retrievedInput1.setStorageResourceId("storageResourceId2"); + retrievedInput1.setUserFriendlyDescription("First argument~"); + retrievedInput1.setValue("value1a"); + + experimentRepository.updateExperiment(retrievedExperimentModel, experimentId); + + retrievedExperimentModel = experimentRepository.getExperiment(experimentId); + assertEquals(1, retrievedExperimentModel.getExperimentInputsSize()); + retrievedInput1 = retrievedExperimentModel.getExperimentInputs().get(0); + assertFalse(retrievedInput1.isIsRequired()); + assertEquals(DataType.URI, retrievedInput1.getType()); + assertEquals(1, retrievedInput1.getInputOrder()); + assertEquals("-arg1a", retrievedInput1.getApplicationArgument()); + assertFalse(retrievedInput1.isDataStaged()); + assertFalse(retrievedInput1.isIsReadOnly()); + assertEquals("{\"bar\": 456}", retrievedInput1.getMetaData()); + assertFalse(retrievedInput1.isRequiredToAddedToCommandLine()); + assertFalse(retrievedInput1.isStandardInput()); + assertEquals("storageResourceId2", retrievedInput1.getStorageResourceId()); + assertEquals("First argument~", retrievedInput1.getUserFriendlyDescription()); + assertEquals("value1a", retrievedInput1.getValue()); + + experimentRepository.removeExperiment(experimentId); + assertFalse(experimentRepository.isExperimentExist(experimentId)); + + gatewayRepository.removeGateway(gatewayId); + projectRepository.removeProject(projectId); + } + }
