Changeset 2295

Timestamp:

02/28/10 21:24:48 (2 years ago)

Author:

Chuck.Esterbrook

Message:

Added -test-runner command line option to specify the method to invoke to run the unit tests.

Location:

cobra/trunk

Files:

• Developer/IntermediateReleaseNotes.text (modified) (1 diff)
• Source/BackEndClr/SharpGenerator.cobra (modified) (3 diffs)
• Source/Cobra.Lang/Test.cobra (modified) (4 diffs)
• Source/CommandLine.cobra (modified) (3 diffs)
• Tests/700-command-line/104-cobra-test.cobra (modified) (2 diffs)
• Tests/700-command-line/106-cobra-test-program.cobra (modified) (1 diff)
• Tests/700-command-line/108-cobra-test-library.cobra (modified) (1 diff)

cobra/trunk/Developer/IntermediateReleaseNotes.text

@@ -72 +72 @@
 Command Line
 ================================================================================
+
+* Added -test-runner to specify the method to invoke to run the unit tests. The method must be "shared". Typically the method will make use of classes in Cobra.Lang.Test to set up and initiate the test run.
 
 * Added -testify-results:filename to control the destination file where testify results are written.

cobra/trunk/Source/BackEndClr/SharpGenerator.cobra

@@ -62 +62 @@
                 if .hasExceptionReportOption
                     print '     try {'
-                print '     CobraLangInternal.Test.ITestRunListener listener = new CobraLangInternal.Test.TextWriterListener(System.Console.Out);'
-                print '     new CobraLangInternal.Test.TestRunner(listener).RunAllTests();'
+                .writeSharpRunAllTests(f)
                 if .hasExceptionReportOption
                     print '     } catch (System.Exception e) {'
@@ -72 +71 @@
         .mainMethodTypeName = '_GeneratedTestRunner'
         _modules.add(SharpModule(fileName, _verbosity))
+
+    def writeSharpRunAllTests(cw as CurlyWriter)
+        runner = .options['test-runner'] to String  # ex: Cobra.Lang.CobraCore.runAllTests, ex: MyProgram.runTests
+        if runner <> 'nil'
+            if runner.endsWith('()'), runner = runner[:-2]
+            if runner.startsWith('Cobra.Lang.'), runner = 'CobraLangInternal.' + runner['Cobra.Lang.'.length:]
+            parts = List<of String>(runner.split(c'.'))
+            if parts.count > 1
+                parts[parts.count-1] = parts.last[0].toUpper.toString + parts.last[1:]
+            stmt = parts.join('.') + '();'
+            cw.writeLine(stmt)
 
     var _didWriteSharpInfoClass as bool
@@ -1840 +1850 @@
                 sw.indent
         if .isMain and .compiler.options.boolValue('include-tests')
-            sw.writeLine('CobraLangInternal.CobraCore.RunAllTests();  // turn off with -include-tests:no (see cobra -h)')
+            (.compiler to Compiler).writeSharpRunAllTests(sw)
 
     def writeSharpImpFooter(sw as CurlyWriter)

cobra/trunk/Source/Cobra.Lang/Test.cobra

@@ -1 +1 @@
 """
+Cobra.Lang.Test contains a family of classes for running tests and reporting their results.
+
+Also, it is the library used by Cobra to run unit tests declared in the language,
+using the "test" keyword.
+
 EXAMPLE A
 
+    # Scans all assemblies for all Cobra-declared tests and runs them.
     TestRunner(TextWriterListener(Console.out)).runAllTests
 
@@ -33 +39 @@
     tr.runTestsFor(System.Reflection.Assembly.getEntryAssembly, false)
     # false == do not follow dependencies
+
+EXAMPLE G
+
+    @args -test-runner:P.runTests
+    
+    class P
+    
+        def main
+            print 'Hello from main.'
+
+        def runTests is shared
+            # Due to the @args above, Cobra will invoke this method for running tests instead of
+            # Cobra.Lang.CobraCore.runAllTests. This allows you to customize the test runner,
+            # including setting parameters, adding listeners, using a custom subclass, etc. 
+            #
+            # When customizing the test run, you will find it useful to read the interface to
+            # Cobra.Lang.Test, and possibly even the implementation.
+            #
+            # Alternatively, you can bypass Cobra.Lang.Test entirely and write whatever code
+            # you like here.
+            tr = Cobra.Lang.Test.TestRunner()
+            tr.runAllTests
 
 NOTES
@@ -46 +74 @@
     [ ] stack trace filtering could be interesting. more experience will be required to see if it's necessary. see
         http://www.google.com/codesearch/p?hl=en#uX1GffpyOZk/test-runner/junit/runner/BaseTestRunner.java&q=testrunner&d=2
-    [ ] more docs
-    
+
     There are more TODOs in the code below.
 """
@@ -86 +113 @@
 
         def runTestsFor(ass as Assembly, willFollowReferences as bool)
+            .runTestsFor(.collectTestsFor(ass, willFollowReferences))
+    
+        def runTestsFor(type as Type)
+            .runTestsFor(.collectTestsFor(type))
+        
+        def runTestsFor(suite as TestSuite)
             .makeTestRunListenerIfNeeded
-            suite = .collectTestsFor(ass, willFollowReferences)
             suite.run(.params, .listener to !)
-    
-        def runTestsFor(type as Type)
-            .makeTestRunListenerIfNeeded
-            suite = .collectTestsFor(type)
-            suite.run(.params, .listener to !)
-    
+            
         def makeTestRunListenerIfNeeded
             ensure .listener

cobra/trunk/Source/CommandLine.cobra

@@ -73 +73 @@
             else
                 this['type'] = 'string'
-        assert _type in ['accumulator', 'args-list', 'bool', 'int','main', 'menu', 'set', 'string']
+        assert _type in ['accumulator', 'args-list', 'bool', 'int', 'main', 'menu', 'set', 'string']
         if .containsKey('synonyms')
             for syn in this['synonyms']
@@ -312 +312 @@
             'name': 'main',
             'type': 'string',
-            'description': 'Specify the type containing the "main" method, particularly when more than type declarations has a "main" method.',
+            'description': 'Specify the type containing the "main" method, particularly when more than one type declaration has a "main" method.',
             'args': 'TYPENAME',
         },
@@ -416 +416 @@
         {
             'name': 'test',
-            'description': 'Run the unit tests in the code.',
+            'description': 'Run the unit tests in the code without running .main. Works for libraries too.',
             'type': 'main',
+        },
+        {
+            'name': 'test-runner',
+            'type': 'string',
+            'description': 'Specify the method to invoke to run the unit tests. The method must be "shared". Typically the method will make use of classes in Cobra.Lang.Test to set up and initiate the test run.',
+            'default': 'Cobra.Lang.CobraCore.runAllTests',
+            'args': 'QUALIFIED-METHOD-NAME|nil',
         },
         {

cobra/trunk/Tests/700-command-line/104-cobra-test.cobra

@@ -3 +3 @@
 class Test
 
-    def main is shared
-        Test().run
-
-    def run
+    def main
         bar = '-------------------------------------------------------------------'
 
         output = .runCobraExe('-test 106-cobra-test-program.cobra')
         try
+            assert '** Alternate test runner' not in output
             assert '** Test' in output
             assert '** main shared' in output
@@ -23 +21 @@
         try
             assert '** Test' in output
-            assert '** run' in output
+            assert '** foo' in output
             assert '** Bar' in output
             assert '** baz' in output
+        finally
+            print bar
+            print output
+            print bar
+
+        output = .runCobraExe('-test-runner:Test.alternateTestRunner -test 106-cobra-test-program.cobra')
+        try
+            assert '** Alternate test runner' in output
+            assert '** Test' in output
+            assert '** main shared' in output
+            assert '** Bar' in output
+            assert '** baz' in output
+        finally
+            print bar
+            print output
+            print bar
+
+        output = .runCobraExe('-test-runner:nil 106-cobra-test-program.cobra')
+        try
+            assert '** Alternate test runner' not in output
+            assert '** Test' not in output
+            assert '** main shared' not in output
+            assert '** Bar' not in output
+            assert '** baz' not in output
         finally
             print bar

cobra/trunk/Tests/700-command-line/106-cobra-test-program.cobra

@@ -14 +14 @@
             pass
 
+    def alternateTestRunner is shared
+        # -test-runner:Test.alternateTestRunner
+        print '** Alternate test runner'
+        tr = Cobra.Lang.Test.TestRunner()
+        tr.runAllTests
+
 namespace Foo
 

cobra/trunk/Tests/700-command-line/108-cobra-test-library.cobra

@@ -8 +8 @@
         print '** Test'
 
-    def run
+    def foo
         test
-            print '** run'
+            print '** foo'
         body
             pass