[Zope-CVS] CVS: Products/Zelenium - CHANGES.txt:1.13 version.txt:1.8 zuite.py:1.8

[Tres Seaver]

Update of /cvs-repository/Products/Zelenium
In directory cvs.zope.org:/tmp/cvs-serv25058

Modified Files:
	CHANGES.txt version.txt zuite.py 
Log Message:
 - Make Zuite's nestable / recursive.


=== Products/Zelenium/CHANGES.txt 1.12 => 1.13 ===
--- Products/Zelenium/CHANGES.txt:1.12	Wed Apr 27 21:18:35 2005
+++ Products/Zelenium/CHANGES.txt	Wed Apr 27 21:29:42 2005
@@ -1,7 +1,13 @@
 Zelenium Product Changelog
 
-  After Zelenium-0.3.1
+  Zelenium-0.4 (2005/04/27)
+
+    - CVS tag:  'Zelenium-0_4'
  
+    - Make Zuite instances recursively include their Zuite children's
+      test cases (to allow easier organization of the test cases in a
+      hierarchy).
+
     - Allow indiviual zuites to override the list of metatypes which
       can be test cases, via a new 'testcase_metatypes' property.
 


=== Products/Zelenium/version.txt 1.7 => 1.8 ===
--- Products/Zelenium/version.txt:1.7	Tue Apr 26 22:41:07 2005
+++ Products/Zelenium/version.txt	Wed Apr 27 21:29:42 2005
@@ -1 +1 @@
-Zelenium-0.3.1
+Zelenium-0.4


=== Products/Zelenium/zuite.py 1.7 => 1.8 ===
--- Products/Zelenium/zuite.py:1.7	Wed Apr 27 21:18:35 2005
+++ Products/Zelenium/zuite.py	Wed Apr 27 21:29:42 2005
@@ -212,9 +212,18 @@
     def listTestCases( self ):
         """ Return a list of our contents which qualify as test cases.
         """
-        return [ { 'id' : x[ 0 ], 'title' : x[ 1 ].title_or_id() }
-                 for x in self.objectItems( self.test_case_metatypes )
-                      if x[ 0 ].startswith('test') ]
+        result = []
+        types = [ self.meta_type ]
+        types.extend( self.test_case_metatypes )
+        for tcid, testcase in self.objectItems( types ):
+            if isinstance(testcase, self.__class__):
+                result.extend( testcase.listTestCases() )
+            else:
+                result.append( { 'id' : tcid
+                               , 'title' : testcase.title_or_id()
+                               , 'url' : testcase.absolute_url(1)
+                               } )
+        return result
 
 
     def __getitem__( self, key, default=_MARKER ):