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

Timestamp:

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

Author:

octorian

Message:

Fix for quoted-printable decoding errors (#98)

Files:

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

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;