- From: Olivier Thereaux via cvs-syncmail <cvsmail@w3.org>
- Date: Wed, 30 Jan 2008 07:36:41 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/2008/link-testsuite/harness
In directory hutz:/tmp/cvs-serv12642
Modified Files:
linktest.py
Log Message:
telling test collection object about the test cases, not just the files
+ documentation generation routines
Index: linktest.py
===================================================================
RCS file: /sources/public/2008/link-testsuite/harness/linktest.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- linktest.py 28 Jan 2008 05:13:05 -0000 1.3
+++ linktest.py 30 Jan 2008 07:36:39 -0000 1.4
@@ -21,7 +21,7 @@
sys.path.append(os.path.join(basedir, "lib"))
from W3CLinkCheckerClient import W3CLinkCheckerClient, W3CLinkCheckerClient_UT
from LinkTestCase import LinkTestCase, LinkTestCase_UT, LinkTestCollection
-
+from Documentation import Documentation
help_message = '''
Run or Generate test suite for link checkers
@@ -91,7 +91,7 @@
collection_file = os.path.join(basedir, 'sample', 'sample.collection')
sample_collection = readCollectionMeta(collection_file)
self.assertEqual(
- (sample_collection.title, sample_collection.description, sample_collection.cases),
+ (sample_collection.title, sample_collection.description, sample_collection.casefiles),
(u"test", u"Sample Collection with one test", ["sample.test"])
)
@@ -100,7 +100,7 @@
basedir = getBaseDir()
collection_file = os.path.join(basedir, 'sample', 'sample.collection')
sample_collection = readCollectionMeta(collection_file)
- for testcase_file in sample_collection.cases:
+ for testcase_file in sample_collection.casefiles:
test_file = os.path.join(basedir, 'sample', testcase_file)
sample_test = readTestCase(test_file)
self.assertEqual(
@@ -165,7 +165,7 @@
unittest.TextTestRunner(verbosity=verbose).run(suite)
elif args[0] == "doc":
- pass
+ generateIndex()
def getBaseDir():
basedir = os.path.dirname(os.path.abspath(__file__))
@@ -212,12 +212,10 @@
for metafile in glob.glob(os.path.join(collection_path, '*.collection')):
collection = readCollectionMeta(metafile)
- for testfile in (glob.glob(os.path.join(collection_path, '*.test'))):
- case = readTestCase(test_file)
- collection.cases
def readCollectionMeta(collection_file):
collection_file_handle = open(collection_file, 'r')
+ collection_path = os.path.dirname(os.path.abspath(collection_file))
try:
tree = ET.parse(collection_file_handle)
except SyntaxError, v:
@@ -238,9 +236,21 @@
tests.append(test.attrib["src"])
else:
tests.append(test.tag)
- collection = LinkTestCollection(title=title, description=description, cases=tests)
+ collection = LinkTestCollection(title=title, description=description, casefiles=tests)
+ for testfile in collection.casefiles:
+ case = readTestCase(os.path.join(collection_path, testfile))
+ collection.cases.append(case)
return collection
+def generateIndex():
+ index = Documentation('index')
+ for testcollection_file in (glob.glob(os.path.join(basedir, 'testcases', '**', '*.collection'))):
+ colldir = os.path.dirname(os.path.abspath(testcollection_file))
+ colldir = os.path.split(colldir)[-1]
+ testcollection = readCollectionMeta(testcollection_file)
+ index.addCollection(testcollection)
+ print index.generate(template_path=os.path.join(basedir, "templates")).encode('utf-8')
+
def buildTestSuite():
suite = unittest.TestSuite()
basedir = getBaseDir()
@@ -249,8 +259,7 @@
colldir = os.path.split(colldir)[-1]
testcollection = readCollectionMeta(testcollection_file)
- for testfile in testcollection.cases:
- case = readTestCase(os.path.join(basedir, 'testcases',colldir,testfile))
+ for case in testcollection.cases:
suite.addTest(case)
return suite
Received on Wednesday, 30 January 2008 07:36:57 UTC