[Gzz-commits] gzz gzz/modules/email/EmailCellMaker.java gzz/m...

[Benja Fallenstein]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Benja Fallenstein <address@hidden>      02/11/27 20:14:31

Modified files:
        gzz/modules/email: EmailCellMaker.java EmailCellMakerTest.java 
        gzz/zzutil     : Ids.java 
        lava/gzz/modules/email: AllEmails.java 
        test/gzz/modules/email: cellmaker.test 

Log message:
        Failing test for Nico to improve EmailCellMaker :)

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/email/EmailCellMaker.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/email/EmailCellMakerTest.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/zzutil/Ids.java.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gzz/modules/email/AllEmails.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/test/gzz/modules/email/cellmaker.test.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: gzz/gzz/modules/email/EmailCellMaker.java
diff -u gzz/gzz/modules/email/EmailCellMaker.java:1.1 
gzz/gzz/modules/email/EmailCellMaker.java:1.2
--- gzz/gzz/modules/email/EmailCellMaker.java:1.1       Sat Nov  2 16:04:49 2002
+++ gzz/gzz/modules/email/EmailCellMaker.java   Wed Nov 27 20:14:31 2002
@@ -3,11 +3,17 @@
 import gzz.media.*;
 import gzz.zzutil.*;
 
-public class EmailCellMaker{
-
-       public void makeCells(EmailInStorm mail,Space space){
+public class EmailCellMaker {
 
+       public void makeCells(EmailInStorm mail,Space space) {
                Cell home = space.getHomeCell();
+
+               Cell subjectList = space.getCell(Ids.c_email_subject);
+               Cell fromList = space.getCell(Ids.c_email_from);
+               Cell toList = space.getCell(Ids.c_email_to);
+               Cell dateList = space.getCell(Ids.c_email_date);
+               Cell bodyList = space.getCell(Ids.c_email_body);
+
                Dim d_email =space.getDim(Ids.d_email);
                Cell c = home.N(d_email,1);
                Dim d_contain = space.getDim(Ids.d_contain);
Index: gzz/gzz/modules/email/EmailCellMakerTest.java
diff -u gzz/gzz/modules/email/EmailCellMakerTest.java:1.1 
gzz/gzz/modules/email/EmailCellMakerTest.java:1.2
--- gzz/gzz/modules/email/EmailCellMakerTest.java:1.1   Thu Nov  7 20:59:46 2002
+++ gzz/gzz/modules/email/EmailCellMakerTest.java       Wed Nov 27 20:14:31 2002
@@ -26,37 +26,67 @@
 
 public class EmailCellMakerTest {
        public void test(Space s){
-               MockEmailInStorm mail = new MockEmailInStorm(
+               MockEmailInStorm mail1 = new MockEmailInStorm(
+                       "address@hidden",
+                       "address@hidden",
+                       "2.1.01",
+                       "Huomenta",
+                       "Hei"
+                       );
+               EmailCellMaker test = new EmailCellMaker();
+               test.makeCells(mail1, s);
+
+               MockEmailInStorm mail2 = new MockEmailInStorm(
                        "address@hidden",
                        "address@hidden",
                        "1.1.01",
                        "Hallo",
                        "Hi"
                        );
-               EmailCellMaker test = new EmailCellMaker();
-               test.makeCells(mail, s);
+               test.makeCells(mail2, s);
 
                Dim d_email =s.getDim(Ids.d_email);
                Dim d_contain = s.getDim(Ids.d_contain);
                Dim d_contain_list = s.getDim(Ids.d_contain_list);
+               Dim d_2 = s.getDim(Ids.d_2);
 
                Cell home = s.getHomeCell();
                Cell c =home.s(d_email,1);
-               Cell fromCell = c.s(d_contain,1);
+               Cell subCell = c.s(d_contain,1);
+               Cell fromCell = subCell.s(d_contain_list,1);
                Cell toCell = fromCell.s(d_contain_list,1);
                Cell dateCell = toCell.s(d_contain_list,1);
-               Cell subCell = dateCell.s(d_contain_list,1);
-               Cell bodyCell = subCell.s(d_contain_list,1);
+               Cell bodyCell = dateCell.s(d_contain_list,1);
 
+               if(!"Hallo".equals(subCell.t()))
+                   throw new Error();
                if(!"address@hidden".equals(fromCell.t()))
-               throw new Error();
+                   throw new Error();
                if(!"address@hidden".equals(toCell.t()))
-               throw new Error();
+                   throw new Error();
                if(!"1.1.01".equals(dateCell.t()))
-               throw new Error();
-               if(!"Hallo".equals(subCell.t()))
-               throw new Error();
+                   throw new Error();
                if(!"Hi".equals(bodyCell.t()))
-               throw new Error();
+                   throw new Error();
+
+               if(!c.s(d_email, 1).s(d_contain, 1).t().equals("Huomenta"))
+                   throw new Error();
+
+               Cell subjectList = s.getCell(Ids.c_email_subject);
+               Cell fromList = s.getCell(Ids.c_email_from);
+               Cell toList = s.getCell(Ids.c_email_to);
+               Cell dateList = s.getCell(Ids.c_email_date);
+               Cell bodyList = s.getCell(Ids.c_email_body);
+
+               if(!subjectList.s(d_2, 1).equals(subCell))
+                   throw new Error();
+               if(!fromList.s(d_2, 2).equals(fromCell))
+                   throw new Error();
+               if(!toList.s(d_2, 1).equals(toCell))
+                   throw new Error();
+               if(!dateList.s(d_2, 1).equals(dateCell))
+                   throw new Error();
+               if(!bodyList.s(d_2, 2).equals(bodyCell))
+                   throw new Error();
        }
 }
Index: gzz/gzz/zzutil/Ids.java
diff -u gzz/gzz/zzutil/Ids.java:1.7 gzz/gzz/zzutil/Ids.java:1.8
--- gzz/gzz/zzutil/Ids.java:1.7 Fri Nov  1 20:23:46 2002
+++ gzz/gzz/zzutil/Ids.java     Wed Nov 27 20:14:31 2002
@@ -59,6 +59,15 @@
      */
     public static String d_email = "urn:urn-5:IMGUcORdRZtSSofhPnbu23Ztrwgh";
 
+    // WELL-KNOWN *CELLS*
+
+    public static String 
+       c_email_subject = "urn:urn-5:AjfTRANQSiSCLodU6qZImZvJA46C:1",
+       c_email_from = "urn:urn-5:AjfTRANQSiSCLodU6qZImZvJA46C:2",
+       c_email_to = "urn:urn-5:AjfTRANQSiSCLodU6qZImZvJA46C:3",
+       c_email_date = "urn:urn-5:AjfTRANQSiSCLodU6qZImZvJA46C:4",
+       c_email_body = "urn:urn-5:AjfTRANQSiSCLodU6qZImZvJA46C:5";
+
     // FOR COMPATIBILITY
 
     /** DEPRECATED-- used for importing old versions, isn't useful nowadays */
Index: gzz/lava/gzz/modules/email/AllEmails.java
diff -u gzz/lava/gzz/modules/email/AllEmails.java:1.1 
gzz/lava/gzz/modules/email/AllEmails.java:1.2
--- gzz/lava/gzz/modules/email/AllEmails.java:1.1       Thu Nov 21 18:51:35 2002
+++ gzz/lava/gzz/modules/email/AllEmails.java   Wed Nov 27 20:14:31 2002
@@ -27,10 +27,21 @@
 import gzz.potion.*;
 import java.util.*;
 import gzz.vob.linebreaking.HChain;
+import gzz.*;
+import gzz.zzutil.*;
 
 public class AllEmails implements Function{
-        public List evaluate (List[] params,Map contetxt){
-                return null;
+        public List evaluate (List[] params,Map context){
+            List allEmails = new ArrayList();
+            Space sp = (Space)context.get(Space.class);
+            Cell home = sp.getHomeCell();
+            Dim d_email = sp.getDim(Ids.d_email);
+            Cell c = home.s(d_email,1);
+            while(c != null){
+                allEmails.add(c);
+                c=c.s(d_email,1);
+            }
+            return allEmails;
         }
        public String getString(Expression[] params, Map context){
                return null;
Index: gzz/test/gzz/modules/email/cellmaker.test
diff -u gzz/test/gzz/modules/email/cellmaker.test:1.1 
gzz/test/gzz/modules/email/cellmaker.test:1.2
--- gzz/test/gzz/modules/email/cellmaker.test:1.1       Thu Nov  7 20:59:46 2002
+++ gzz/test/gzz/modules/email/cellmaker.test   Wed Nov 27 20:14:31 2002
@@ -20,6 +20,9 @@
 from test.tools.tools import *
 
 def testEmailCellMaker():
+    """
+    fail: *
+    """
     sp = gzz.impl.ModularSpace(*spaceArgList())
     test = gzz.modules.email.EmailCellMakerTest()
     test.test(sp)