[Gzz-commits] gzz gzz/modules/email/AddressBookBinder.java te...

[Benja Fallenstein]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Benja Fallenstein <address@hidden>      02/10/09 18:44:32

Modified files:
        gzz/modules/email: AddressBookBinder.java 
        test           : testutil.py 
        test/gzz/modules/email: email.test 

Log message:
        Fix Dreevich's bug

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/email/AddressBookBinder.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/test/testutil.py.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/test/gzz/modules/email/email.test.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: gzz/gzz/modules/email/AddressBookBinder.java
diff -c gzz/gzz/modules/email/AddressBookBinder.java:1.1 
gzz/gzz/modules/email/AddressBookBinder.java:1.2
*** gzz/gzz/modules/email/AddressBookBinder.java:1.1    Tue Oct  8 14:48:10 2002
--- gzz/gzz/modules/email/AddressBookBinder.java        Wed Oct  9 18:44:32 2002
***************
*** 62,68 ****
                return c.s(d_2, dir);
        }
  
!       public void test(Space s) {
                Cell home = s.getHomeCell();
                Dim d_1 = s.getDim(Ids.d_1);
                Dim d_2 = s.getDim(Ids.d_2);
--- 62,68 ----
                return c.s(d_2, dir);
        }
  
!       public void testInsertRow(Space s) {
                Cell home = s.getHomeCell();
                Dim d_1 = s.getDim(Ids.d_1);
                Dim d_2 = s.getDim(Ids.d_2);
***************
*** 99,102 ****
--- 99,161 ----
                     throw new Error();
  
        }
+         
+         public Cell deleteRow(Cell c) {
+               Dim d_1 = c.space.getDim(Ids.d_1);
+               Dim d_2 = c.space.getDim(Ids.d_2);
+                 
+                 Cell x = c.s(d_2, -1);
+                 if(x == null) x = c.s(d_2, 1);
+                 if(x == null) x = c.space.getHomeCell();
+             
+                 while(c.s(d_1, -1) != null) {
+                     c.s(d_1, -1).delete();
+                 }
+                 
+                 while(c.s(d_1, 1) != null) {
+                     c.s(d_1, 1).delete();
+                 }
+                 
+                 c.delete();
+                 
+                 return x;
+         }
+         
+         public void testDeleteRow(Space s) {
+               Cell home = s.getHomeCell();
+               Dim d_1 = s.getDim(Ids.d_1);
+               Dim d_2 = s.getDim(Ids.d_2);
+                 
+                 Cell a = home.N(d_1, 1);
+                 Cell b = home.N(d_2, 1);
+                 Cell c = b.N(d_2, 1);
+                 Cell d = a.N(d_2, 1);
+                 Cell e = b.N(d_1, 1);
+                 
+                 d.connect(d_2, 1, e);
+                 d.connect(d_1, -1, c);
+             
+                 Cell x = deleteRow(e);
+                 
+                 if(!x.equals(d))
+                     throw new Error();
+                     
+                 if(!x.s(d_1, -1).equals(c))
+                     throw new Error();
+                     
+                 if(!c.s(d_2, -1).equals(home))
+                     throw new Error();
+                     
+                 if(!home.s(d_1, 1).equals(a))
+                     throw new Error();
+                     
+                 if(!a.s(d_2, 1).equals(d))
+                     throw new Error();
+                     
+                 if(c.s(d_2, 1) != null)
+                     throw new Error();
+                     
+                 if(d.s(d_2, 1) != null)
+                     throw new Error();
+         }
  }
Index: gzz/test/gzz/modules/email/email.test
diff -c gzz/test/gzz/modules/email/email.test:1.2 
gzz/test/gzz/modules/email/email.test:1.3
*** gzz/test/gzz/modules/email/email.test:1.2   Tue Oct  8 16:38:04 2002
--- gzz/test/gzz/modules/email/email.test       Wed Oct  9 18:44:32 2002
***************
*** 21,29 ****
  from test.tools import tools
  
  def testAddressBookBinder():
!     space = gzz.impl.ModularSpace(*tools.spaceArgList())
      try:
!         gzz.modules.email.AddressBookBinder().test(space)
      except java.lang.Throwable, t:
          t.printStackTrace()
        raise t
--- 21,31 ----
  from test.tools import tools
  
  def testAddressBookBinder():
!     space1 = gzz.impl.ModularSpace(*tools.spaceArgList())
!     space2 = gzz.impl.ModularSpace(*tools.spaceArgList())
      try:
!         gzz.modules.email.AddressBookBinder().testInsertRow(space1)
!         gzz.modules.email.AddressBookBinder().testDeleteRow(space2)
      except java.lang.Throwable, t:
          t.printStackTrace()
        raise t
Index: gzz/test/testutil.py
diff -c gzz/test/testutil.py:1.17 gzz/test/testutil.py:1.18
*** gzz/test/testutil.py:1.17   Wed Oct  9 10:38:42 2002
--- gzz/test/testutil.py        Wed Oct  9 18:44:32 2002
***************
*** 35,40 ****
--- 35,41 ----
  
  import unittest, os.path, fnmatch, string, imp
  import java
+ from gzz.client import GraphicsAPI
  
  graphicswindow = None
  def getGraphicsWindow():
***************
*** 175,181 ****
              test.remove('jni')
      except ValueError:
          pass
!     from gzz.client import GraphicsAPI
      class Starter(java.lang.Runnable):
        def run(self):
            unittest.TextTestRunner(verbosity=2).run(suite(test))
--- 176,182 ----
              test.remove('jni')
      except ValueError:
          pass
!         
      class Starter(java.lang.Runnable):
        def run(self):
            unittest.TextTestRunner(verbosity=2).run(suite(test))