This is true bear with me the uncommented version will be with you shorty On 5 Nov 2015 17:13, "Mattmann, Chris A (3980)" < chris.a.mattm...@jpl.nasa.gov> wrote:
> Can you please remove the commented out code from these commits? > > If it’s commented out it shouldn’t be committed :-) > > ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ > Chris Mattmann, Ph.D. > Chief Architect > Instrument Software and Science Data Systems Section (398) > NASA Jet Propulsion Laboratory Pasadena, CA 91109 USA > Office: 168-519, Mailstop: 168-527 > Email: chris.a.mattm...@nasa.gov > WWW: http://sunset.usc.edu/~mattmann/ > ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ > Adjunct Associate Professor, Computer Science Department > University of Southern California, Los Angeles, CA 90089 USA > ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ > > > > > > -----Original Message----- > From: "magicaltr...@apache.org" <magicaltr...@apache.org> > Reply-To: "dev@oodt.apache.org" <dev@oodt.apache.org> > Date: Thursday, November 5, 2015 at 9:04 AM > To: "comm...@oodt.apache.org" <comm...@oodt.apache.org> > Subject: oodt git commit: OODT-917 tests for RM to validate XMLRPC > interface > > >Repository: oodt > >Updated Branches: > > refs/heads/master 773f78feb -> 51f6bddab > > > > > >OODT-917 tests for RM to validate XMLRPC interface > > > > > >Project: http://git-wip-us.apache.org/repos/asf/oodt/repo > >Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/51f6bdda > >Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/51f6bdda > >Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/51f6bdda > > > >Branch: refs/heads/master > >Commit: 51f6bddab6506d9e75d952b0cfa7166187236a49 > >Parents: 773f78f > >Author: Tom Barber <t...@analytical-labs.com> > >Authored: Thu Nov 5 17:04:27 2015 +0000 > >Committer: Tom Barber <t...@analytical-labs.com> > >Committed: Thu Nov 5 17:04:27 2015 +0000 > > > >---------------------------------------------------------------------- > > .../system/TestXmlRpcResourceManagerClient.java | 43 +++++++++++--------- > > .../system/TestXmlRpcWorkflowManagerClient.java | 9 ++++ > > 2 files changed, 33 insertions(+), 19 deletions(-) > >---------------------------------------------------------------------- > > > > > > > http://git-wip-us.apache.org/repos/asf/oodt/blob/51f6bdda/resource/src/tes > >t/java/org/apache/oodt/cas/resource/system/TestXmlRpcResourceManagerClient > >.java > >---------------------------------------------------------------------- > >diff --git > >a/resource/src/test/java/org/apache/oodt/cas/resource/system/TestXmlRpcRes > >ourceManagerClient.java > >b/resource/src/test/java/org/apache/oodt/cas/resource/system/TestXmlRpcRes > >ourceManagerClient.java > >index a4a6852..dce1094 100644 > >--- > >a/resource/src/test/java/org/apache/oodt/cas/resource/system/TestXmlRpcRes > >ourceManagerClient.java > >+++ > >b/resource/src/test/java/org/apache/oodt/cas/resource/system/TestXmlRpcRes > >ourceManagerClient.java > >@@ -1,6 +1,8 @@ > > package org.apache.oodt.cas.resource.system; > > > > import org.apache.commons.io.FileUtils; > >+import org.apache.oodt.cas.resource.structs.ResourceNode; > >+import org.apache.oodt.cas.resource.structs.exceptions.JobQueueException; > > import > >org.apache.oodt.cas.resource.structs.exceptions.JobRepositoryException; > > import org.apache.oodt.cas.resource.structs.exceptions.MonitorException; > > import > >org.apache.oodt.cas.resource.structs.exceptions.QueueManagerException; > >@@ -12,9 +14,9 @@ import java.io.File; > > import java.io.FileFilter; > > import java.io.FileInputStream; > > import java.io.IOException; > >+import java.net.URL; > > import java.util.Hashtable; > > import java.util.List; > >-import java.util.Map; > > import java.util.Properties; > > > > import static org.hamcrest.MatcherAssert.assertThat; > >@@ -32,11 +34,14 @@ public class TestXmlRpcResourceManagerClient { > > > > private static XmlRpcResourceManager rm; > > private static File thetmpPolicyDir; > >+ private static XmlRpcResourceManagerClient rmc; > > > > @BeforeClass > > public static void setUp() throws Exception { > > generateTestConfiguration(); > > rm = new XmlRpcResourceManager(RM_PORT); > >+ rmc = new XmlRpcResourceManagerClient(new URL("http://localhost:"; > >+RM_PORT)); > >+ > > } > > > > private static void generateTestConfiguration() throws IOException { > >@@ -79,7 +84,7 @@ public class TestXmlRpcResourceManagerClient { > > > > @Test > > public void testGetNodes() throws MonitorException { > >- List<Hashtable> nodes = rm.getNodes(); > >+ List<Hashtable> nodes = rmc.getNodes(); > > > > assertThat(nodes, is(not(nullValue()))); > > assertThat(nodes, hasSize(1)); > >@@ -89,7 +94,7 @@ public class TestXmlRpcResourceManagerClient { > > @Test > > public void testGetExecutionReport() throws JobRepositoryException { > > > >- String execreport = rm.getExecutionReport(); > >+ String execreport = rmc.getExecReport(); > > > > > > assertThat(execreport, is(not(nullValue()))); > >@@ -99,7 +104,7 @@ public class TestXmlRpcResourceManagerClient { > > > > @Test > > public void testJobQueueCapacity() throws JobRepositoryException { > >- int capacity = rm.getJobQueueCapacity(); > >+ int capacity = rmc.getJobQueueCapacity(); > > > > assertThat(capacity, equalTo(1000)); > > > >@@ -107,7 +112,7 @@ public class TestXmlRpcResourceManagerClient { > > > > @Test > > public void testGetJobQueueSize() throws JobRepositoryException { > >- int size = rm.getJobQueueSize(); > >+ int size = rmc.getJobQueueSize(); > > > > assertThat(size, equalTo(0)); > > > >@@ -117,22 +122,22 @@ public class TestXmlRpcResourceManagerClient { > > > > @Test > > public void testGetNodeById() throws MonitorException { > >- List<Hashtable> nodelist = rm.getNodes(); > >+ List<ResourceNode> nodelist = rmc.getNodes(); > > > >- Map node = rm.getNodeById((String) nodelist.get(0).get("node.id")); > >+ ResourceNode node = rmc.getNodeById(nodelist.get(0).getNodeId()); > > > > assertThat(node, is(not(nullValue()))); > > > >- assertThat((String)node.get("node.id"), equalTo("localhost")); > >+ assertThat(node.getNodeId(), equalTo("localhost")); > > } > > > > > > @Test > > public void testGetNodeLoad() throws MonitorException { > > > >- List<Hashtable> nodelist = rm.getNodes(); > >+ List<ResourceNode> nodelist = rmc.getNodes(); > > > >- String node = rm.getNodeLoad((String) > >nodelist.get(0).get("node.id")); > >+ String node = rmc.getNodeLoad(nodelist.get(0).getNodeId()); > > > > assertNotNull(node); > > > >@@ -142,14 +147,14 @@ public class TestXmlRpcResourceManagerClient { > > > > @Test > > public void testNodeReport() throws MonitorException { > >- String report = rm.getNodeReport(); > >+ String report = rmc.getNodeReport(); > > > > assertThat(report, is(not(nullValue()))); > > } > > > > @Test > > public void testGetNodesInQueue() throws QueueManagerException { > >- List<String> nodes = rm.getNodesInQueue("long"); > >+ List<String> nodes = rmc.getNodesInQueue("long"); > > > > assertThat(nodes, is(not(nullValue()))); > > > >@@ -159,8 +164,8 @@ public class TestXmlRpcResourceManagerClient { > > > > > > @Test > >- public void testQueuedJobs(){ > >- List jobs = rm.getQueuedJobs(); > >+ public void testQueuedJobs() throws JobQueueException { > >+ List jobs = rmc.getQueuedJobs(); > > > > assertThat(jobs, is(not(nullValue()))); > > > >@@ -168,19 +173,19 @@ public class TestXmlRpcResourceManagerClient { > > } > > > > @Test > >- public void testQueuesWithNode() throws MonitorException { > >- List<Hashtable> nodelist = rm.getNodes(); > >+ public void testQueuesWithNode() throws MonitorException, > >QueueManagerException { > >+ List<ResourceNode> nodelist = rmc.getNodes(); > > > > > >- List<String> queues = rm.getQueuesWithNode((String) > >nodelist.get(0).get("node.id")); > >+ List<String> queues = > >rmc.getQueuesWithNode(nodelist.get(0).getNodeId()); > > assertThat(queues, hasSize(3)); > > > > assertThat(queues, containsInAnyOrder("high", "quick", "long")); > > } > > > > @Test > >- public void testQueues(){ > >- List<String> queues = rm.getQueues(); > >+ public void testQueues() throws QueueManagerException { > >+ List<String> queues = rmc.getQueues(); > > > > assertThat(queues, hasSize(3)); > > > > > > > http://git-wip-us.apache.org/repos/asf/oodt/blob/51f6bdda/workflow/src/tes > >t/java/org/apache/oodt/cas/workflow/system/TestXmlRpcWorkflowManagerClient > >.java > >---------------------------------------------------------------------- > >diff --git > >a/workflow/src/test/java/org/apache/oodt/cas/workflow/system/TestXmlRpcWor > >kflowManagerClient.java > >b/workflow/src/test/java/org/apache/oodt/cas/workflow/system/TestXmlRpcWor > >kflowManagerClient.java > >index fe09127..3a51680 100644 > >--- > >a/workflow/src/test/java/org/apache/oodt/cas/workflow/system/TestXmlRpcWor > >kflowManagerClient.java > >+++ > >b/workflow/src/test/java/org/apache/oodt/cas/workflow/system/TestXmlRpcWor > >kflowManagerClient.java > >@@ -322,6 +322,15 @@ public class TestXmlRpcWorkflowManagerClient { > > > > } > > > >+ @Ignore > >+ @Test > >+ public void testGetWorkflowInstances() throws IOException, > >XmlRpcException { > >+ > >+ //List wfinstances = fmc.getWorkflowInstances(); > >+ > >+ ///assertNotNull(wfinstances); > >+ } > >+ > > > > @Test > > public void testGetWorkflowInstanceMetadata() { > > > >
