This is an automated email from the ASF dual-hosted git repository.
yasithdev pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata.git
The following commit(s) were added to refs/heads/master by this push:
new 62c980a385 Remove dead commented-out orchestrator test stubs (#668)
62c980a385 is described below
commit 62c980a385065f7c999328ec5ca749188ecfe10d
Author: Yasith Jayawardana <[email protected]>
AuthorDate: Sat Jun 13 00:53:01 2026 -0400
Remove dead commented-out orchestrator test stubs (#668)
Four legacy test classes whose entire bodies are commented-out
pre-Thrift-removal
code: BaseOrchestratorTest (empty class — its body is one big block
comment) and
its three empty subclasses NewOrchestratorTest, OrchestratorTestWithGRAM,
and
OrchestratorTestWithMyProxyAuth. They contain no @Test methods, nothing
outside
the quartet references them, and test sources compile cleanly without them.
---
.../service/BaseOrchestratorTest.java | 83 ------------------
.../orchestration/service/NewOrchestratorTest.java | 99 ----------------------
.../service/OrchestratorTestWithGRAM.java | 79 -----------------
.../service/OrchestratorTestWithMyProxyAuth.java | 83 ------------------
4 files changed, 344 deletions(-)
diff --git
a/airavata-api/orchestration-service/src/test/java/org/apache/airavata/orchestration/service/BaseOrchestratorTest.java
b/airavata-api/orchestration-service/src/test/java/org/apache/airavata/orchestration/service/BaseOrchestratorTest.java
deleted file mode 100644
index d20a1d6265..0000000000
---
a/airavata-api/orchestration-service/src/test/java/org/apache/airavata/orchestration/service/BaseOrchestratorTest.java
+++ /dev/null
@@ -1,83 +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.orchestration.service;
-
-// import org.apache.airavata.client.tools.DocumentCreatorNew;
-
-public class BaseOrchestratorTest {
-
- /* private GatewayResource gatewayResource;
- private WorkerResource workerResource;
- private UserResource userResource;
- private Initialize initialize;
- private DocumentCreatorNew documentCreator;
-
- public void setUp() throws Exception {
- initialize = new Initialize("registry-derby.sql");
- initialize.initializeDB();
- gatewayResource = (GatewayResource)
ResourceUtils.getGateway(ServerSettings.getSystemUserGateway());
- workerResource = (WorkerResource)
ResourceUtils.getWorker(gatewayResource.getGatewayName(),
ServerSettings.getDefaultUser());
- userResource = new UserResource();
- userResource.setUserName(ServerSettings.getDefaultUser());
- userResource.setPassword(ServerSettings.getDefaultUser());
-
- documentCreator = new DocumentCreatorNew(getAiravataClient());
- documentCreator.createLocalHostDocs();
- documentCreator.createPBSDocsForOGCE_Echo();
- }
-
- public void tearDown() throws Exception {
- initialize.stopDerbyServer();
- }
-
- public GatewayResource getGatewayResource() {
- return gatewayResource;
- }
-
- public WorkerResource getWorkerResource() {
- return workerResource;
- }
-
- public UserResource getUserResource() {
- return userResource;
- }
-
- private Airavata.Client getAiravataClient() {
- Airavata.Client client = null;
- try {
- client = AiravataClientFactory.createAiravataClient("localhost",
8930);
- } catch (AiravataClientConnectException e) {
- e.printStackTrace();
- }
- return client;
- }
-
- public DocumentCreatorNew getDocumentCreator() {
- return documentCreator;
- }
-
- public void setDocumentCreator(DocumentCreatorNew documentCreator) {
- this.documentCreator = documentCreator;
- }
-
- private void settingServerProperties(){
-
- }*/
-}
diff --git
a/airavata-api/orchestration-service/src/test/java/org/apache/airavata/orchestration/service/NewOrchestratorTest.java
b/airavata-api/orchestration-service/src/test/java/org/apache/airavata/orchestration/service/NewOrchestratorTest.java
deleted file mode 100644
index 52e4bf114e..0000000000
---
a/airavata-api/orchestration-service/src/test/java/org/apache/airavata/orchestration/service/NewOrchestratorTest.java
+++ /dev/null
@@ -1,99 +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.orchestration.service;
-
-public class NewOrchestratorTest extends BaseOrchestratorTest {
- // private static final Logger log =
LoggerFactory.getLogger(NewOrchestratorTest.class);
- //
- // private Orchestrator orchestrator;
- // private List<TaskDetails> tasks;
- //
- // @BeforeTest
- // public void setUp() throws Exception {
- // AiravataUtils.setExecutionAsServer();
- // super.setUp();
- // orchestrator = new SimpleOrchestratorImpl();
- // // System.setProperty("myproxy.user", "ogce");
- //// System.setProperty("myproxy.pass", "");
- //// System.setProperty("trusted.cert.location",
"/Users/lahirugunathilake/Downloads/certificates");
- // //this is the same propertySystem.getProperty("myproxy.user");
- ////
System.setProperty("myproxy.pass",System.getProperty("myproxy.password"));
- ////
System.setProperty("trusted.cert.location",System.getProperty("gsi.working.directory"));
- // }
- //
- //
- //
- // @Test
- // public void localHostTest() throws Exception {
- // // creating host description
- // List<DataObjectType> exInputs = new ArrayList<DataObjectType>();
- // DataObjectType input = new DataObjectType();
- // input.setKey("echo_input");
- // input.setType(DataType.STRING);
- // input.setValue("echo_output=Hello World");
- // exInputs.add(input);
- //
- // List<DataObjectType> exOut = new ArrayList<DataObjectType>();
- // DataObjectType output = new DataObjectType();
- // output.setKey("echo_output");
- // output.setType(DataType.STRING);
- // output.setValue("");
- // exOut.add(output);
- //
- // Experiment simpleExperiment =
- // ExperimentModelUtil.createSimpleExperiment("default",
"admin", "echoExperiment", "SimpleEcho0",
- // "SimpleEcho0", exInputs);
- // simpleExperiment.setExperimentOutputs(exOut);
- //
- // WorkflowNodeDetails test =
ExperimentModelUtil.createWorkflowNode("test", null);
- // ComputationalResourceScheduling scheduling =
- // ExperimentModelUtil.createComputationResourceScheduling("localhost", 1,
1, 1, "normal", 0, 0, 1, "sds128");
- // scheduling.setResourceHostId("localhost");
- // UserConfigurationData userConfigurationData = new
UserConfigurationData();
- // userConfigurationData.setAiravataAutoSchedule(false);
- // userConfigurationData.setOverrideManualScheduledParams(false);
- //
userConfigurationData.setComputationalResourceScheduling(scheduling);
- // simpleExperiment.setUserConfigurationData(userConfigurationData);
- //
- // Registry defaultRegistry =
RegistryFactory.getDefaultExpCatalog();
- // String experimentId =
(String)defaultRegistry.add(ParentDataType.EXPERIMENT, simpleExperiment);
- //
- // simpleExperiment.setExperimentID(experimentId);
- // tasks = orchestrator.createTasks(experimentId);
- // for(TaskDetails details:tasks) {
- // orchestrator.launchProcess(simpleExperiment,test,
details,null);
- // }
- // }
- //
- // private AiravataAPI getAiravataAPI() {
- // AiravataAPI airavataAPI = null;
- // try {
- // String systemUserName = ServerSettings.getSystemUser();
- // String gateway = ServerSettings.getSystemUserGateway();
- // airavataAPI = AiravataAPIFactory.getAPI(gateway,
systemUserName);
- // } catch (ApplicationSettingsException e) {
- // e.printStackTrace();
- // } catch (AiravataAPIInvocationException e) {
- // e.printStackTrace();
- // }
- // return airavataAPI;
- // }
-
-}
diff --git
a/airavata-api/orchestration-service/src/test/java/org/apache/airavata/orchestration/service/OrchestratorTestWithGRAM.java
b/airavata-api/orchestration-service/src/test/java/org/apache/airavata/orchestration/service/OrchestratorTestWithGRAM.java
deleted file mode 100644
index b418172d65..0000000000
---
a/airavata-api/orchestration-service/src/test/java/org/apache/airavata/orchestration/service/OrchestratorTestWithGRAM.java
+++ /dev/null
@@ -1,79 +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.orchestration.service;
-
-public class OrchestratorTestWithGRAM extends BaseOrchestratorTest {
- // private static final Logger log =
LoggerFactory.getLogger(OrchestratorTestWithGRAM.class);
- //
- // private Orchestrator orchestrator;
- //
- // private String experimentID;
- //
- // @BeforeTest
- // public void setUp() throws Exception {
- // AiravataUtils.setExecutionAsServer();
- // super.setUp();
- // orchestrator = new SimpleOrchestratorImpl();
- // createJobRequestWithDocuments();
- // }
- //
- // private void createJobRequestWithDocuments() throws Exception{
- // //Using new airavata-api methods to store experiment metadata
- //// BasicMetadata basicMetadata = new BasicMetadata();
- //// basicMetadata.setExperimentName("test-trestles");
- //// basicMetadata.setUserName("admin");
- //// basicMetadata.setUserNameIsSet(true);
- //// basicMetadata.setProjectID("default");
- ////
- //// AdvancedInputDataHandling advancedInputDataHandling = new
AdvancedInputDataHandling();
- //// AdvancedOutputDataHandling advancedOutputDataHandling = new
AdvancedOutputDataHandling();
- //// ComputationalResourceScheduling
computationalResourceScheduling = new
- // ComputationalResourceScheduling();
- //// QualityOfServiceParams qualityOfServiceParams = new
QualityOfServiceParams();
- //// ConfigurationData configurationData = new ConfigurationData();
- ////
- //// HashMap<String, String> exInputs = new HashMap<String,
String>();
- //// exInputs.put("echo_input", "echo_output=hello");
- ////
- //// configurationData.setExperimentInputs(exInputs);
- ////
configurationData.setAdvanceInputDataHandling(advancedInputDataHandling);
- ////
configurationData.setAdvanceOutputDataHandling(advancedOutputDataHandling);
- ////
configurationData.setComputationalResourceScheduling(computationalResourceScheduling);
- //// configurationData.setQosParams(qualityOfServiceParams);
- //// configurationData.setApplicationId("SimpleEcho1");
- ////
- //// Registry registry = new RegistryImpl();
- //// experimentID = (String)
registry.add(ParentDataType.EXPERIMENT, basicMetadata);
- //// registry.add(ChildDataType.EXPERIMENT_CONFIGURATION_DATA,
configurationData, experimentID);
- // }
- //
- // @Test
- // public void noDescriptorTest() throws Exception {
- //
- //// boolean b = orchestrator.launchProcess(experimentID);
- ////
- //// if (b) {
- //// Assertions.assertTrue(true);
- //// } else {
- //// Assertions.assertFalse(true);
- //// }
- // }
-
-}
diff --git
a/airavata-api/orchestration-service/src/test/java/org/apache/airavata/orchestration/service/OrchestratorTestWithMyProxyAuth.java
b/airavata-api/orchestration-service/src/test/java/org/apache/airavata/orchestration/service/OrchestratorTestWithMyProxyAuth.java
deleted file mode 100644
index 77cd85045a..0000000000
---
a/airavata-api/orchestration-service/src/test/java/org/apache/airavata/orchestration/service/OrchestratorTestWithMyProxyAuth.java
+++ /dev/null
@@ -1,83 +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.orchestration.service;
-
-public class OrchestratorTestWithMyProxyAuth extends BaseOrchestratorTest {
- // private static final Logger log =
LoggerFactory.getLogger(NewOrchestratorTest.class);
- //
- // private Orchestrator orchestrator;
- //
- // private String experimentID;
- //
- // private List<TaskDetails> tasks;
- //
- // @BeforeTest
- // public void setUp() throws Exception {
- // AiravataUtils.setExecutionAsServer();
- // super.setUp();
- // orchestrator = new SimpleOrchestratorImpl();
- //// System.setProperty("myproxy.username", "ogce");
- //// System.setProperty("myproxy.password", "");
- // System.setProperty("trusted.cert.location",
"/Users/lahirugunathilake/Downloads/certificates");
- ////
System.setProperty("trusted.cert.location",System.getProperty("gsi.working.directory"));
- // }
- //
- // @Test
- // public void noDescriptorTest() throws Exception {
- // List<DataObjectType> exInputs = new ArrayList<DataObjectType>();
- // DataObjectType input = new DataObjectType();
- // input.setKey("echo_input");
- // input.setType(DataType.STRING);
- // input.setValue("echo_output=Hello World");
- // exInputs.add(input);
- //
- // List<DataObjectType> exOut = new ArrayList<DataObjectType>();
- // DataObjectType output = new DataObjectType();
- // output.setKey("echo_output");
- // output.setType(DataType.STRING);
- // output.setValue("");
- // exOut.add(output);
- //
- // Experiment simpleExperiment =
- // ExperimentModelUtil.createSimpleExperiment("default",
"admin", "echoExperiment", "SimpleEcho2",
- // "SimpleEcho2", exInputs);
- // simpleExperiment.setExperimentOutputs(exOut);
- //
- // ComputationalResourceScheduling scheduling =
- //
ExperimentModelUtil.createComputationResourceScheduling("trestles.sdsc.edu", 1,
1, 1, "normal", 0, 0, 1,
- // "sds128");
- // scheduling.setResourceHostId("gsissh-trestles");
- // UserConfigurationData userConfigurationData = new
UserConfigurationData();
- // userConfigurationData.setAiravataAutoSchedule(false);
- // userConfigurationData.setOverrideManualScheduledParams(false);
- //
userConfigurationData.setComputationalResourceScheduling(scheduling);
- // simpleExperiment.setUserConfigurationData(userConfigurationData);
- //
- // WorkflowNodeDetails test =
ExperimentModelUtil.createWorkflowNode("test", null);
- // Registry registry = RegistryFactory.getDefaultExpCatalog();
- // experimentID = (String) registry.add(ParentDataType.EXPERIMENT,
simpleExperiment);
- // tasks = orchestrator.createTasks(experimentID);
- //
- // for (TaskDetails taskDetail: tasks)
- // {
- // orchestrator.launchProcess(simpleExperiment,test,
taskDetail,null);
- // }
- // }
-}
