perfsonar development work

Author: dante.delvaux
Date: 2013-03-21 11:59:35 +0000 (Thu, 21 Mar 2013)
New Revision: 6242

Modified:
   trunk/perfsonar-base/messaging-test-data/
   trunk/perfsonar-base/messaging-test-data/pom.xml
   trunk/perfsonar-base/messaging/pom.xml
   trunk/perfsonar-base/sample-service/
   
trunk/perfsonar-java-rrd-ma-base3/src/test/java/net/geant/perfsonar/ma/rrd/RRDMATest.java
   
trunk/perfsonar-java-rrd-ma-base3/src/test/java/net/geant/perfsonar/ma/rrd/RRDMAWebServiceTest.java
Log:
RRD MA with base3: re-enabling unit testing following base3 update.

Modified: trunk/perfsonar-base/messaging/pom.xml
===================================================================
--- trunk/perfsonar-base/messaging/pom.xml      2013-03-20 22:44:43 UTC (rev 
6241)
+++ trunk/perfsonar-base/messaging/pom.xml      2013-03-21 11:59:35 UTC (rev 
6242)
@@ -12,7 +12,7 @@
        <groupId>net.geant.perfsonar.base</groupId>
        <artifactId>messaging</artifactId>
        <version>3.0.0-SNAPSHOT</version>
-    <name>perfSONAR base 3 messaging</name>
+    <name>perfSONAR base 3 Messaging</name>
     <description>Library for serialization and deserialization of perfSONAR 
messages.</description>
        <packaging>bundle</packaging>
        


Property changes on: trunk/perfsonar-base/messaging-test-data
___________________________________________________________________
Added: svn:ignore
   + target

.settings

.project

.classpath


Modified: trunk/perfsonar-base/messaging-test-data/pom.xml
===================================================================
--- trunk/perfsonar-base/messaging-test-data/pom.xml    2013-03-20 22:44:43 
UTC (rev 6241)
+++ trunk/perfsonar-base/messaging-test-data/pom.xml    2013-03-21 11:59:35 
UTC (rev 6242)
@@ -1,7 +1,17 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>net.geant.perfsonar.base</groupId>
-  <artifactId>messaging-test-data</artifactId>
-  <version>1.0.0</version>
-  <name>Test Data for Messaging tests</name>
+<project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+       <modelVersion>4.0.0</modelVersion>
+
+       <parent>
+               <groupId>net.geant.perfsonar</groupId>
+               <artifactId>parent</artifactId>
+               <version>1.0.1-SNAPSHOT</version>
+               <relativePath>../../parent/</relativePath>
+       </parent>
+
+       <groupId>net.geant.perfsonar.base</groupId>
+       <artifactId>messaging-test-data</artifactId>
+       <version>1.0.0</version>
+       <name>perfSONAR base 3 Test data for Messaging</name>
+       <description>Contains test data needed to properly run perfSONAR base 
3 messaging tests.</description>
 </project>
\ No newline at end of file


Property changes on: trunk/perfsonar-base/sample-service
___________________________________________________________________
Added: svn:ignore
   + target

.settings

.project

.classpath


Modified: 
trunk/perfsonar-java-rrd-ma-base3/src/test/java/net/geant/perfsonar/ma/rrd/RRDMATest.java
===================================================================
--- 
trunk/perfsonar-java-rrd-ma-base3/src/test/java/net/geant/perfsonar/ma/rrd/RRDMATest.java
   2013-03-20 22:44:43 UTC (rev 6241)
+++ 
trunk/perfsonar-java-rrd-ma-base3/src/test/java/net/geant/perfsonar/ma/rrd/RRDMATest.java
   2013-03-21 11:59:35 UTC (rev 6242)
@@ -35,7 +35,6 @@
        }
 
 
-    /*
        @Test
        public void checkEcho() throws SAXException {
         logger.info("•••• Checking echo request");
@@ -60,17 +59,16 @@
            print(resp.getReader());
        }
 
-       @Test
-       public void checkSetupDataRequest() throws Exception {
-               final Command command1 = (Command) Command.SHOW_ENVIRONMENT
-                               .newInstance();
-               command1.setRouterName("host1");
-               final Command command2 = (Command) 
Command.PING_IPV6.newInstance();
-               command2.setRouterName("host2");
-               print(client.executeCommands(REQUEST_ID, command1, command2)
-                               .getReader());
-       }
-       */
+//     @Test
+//     public void checkSetupDataRequest() throws Exception {
+//             final Command command1 = (Command) Command.SHOW_ENVIRONMENT
+//                             .newInstance();
+//             command1.setRouterName("host1");
+//             final Command command2 = (Command) 
Command.PING_IPV6.newInstance();
+//             command2.setRouterName("host2");
+//             print(client.executeCommands(REQUEST_ID, command1, command2)
+//                             .getReader());
+//     }
 
        private void print(Reader reader) throws IOException {
                for (int i = reader.read(); i != -1; i = reader.read())

Modified: 
trunk/perfsonar-java-rrd-ma-base3/src/test/java/net/geant/perfsonar/ma/rrd/RRDMAWebServiceTest.java
===================================================================
--- 
trunk/perfsonar-java-rrd-ma-base3/src/test/java/net/geant/perfsonar/ma/rrd/RRDMAWebServiceTest.java
 2013-03-20 22:44:43 UTC (rev 6241)
+++ 
trunk/perfsonar-java-rrd-ma-base3/src/test/java/net/geant/perfsonar/ma/rrd/RRDMAWebServiceTest.java
 2013-03-21 11:59:35 UTC (rev 6242)
@@ -53,7 +53,7 @@
         * This test that the resource loading from an external Jar is 
working fine.
         * The EchoRequest template is coming from net.geant.perfsonar.base
         */
-       /*
+
        @Test
        public void checkingEchoTemplate() {
         logger.info("•••• Checking echo request template loading");
@@ -71,5 +71,5 @@
         logger.info("•••• Checking MetadataKey request");
                client.invoke(new 
FileReader("samples/requests/MetadataKeyRequest-Discards-1.xml"));
        }
-       */
+
 }