perfsonar development work

Author: dante.delvaux
Date: 2013-05-06 18:27:04 +0100 (Mon, 06 May 2013)
New Revision: 6365

Modified:
   trunk/perfsonar-base/base/pom.xml
   trunk/perfsonar-base/base/src/main/java/net/geant/perfsonar/PerfSONAR.java
   
trunk/perfsonar-base/base/src/main/java/net/geant/perfsonar/selftest/SelfTest.java
   
trunk/perfsonar-base/base/src/main/java/net/geant/perfsonar/selftest/SelfTestRunner.java
   
trunk/perfsonar-base/base/src/test/java/net/geant/perfsonar/PerfSONARTest.java
   
trunk/perfsonar-base/base/src/test/java/net/geant/perfsonar/helpers/Response.java
   trunk/perfsonar-java-rrd-ma-base3/
   
trunk/perfsonar-java-rrd-ma-base3/src/main/resources/net/geant/perfsonar/conf/test_rrdma_db.sql
   
trunk/perfsonar-java-rrd-ma-base3/src/main/resources/net/geant/perfsonar/ma/MetadataKeyResponse.template
   
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:
pSbase3: Adding a PerfSONARTest unit test that is failing on my machine for 
unkown reasons, but that is reproducible.  See 
PerfSONARTest.checkEchoLogging()

Modified: trunk/perfsonar-base/base/pom.xml
===================================================================
--- trunk/perfsonar-base/base/pom.xml   2013-05-06 17:18:59 UTC (rev 6364)
+++ trunk/perfsonar-base/base/pom.xml   2013-05-06 17:27:04 UTC (rev 6365)
@@ -22,21 +22,6 @@
         
<url>https://svn.geant.net/fisheye/browse/SA2T3-ps-java-services/trunk/perfsonar-base/base/</url>
     </scm>
 
-       <developers>
-               <developer>
-                       <id>blazej.pietrzak</id>
-                       <name>Blazej Pietrzak</name>
-                       
<email></email>
-                       <organization>PSNC</organization>
-                       
<organizationUrl>http://www.man.poznan.pl/</organizationUrl>
-                       <roles>
-                               <role>architect</role>
-                               <role>developer</role>
-                       </roles>
-                       <timezone>+1</timezone>
-               </developer>
-       </developers>
-
        <dependencies>
                <dependency>
                        <groupId>net.geant.perfsonar.base</groupId>

Modified: 
trunk/perfsonar-base/base/src/main/java/net/geant/perfsonar/PerfSONAR.java
===================================================================
--- 
trunk/perfsonar-base/base/src/main/java/net/geant/perfsonar/PerfSONAR.java  
2013-05-06 17:18:59 UTC (rev 6364)
+++ 
trunk/perfsonar-base/base/src/main/java/net/geant/perfsonar/PerfSONAR.java  
2013-05-06 17:27:04 UTC (rev 6365)
@@ -79,9 +79,9 @@
                EchoRequestHandler.setServiceName(getServiceName());
                EchoRequestHandler.setServiceType((getServiceType() == null) 
? null : getServiceType().toString());
                usingAPT =
-                       (getXPathAnnotations() != null)
-                       || (getLookupServiceRegisterAnnotations() != null)
-                       || (getSelfTestsAnnotations() != null);
+                       getXPathAnnotations() != null
+                       || getLookupServiceRegisterAnnotations() != null
+                       || getSelfTestsAnnotations() != null;
        }
 
        private void loadConfiguration() {
@@ -213,12 +213,10 @@
                        throw new RuntimeException(
                                        "NMWG message was not found in the 
payload.");
 
-               final NMWGMessage msg = 
deserializer.getObjects(NMWGMessage.class,
-                               objects).get(0);
+               final NMWGMessage msg = 
deserializer.getObjects(NMWGMessage.class, objects).get(0);
 
-               logger.debug("Dispatching an incoming message");
                String msgType = msg.getType();
-               logger.debug(msgType);
+        logger.debug("Dispatching an incoming message: {}", msgType);
                final Method m = Configuration.getHandler(msgType);
                if (m == null)
                        throw new RuntimeException("No handler defined for " 
+ msgType);

Modified: 
trunk/perfsonar-base/base/src/main/java/net/geant/perfsonar/selftest/SelfTest.java
===================================================================
--- 
trunk/perfsonar-base/base/src/main/java/net/geant/perfsonar/selftest/SelfTest.java
  2013-05-06 17:18:59 UTC (rev 6364)
+++ 
trunk/perfsonar-base/base/src/main/java/net/geant/perfsonar/selftest/SelfTest.java
  2013-05-06 17:27:04 UTC (rev 6365)
@@ -41,7 +41,7 @@
        }
 
        public boolean isParameterized() {
-               return (method.getParameterTypes().length == 1);
+               return method.getParameterTypes().length == 1;
        }
 
        public Class<?> getParameterType() {

Modified: 
trunk/perfsonar-base/base/src/main/java/net/geant/perfsonar/selftest/SelfTestRunner.java
===================================================================
--- 
trunk/perfsonar-base/base/src/main/java/net/geant/perfsonar/selftest/SelfTestRunner.java
    2013-05-06 17:18:59 UTC (rev 6364)
+++ 
trunk/perfsonar-base/base/src/main/java/net/geant/perfsonar/selftest/SelfTestRunner.java
    2013-05-06 17:27:04 UTC (rev 6365)
@@ -132,7 +132,7 @@
        }
 
        private boolean isSelfTestData() {
-               return (SelfTestRunner.name == null) && 
(SelfTestRunner.successMessage == null);
+               return SelfTestRunner.name == null && 
SelfTestRunner.successMessage == null;
        }
 
        public static void clearConfiguration() {

Modified: 
trunk/perfsonar-base/base/src/test/java/net/geant/perfsonar/PerfSONARTest.java
===================================================================
--- 
trunk/perfsonar-base/base/src/test/java/net/geant/perfsonar/PerfSONARTest.java
      2013-05-06 17:18:59 UTC (rev 6364)
+++ 
trunk/perfsonar-base/base/src/test/java/net/geant/perfsonar/PerfSONARTest.java
      2013-05-06 17:27:04 UTC (rev 6365)
@@ -76,6 +76,19 @@
                assertEquals(new Response(NMWG.toEchoResponse(REQUEST_ID)), 
client.echo(REQUEST_ID));
        }
        
+       /**
+        * This test is currently (20130506) failing under OSX 10.8.3 jre 
1.6.0_45
+        * @throws Exception
+        */
+    @Test
+    public void checkEchoLogging() throws Exception {
+        Response expectedResponse = new 
Response(NMWG.toEchoResponse(REQUEST_ID));
+        Response generatedResponse = client.echo(REQUEST_ID);
+        logger.debug("Expected response: {}", expectedResponse);
+        logger.debug("Generated response: {}", generatedResponse);
+        assertEquals(expectedResponse, generatedResponse);
+    }
+    
        @Test
        public void checkSelfTest() throws Throwable {
                assertEquals(

Modified: 
trunk/perfsonar-base/base/src/test/java/net/geant/perfsonar/helpers/Response.java
===================================================================
--- 
trunk/perfsonar-base/base/src/test/java/net/geant/perfsonar/helpers/Response.java
   2013-05-06 17:18:59 UTC (rev 6364)
+++ 
trunk/perfsonar-base/base/src/test/java/net/geant/perfsonar/helpers/Response.java
   2013-05-06 17:27:04 UTC (rev 6365)
@@ -4,38 +4,63 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
+import java.io.UnsupportedEncodingException;
 
 import javax.xml.transform.stream.StreamSource;
 
 import org.custommonkey.xmlunit.Diff;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class Response {
+    protected Logger logger = LoggerFactory.getLogger(getClass());
        private final Reader input;
        
     public Response(InputStream input) {
        if (input == null)
-               throw new NullPointerException("Response cannot be null.");
-       this.input = new InputStreamReader(input);
+               throw new NullPointerException("Response InputStream cannot 
be null.");
+       try {
+            this.input = new InputStreamReader(input, "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            String msg = "UTF-8 charset is not supported on this platform.";
+            logger.error(msg);
+            throw new RuntimeException(msg, e);
+        }
     }
     
     public Response(StreamSource source) {
        if (source.getInputStream() == null) {
-               if (source.getReader() == null)
-                       throw new NullPointerException("Response cannot be 
null.");
+               if (source.getReader() == null) {
+                   String msg = "Response StreamSource Reader cannot be 
null.";
+                   logger.error(msg);
+                       throw new NullPointerException();
+               }
                this.input = source.getReader();
        } else
-               this.input = new InputStreamReader(source.getInputStream());
+            try {
+                this.input = new InputStreamReader(source.getInputStream(), 
"UTF-8");
+            } catch (UnsupportedEncodingException e) {
+                String msg = "UTF-8 charset is not supported on this 
platform.";
+                logger.error(msg);
+                throw new RuntimeException(msg, e);
+            }
     }
     
     public Response(Reader input) {
-       if (input == null)
-               throw new NullPointerException("Response cannot be null.");
+       if (input == null) {
+           String msg = "Response Reader cannot be null.";
+           logger.error(msg);
+               throw new NullPointerException();
+       }
        this.input = input;
     }
     
     public boolean equals(Object obj) {
-       if (obj == null)
-               throw new NullPointerException("Cannot compare against null 
object.");
+       if (obj == null) {
+           String msg = "Cannot compare against null object.";
+           logger.error(msg);
+               throw new NullPointerException();
+       }
        
        if (obj instanceof Response)
                return equals(((Response) obj).input);
@@ -44,9 +69,14 @@
                return false;
        
        try {
-                       return new Diff((Reader) obj, input).identical();
+           logger.debug("Object to compare against: {}", obj);
+           logger.debug("My own content: {}", input);
+           Diff diff = new Diff((Reader) obj, input);
+                       return diff.identical();
                } catch (Exception ex) {
-                       throw new RuntimeException("Cannot compare XML 
responses.", ex);
+                   String msg = "Cannot compare XML responses (" + 
ex.getClass() + "): " + ex.getMessage();
+                   logger.error(msg);
+                       throw new RuntimeException(msg, ex);
                }
     }
     
@@ -62,6 +92,7 @@
                                buffer.append((char) ch);
                        }
                } catch (IOException e) {
+                   logger.error("Error converting Response to string 
(returning null!): {}", e.getMessage());
                        return null;
                }
        return buffer.toString();


Property changes on: trunk/perfsonar-java-rrd-ma-base3
___________________________________________________________________
Modified: svn:ignore
   - logs
velocity.log*
target
.apt_generated
.settings

.classpath

.project

   + logs
velocity.log*
target
.apt_generated
.settings

.classpath

.project

.checkstyle

.ruleset

.pmd


Modified: 
trunk/perfsonar-java-rrd-ma-base3/src/main/resources/net/geant/perfsonar/conf/test_rrdma_db.sql
===================================================================
--- 
trunk/perfsonar-java-rrd-ma-base3/src/main/resources/net/geant/perfsonar/conf/test_rrdma_db.sql
     2013-05-06 17:18:59 UTC (rev 6364)
+++ 
trunk/perfsonar-java-rrd-ma-base3/src/main/resources/net/geant/perfsonar/conf/test_rrdma_db.sql
     2013-05-06 17:27:04 UTC (rev 6365)
@@ -1,7 +1,7 @@
 # running:
 # mysql -u root -p < test_rrdma_db.sql
 
-USE perfsonar_rrdma 
+USE perfsonar_rrdma
 
 
 INSERT

Modified: 
trunk/perfsonar-java-rrd-ma-base3/src/main/resources/net/geant/perfsonar/ma/MetadataKeyResponse.template
===================================================================
--- 
trunk/perfsonar-java-rrd-ma-base3/src/main/resources/net/geant/perfsonar/ma/MetadataKeyResponse.template
    2013-05-06 17:18:59 UTC (rev 6364)
+++ 
trunk/perfsonar-java-rrd-ma-base3/src/main/resources/net/geant/perfsonar/ma/MetadataKeyResponse.template
    2013-05-06 17:27:04 UTC (rev 6365)
@@ -27,7 +27,7 @@
                 <nmwg:parameter name="description" 
value="${command.description}" />
 #if (${command.syntax})
                 <nmwg:parameter name="syntax" />
-#else 
+#else
                 <nmwg:parameter name="syntax" value="${command.syntax} />
 #end
             </nmwg:parameters>
@@ -37,4 +37,4 @@
     </nmwg:data>
 #set( $idx = $idx + 1 )
 #end
-</nmwg:message>
\ No newline at end of file
+</nmwg:message>

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-05-06 17:18:59 UTC (rev 6364)
+++ 
trunk/perfsonar-java-rrd-ma-base3/src/test/java/net/geant/perfsonar/ma/rrd/RRDMATest.java
   2013-05-06 17:27:04 UTC (rev 6365)
@@ -6,9 +6,14 @@
 
 import java.io.IOException;
 import java.io.Reader;
+import java.io.StringReader;
+import java.io.StringWriter;
 
 import net.geant.perfsonar.Configuration;
+import net.geant.perfsonar.response.EchoResponse;
+import net.geant.perfsonar.templates.NMWG;
 import net.geant.perfsonar.templates.NMWGRRDMA;
+import net.geant.perfsonar.templates.TemplateEngine;
 import net.geant.perfsonar.helpers.PerfSONARClient;
 import net.geant.perfsonar.helpers.Response;
 import net.geant.perfsonar.ma.RRDMAService;
@@ -28,58 +33,79 @@
     protected Logger logger = LoggerFactory.getLogger(getClass());
 
     static final String REQUEST_ID = "request1";
-       private PerfSONARClient client;
-       private RRDMAService service = new RRDMAService();
+    private PerfSONARClient client;
+    private RRDMAService service = new RRDMAService();
 
-       @Before
-       public void givenPerfSONARClient() {
-               client = new PerfSONARClient(service);
-       }
+    @Before
+    public void givenPerfSONARClient() {
+        client = new PerfSONARClient(service);
+    }
 
-       @Test
-       public void checkEcho() throws SAXException {
+    @Test
+    public void checkEcho() throws SAXException, IOException {
         logger.info("•••• Checking echo request");
-               assertEquals(new 
Response(NMWGRRDMA.toEchoResponse(REQUEST_ID)), client.echo(REQUEST_ID));
-       }
+        Response expectedResponse1 = new 
Response(NMWGRRDMA.toEchoResponse(REQUEST_ID));
+        Response expectedResponse2 = new 
Response(NMWGRRDMA.toEchoResponse(REQUEST_ID));
+        logger.info("Trying to compare 2 NMWG.groovy generated responses");
+        assertEquals(expectedResponse1, expectedResponse2);
+        logger.debug("Test 1 passed");
 
-       @Test
-       public void checkSelfTest() throws SAXException, 
DeserializationException {
+        final StringWriter out = new StringWriter();
+        TemplateEngine.put("requestId", "req1");
+        TemplateEngine.evaluate(out, EchoResponse.class, 
"EchoResponse.template");
+        Response r1 = new Response(new StringReader(out.toString()));
+        Response r2 = new Response(NMWGRRDMA.toEchoResponse("req1"));
+        logger.info("Trying to call template engine directly");
+        assertEquals(r1, r2);
+        logger.debug("Test 2 passed");
+
+        Response expectedResponse = new 
Response(NMWGRRDMA.toEchoResponse(REQUEST_ID));
+        logger.debug("Expected response: {}", expectedResponse);
+        Response echoResponse = client.echo(REQUEST_ID);
+        logger.debug("Generated response: {}", echoResponse);
+        logger.info("Trying to run a full echo request test");
+        assertEquals(expectedResponse, echoResponse);
+        logger.debug("Test 3 passed");
+    }
+
+    @Test
+    public void checkSelfTest() throws SAXException, 
DeserializationException {
         logger.info("•••• Checking self-test request");
         Response resp = new Response(NMWGRRDMA.toSelfTestResponse(
                 REQUEST_ID,
-                new SelfTestResult[] {
-                        success("test1", "Test passed.", "RRD_MA", "MA"),
+                new SelfTestResult[] {success("test1", "Test passed.", 
"RRD_MA", "MA"),
                         failure("test2", "Test failed.", "RRD_MA", "MA"), 
}));
-               assertEquals(resp, client.selfTest(REQUEST_ID));
-       }
+        assertEquals(resp, client.selfTest(REQUEST_ID));
+    }
 
-       @Test
-       public void checkConfig() throws Exception {
-           
assertEquals(RRDMAServiceController.class.getMethod("listRRDFiles", 
Interface.class),
-                   Configuration.getHandler("MetadataKeyRequest"));
-        }
+    @Test
+    public void checkConfig() throws Exception {
+        assertEquals(RRDMAServiceController.class.getMethod("listRRDFiles", 
Interface.class),
+                Configuration.getHandler("MetadataKeyRequest"));
+    }
 
-       @Ignore
-       @Test
-       public void checkMetadataKey() throws SAXException, IOException {
+    @Ignore
+    @Test
+    public void checkMetadataKey() throws SAXException, IOException {
         logger.info("•••• Checking metadata key request");
-           Response resp = new 
Response(client.invoke(NMWGRRDMA.toMetadataKeyRequest(REQUEST_ID)));
-           print(resp.getReader());
-       }
+        Response resp = new 
Response(client.invoke(NMWGRRDMA.toMetadataKeyRequest(REQUEST_ID)));
+        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())
-                       System.out.print((char) i);
-       }
+    private void print(Reader reader) throws IOException {
+        for (int i = reader.read(); i != -1; i = reader.read()) {
+            System.out.print((char) i);
+        }
+    }
 }

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-05-06 17:18:59 UTC (rev 6364)
+++ 
trunk/perfsonar-java-rrd-ma-base3/src/test/java/net/geant/perfsonar/ma/rrd/RRDMAWebServiceTest.java
 2013-05-06 17:27:04 UTC (rev 6365)
@@ -1,6 +1,7 @@
 package net.geant.perfsonar.ma.rrd;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 
 import java.io.FileNotFoundException;
 import java.io.FileReader;
@@ -31,47 +32,48 @@
 public class RRDMAWebServiceTest {
     protected Logger logger = LoggerFactory.getLogger(getClass());
 
-       private static final String REQUEST_ID = "request1";
-       private static final String SERVICE_URL = 
"http://localhost:9000/perfsonar-java-rrd-ma";;
-       private final PerfSONARServiceClient client = new 
PerfSONARServiceClient(SERVICE_URL);
-       private RRDMAService service = new RRDMAService();
-       private Endpoint endpoint;
-       
-       @Before
-       public void givenRrdMAService() throws InterruptedException, 
IOException {
-               endpoint = Endpoint.publish(SERVICE_URL, service);
-       }
-               
-       @After
-       public void stopServices() {
-               endpoint.stop();
-               service.stop();
-               endpoint = null;
-               service = null;
-       }
+    private static final String REQUEST_ID = "request1";
+    private static final String SERVICE_URL = 
"http://localhost:9000/perfsonar-java-rrd-ma";;
+    private final PerfSONARServiceClient client = new 
PerfSONARServiceClient(SERVICE_URL);
+    private RRDMAService service = new RRDMAService();
+    private Endpoint endpoint;
 
-       /**
-        * This test that the resource loading from an external Jar is 
working fine.
-        * The EchoRequest template is coming from net.geant.perfsonar.base
-        */
+    @Before
+    public void givenRrdMAService() throws InterruptedException, IOException 
{
+        endpoint = Endpoint.publish(SERVICE_URL, service);
+    }
 
-       @Test
-       public void checkingEchoTemplate() {
+    @After
+    public void stopServices() {
+        endpoint.stop();
+        service.stop();
+        endpoint = null;
+        service = null;
+    }
+
+    /**
+     * 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");
-        
assertNotNull(EchoResponse.class.getClassLoader().getResourceAsStream("net/geant/perfsonar/response/EchoResponse.template"));
-    }  
-       
-       @Test
-       public void shouldSayEcho() throws SAXException, InterruptedException 
{
+        
assertNotNull(EchoResponse.class.getClassLoader().getResourceAsStream(
+                "net/geant/perfsonar/response/EchoResponse.template"));
+    }
+
+    @Test
+    public void shouldSayEcho() throws SAXException, InterruptedException {
         logger.info("•••• Checking echo request");
-               assertEquals(new Response(NMWG.toEchoResponse(REQUEST_ID)), 
client.echo(REQUEST_ID));
-       }
+        assertEquals(new Response(NMWG.toEchoResponse(REQUEST_ID)), 
client.echo(REQUEST_ID));
+    }
 
-       @Ignore
-       @Test(expected=SOAPFaultException.class)
-       public void shouldFail() throws FileNotFoundException, SAXException {
+    @Ignore
+    @Test(expected = SOAPFaultException.class)
+    public void shouldFail() throws FileNotFoundException, SAXException {
         logger.info("•••• Checking MetadataKey request");
-               client.invoke(new 
FileReader("samples/requests/MetadataKeyRequest-Discards-1.xml"));
-       }
+        client.invoke(new 
FileReader("samples/requests/MetadataKeyRequest-Discards-1.xml"));
+    }
 
 }