Changeset 2294

Timestamp:

02/27/10 22:11:13 (2 years ago)

Author:

Chuck.Esterbrook

Message:

Code cleanup.

Location:

cobra/trunk/Source

Files:

• BackEndClr/SharpGenerator.cobra (modified) (1 diff)
• Cobra.Lang/CobraCore.cobra (modified) (1 diff)
• Cobra.Lang/Native.cs (modified) (1 diff)
• Cobra.Lang/NativeExtern.cobra (modified) (1 diff)

cobra/trunk/Source/BackEndClr/SharpGenerator.cobra

@@ -56 +56 @@
                 print 'using CobraLangInternal = Cobra.Lang[.embedRunTimeSuffix];'
                 print ''
-                print 'class RunTests {'
+                print 'class _GeneratedTestRunner {'
                 print ''
                 print ' public static void Main() {'
                 print '     CobraLangInternal.CobraImp.ShowTestProgress = true;'
                 if .hasExceptionReportOption
-                    print '     bool success = false;'
                     print '     try {'
                 print '     CobraLangInternal.Test.ITestRunListener listener = new CobraLangInternal.Test.TextWriterListener(System.Console.Out);'
                 print '     new CobraLangInternal.Test.TestRunner(listener).RunAllTests();'
                 if .hasExceptionReportOption
-                    print '     success = true;'
                     print '     } catch (System.Exception e) {'
                     print '         CobraLangInternal.CobraCore.HandleUnhandledException(e);'
                     print '     }'
-                    print '     if (success)'
-                print '     CobraLangInternal.CobraImp.TestProgressWriter.WriteLine("\\nSuccess!  All tests pass.\\n");'
                 print ' }'
                 print '}'
-        .mainMethodTypeName = 'RunTests'
+        .mainMethodTypeName = '_GeneratedTestRunner'
         _modules.add(SharpModule(fileName, _verbosity))
 

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

@@ -138 +138 @@
                 Run all Cobra `test` sections in all assemblies using reflection to locate them.
                 """
-                # listener = Cobra.Lang.Test.TextWriterListener(Console.out)
-                listener = Cobra.Lang.Test.TextWriterOnlyOnFailureListener(Console.out)
+                if CobraImp.showTestProgress, listener = Cobra.Lang.Test.TextWriterListener(Console.out)
+                else, listener = Cobra.Lang.Test.TextWriterOnlyOnFailureListener(Console.out)
                 tr = Cobra.Lang.Test.TestRunner(listener)
                 tr.runAllTests

cobra/trunk/Source/Cobra.Lang/Native.cs

@@ -747 +747 @@
         set {
             _showTestProgress = value;
-        }
-    }
-
-    static private TextWriter _testProgressWriter = null;
-
-    static public TextWriter TestProgressWriter {
-        get {
-            return _testProgressWriter==null ? Console.Out : _testProgressWriter;
-        }
-        set {
-            _testProgressWriter = value;
-        }
-    }
-
-    static public void TestBegan(string className) {
-        if (ShowTestProgress) {
-            TestProgressWriter.WriteLine("Testing {0}...", className);
-            TestProgressWriter.Flush();
-        }
-    }
-
-    static public void TestEnded(string className) {
-        if (ShowTestProgress) {
-            TestProgressWriter.WriteLine("Completed testing of {0}.{1}", className, Environment.NewLine);
-            TestProgressWriter.Flush();
         }
     }

cobra/trunk/Source/Cobra.Lang/NativeExtern.cobra

@@ -16 +16 @@
                 get detailedStackTrace as Stack<of CobraFrame>
                     pass
+                pro showTestProgress as bool
+                    get
+                        pass
+                    set
+                        pass
                 def reset(printDestination as System.IO.TextWriter)
                     pass