perfsonar development work

Author: psnc.pikusa
Date: 2011-10-05 12:58:27 +0100 (Wed, 05 Oct 2011)
New Revision: 5854

Modified:
   
trunk/perfsonar-java-sql-ma/src/test/java/org/perfsonar/service/measurementArchive/sqlType/OwampResponseGeneratorTest.java
Log:
Changes in test. Tests work

Modified: 
trunk/perfsonar-java-sql-ma/src/test/java/org/perfsonar/service/measurementArchive/sqlType/OwampResponseGeneratorTest.java
===================================================================
--- 
trunk/perfsonar-java-sql-ma/src/test/java/org/perfsonar/service/measurementArchive/sqlType/OwampResponseGeneratorTest.java
  2011-10-05 10:10:36 UTC (rev 5853)
+++ 
trunk/perfsonar-java-sql-ma/src/test/java/org/perfsonar/service/measurementArchive/sqlType/OwampResponseGeneratorTest.java
  2011-10-05 11:58:27 UTC (rev 5854)
@@ -8,18 +8,16 @@
 
 import org.ggf.ns.nmwg.base.v2_0.Data;
 import org.ggf.ns.nmwg.tools.owamp.v2_0.Datum;
+import org.junit.Assert;
 import org.junit.Test;
-import org.junit.Assert.*;
 import 
org.perfsonar.service.measurementArchive.sqlType.fetch.OwampResponseGenerator;
+import 
org.perfsonar.service.measurementArchive.sqlType.nmwg.OwampAggregationDatum;
 
-import antlr.collections.impl.Vector;
 
 public class OwampResponseGeneratorTest {
        
        /**
-        * This test should verify if returned Datum is valid. However 
because Data.getDatum() method return Vector instead of Datum,
-        * assertEquals doesn't cope with that and complains that test failed 
although that the String representatives of expected and tested
-        * objects are the same. This test should be fixed time to fixed later
+        * This test should verify if returned Datum is valid. 
         */
        @Test
        public void shouldReturnDatum(){
@@ -47,23 +45,84 @@
            List<Map<String, String>> list = new 
ArrayList<Map<String,String>>();
            list.add(row);
            
-           //Datum datumTest = new Datum();
+           String s = "";
            java.util.Vector datumTest = new java.util.Vector();
+           
            //when
            try{
-               //Data d = new OwampResponseGenerator().getResponse(list);
-               //System.out.println("Size: "+ d.getChildMap().size());
-               //System.out.println(d.getChildArray().length);
-               //datumTest = d.getDatum();
-               
+               Data d = new OwampResponseGenerator("test").getResponse(list);
+               datumTest = d.getDatum();
+               s = datumTest.toString();
+               s = s.substring(1, s.length() -1); //This is because 
vector.toString() method begins and ends with "[]" brackets, while 
Datum.toString() not. 
            }catch(Exception e){
                e.printStackTrace();
            }
+                   
+           //then
+           Assert.assertEquals(datum.toString(), s);
+
+       }
+       
+       @Test
+       public void shouldReturnOwampAggregaionDatum(){
+               //given
+               Map<String, String> row = new HashMap<String, String>();
+               row.put("sender", "1");
+               row.put("receiver", "1");
+               row.put("sent", "1");
+               row.put("loss","1");
+               row.put("lostPercent","1.0");
+               row.put("duplicates","1");
+               row.put("minDelay","1.0");
+               row.put("medDelay","1.0");
+               row.put("maxDelay","1.0");
+               row.put("delayUnits","1");
+               row.put("error","1");
+               row.put("errorUnits","1");
+               row.put("jitter","1");
+               row.put("jitterUnits","1");
+               row.put("hops","1");
+               
+               OwampAggregationDatum datum = new OwampAggregationDatum();
+               datum.setSender(row.get("sender"));
+               datum.setReceiver(row.get("receiver"));
+               datum.setSent(row.get("sent"));
+               datum.setLoss(row.get("loss"));
+               datum.setLostPercent(row.get("lostPercent"));
+               datum.setDuplicates(row.get("duplicates"));
+               datum.setDelayUnits(row.get("minDelay"));
+               datum.setMinDelay(row.get("minDelay"));
+               datum.setMedDelay(row.get("medDelay"));
+               datum.setMaxDelay(row.get("maxDelay"));
+               datum.setDelayUnits(row.get("delayUnits"));
+               datum.setError(row.get("error"));
+               datum.setErrorUnits(row.get("errorUnits"));
+               datum.setJitter(row.get("jitter"));
+               datum.setJitterUnits(row.get("jitterUnits"));
+               datum.setHops(row.get("hops"));
+               
+               List<Map<String, String>> list = new 
ArrayList<Map<String,String>>();
+           list.add(row);
            
+           String s = "";
+           java.util.Vector datumTest = new java.util.Vector();
            
-          //then
-           //Assert.assertEquals(datum, datumTest);
-
+           //when
+           try{
+               Data d = new OwampResponseGenerator("test").getResponse(list);
+               datumTest = d.getDatum();
+               s = datumTest.toString();
+               s = s.substring(1, s.length() -1); //This is because 
vector.toString() method begins and ends with "[]" brackets, while 
Datum.toString() not. 
+           }catch(Exception e){
+               e.printStackTrace();
+           }
+                   
+           //then
+           
+           //System.out.println(datum.toString());
+           //System.out.println(s);
+           Assert.assertEquals(datum.toString(), s);
+               
        }