Google code issue 143: org.jsmpp.PDUStringException: C-Octet String v…

…alue 'System ID' cannot more than 9. Actual length of string is 9
uudashr · Sep 2, 2013 · abb4646 · abb4646
1 parent 38b92cd
commit abb4646
Show file tree

Hide file tree

Showing 3 changed files with 98 additions and 9 deletions.
diff --git a/jsmpp/src/main/java/org/jsmpp/util/StringValidator.java b/jsmpp/src/main/java/org/jsmpp/util/StringValidator.java
@@ -87,7 +87,7 @@ public static void validateString(byte[] value, StringParameter param)
     static boolean isCOctetStringValid(String value, int maxLength) {
         if (value == null)
             return true;
-        if (value.length() >= maxLength)
+        if (value.length() > maxLength)
             return false;
         return true;
 
@@ -96,7 +96,7 @@ static boolean isCOctetStringValid(String value, int maxLength) {
     static boolean isCOctetStringValid(byte[] value, int maxLength) {
         if (value == null)
             return true;
-        if (value.length >= maxLength)
+        if (value.length > maxLength)
             return false;
         return true;
 

diff --git a/jsmpp/src/test/java/org/jsmpp/bean/StringValidationTest.java b/jsmpp/src/test/java/org/jsmpp/bean/StringValidationTest.java
@@ -49,16 +49,10 @@ public void testValidation() {
             fail("Should be okay inserting string that has length less than 16");
         }
 
-        try {
-            StringValidator.validateString("smsgwsmsgwsmsgw", StringParameter.SYSTEM_ID);
-        } catch (PDUStringException e) {
-            fail("Should be okay inserting 15 char of string");
-        }
-
         try {
             StringValidator.validateString("smsgwsmsgwsmsgwe", StringParameter.SYSTEM_ID);
-            fail("Should fail inserting 16 char of string");
         } catch (PDUStringException e) {
+            fail("Should be okay inserting 16 char of string");
         }
 
         try {

diff --git a/jsmpp/src/test/java/org/jsmpp/util/StringValidatorTest.java b/jsmpp/src/test/java/org/jsmpp/util/StringValidatorTest.java
@@ -0,0 +1,95 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License"); 
+ * you may not use this file except in compliance with the License. 
+ * You may obtain a copy of the License at
+ * 
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * 
+ */
+package org.jsmpp.util;
+
+import static org.testng.Assert.*;
+
+import org.jsmpp.PDUStringException;
+import org.testng.annotations.Test;
+
+public class StringValidatorTest {
+
+    @Test(groups="checkintest")
+    public void validateStringOctedStringWithString() throws Exception {
+        StringValidator.validateString("", StringParameter.SHORT_MESSAGE);
+        StringValidator.validateString("short messages", StringParameter.SHORT_MESSAGE);
+        String shortMessage = "123456789012345678901234567890123456789012345678901234567890123456789012345678901234567"
+            + "89012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901"
+            + "234567890123456789012345678901234567890123456789012345678901234";
+        StringValidator.validateString(shortMessage, StringParameter.SHORT_MESSAGE);
+
+        try {
+            shortMessage = shortMessage + "5";
+            StringValidator.validateString(shortMessage, StringParameter.SHORT_MESSAGE);
+            fail("PDUStringException expected");
+        } catch (PDUStringException e) {
+            // expected
+            assertEquals(e.getMessage(), "Octet String value '" + shortMessage + "' cannot more than 254. Actual length"
+                + " of string is 255");
+        }
+    }
+
+    @Test(groups="checkintest")
+    public void validateStringOctedStringWithByteArray() throws Exception {
+        StringValidator.validateString("".getBytes("UTF-8"), StringParameter.SHORT_MESSAGE);
+        StringValidator.validateString("short messages".getBytes("UTF-8"), StringParameter.SHORT_MESSAGE);
+        String shortMessage = "123456789012345678901234567890123456789012345678901234567890123456789012345678901234567"
+            + "89012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901"
+            + "234567890123456789012345678901234567890123456789012345678901234";
+        StringValidator.validateString(shortMessage.getBytes("UTF-8"), StringParameter.SHORT_MESSAGE);
+
+        try {
+            shortMessage = shortMessage + "5";
+            StringValidator.validateString(shortMessage.getBytes("UTF-8"), StringParameter.SHORT_MESSAGE);
+            fail("PDUStringException expected");
+        } catch (PDUStringException e) {
+            // expected
+            assertEquals(e.getMessage(), "Octet String value '" + shortMessage + "' cannot more than 254. Actual length"
+                + " of string is 255");
+        }
+    }
+
+    @Test(groups="checkintest")
+    public void validateStringCOctedStringWithString() throws Exception {
+        StringValidator.validateString("", StringParameter.SYSTEM_ID);
+        StringValidator.validateString("System ID", StringParameter.SYSTEM_ID);
+        StringValidator.validateString("1234567890123456", StringParameter.SYSTEM_ID);
+
+        try {
+            StringValidator.validateString("12345678901234567", StringParameter.SYSTEM_ID);
+            fail("PDUStringException expected");
+        } catch (PDUStringException e) {
+            // expected
+            assertEquals(e.getMessage(), "C-Octet String value '12345678901234567' cannot more than 16. Actual length "
+                + "of string is 17");
+        }
+    }
+
+    @Test(groups="checkintest")
+    public void validateStringCOctedStringWithByteArray() throws Exception {
+        StringValidator.validateString("".getBytes("UTF-8"), StringParameter.SYSTEM_ID);
+        StringValidator.validateString("System ID".getBytes("UTF-8"), StringParameter.SYSTEM_ID);
+        StringValidator.validateString("1234567890123456".getBytes("UTF-8"), StringParameter.SYSTEM_ID);
+
+        try {
+            StringValidator.validateString("12345678901234567".getBytes("UTF-8"), StringParameter.SYSTEM_ID);
+            fail("PDUStringException expected");
+        } catch (PDUStringException e) {
+            // expected
+            assertEquals(e.getMessage(), "C-Octet String value '12345678901234567' cannot more than 16. Actual length "
+                + "of string is 17");
+        }
+    }
+}