You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sh...@apache.org on 2015/05/30 17:42:09 UTC
airavata git commit: Fixed test compilation issue.
Repository: airavata
Updated Branches:
refs/heads/master 14fe107ce -> a1ba91510
Fixed test compilation issue.
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/a1ba9151
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/a1ba9151
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/a1ba9151
Branch: refs/heads/master
Commit: a1ba91510e61dc4d04b1d1c8c2d29af00134787d
Parents: 14fe107
Author: Shameera Rathanyaka <sh...@gmail.com>
Authored: Sat May 30 11:41:57 2015 -0400
Committer: Shameera Rathanyaka <sh...@gmail.com>
Committed: Sat May 30 11:41:57 2015 -0400
----------------------------------------------------------------------
.../apache/airavata/gfac/GFacConfiguration.java | 9 ++++
.../apache/airavata/job/GFacConfigXmlTest.java | 47 +++++++-------------
2 files changed, 24 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/a1ba9151/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/GFacConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/GFacConfiguration.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/GFacConfiguration.java
index 042f036..60e9c71 100644
--- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/GFacConfiguration.java
+++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/GFacConfiguration.java
@@ -23,6 +23,7 @@ package org.apache.airavata.gfac;
import java.io.File;
import java.io.IOException;
+import java.net.URL;
import java.util.*;
import javax.xml.parsers.DocumentBuilder;
@@ -66,6 +67,14 @@ public class GFacConfiguration {
// }
+ public static File getConfigFile() {
+ URL resource = GFacConfiguration.class.getClassLoader().getResource(org.apache.airavata.common.utils.Constants.GFAC_CONFIG_XML);
+ File gfacConfigFile = null;
+ if (resource != null) {
+ gfacConfigFile = new File(resource.getPath());
+ }
+ return gfacConfigFile;
+ }
public List<GFacHandlerConfig> getInHandlers() {
//This will avoid the misconfiguration done by user in gfac-config.xml
return removeDuplicateWithOrder(inHandlers);
http://git-wip-us.apache.org/repos/asf/airavata/blob/a1ba9151/modules/gfac/gfac-core/src/test/java/org/apache/airavata/job/GFacConfigXmlTest.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-core/src/test/java/org/apache/airavata/job/GFacConfigXmlTest.java b/modules/gfac/gfac-core/src/test/java/org/apache/airavata/job/GFacConfigXmlTest.java
index 05e25d1..6164b2e 100644
--- a/modules/gfac/gfac-core/src/test/java/org/apache/airavata/job/GFacConfigXmlTest.java
+++ b/modules/gfac/gfac-core/src/test/java/org/apache/airavata/job/GFacConfigXmlTest.java
@@ -21,37 +21,33 @@
package org.apache.airavata.job;
import junit.framework.Assert;
-import org.apache.airavata.common.utils.AiravataUtils;
import org.apache.airavata.gfac.GFacConfiguration;
import org.apache.airavata.gfac.core.context.ApplicationContext;
import org.apache.airavata.gfac.core.context.JobExecutionContext;
-import org.apache.airavata.gfac.core.cpi.BetterGfacImpl;
-import org.apache.airavata.model.appcatalog.computeresource.*;
+import org.apache.airavata.model.appcatalog.computeresource.ComputeResourceDescription;
+import org.apache.airavata.model.appcatalog.computeresource.JobSubmissionInterface;
+import org.apache.airavata.model.appcatalog.computeresource.JobSubmissionProtocol;
+import org.apache.airavata.model.appcatalog.computeresource.ResourceJobManager;
+import org.apache.airavata.model.appcatalog.computeresource.ResourceJobManagerType;
+import org.apache.airavata.model.appcatalog.computeresource.SSHJobSubmission;
+import org.apache.airavata.model.appcatalog.computeresource.SecurityProtocol;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
-import org.xml.sax.SAXException;
-
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.xpath.XPathExpressionException;
-import java.io.IOException;
public class GFacConfigXmlTest {
-
private final static Logger log = LoggerFactory.getLogger(GFacConfigXmlTest.class);
- private BetterGfacImpl gfac;
@BeforeClass
public void setUp() throws Exception {
- gfac = new BetterGfacImpl();
}
@Test
public void testGFacConfigWithHost(){
- Assert.assertNotNull(gfac.getGfacConfigFile());
- Assert.assertEquals(1,gfac.getDaemonHandlers().size());
+ Assert.assertNotNull(GFacConfiguration.getConfigFile());
try {
- JobExecutionContext jec = new JobExecutionContext(GFacConfiguration.create(gfac.getGfacConfigFile(), null), "testService");
+ Assert.assertEquals(1, GFacConfiguration.getDaemonHandlers(GFacConfiguration.getConfigFile()).size());
+ JobExecutionContext jec = new JobExecutionContext(GFacConfiguration.create(GFacConfiguration.getConfigFile(), null), "testService");
ApplicationContext applicationContext = new ApplicationContext();
ComputeResourceDescription computeResourceDescription = new ComputeResourceDescription();
computeResourceDescription.setHostName("trestles.sdsc.xsede.org");
@@ -80,22 +76,16 @@ public class GFacConfigXmlTest {
// Scheduler.schedule(jec);
// Assert.assertEquals(ExecutionMode.ASYNCHRONOUS, jec.getGFacConfiguration().getExecutionMode());
// Assert.assertEquals("org.apache.airavata.job.TestProvider", jec.getProvider().getClass().getName());
- } catch (ParserConfigurationException e) {
- log.error(e.getMessage(), e);
- } catch (IOException e) {
- log.error(e.getMessage(), e);
- } catch (SAXException e) {
- log.error(e.getMessage(), e);
- } catch (XPathExpressionException e) {
+ } catch (Exception e) {
log.error(e.getMessage(), e);
}
}
@Test
public void testAppSpecificConfig() {
- Assert.assertNotNull(gfac.getGfacConfigFile());
- Assert.assertEquals(1, gfac.getDaemonHandlers().size());
+ Assert.assertNotNull(GFacConfiguration.getConfigFile());
try {
- JobExecutionContext jec = new JobExecutionContext(GFacConfiguration.create(gfac.getGfacConfigFile(), null), "UltraScan");
+ Assert.assertEquals(1, GFacConfiguration.getDaemonHandlers(GFacConfiguration.getConfigFile()).size());
+ JobExecutionContext jec = new JobExecutionContext(GFacConfiguration.create(GFacConfiguration.getConfigFile(), null), "UltraScan");
ApplicationContext applicationContext = new ApplicationContext();
ComputeResourceDescription computeResourceDescription = new ComputeResourceDescription();
computeResourceDescription.setHostName("trestles.sdsc.xsede.org");
@@ -128,16 +118,9 @@ public class GFacConfigXmlTest {
// Assert.assertEquals(1, jec.getGFacConfiguration().getInHandlers().get(2).getProperties().size());
// Assert.assertEquals(ExecutionMode.ASYNCHRONOUS, jec.getGFacConfiguration().getExecutionMode());// todo this logic might be wrong
// Assert.assertEquals("org.apache.airavata.job.TestProvider", jec.getProvider().getClass().getName());
- } catch (ParserConfigurationException e) {
- log.error(e.getMessage(), e);
- } catch (IOException e) {
- log.error(e.getMessage(), e);
- } catch (SAXException e) {
- log.error(e.getMessage(), e);
- } catch (XPathExpressionException e) {
+ } catch (Exception e) {
log.error(e.getMessage(), e);
}
}
-
}