[ff-cvs] navidoc ./test.py org/nongnu/navidoc/util/Cachi...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/navidoc
Module name:    navidoc
Branch:         
Changes by:     Tuomas J. Lukka <address@hidden>        03/09/11 13:22:27

Modified files:
        .              : test.py 
        org/nongnu/navidoc/util: CachingMap.java imagesize.test 
Added files:
        org/nongnu/navidoc/util: cachingmap.test weakvaluemap.test 

Log message:
        patch-2
        Make tests work
        patch-3
        Move test from libvob
        patch-4
        Add a failing test and fix a REALLY BAD, REALLY LONG-STANDING bug in 
CachingMap. Apparently, the Removed interface was totally misused. NO WONDER 
there were some problems in FenPDF.....

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/test.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/org/nongnu/navidoc/util/cachingmap.test?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/org/nongnu/navidoc/util/weakvaluemap.test?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/org/nongnu/navidoc/util/CachingMap.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/org/nongnu/navidoc/util/imagesize.test.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: navidoc/org/nongnu/navidoc/util/CachingMap.java
diff -u navidoc/org/nongnu/navidoc/util/CachingMap.java:1.1 
navidoc/org/nongnu/navidoc/util/CachingMap.java:1.2
--- navidoc/org/nongnu/navidoc/util/CachingMap.java:1.1 Wed Aug 13 01:40:29 2003
+++ navidoc/org/nongnu/navidoc/util/CachingMap.java     Thu Sep 11 13:22:26 2003
@@ -69,7 +69,7 @@
                    i = map.keySet().iterator();
            }
            Object rkey = i.next();
-           Object rval = map.get(key);
+           Object rval = map.get(rkey);
            if(rval instanceof Removable) 
                ((Removable)rval).wasRemoved(rkey);
            map.remove(rkey);
Index: navidoc/org/nongnu/navidoc/util/imagesize.test
diff -u navidoc/org/nongnu/navidoc/util/imagesize.test:1.1 
navidoc/org/nongnu/navidoc/util/imagesize.test:1.2
--- navidoc/org/nongnu/navidoc/util/imagesize.test:1.1  Sun Apr 20 04:17:45 2003
+++ navidoc/org/nongnu/navidoc/util/imagesize.test      Thu Sep 11 13:22:26 2003
@@ -22,10 +22,11 @@
 
 
 from java.io import File
+from org.nongnu import navidoc
 
 def testReadImage():
-    s = vob.util.ImageSize.readSize(File("test/vob/util/modularspace.png"))
+    s = navidoc.util.ImageSize.readSize(File("test/modularspace.png"))
 
-    failIfEqual(s, None)
-    failUnlessEqual(s.width, 730)
-    failUnlessEqual(s.height, 772)
+    assert s != None
+    assert s.width == 730, s.width
+    assert s.height == 772, s.height
Index: navidoc/test.py
diff -u navidoc/test.py:1.1 navidoc/test.py:1.2
--- navidoc/test.py:1.1 Mon Jun  2 08:43:58 2003
+++ navidoc/test.py     Thu Sep 11 13:22:26 2003
@@ -102,6 +102,8 @@
     """
 
     def addTests(list, dirname, names):
+       if dirname[0] in [',', '{']: return
+       if len(dirname) > 2 and dirname[2] in [',', '{']: return
         names = [n for n in names if fnmatch.fnmatch(n, '*.test')]
         names = [os.path.join(dirname, name) for name in names]
         list.extend(names)