Changeset 277

Timestamp:

08/26/08 08:06:55 PM (3 months ago)

Author:

octorian

Message:

Fix for quoted-printable decoding errors (#98)

Location:

branches/LogicMail-1.0

Files:

• LogicMail/src/org/logicprobe/LogicMail/util/StringParser.java (modified) (3 diffs)
• LogicMailTests/src/org/logicprobe/LogicMail/util/StringParserTest.java (modified) (3 diffs)

branches/LogicMail-1.0/LogicMail/src/org/logicprobe/LogicMail/util/StringParser.java

@@ -732 +732 @@
                     break;
                 }
-                try {
-                    int charVal = Integer.parseInt(text.substring(index+1, index+3), 16);
-                    buffer.append((char)charVal);
-                } catch (NumberFormatException exp) { }
-                index += 3;
+                else {
+                    char ch1 = text.charAt(index+1);
+                    char ch2 = text.charAt(index+2);
+                    if(ch1 == '\r' && ch2 == '\n') {
+                        index += 3;
+                    }
+                    else if(ch1 == '\n') {
+                        index += 2;
+                    }
+                    else {
+                        try {
+                            int charVal = Integer.parseInt(text.substring(index+1, index+3), 16);
+                            buffer.append((char)charVal);
+                        } catch (NumberFormatException exp) { }
+                        index += 3;
+                    }
+                }
             }
             else {
@@ -753 +765 @@
         char ch;
         String charStr;
-        for(int i=0; i<text.length(); i++) {
+        int length = text.length();
+        for(int i=0; i<length; i++) {
             ch = text.charAt(i);
-            if(ch < 128) {
+            if(ch != '\t' && ch != ' ' && ch < 128) {
+                if(buffer.length() == 75 && i < length - 1) {
+                    buffer.append("=\r\n");
+                }
                 buffer.append(ch);
             }
             else {
-                charStr = Integer.toHexString((int)ch);
+                if(buffer.length() == 73 && i < length - 3) {
+                    buffer.append("=\r\n");
+                }
+                charStr = Integer.toHexString((int)ch).toUpperCase();
                 buffer.append('=');
                 if(charStr.length() == 1) {
@@ -767 +786 @@
             }
         }
+        
         return buffer.toString();
     }

branches/LogicMail-1.0/LogicMailTests/src/org/logicprobe/LogicMail/util/StringParserTest.java

@@ -649 +649 @@
     /**
      * Test of decodeQuotedPrintable method, of class org.logicprobe.LogicMail.util.StringParser.
-     */
-    public void testDecodeQuotedPrintable() {
+     * Basic test.
+     */
+    public void testDecodeQuotedPrintable1() {
         System.out.println("decodeQuotedPrintable");
         String text = "=A1Hol=E1 Se=F1or!";
@@ -659 +660 @@
 
     /**
+     * Test of decodeQuotedPrintable method, of class org.logicprobe.LogicMail.util.StringParser.
+     * Soft line-break test.
+     */
+    public void testDecodeQuotedPrintable2() {
+        System.out.println("decodeQuotedPrintable");
+        String text = "=A1Hol=E1 Se=F1or!=20=20H=\n"+
+                      "ow=20are=20you=20today?";
+        String expectedResult = "¡Holá Señor!  How are you today?";
+        String result = StringParser.decodeQuotedPrintable(text);
+        assertEquals(expectedResult, result);
+    }
+
+    /**
      * Test of encodeQuotedPrintable method, of class org.logicprobe.LogicMail.util.StringParser.
-     */
-    public void testEncodeQuotedPrintable() {
+     * Basic test.
+     */
+    public void testEncodeQuotedPrintable1() {
         System.out.println("encodeQuotedPrintable");
         String text = "¡Holá Señor!";
-        String expectedResult = "=A1Hol=E1 Se=F1or!".toLowerCase();
-        String result = StringParser.encodeQuotedPrintable(text).toLowerCase();
+        String expectedResult = "=A1Hol=E1=20Se=F1or!";
+        String result = StringParser.encodeQuotedPrintable(text);
+        assertEquals(expectedResult, result);
+    }
+
+    /**
+     * Test of encodeQuotedPrintable method, of class org.logicprobe.LogicMail.util.StringParser.
+     * Soft line-break test.
+     */
+    public void testEncodeQuotedPrintable2() {
+        System.out.println("encodeQuotedPrintable");
+        String text = "¡Holá Señor! ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789 ¡Holá Señor!";
+        String expectedResult = "=A1Hol=E1=20Se=F1or!=20ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz=\r\n0123456789=20=A1Hol=E1=20Se=F1or!";
+        String result = StringParser.encodeQuotedPrintable(text);
         assertEquals(expectedResult, result);
     }
@@ -723 +750 @@
 //                ((StringParserTest)tc).testReadWholeStream();
 //        }}));
-        testSuite.addTest(new StringParserTest("decodeQuotedPrintable", new TestMethod() {
-            public void run(TestCase tc) {
-                ((StringParserTest)tc).testDecodeQuotedPrintable();
-        }}));
-        testSuite.addTest(new StringParserTest("encodeQuotedPrintable", new TestMethod() {
-            public void run(TestCase tc) {
-                ((StringParserTest)tc).testEncodeQuotedPrintable();
+        testSuite.addTest(new StringParserTest("decodeQuotedPrintable1", new TestMethod() {
+            public void run(TestCase tc) {
+                ((StringParserTest)tc).testDecodeQuotedPrintable1();
+        }}));
+        testSuite.addTest(new StringParserTest("decodeQuotedPrintable2", new TestMethod() {
+            public void run(TestCase tc) {
+                ((StringParserTest)tc).testDecodeQuotedPrintable2();
+        }}));
+        testSuite.addTest(new StringParserTest("encodeQuotedPrintable1", new TestMethod() {
+            public void run(TestCase tc) {
+                ((StringParserTest)tc).testEncodeQuotedPrintable1();
+        }}));
+        testSuite.addTest(new StringParserTest("encodeQuotedPrintable2", new TestMethod() {
+            public void run(TestCase tc) {
+                ((StringParserTest)tc).testEncodeQuotedPrintable2();
         }}));
         return testSuite;