Changeset 7983

Timestamp:

10/21/07 01:47:30 (1 year ago)

Author:

tobie

Message:

prototype: Minor cosmetic changes to the display of unit tests in terminal.

Files:

• spinoffs/prototype/trunk/CHANGELOG (modified) (1 diff)
• spinoffs/prototype/trunk/test/lib/jstest.rb (modified) (2 diffs)
• spinoffs/prototype/trunk/test/lib/unittest.js (modified) (2 diffs)

spinoffs/prototype/trunk/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Minor cosmetic changes to the display of unit tests in terminal. [Tobie Langel]
-
-* Make submitting forms work in Opera < 9.1. Closes #9917, #9463, #8260. [kangax]

spinoffs/prototype/trunk/test/lib/jstest.rb

@@ -204 +204 @@
-    @queue = Queue.new
-
-    result = []
-
-    @server = WEBrick::HTTPServer.new(:Port => 4711) # TODO: make port configurable
-    @server.mount_proc("/results") do |req, res|
-
+
+
+
+
+
+
-      res.body = "OK"
-    end
@@ -226 +229 @@
-      trap("INT") { @server.shutdown }
-      t = Thread.new { @server.start }
-
+
-      # run all combinations of browsers and tests
-      @browsers.each do |browser|
-        if browser.supported?
+          t0 = Time.now
+          results = {:tests => 0, :assertions => 0, :failures => 0, :errors => 0}
+          errors = []
+          failures = []
-          browser.setup
+          puts "\nStarted tests in #{browser}"
-          @tests.each do |test|
-            browser.visit("http://localhost:4711#{test}?resultsURL=http://localhost:4711/results&t=" + ("%.6f" % Time.now.to_f))
+ 
-            result = @queue.pop
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-          end
+          
+          puts "\nFinished in #{(Time.now - t0).round.to_s} seconds."
+          puts "  Failures: #{failures.join(', ')}" unless failures.empty?
+          puts "  Errors:   #{errors.join(', ')}" unless errors.empty?
+          puts "#{results[:tests]} tests, #{results[:assertions]} assertions, #{results[:failures]} failures, #{results[:errors]} errors"
-          browser.teardown
-        else
-
+\n
-        end
-      end

spinoffs/prototype/trunk/test/lib/unittest.js

@@ -178 +178 @@
-  //  "SUCCESS" if there was neither
-  getResult: function() {
-hasFailure = false;
-for(var i=0;i<this.tests.length;i++) {
-if (this.tests[i].errors > 0) {
-  return "ERROR";
-}
-  if (this.tests[i].failures > 0) {
-    hasFailure = true;
-  }
-}
-if (hasFailure) {
-turn "FAILURE"
-} else {
-  return "SUCCESS"
-  }
-},
+results = {
+  tests: this.tests.length,
+assertions: 0,
+failures: 0,
+errors: 0
+};
+
+return this.tests.inject(results, function(results, test) {
+  results.assertions += test.assertions;
+  results.failures   += test.failures;
+sults.errors     += test.errors
+  return results;
+})
+},
+
-  postResults: function() {
-    if (this.options.resultsURL) {
-      new Ajax.Request(this.options.resultsURL, 
-'result=' + 
+
-    }
-  },
@@ -225 +225 @@
-    }
-  },
+  
-  summary: function() {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-  }
-}