Revert "Google code issue 143: org.jsmpp.PDUStringException: C-Octet …

…String value 'System ID' cannot more than 9. Actual length of string is 9" This reverts commit abb4646.
uudashr · Sep 4, 2013 · 85400e0 · 85400e0
1 parent abb4646
commit 85400e0
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 98 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,10 +49,16 @@ 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