Changeset 29438 for branches/sc_branches/psps_testing/utilities/test_report.py

Timestamp:

Oct 15, 2010, 2:51:13 PM (16 years ago)

Author:

Serge CHASTEL

Message:

Test report now in xml

File:

• branches/sc_branches/psps_testing/utilities/test_report.py (modified) (4 diffs)

branches/sc_branches/psps_testing/utilities/test_report.py

@@ -2 +2 @@
 import datetime
 from utilities.configuration import Configuration
+from utilities.abstract_test_report import AbstractTestReport
 
-class TestReportClass(logging.Logger):
-    datefmt = '%H:%M:%S'
-    fmt = '[%(asctime)8s] | %(requirement)65s | %(message)s'
-    class __impl(logging.Logger):
+class TestReportClass(AbstractTestReport):
+    """
+    An implementation of AbstractTestReport for PSPS testing test
+    reports.
+    """
+    class __impl(AbstractTestReport):
         """ Implementation of the singleton interface """
         def __init__(self):
-            """Sets logging up"""
-            logging.Logger.__init__(self, __name__)
-            logging.basicConfig(level=logging.INFO, 
-                                format=TestReportClass.fmt)
-            handler = logging.StreamHandler(open('log/test_report.txt', 'w'))
-            handler.setFormatter(logging.Formatter(TestReportClass.fmt,
-                                                   TestReportClass.datefmt))
-            self.addHandler(handler)
+            """Sets up AbstractTestReport"""
+            AbstractTestReport.__init__(self)
         def id(self):
             """ Test method, return singleton id """
@@ -23 +20 @@
     __instance = None
 
-    def info(self, message):
-        for line in message.split('\n'):
-            logging.Logger.info(self,
-                                line, 
-                                extra = {'requirement': 'INFO'})
+    def info(self, message, extra=None):
+        self.addTestResult(AbstractTestReport.DEFAULT,
+                           'INFO',
+                           '', 
+                           message)
 
     def __init__(self):
@@ -44 +41 @@
         # Store instance reference as the only member in the handle
         self.__dict__['_TestReportClass__instance'] = TestReportClass.__instance
-        logging.Logger.info(self,
-                            'Test performed on ' + str(datetime.date.today()),
-                            extra = {'requirement': 'This column usually shows the "Requirement ID"'})
+        self.info('Test performed on ' + str(datetime.date.today()),
+                  extra = {'requirement': 
+                           'This column usually shows the "Requirement ID"'})
         self.info(str(Configuration()))
 
@@ -57 +54 @@
         return setattr(self.__instance, attr, value)
 
-    # def test_result(self, requirement, message):
-    #     self.info(message, 
-    #               extra = {'requirement': requirement})
-    def title(self, title):
-        logging.Logger.info(self,
-                            title,
-                            extra = {'requirement': '--------------------'})
-    def ok(self, requirement):
-         logging.Logger.info(self,
-                             'OK', 
-                             extra = {'requirement': requirement})
-    def ko(self, requirement, cause):
-         logging.Logger.info(self,
-                             'KO (%s)' % cause, 
-                             extra = {'requirement': requirement})
+    def save(self, filename, prettyxml=True):
+        f = open(filename, "w")
+        if prettyxml:
+            f.write(self.toprettyxml())
+        else:
+            f.write(self.toxml())
+        f.close()
 
 TestReport = TestReportClass()
 
-if __name__ == '__main__':
+if __name__ == '__main__': # pragma: no cover
     import logging
     import sys
     current_argument_position = 1
     while current_argument_position < len(sys.argv):
-        if sys.argv[current_argument_position] == '-debug': # pragma: no cover
+        if sys.argv[current_argument_position] == '-debug':
             PsPsLogger.setLevel(logging.DEBUG)
             PsPsLogger.set_stderr()
-            current_argument_position += 1
-        elif sys.argv[current_argument_position] == 'test':
-            print 'Running unittest for TestReport class'
+        elif sys.argv[current_argument_position] == 'unittest':
             import doctest
             doctest.testmod()
             sys.exit(0)
+        current_argument_position += 1
+    print('  Usage: %s [--debug] unittest' % sys.argv[0])