[Gzz-commits] storm/org/nongnu/storm IndexedPool.meta StormPo...

[Benja Fallenstein]

CVSROOT:        /cvsroot/storm
Module name:    storm
Changes by:     Benja Fallenstein <address@hidden>      03/04/07 19:27:54

Modified files:
        org/nongnu/storm: IndexedPool.meta StormPool.meta 
        org/nongnu/storm/impl: TransientPool.test 
Removed files:
        org/nongnu/storm/impl: TransientPoolIndexing.test 

Log message:
        more tests

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/storm/storm/org/nongnu/storm/IndexedPool.meta.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/storm/storm/org/nongnu/storm/StormPool.meta.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/storm/storm/org/nongnu/storm/impl/TransientPool.test.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: storm/org/nongnu/storm/IndexedPool.meta
diff -u storm/org/nongnu/storm/IndexedPool.meta:1.2 
storm/org/nongnu/storm/IndexedPool.meta:1.3
--- storm/org/nongnu/storm/IndexedPool.meta:1.2 Mon Apr  7 16:16:28 2003
+++ storm/org/nongnu/storm/IndexedPool.meta     Mon Apr  7 19:27:54 2003
@@ -23,19 +23,25 @@
 # Tests for IndexedPool implementations
 
 # Requires attribute:
-# pool(indexTypes) -- a method taking a list of index types
+# Pool(indexTypes) -- a method taking a list of index types
 #                     and returning the appropriate IndexedPool
 
 import java, org
 import jarray
 
+execfile('org/nongnu/storm/StormPool.meta')
+
+def setUp():
+    global pool
+    pool = Pool([])
+
 def set(list):
     set = java.util.HashSet()
     for el in list: set.add(el)
     return set
 
 def testNonavailableIndexRaisesException():
-    p = pool([])
+    p = Pool([])
     try:
         p.getIndex("http://example.com/no-such-index";)
     except java.util.NoSuchElementException:
@@ -44,7 +50,7 @@
         assert 0
 
 def testContentTypeIndex():
-    p = pool([org.nongnu.storm.util.ContentTypeIndexType()])
+    p = Pool([org.nongnu.storm.util.ContentTypeIndexType()])
     i = 
p.getIndex(org.nongnu.storm.util.ContentTypeIndexType.contentTypeIndexTypeURI)
 
     assert i != None
Index: storm/org/nongnu/storm/StormPool.meta
diff -u storm/org/nongnu/storm/StormPool.meta:1.3 
storm/org/nongnu/storm/StormPool.meta:1.4
--- storm/org/nongnu/storm/StormPool.meta:1.3   Mon Apr  7 19:23:01 2003
+++ storm/org/nongnu/storm/StormPool.meta       Mon Apr  7 19:27:54 2003
@@ -190,7 +190,7 @@
 
 def testAddBlock():
     """
-    Test adding a block from a different pool. XXX!!!
+    Test adding a block from a different pool. XXX missing!!!
     """
 
     pass
Index: storm/org/nongnu/storm/impl/TransientPool.test
diff -u storm/org/nongnu/storm/impl/TransientPool.test:1.1 
storm/org/nongnu/storm/impl/TransientPool.test:1.2
--- storm/org/nongnu/storm/impl/TransientPool.test:1.1  Mon Apr  7 16:16:49 2003
+++ storm/org/nongnu/storm/impl/TransientPool.test      Mon Apr  7 19:27:54 2003
@@ -23,8 +23,9 @@
 
 import java, org
 
-def setUp():
-    global pool
-    pool = org.nongnu.storm.impl.TransientPool(java.util.HashSet())
-        
-execfile('org/nongnu/storm/StormPool.meta')
+def Pool(indexTypes):
+    set = java.util.HashSet()
+    for el in indexTypes: set.add(el)
+    return org.nongnu.storm.impl.TransientPool(set)
+
+execfile("org/nongnu/storm/IndexedPool.meta")