Added model parsing tests from fixtures

pom.xml

@@ -55,5 +55,10 @@
             <artifactId>junit</artifactId>
             <version>4.8.2</version>
         </dependency>
+        <dependency>
+            <groupId>joda-time</groupId>
+            <artifactId>joda-time</artifactId>
+            <version>2.1</version>
+        </dependency>
     </dependencies>
 </project>

src/main/java/postageapp/PostageAppClientImpl.java

@@ -164,7 +164,7 @@ private String sendRequest(String endpoint, String content) throws PostageAppExc
 
         this.checkForError(response);
 
-        return (Map<String, ?>) response.get("data");
+        return (Map<String, ?>) responseMap.get("data");
     }
 
     private void checkForError(Map<String, ?> responseJson) throws PostageAppException {

src/main/java/postageapp/models/Message.java

@@ -12,17 +12,17 @@
  */
 public class Message extends PostageModel {
     private String uid, template;
-    private int transmissionsTotal, transmissionsFailed, transmissionsCompleted;
+    private double transmissionsTotal, transmissionsFailed, transmissionsCompleted;
     private Date createdAt, willPurgeAt;
 
     public Message(String uid, Map<String, ?> json) {
         super(json);
 
         this.uid = uid;
         this.template = (String) json.get("template");
-        this.transmissionsTotal = (Integer) json.get("transmissions_total");
-        this.transmissionsCompleted = (Integer) json.get("transmissions_completed");
-        this.transmissionsFailed = (Integer) json.get("transmissions_failed");
+        this.transmissionsTotal = (Double) json.get("transmissions_total");
+        this.transmissionsCompleted = (Double) json.get("transmissions_completed");
+        this.transmissionsFailed = (Double) json.get("transmissions_failed");
         this.createdAt = this.dateFromString((String) json.get("created_at"));
         this.willPurgeAt = this.dateFromString((String) json.get("will_purge_at"));
     }
@@ -35,15 +35,15 @@ public String getTemplate() {
         return template;
     }
 
-    public int getTransmissionsCompleted() {
+    public double getTransmissionsCompleted() {
         return transmissionsCompleted;
     }
 
-    public int getTransmissionsFailed() {
+    public double getTransmissionsFailed() {
         return transmissionsFailed;
     }
 
-    public int getTransmissionsTotal() {
+    public double getTransmissionsTotal() {
         return transmissionsTotal;
     }
 

src/main/java/postageapp/models/MessageTransmission.java

@@ -15,7 +15,7 @@
  * To change this template use File | Settings | File Templates.
  */
 public class MessageTransmission extends PostageModel {
-    private String status, resultCode, resultMessage;
+    private String status, resultCode, errorMessage;
     private Date createdAt, failedAt, openedAt;
 
     public MessageTransmission(Map<String, ?> json) {
@@ -26,7 +26,7 @@ public MessageTransmission(Map<String, ?> json) {
         this.failedAt = this.dateFromString((String) json.get("failed_at"));
         this.openedAt = this.dateFromString((String) json.get("opened_at"));
         this.resultCode = (String) json.get("result_code");
-        this.resultMessage = (String) json.get("result_message");
+        this.errorMessage = (String) json.get("error_message");
     }
 
     public Date getCreatedAt() {
@@ -45,8 +45,8 @@ public String getResultCode() {
         return resultCode;
     }
 
-    public String getResultMessage() {
-        return resultMessage;
+    public String getErrorMessage() {
+        return errorMessage;
     }
 
     public String getStatus() {

src/main/java/postageapp/models/MessageTransmissonsResponse.java

@@ -1,5 +1,6 @@
 package postageapp.models;
 
+import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -10,11 +11,11 @@
  * To change this template use File | Settings | File Templates.
  */
 public class MessageTransmissonsResponse {
-    private String messageId;
-    private Map<String, MessageTransmission> transmissions;
+    private double messageId;
+    private Map<String, MessageTransmission> transmissions = new HashMap<String, MessageTransmission>();
 
     public MessageTransmissonsResponse(Map<String, ?> json) {
-        Map<String, String> messageMap = (Map<String, String>) json.get("message");
+        Map<String, Double> messageMap = (Map<String, Double>) json.get("message");
         this.messageId = messageMap.get("id");
 
         Map<String, ?> transmissionsMap = (Map<String, ?>) json.get("transmissions");
@@ -23,4 +24,12 @@ public MessageTransmissonsResponse(Map<String, ?> json) {
             this.transmissions.put(email, new MessageTransmission((Map<String, String>) transmissionsMap.get(email)));
         }
     }
+
+    public double getMessageId() {
+        return this.messageId;
+    }
+
+    public Map<String, MessageTransmission> getTransmissions() {
+        return this.transmissions;
+    }
 }

src/main/java/postageapp/models/PostageModel.java

@@ -1,5 +1,8 @@
 package postageapp.models;
 
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
+
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -14,18 +17,16 @@
  * To change this template use File | Settings | File Templates.
  */
 public abstract class PostageModel {
-    private final DateFormat dateFormat = new SimpleDateFormat("YYY-MM-dd hh:mm:ss");
     private Map<String, ?> json;
+    private DateTimeFormatter formatter = DateTimeFormat.forPattern("yyyy-MM-dd'T'HH:mm:ssZ");
 
     public PostageModel(Map<String, ?> json) {
         this.json = json;
     }
 
     protected Date dateFromString(String date) {
-        try {
-            return this.dateFormat.parse((String) json.get("created_at"));
-        } catch (ParseException e) {
-            e.printStackTrace();
+        if (date != null) {
+            return this.formatter.parseDateTime(date).toDate();
         }
 
         return null;

src/main/java/postageapp/models/ProjectMetrics.java

@@ -12,37 +12,37 @@
  * To change this template use File | Settings | File Templates.
  */
 public class ProjectMetrics extends PostageModel {
-    private int currentPercent, previousPercent,
+    private double currentPercent, previousPercent,
             diffPercent, currentValue, previousValue;
 
     public ProjectMetrics(Map<String, ?> json) {
         super(json);
 
-        this.currentPercent = (Integer) json.get("currentPercent");
-        this.previousPercent = (Integer) json.get("previousPercent");
-        this.diffPercent = (Integer) json.get("diffPercent");
-        this.currentValue = (Integer) json.get("currentValue");
-        this.previousPercent = (Integer) json.get("previousPercent");
-        this.previousValue = (Integer) json.get("previousValue");
+        this.currentPercent = (Double) json.get("current_percent");
+        this.previousPercent = (Double) json.get("previous_percent");
+        this.diffPercent = (Double) json.get("diff_percent");
+        this.currentValue = (Double) json.get("current_value");
+        this.previousPercent = (Double) json.get("previous_percent");
+        this.previousValue = (Double) json.get("previous_value");
     }
 
-    public int getCurrentPercent() {
+    public double getCurrentPercent() {
         return currentPercent;
     }
 
-    public int getCurrentValue() {
+    public double getCurrentValue() {
         return currentValue;
     }
 
-    public int getDiffPercent() {
+    public double getDiffPercent() {
         return diffPercent;
     }
 
-    public int getPreviousPercent() {
+    public double getPreviousPercent() {
         return previousPercent;
     }
 
-    public int getPreviousValue() {
+    public double getPreviousValue() {
         return previousValue;
     }
 }

src/test/java/postageapp/ModelTestCase.java

@@ -1,5 +1,13 @@
 package postageapp;
+
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
 import junit.framework.TestCase;
+import org.apache.commons.io.IOUtils;
+
+import java.io.InputStream;
+import java.lang.reflect.Type;
+import java.util.Map;
 
 /**
  * Created with IntelliJ IDEA.
@@ -8,5 +16,28 @@
  * Time: 7:57 PM
  * To change this template use File | Settings | File Templates.
  */
-public class ModelTestCase extends TestCase {
+public abstract class ModelTestCase extends TestCase {
+    protected String loadModelFixture(String fixturePath) {
+        InputStream jsonStream = getClass().getClassLoader().getResourceAsStream(fixturePath);
+        assertNotNull(jsonStream);
+
+        String jsonString = null;
+        try {
+            jsonString = IOUtils.toString(jsonStream);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return jsonString;
+    }
+
+    protected Map<String, ?> getDataFromResponse(String jsonString) {
+        Gson gson = new Gson();
+
+        Type mapType = new TypeToken<Map<String, ?>>() {
+        }.getType();
+        Map<String, ?> responseMap = gson.fromJson(jsonString, mapType);
+
+        return (Map<String, ?>) responseMap.get("data");
+    }
+
 }

src/test/java/postageapp/PostageAppClientTest.java

@@ -0,0 +1,11 @@
+package postageapp;
+
+/**
+ * Created with IntelliJ IDEA.
+ * User: stephanleroux
+ * Date: 2012-11-29
+ * Time: 8:32 PM
+ * To change this template use File | Settings | File Templates.
+ */
+public class PostageAppClientTest {
+}

src/test/java/postageapp/http/PostageAppExceptionTest.java

@@ -0,0 +1,11 @@
+package postageapp.http;
+
+/**
+ * Created with IntelliJ IDEA.
+ * User: stephanleroux
+ * Date: 2012-11-29
+ * Time: 8:32 PM
+ * To change this template use File | Settings | File Templates.
+ */
+public class PostageAppExceptionTest {
+}

src/test/java/postageapp/http/PostageAppHttpClientTest.java

@@ -0,0 +1,11 @@
+package postageapp.http;
+
+/**
+ * Created with IntelliJ IDEA.
+ * User: stephanleroux
+ * Date: 2012-11-29
+ * Time: 8:32 PM
+ * To change this template use File | Settings | File Templates.
+ */
+public class PostageAppHttpClientTest {
+}

src/test/java/postageapp/models/AccountInfoTest.java

@@ -1,7 +1,16 @@
 package postageapp.models;
 
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
+import junit.framework.TestCase;
+import org.apache.commons.io.IOUtils;
+import org.junit.Test;
 import postageapp.ModelTestCase;
 
+import java.io.InputStream;
+import java.lang.reflect.Type;
+import java.util.Map;
+
 /**
  * Created with IntelliJ IDEA.
  * User: stephanleroux
@@ -10,4 +19,18 @@
  * To change this template use File | Settings | File Templates.
  */
 public class AccountInfoTest extends ModelTestCase {
+    @Test
+    public void testParseAccountInfoJson() throws Exception {
+        Map<String, ?> dataObj = this.getDataFromResponse(this.loadModelFixture("mock_api_1.0/mock_account_info.json"));
+
+        AccountInfo info = new AccountInfo((Map<String, ?>)dataObj.get("account"));
+
+        assertNotNull(info.getName());
+        assertNotNull(info.getTransmissions());
+        assertNotNull(info.getTransmissions().get("today"));
+        assertNotNull(info.getTransmissions().get("this_month"));
+        assertNotNull(info.getTransmissions().get("overall"));
+        assertNotNull(info.getUrl());
+        assertNotNull(info.getUsers());
+    }
 }

src/test/java/postageapp/models/MessageTest.java

@@ -0,0 +1,29 @@
+package postageapp.models;
+
+import org.junit.Test;
+import postageapp.ModelTestCase;
+
+import java.util.Map;
+
+/**
+ * Created with IntelliJ IDEA.
+ * User: stephanleroux
+ * Date: 2012-11-29
+ * Time: 8:31 PM
+ * To change this template use File | Settings | File Templates.
+ */
+public class MessageTest extends ModelTestCase {
+    @Test
+    public void testParseMessageJson() throws Exception {
+        Map<String, ?> dataObj = this.getDataFromResponse(this.loadModelFixture("mock_api_1.0/mock_get_messages.json"));
+        Message msg = new Message("27cf6ede7501a32d54d22abe17e3c154d2cae7f3",
+                (Map<String, ?>)dataObj.get("27cf6ede7501a32d54d22abe17e3c154d2cae7f3"));
+        assertNotNull(msg.getCreatedAt());
+        assertNotNull(msg.getTemplate());
+        assertNotNull(msg.getTransmissionsCompleted());
+        assertNotNull(msg.getTransmissionsFailed());
+        assertNotNull(msg.getTransmissionsTotal());
+        assertNotNull(msg.getUid());
+        assertNotNull(msg.getWillPurgeAt());
+    }
+}

src/test/java/postageapp/models/MessageTransmissionResponseTest.java

@@ -0,0 +1,33 @@
+package postageapp.models;
+
+import org.junit.Test;
+import postageapp.ModelTestCase;
+
+import java.util.Map;
+
+/**
+ * Created with IntelliJ IDEA.
+ * User: stephanleroux
+ * Date: 2012-11-29
+ * Time: 8:31 PM
+ * To change this template use File | Settings | File Templates.
+ */
+public class MessageTransmissionResponseTest extends ModelTestCase {
+    @Test
+    public void testParseMessageTransmissionResponseJson() {
+        Map<String, ?> data = this.getDataFromResponse(this.loadModelFixture("mock_api_1.0/mock_message_transmissions.json"));
+        MessageTransmissonsResponse response = new MessageTransmissonsResponse(data);
+        assertNotNull(response);
+        assertNotNull(response.getMessageId());
+        assertNotNull(response.getTransmissions());
+
+        MessageTransmission transmission = response.getTransmissions().get("[email protected]");
+        assertNotNull(transmission);
+        assertNotNull(transmission.getErrorMessage());
+        assertNotNull(transmission.getCreatedAt());
+        assertNull(transmission.getFailedAt());
+        assertNotNull(transmission.getOpenedAt());
+        assertNotNull(transmission.getResultCode());
+        assertNotNull(transmission.getStatus());
+    }
+}