[Gzz-commits] gzz test/gzz/modules/email/converter.test gzz/m...

[Marc Schiereck]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Marc Schiereck <address@hidden> 02/11/17 19:09:14

Modified files:
        test/gzz/modules/email: converter.test 
        gzz/modules/email: DefaultEmailInStorm.java 
Added files:
        test/gzz/modules/email: TestDefaultEmailInStorm.java 

Log message:
        Tests for DefaulEmailInStorm

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/test/gzz/modules/email/TestDefaultEmailInStorm.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/test/gzz/modules/email/converter.test.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/email/DefaultEmailInStorm.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: gzz/gzz/modules/email/DefaultEmailInStorm.java
diff -u gzz/gzz/modules/email/DefaultEmailInStorm.java:1.2 
gzz/gzz/modules/email/DefaultEmailInStorm.java:1.3
--- gzz/gzz/modules/email/DefaultEmailInStorm.java:1.2  Tue Nov 12 09:16:27 2002
+++ gzz/gzz/modules/email/DefaultEmailInStorm.java      Sun Nov 17 19:09:14 2002
@@ -83,7 +83,7 @@
     }
 
     protected int nextLine(String str, int curPos) {
-        if (curPos >= (str.length() - 2)) return 0;
+        if (curPos >= (str.length() - 2)) return str.length();
         for(; str.charAt(curPos) != '\r' 
               && str.charAt(curPos + 1) != '\n'
               && curPos != str.length() - 2;
@@ -92,7 +92,7 @@
     }
 
     protected int nextHeader(String str, int curPos) {
-        if (curPos >= (str.length() - 2)) return 0;
+        if (curPos >= (str.length() - 2)) return str.length();
         while(str.charAt(curPos) != '\r' 
               && str.charAt(curPos + 1) != '\n') {
             curPos = nextLine(str, curPos);
@@ -120,14 +120,17 @@
         while(!getFieldBodyString("content-type", 
                                   header, 
                                   position).trim().startsWith("text/")
-              && position != 0) {
+              && position != header.length()) {
             oldPosition = position;
             position = nextHeader(header, position);
         }
         String id = getFieldBodyString("content-id", header, 
oldPosition).trim();
-       if(id.startsWith("storm:block:"))
+       if(id.startsWith("storm:block:")) {
           id = id.substring("storm:block:".length());
-        return (new Mediaserver.Id(id));
+           return (new Mediaserver.Id(id));
+       } else {
+            return null;
+       }
     }
 
     protected String getFieldBodyString(String field,
@@ -174,7 +177,7 @@
                 }
             }
             position = nextLine(header, position);
-        } while(position != 0);
+        } while(position != header.length());
         return positions;
     }
 
Index: gzz/test/gzz/modules/email/converter.test
diff -u gzz/test/gzz/modules/email/converter.test:1.5 
gzz/test/gzz/modules/email/converter.test:1.6
--- gzz/test/gzz/modules/email/converter.test:1.5       Sun Nov 10 19:52:45 2002
+++ gzz/test/gzz/modules/email/converter.test   Sun Nov 17 19:09:14 2002
@@ -20,6 +20,7 @@
 import re
 import gzz
 import java
+import test
 
 mail1f = "From address@hidden Wed Oct 16 00:15:44 2002\n"
 
@@ -133,6 +134,10 @@
 mail2Body =  "test test test test test\r\n"
 mail2Body += "test test test test test\r\n\r\n"
 
+mail3HeaderID = 
gzz.mediaserver.Mediaserver.Id("017C871C829D2E09724CF37B4A5E440348E268B683")
+mail3Body1ID  = 
gzz.mediaserver.Mediaserver.Id("013C2CF12FE47EDCFDB0D5F944625FECD72C4ACB53")
+mail3Body2ID  = 
gzz.mediaserver.Mediaserver.Id("015107BCBB7AC83A118F371A93C8B8E3AF0C6A2357")
+
 mail3f = "From address@hidden Wed Oct 16 00:19:04 2002\n"
 
 mail3 = """Return-path: <address@hidden>
@@ -245,3 +250,7 @@
         raise java.lang.Error()
     if not 
java.lang.String(medServ.getDatum(mail2BodyID).getBytes()).equals(mail2Body):
         raise java.lang.Error()
+
+    deisTest = test.gzz.modules.email.TestDefaultEmailInStorm(medServ, 
mail3HeaderID)
+    deisTest.test()
+