Merge pull request #90 from khaing211/master

#89 DeliveryReceipt, err:null error
twitter-archive · Apr 17, 2015 · bb9f370 · bb9f370
2 parents 655e2e0 + 9efd875
commit bb9f370
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/src/main/java/com/cloudhopper/smpp/util/DeliveryReceipt.java b/src/main/java/com/cloudhopper/smpp/util/DeliveryReceipt.java
@@ -103,7 +103,7 @@ public DeliveryReceipt(String messageId, int submitCount,
 		this.submitDate = submitDate;
 		this.doneDate = doneDate;
 		this.state = state;
-		this.errorCode = errorCode;
+		setErrorCode(errorCode);
 		this.text = text;
 	}
 

diff --git a/src/test/java/com/cloudhopper/smpp/util/DeliveryReceiptTest.java b/src/test/java/com/cloudhopper/smpp/util/DeliveryReceiptTest.java
@@ -293,6 +293,17 @@ public void toShortMessageWith11DigitLongMessageId() {
         Assert.assertEquals("id:12345678901 sub:000 dlvrd:000 submit date:0000000000 done date:0000000000 stat:BADSTAT err:000 text:", receipt0);
     }
 
+
+    @Test
+    public void toShortMessageWithFullConstructor() throws DeliveryReceiptException {
+        DeliveryReceipt dlr = new DeliveryReceipt("12345", 1, 1, new DateTime(0L, DateTimeZone.UTC),
+                new DateTime(0L, DateTimeZone.UTC), SmppConstants.STATE_ENROUTE, 0, "text");
+
+        String receipt = dlr.toShortMessage();
+
+        Assert.assertEquals("id:12345 sub:001 dlvrd:001 submit date:7001010000 done date:7001010000 stat:ENROUTE err:000 text:text", receipt);
+    }
+
     @Test
     public void parseShortMessageWith11DigitLongMessageId() throws Exception {
         DeliveryReceipt dlr = DeliveryReceipt.parseShortMessage("id:98765432101 sub:000 dlvrd:000 submit date:1001010000 done date:1001010000 stat:ENROUTE err:000 text:", DateTimeZone.UTC);