perfsonar development work

Author: dante.delvaux
Date: 2013-03-21 19:41:12 +0000 (Thu, 21 Mar 2013)
New Revision: 6243

Modified:
   
trunk/perfsonar-java-rrd-ma-base3/src/test/java/net/geant/perfsonar/ma/rrd/RRDMATest.java
   trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/pom.xml
Log:
RRD MA base3: adding test on Configuration.getHandler

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-21 11:59:35 UTC (rev 6242)
+++ 
trunk/perfsonar-java-rrd-ma-base3/src/test/java/net/geant/perfsonar/ma/rrd/RRDMATest.java
   2013-03-21 19:41:12 UTC (rev 6243)
@@ -7,10 +7,12 @@
 import java.io.IOException;
 import java.io.Reader;
 
+import net.geant.perfsonar.Configuration;
 import net.geant.perfsonar.templates.NMWGRRDMA;
 import net.geant.perfsonar.helpers.PerfSONARClient;
 import net.geant.perfsonar.helpers.Response;
 import net.geant.perfsonar.ma.RRDMAService;
+import net.geant.perfsonar.ma.RRDMAServiceController;
 import net.geant.perfsonar.templates.SelfTestResult;
 
 import org.junit.Before;
@@ -24,9 +26,7 @@
     protected Logger logger = LoggerFactory.getLogger(getClass());
 
     static final String REQUEST_ID = "request1";
-
        private PerfSONARClient client;
-
        private RRDMAService service = new RRDMAService();
 
        @Before
@@ -34,7 +34,6 @@
                client = new PerfSONARClient(service);
        }
 
-
        @Test
        public void checkEcho() throws SAXException {
         logger.info("•••• Checking echo request");
@@ -53,6 +52,12 @@
        }
 
        @Test
+       public void checkConfig() throws Exception {
+           
assertEquals(RRDMAServiceController.class.getMethod("listRRDFiles", 
Interface.class),
+                   Configuration.getHandler("MetadataKeyRequest"));
+        }
+
+       @Test
        public void checkMetadataKey() throws SAXException, IOException {
         logger.info("•••• Checking metadata key request");
            Response resp = new 
Response(client.invoke(NMWGRRDMA.toMetadataKeyRequest(REQUEST_ID)));

Modified: 
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/pom.xml
===================================================================
--- trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/pom.xml 
  2013-03-21 11:59:35 UTC (rev 6242)
+++ trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/pom.xml 
  2013-03-21 19:41:12 UTC (rev 6243)
@@ -12,10 +12,6 @@
                <relativePath>..</relativePath>
        </parent>
 
-       <properties>
-               <junit.version>4.8.1</junit.version>
-       </properties>
-
        <build>
                <finalName>${project.artifactId}</finalName>
 
@@ -96,7 +92,6 @@
                <dependency>
                        <groupId>junit</groupId>
                        <artifactId>junit</artifactId>
-                       <version>${junit.version}</version>
                        <scope>test</scope>
                </dependency>
         <dependency>