r191 - branches/rewrite/tests/PackageList

[Otavio Salvador]

Author: otavio
Date: Fri Jul 23 16:25:14 2004
New Revision: 191

Modified:
   branches/rewrite/tests/PackageList/test.py
Log:
Refactore the tests. Some obscure issues to clean still exist.

Modified: branches/rewrite/tests/PackageList/test.py
==============================================================================
--- branches/rewrite/tests/PackageList/test.py	(original)
+++ branches/rewrite/tests/PackageList/test.py	Fri Jul 23 16:25:14 2004
@@ -27,14 +27,10 @@
 ## Set the debuggin level
 #getLogger().setLevel(DEBUG)
 
-def test(msg, code, packagesfile, should=None):
-    stdout.write("PackageList(%s): %s... " % (packagesfile, msg))
+def test(msg, code, should=None):
+    stdout.write("PackageList: %s... " %  msg)
     try:
-	packagelist = PackageList()
-	parse = apt_pkg.ParseTagFile(open(packagesfile, "r"))
-	while parse.Step() == 1:
-	    packagelist.add(Package(parse.Section))
-	code(PackageList())
+	code()
         if not should:
             print "Works."
         else:
@@ -52,16 +48,36 @@
         else:
             print("Failed. Package [%s] does not exist."
                   % (msg.package))
+    except RuntimeError, msg:
+        if should == 'RuntimeError':
+            print "Works."
+        else:
+            print("Failed. %s."
+                  % (msg))
 
-def goodTest(packagelist):
-    pass
-
-def alreadyExistsTest(packagelist):
-    # add the packages over again to generate an Already Exists error
+def goodTest():
     parse = apt_pkg.ParseTagFile(open('Packages', "r"))
-    while parse.step() == 1:
-        packagelist.add(Package(parse.Section))
+    packagelist = PackageList()
+    while parse.Step() == 1:
+        p = Package(parse.Section)
+        packagelist.add(p)
+        packagelist.remove(p)
+test('Good package test', goodTest)
 
-test('Good package test', goodTest, 'Packages')
-test('Package Already Exists', alreadyExistsTest, 'Packages', 'PackageAlreadyExists')
+def alreadyExistsTest():
+    parse = apt_pkg.ParseTagFile(open('Packages', "r"))
+    packagelist = PackageList()
+    while parse.Step() == 1:
+        p = Package(parse.Section)
+        packagelist.add(p)
+        packagelist.add(p)
+test('Package Already Exists', alreadyExistsTest, 'PackageAlreadyExists')
 
+def removeTest():
+    # reuse the previous list ###WHY?
+    packagelist = PackageList()
+    # this is valid
+    packagelist.remove('brandeisblue')
+    if len(packagelist) != 0:
+        raise RuntimeError('Returned a invalid size')
+test('Remove', removeTest)