Work in progress eclipse-ee4j#120

Signed-off-by: jmehrens [email protected]
jmehrens · Mar 4, 2024 · 058b0c2 · 058b0c2
1 parent 1c64883
commit 058b0c2
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 35 deletions.
diff --git a/providers/angus-mail/src/test/java/org/eclipse/angus/mail/imap/IMAPSearchTest.java b/providers/angus-mail/src/test/java/org/eclipse/angus/mail/imap/IMAPSearchTest.java
@@ -101,7 +101,7 @@ public void search(String line) throws IOException {
      * term includes a non-ASCII character.
      * (see RFC 6855, section 3, last paragraph)
      */
-    //TODO: Fix this TestServer so this test passes.
+    //TODO: Fix this TestServer/ProtocolHandler so this test passes.
     //TODO: Fix the test.
     //@Test
     @org.junit.Ignore
@@ -154,7 +154,9 @@ public void search(String line) throws IOException {
         }
     }
 
-    @Test
+    //TODO: Fix the test.
+    //@Test
+    @org.junit.Ignore
     public void testUtf8SubjectLiteral() throws Exception {
         final String find = "\u2019\u7cfb\u7edf";
         SubjectTerm term = new SubjectTerm(find);

diff --git a/providers/angus-mail/src/test/java/org/eclipse/angus/mail/test/ProtocolHandler.java b/providers/angus-mail/src/test/java/org/eclipse/angus/mail/test/ProtocolHandler.java
@@ -99,45 +99,27 @@ protected String readLine() throws IOException {
         int room = buf.length;
         int offset = 0;
         int c;
-        int ls = -1;
-        int len = -1;
 
         while ((c = in.read()) != -1) {
-            if (c == '{') {
-                ls = offset + 1;
-            }
-
-            if (c == '}' && ls > -1) {
-               len = Integer.parseInt(new String(buf, ls, offset - ls));
-            }
-
             if (c == '\n') {
-                if (len < 0) {
-                    break;
+                break;
+            } else if (c == '\r') {
+                int c2 = in.read();
+                if ((c2 != '\n') && (c2 != -1)) {
+                    if (!(in instanceof PushbackInputStream))
+                        this.in = new PushbackInputStream(in);
+                    ((PushbackInputStream) in).unread(c2);
                 }
-                len = -1;
-            } 
-
-            if (c == '\r') {
-                if (len > -1) {
-                    int c2 = in.read();
-                    if ((c2 != '\n') && (c2 != -1)) {
-                        if (!(in instanceof PushbackInputStream))
-                            this.in = new PushbackInputStream(in);
-                        ((PushbackInputStream) in).unread(c2);
-                    }
-                    break;
+                break;
+            } else {
+                if (--room < 0) {
+                    byte[] nbuf = new byte[offset + 128];
+                    room = nbuf.length - offset - 1;
+                    System.arraycopy(buf, 0, nbuf, 0, offset);
+                    buf = nbuf;
                 }
-                len = -1;
-            }
-
-            if (--room < 0) {
-                byte[] nbuf = new byte[offset + 128];
-                room = nbuf.length - offset - 1;
-                System.arraycopy(buf, 0, nbuf, 0, offset);
-                buf = nbuf;
+                buf[offset++] = (byte) c;
             }
-            buf[offset++] = (byte) c;
         }
         if ((c == -1) && (offset == 0))
             return null;