Changeset 2291

Timestamp:

02/27/10 09:18:29 (2 years ago)

Author:

Chuck.Esterbrook

Message:

Use the new Cobra.Lang.Test.TestRunner? for running inline unit tests.
Fix some test cases from the last checkin.

Location:

cobra/trunk

Files:

• Source/BackEndClr/SharpGenerator.cobra (modified) (8 diffs)
• Source/Cobra.Lang/CobraCore.cobra (modified) (1 diff)
• Source/CommandLine.cobra (modified) (1 diff)
• Source/Phases/BindRunTimeLibraryPhase.cobra (modified) (1 diff)
• Tests/120-classes/920-type-decl-clauses.cobra (modified) (3 diffs)
• Tests/140-structs/300-type-decl-clauses.cobra (modified) (4 diffs)
• Tests/320-misc-two/250-qualified/200-qual-generic.cobra (modified) (1 diff)

cobra/trunk/Source/BackEndClr/SharpGenerator.cobra

@@ -63 +63 @@
                     print '     bool success = false;'
                     print '     try {'
-                for module in _modules
-                    module.writeSharpTestInvocation(f)
+                print '     CobraLangInternal.Test.ITestRunListener listener = new CobraLangInternal.Test.TextWriterListener(System.Console.Out);'
+                print '     new CobraLangInternal.Test.TestRunner(listener).RunAllTests();'
                 if .hasExceptionReportOption
                     print '     success = true;'
@@ -583 +583 @@
     is partial
 
-    get sharpSuffix as String
+    get sharpFullName as String
         value as Object?
-        if not .addOnValues.tryGetValue('sharpSuffix', out value)
-            suffix = if(.fullName == 'Cobra.Lang', .compiler.embedRunTimeSuffix, '')
-            .addOnValues['sharpSuffix'] = suffix
-            return suffix
+        if not .addOnValues.tryGetValue('sharpFullName', out value)
+            fullName = .fullName
+            if fullName == 'Cobra.Lang'
+                name = 'Cobra.Lang' + .compiler.embedRunTimeSuffix
+            else if fullName.startsWith('Cobra.Lang.')
+                name = 'Cobra.Lang[.compiler.embedRunTimeSuffix].' + fullName['Cobra.Lang.'.length:]
+            else
+                name = fullName
+            .addOnValues['sharpFullName'] = name
+            return name
         else
             return value to String
@@ -600 +606 @@
             return 'global::'
         else
-            return .fullName + .sharpSuffix
+            return .sharpFullName
 
     get sharpQualifier as String
@@ -607 +613 @@
             return 'global::'
         else
-            return .fullName + .sharpSuffix + '.'
+            return .sharpFullName + '.'
     
     def writeSharpDef(sw as CurlyWriter) is override
@@ -613 +619 @@
         base.writeSharpDef(sw)
         if not .isRoot
-            sw.writeAndIndent('namespace [.name][.sharpSuffix] {\n\n')
+            suffix = if(.fullName == 'Cobra.Lang', .compiler.embedRunTimeSuffix, '')
+            sw.writeAndIndent('namespace [.name][suffix] {\n\n')
         for ud in _useDirectives
             ud.writeSharpDef(sw)
@@ -995 +1002 @@
                 .compiler.boxMemberStack.push(decl)
                 try
-/#
-delme
-                    if decl inherits BoxMember
-                        if decl.parentBox is not this  # skip extension methods that were not declared in this box
-                            continue
-#/
                     decl.writeSharpDef(sw)
                 finally
@@ -1078 +1079 @@
 
     def writeSharpTest(sw as CurlyWriter)
-        # Running tests from the static initializer seems like a good idea, but has been problematic at various times on both .NET and Mono, so no more:
-        # sw.write('\nstatic [.rootName]() { RunTestsIfNeeded(); }\n')
-        # -- er, it turned out that the problem was likely -dst on SourceSite. Consequently we could try returning to static initializers to trigger tests.
-        sw.write('\nprivate static bool __didStartTests = false;\n')
-        newWord = .newForSharpTest
-        sw.write('\npublic static[newWord] void RunTestsIfNeeded() { if (!__didStartTests) RunTests(); }\n')
-        sw.write('\npublic static[newWord] void RunTests()')
-        sw.writeAndIndent(' {\n')
-        sw.write('__didStartTests = true;\n')
-        sw.write('CobraLangInternal.CobraImp.TestBegan("[.name]");\n')
-        if _testMethod
-            sw.write('[_testMethod.sharpName]();\n')
-        for decl in _declsInOrder
-            decl.writeSharpTestInvocation(sw)
-        sw.write('CobraLangInternal.CobraImp.TestEnded("[.name]");\n')
-        sw.dedentAndWrite('}\n')
-
-    var _didWriteSharpTestInvocation = false
+        pass
 
     def writeSharpTestInvocation(sw as CurlyWriter) is override
-        # used by the test option
-        if _didWriteSharpTestInvocation
-            return
-        if .isExtern
-            return
-        if .isGenericDef  # sorry, but static methods always require a type arg even if you don't need it. workaround. make another class with a 'test' section that tests the generic class TODO: make Cobra do this, but then watch for use of the generic param!
-            return
-        #assert .parentNameSpace  # suppress for nested classes 
-        sw.write('\t\t[.sharpRef].RunTestsIfNeeded();\n')
-        _didWriteSharpTestInvocation = true
+        pass
 
     get newForSharpTest as String
@@ -2824 +2799 @@
             sw.write('try')
             _tryBlock.writeSharpDef(sw, false)
-            # delme sw.write('[helperName] = true;\n')
             sw.dedent
             sw.write('}\n')

cobra/trunk/Source/Cobra.Lang/CobraCore.cobra

@@ -138 +138 @@
                 Run all Cobra `test` sections in all assemblies using reflection to locate them.
                 """
-                # start = DateTime.now
-                _runAllTests(Assembly.getEntryAssembly, Dictionary<of String, String>())
-                # duration = DateTime.now.subtract(start)
-                # trace duration
-
-            def _runAllTests(ass as Assembly, found as Dictionary<of String, String>)  # CC: found should be Set<of String>
-                name = ass.getName.toString
-                if found.containsKey(name)
-                    return
-                found.add(name, name)
-                if _skipAssemblyNameForTesting(name)  # saves some time
-                    return
-
-                # print 'Testing assembly:', ass
-                for type in ass.getExportedTypes
-                    members = type.getMember('RunTestsIfNeeded')
-                    if members and members.length and members[0] inherits MethodInfo
-                        method = members[0] to MethodInfo
-                        # trace type, method
-                        if type.containsGenericParameters
-                            # TODO: this is quite awful. tests in generic types are being skipped!
-                            # potential solution 1: move type test out of the type into a "sister" type: private __FooTest
-                            # potential solution 2: require a constructed type in Cobra: `test Foo<of int> ...` and then put that in a method attribute in the gen C# and use that type
-                            continue
-                        method.invoke(type, nil)
-
-                # traverse further assemblies
-                for assName in ass.getReferencedAssemblies
-                    subAss = Assembly.load(assName)
-                    _runAllTests(subAss to !, found)
+                # listener = Cobra.Lang.Test.TextWriterListener(Console.out)
+                listener = Cobra.Lang.Test.TextWriterOnlyOnFailureListener(Console.out)
+                tr = Cobra.Lang.Test.TestRunner(listener)
+                tr.runAllTests
 
             var _skipPrefixes = @['System.', 'Mono.', 'mscorlib,', 'System,']

cobra/trunk/Source/CommandLine.cobra

@@ -714 +714 @@
             print 'Not running tests due to errors above.'
             return
-        testInvoker = c.modules[c.modules.count-1]  # CC: .last
+        testInvoker = c.modules.last
         assert testInvoker inherits NativeModule
         assert testInvoker.fileName.startsWith('test-')

cobra/trunk/Source/Phases/BindRunTimeLibraryPhase.cobra

@@ -32 +32 @@
         c = .compiler
         pathsToCompile = c.pathsToCompile
-        runTimePaths = c.commandLineArgParser.readFilesFile(Path.combine(Path.combine(.cobraExeDir, 'Cobra.Lang'), 'files.text'))
+        filesPath = Path.combine(Path.combine(.cobraExeDir, 'Cobra.Lang'), 'files.text')
+        runTimePaths = c.commandLineArgParser.readFilesFile(filesPath)
         runTimePaths.reverse
         for runTimePath in runTimePaths

cobra/trunk/Tests/120-classes/920-type-decl-clauses.cobra

@@ -4 +4 @@
 use System.Collections
 
-class TestAttribute inherits Attribute
+class FooAttribute inherits Attribute
     pass
 
-class Test2Attribute inherits Attribute
+class Foo2Attribute inherits Attribute
     pass
 
@@ -42 +42 @@
     pass
 
-class H inherits Object implements IDisposable has Test
+class H inherits Object implements IDisposable has Foo
     def dispose
         pass
 
-class I inherits Object implements IDisposable has Test is public
+class I inherits Object implements IDisposable has Foo is public
     def dispose
         pass
 
-class J inherits Object implements IDisposable, IEnumerable has Test, Test2 is public
+class J inherits Object implements IDisposable, IEnumerable has Foo, Foo2 is public
     def dispose
         pass
@@ -59 +59 @@
     inherits Object
     implements IDisposable
-    has Test
+    has Foo
     is public
     def dispose

cobra/trunk/Tests/140-structs/300-type-decl-clauses.cobra

@@ -4 +4 @@
 use System.Collections
 
-class TestAttribute inherits Attribute
+class FooAttribute inherits Attribute
     pass
 
-class Test2Attribute inherits Attribute
+class Foo2Attribute inherits Attribute
     pass
 
@@ -18 +18 @@
         pass
 
-struct C has Test is internal
+struct C has Foo is internal
 
     pass
 
-struct D is internal has Test
+struct D is internal has Foo
     pass
 
 struct E is internal
 
-    has Test
+    has Foo
     
     pass
@@ -34 +34 @@
 
 
-    has Test
+    has Foo
     pass
 
-struct G is internal implements IDisposable has Test
+struct G is internal implements IDisposable has Foo
     def dispose
         pass
 
-struct H implements IDisposable, IEnumerable has Test, Test2 is public
+struct H implements IDisposable, IEnumerable has Foo, Foo2 is public
     def dispose
         pass
@@ -49 +49 @@
 struct I
     implements IDisposable
-    has Test
+    has Foo
     is public
     def dispose

cobra/trunk/Tests/320-misc-two/250-qualified/200-qual-generic.cobra

@@ -3 +3 @@
     class Referer
 
-        def stuff as A.B.C.Container<of String>  # dotted generic name use to confound compiler
+        def stuff as A.B.C.Container<of String>  # dotted generic name used to confound compiler
             return nil to passthrough