Util tests + more Payload tests

- Fixes snowplow#34
- Fixes snowplow#35

Author: jonalmeida

src/main/java/com/snowplowanalytics/snowplow/tracker/Util.java

@@ -26,6 +26,7 @@ public static ObjectMapper defaultMapper() {
         return sObjectMapper;
     }
 
+    @Deprecated
     public static JsonNode stringToJsonNode(String str) {
         try {
             return defaultMapper().readTree(str);
@@ -44,7 +45,7 @@ public static int getTransactionId() {
         return r.nextInt(999999-100000+1) + 100000;
     }
 
-    public static long getTimestamp() {
+    public static Long getTimestamp() {
         return System.currentTimeMillis();
     }
 }

src/test/java/com/snowplowanalytics/snowplow/tracker/PayloadMapCTest.java

@@ -23,15 +23,16 @@ public void testSetParamMap() throws Exception {
         LinkedHashMap<String, String> param = new LinkedHashMap<String, String>();
         param.put("e","pv");
         PayloadMap payloadMap = new PayloadMapC(param,null);
-        assertSame(param, payloadMap.getParams());
-//        assertNull(payloadMap.getConfigs());
+        assertEquals(param, payloadMap.getParams());
+        assertNull(payloadMap.getConfigs());
     }
 
     @Test
     public void testSetTransactionId() throws Exception {
         PayloadMapC payloadMap = new PayloadMapC();
         payloadMap.setTransactionID();
         Integer i = Integer.parseInt(payloadMap.getParam("tid"));
+        // Just a formality, the parseLong would catch the error
         assertTrue(i instanceof Integer);
     }
 
@@ -40,16 +41,22 @@ public void testSetTimestamp() throws Exception {
         PayloadMapC payloadMap = new PayloadMapC();
         payloadMap.setTimestamp();
         Long i = Long.parseLong(payloadMap.getParam("dtm"));
+        // Just a formality, the parseLong would catch the error
         assertTrue(i instanceof Long);
     }
 
-//    @Test
-//    public void testSetTimestamp2() throws Exception {
-//        PayloadMapC payloadMap = new PayloadMapC();
-//        payloadMap.setTimestamp(123456L);
-//        Long i = Long.parseLong(payloadMap.getParam("dtm"));
-//        Long j = 123456L;
-//        assertSame(j, i);
-//    }
+    @Test
+    public void testSetTimestamp2() throws Exception {
+        PayloadMapC payloadMap = new PayloadMapC();
+        payloadMap.setTimestamp(123456);
+        assertEquals("123456.0", payloadMap.getParam("dtm"));
+    }
+
+    @Test
+    public void testAdd() throws Exception {
+        PayloadMapC payloadMap = new PayloadMapC();
+        payloadMap.add("e", "pv");
+
+    }
 
 }

src/test/java/com/snowplowanalytics/snowplow/tracker/UtilTest.java

@@ -0,0 +1,69 @@
+package com.snowplowanalytics.snowplow.tracker;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
+import junit.framework.TestCase;
+
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
+public class UtilTest extends TestCase {
+    @Test
+    public void testGetTimestamp() {
+        assertNotNull(Util.getTimestamp());
+    }
+
+    @Test
+    public void testGetTransactionId() {
+        assertNotNull(Util.getTransactionId());
+    }
+
+    @Test
+    public void testMapToJsonNode() {
+        Map map = new HashMap();
+        map.put("foo", "bar");
+
+        JsonNode node = Util.mapToJsonNode(map);
+
+        assertEquals("bar", node.get("foo").asText());
+    }
+
+    @Test
+    public void testMapToJsonNode2() {
+        Map map = new HashMap();
+        map.put("foo", "bar");
+
+        ArrayList<String> list = new ArrayList<String>();
+        list.add("some");
+        list.add("stuff");
+
+        map.put("list", list);
+
+        JsonNode node = Util.mapToJsonNode(map);
+
+        assertEquals("{\"list\":[\"some\",\"stuff\"],\"foo\":\"bar\"}", node.toString());
+    }
+
+    @Test
+    public void testStringToJsonNode() throws Exception {
+        Map map = new HashMap();
+        map.put("foo", "bar");
+
+        ArrayList<String> list = new ArrayList<String>();
+        list.add("some");
+        list.add("stuff");
+
+        map.put("list", list);
+        String res = "{\"list\":[\"some\",\"stuff\"],\"foo\":\"bar\"}";
+
+        Util.stringToJsonNode(res);
+
+        JsonNode node = Util.mapToJsonNode(map);
+
+        assertEquals(node.toString(), res);
+    }
+}