rubyunit 0.4.22 → 0.4.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad3e199e65128364b0fa5fbdf84b92bcb36c4676
-  data.tar.gz: b35fe9cf0e478f137db664ea352f8a8efd4f9577
+  metadata.gz: 5d88b937416b22f572f04440f7a0065216e040a5
+  data.tar.gz: 96c0e73090b854965d5c4153701d154c90f896fa
 SHA512:
-  metadata.gz: 66c8aca53812dce104d189db03a21e5268530aed6902c686e9a6405126bff0201e7e12058642842de6a79042c57e8ef23be8ec545f9639d3c9c9d7ee1868ac38
-  data.tar.gz: 8925eac31be70bc57f59d9f75dcbed7fa7149094df7c0bd53df88caaf35789ec2a247ee7347d35140f7e2bd204602a41c4d7fa3da81be3fde91dbfe443cc3bcf
+  metadata.gz: 8c2056ea74a124f676f30b4384a61ba5acf1dc65e2aa33c6f92677232653a0ee657c1d28e0b3ff87a580ec978289f882e4a03bcd3712f1f632aeea1797240fc1
+  data.tar.gz: ded6018f7b70dbbf6326eec4ecd35f1653cce8e8c6ad969622d26b9345f7c8f9e76edd63b9270c4146c32afc91f910e3c8b5a93d648e965ece20a6846c9da2c8

data/TestSuite.rb

@@ -11,7 +11,4 @@ require 'RubyUnit'
 RubyUnit.debug = true if ARGV.include? '--debug'
 
 # Automatically load Test Sets
-Dir['tests/TS_*.rb'].each do |test_set|
-  puts "Adding Test Set #{test_set}" if RubyUnit.debug
-  require_relative test_set
-end
+RubyUnit::TestSuite.new Dir['tests/TS_*.rb']

data/lib/RubyUnit.rb

@@ -13,7 +13,7 @@ module RubyUnit
 
   ##
   # Current RubyUnit version
-  VERSION            = '0.4.22'
+  VERSION            = '0.4.23'
 
   ##
   # Set debug mode
@@ -53,6 +53,8 @@ module RubyUnit
   end
 end
 
+require_relative 'RubyUnit/TestSuite'
+require_relative 'RubyUnit/TestSet'
 require_relative 'RubyUnit/TestCase'
 require_relative 'RubyUnit/Runner'
 

data/lib/RubyUnit/AssertionFailure.rb

@@ -23,12 +23,12 @@ module RubyUnit
     # Create a string from the assertion data
     #
     def info
-      s = "\n"
-      s = "#{FAILURE}: #{message}\n" if message.length > 0
+      data = []
+      data << message if message.length > 0
       @data.each do |key, value|
-        s << "\n#{key}:\n\t#{value.inspect}"
+        data << ":#{key} => #{value.inspect}"
       end
-      s
+      data.join "\n"
     end
   end
 end

data/lib/RubyUnit/Report.rb

@@ -14,6 +14,7 @@ module RubyUnit
     @@start      = nil
     @@finish     = nil
 
+    @@i          = 0
     def self.record result
       @@results << result
 
@@ -46,28 +47,40 @@ module RubyUnit
       @@finish
     end
 
+    def self.report_head result
+      puts
+      puts "#{@@i += 1}) #{result.test_case}::#{result.test}(#{result.params})"
+      puts result.error.class.to_s + ": " + result.error.message
+    end
+
+    def self.report_info result, trace = true
+      puts
+      puts result.error.info if result.error.respond_to? :info
+      puts result.error.backtrace * "\n" if trace
+    end
+
     def self.report type, results = [], trace = true
+      @@i = 0
       puts "\n#{results.count} #{type}:\n" if results.count > 0
       results.each_with_index do |result, i|
-        puts "\n#{i + 1}) #{result.test_case}::#{result.test}(#{result.params})"
-        puts "#{result.error.class}: #{result.error.message}"
-        puts result.error.backtrace * "\n" if trace
+        report_head result
+        report_info result, trace
       end
     end
 
-    def self.errors
+    def self.report_errors
       report 'Errors in Tests', @@errors
     end
 
-    def self.failures
+    def self.report_failures
       report 'Failed Tests', @@fail
     end
 
-    def self.skips
+    def self.report_skips
       report 'Skipped Tests', @@skip, false
     end
 
-    def self.incompletes
+    def self.report_incompletes
       report 'Incomplete Tests', @@incomplete, false
     end
 
@@ -75,15 +88,67 @@ module RubyUnit
       @@fail.count + @@errors.count
     end
 
-    def self.stats
-      elapsed  = @@finish - @@start
-      inverse  = Rational(elapsed.to_r.denominator,elapsed.to_r.numerator)
-      puts
-      puts "Tests Complete in #{elapsed} seconds!"
-      puts "%.3f tests/s, %.3f assertions/s" % [(tests * inverse).to_f, (TestCase.assertions * inverse).to_f]
-      puts "%d Assertions, %d Skipped Tests, %d Incomplete Tests" % [TestCase.assertions, @@skip.count, @@incomplete.count]
-      puts "%d Tests, %d Errors, %d Failures" % [tests, @@errors.count, @@fail.count]
+    def self.per_second count
+      return 0 if @@start.nil?
+      finish  = @@finish.nil? ? Time.new : @@finish
+      elapsed = (finish - @@start).to_r
+      (count * (Rational(elapsed.denominator, elapsed.numerator))).to_f
+    end
+
+    def self.report_timed
+      timed_stats.each do |key, duration|
+        puts "#{key} in #{duration} seconds"
+      end
+    end
+
+    def self.timed_stats
+      timed = {}
+      timed['Tests Completed'] = @@finish - @@start
+      timed
+    end
+
+    def self.report_rated
+      s = ''
+      rated_stats.each do |rated, count|
+        s << "%.3f #{rated}/s" % [per_second(count)]
+        s << ', ' unless rated_stats.keys.last == rated
+      end
+      puts s
+    end
+
+    def self.rated_stats
+      rated = {}
+      rated['Tests']      = tests
+      rated['Assertions'] = TestCase.assertions
+      rated
+    end
+
+    def self.report_counted
+      s = ''
+      counted_stats.each do |counted, count|
+        s << "#{count} #{counted}"
+        s << ', ' unless counted_stats.keys.last == counted
+      end
+      puts s
+    end
+
+    def self.counted_stats
+      counted                     = rated_stats.clone
+      counted['Skipped Tests']    = @@skip.count unless @@skip.count.zero?
+      counted['Incomplete Tests'] = @@incomplete.count unless @@incomplete.count.zero?
+      counted['Failed Tests']     = @@fail.count
+      counted
+    end
+
+    def self.report_stats
       puts
+      report_timed
+      report_rated
+      report_counted
+    end
+
+    def self.stats
+      {:timed=>timed_stats,:rate=>rated_stats,:count=>counted_stats}
     end
   end
 end

data/lib/RubyUnit/Runner.rb

@@ -78,11 +78,11 @@ module RubyUnit
       #  report # => nice and simple
       #
       def report
-        Report.errors
-        Report.skips
-        Report.incompletes
-        Report.failures
-        Report.stats
+        Report.report_errors
+        Report.report_skips
+        Report.report_incompletes
+        Report.report_failures
+        Report.report_stats
       end
     end
 

data/lib/RubyUnit/TestSet.rb

@@ -0,0 +1,28 @@
+module RubyUnit
+  ##
+  # Test Sets are a collection of Test Cases
+  class TestSet
+    ##
+    # Create a test set and import test cases.
+    def initialize test_cases
+      $:.unshift '.' unless $:.include? '.'
+      import test_cases
+    end
+
+    ##
+    # Import the test cases for this test set
+    def import test_cases
+      raise TypeError, "File list must be an Array, got #{test_cases.class}" unless test_cases.is_a? Array
+      test_cases.each do |test_case|
+        puts "%20s : %s" % ['Adding ' + self.class.type, test_case] if RubyUnit.debug
+        require test_case
+      end
+    end
+
+    ##
+    # Defining type of files includes for RubyUnit::TestSuite used with --debug
+    def self.type
+      'Test Case'
+    end
+  end
+end

data/lib/RubyUnit/TestSuite.rb

@@ -0,0 +1,17 @@
+require_relative 'TestSet'
+
+module RubyUnit
+  TYPE = 'Test Set'
+
+  ##
+  # Test Suites are a collection of test sets
+  # TestSuite is a larger concept of TestSet
+  class TestSuite < TestSet
+
+    ##
+    # Defining type of files includes for RubyUnit::TestSuite used with --debug
+    def self.type
+      'Test Set'
+    end
+  end
+end

data/tests/TS_AssertionFailure.rb

@@ -3,7 +3,4 @@
 require 'RubyUnit'
 
 # Test Cases
-Dir["#{File.dirname(__FILE__)}/AssertionFailure/TC_*.rb"].each do |test_case|
-  puts "Adding Test Case #{test_case}" if RubyUnit.debug
-  require test_case
-end
+RubyUnit::TestSet.new Dir["#{File.dirname(__FILE__)}/AssertionFailure/TC_*.rb"]

data/tests/TS_AssertionMessage.rb

@@ -3,7 +3,4 @@
 require 'RubyUnit'
 
 # Test Cases
-Dir["#{File.dirname(__FILE__)}/AssertionMessage/TC_*.rb"].each do |test_case|
-  puts "Adding Test Case #{test_case}" if RubyUnit.debug
-  require test_case
-end
+RubyUnit::TestSet.new Dir["#{File.dirname(__FILE__)}/AssertionMessage/TC_*.rb"]

data/tests/TS_Assertions.rb

@@ -57,7 +57,4 @@ module AssertionsTests
 end
 
 # Test Cases
-Dir["#{File.dirname(__FILE__)}/Assertions/TC_*.rb"].each do |test_case|
-  puts "Adding Test Case #{test_case}" if RubyUnit.debug
-  require test_case
-end
+RubyUnit::TestSet.new Dir["#{File.dirname(__FILE__)}/Assertions/TC_*.rb"]

data/tests/TS_IncompleteTest.rb

@@ -3,7 +3,4 @@
 require 'RubyUnit'
 
 # Test Cases
-Dir["#{File.dirname(__FILE__)}/IncompleteTest/TC_*.rb"].each do |test_case|
-  puts "Adding Test Case #{test_case}" if RubyUnit.debug
-  require test_case
-end
+RubyUnit::TestSet.new Dir["#{File.dirname(__FILE__)}/IncompleteTest/TC_*.rb"]

data/tests/TS_RubyUnit.rb

@@ -3,7 +3,4 @@
 require 'RubyUnit'
 
 # Test Cases
-Dir["#{File.dirname(__FILE__)}/RubyUnit/TC_*.rb"].each do |test_case|
-  puts "Adding Test Case #{test_case}" if RubyUnit.debug
-  require test_case
-end
+RubyUnit::TestSet.new Dir["#{File.dirname(__FILE__)}/RubyUnit/TC_*.rb"]

data/tests/TS_Runner.rb

@@ -3,7 +3,4 @@
 require 'RubyUnit'
 
 # Test Cases
-Dir["#{File.dirname(__FILE__)}/Runner/TC_*.rb"].each do |test_case|
-  puts "Adding Test Case #{test_case}" if RubyUnit.debug
-  require test_case
-end
+RubyUnit::TestSet.new Dir["#{File.dirname(__FILE__)}/Runner/TC_*.rb"]

data/tests/TS_SkippedTest.rb

@@ -3,7 +3,4 @@
 require 'RubyUnit'
 
 # Test Cases
-Dir["#{File.dirname(__FILE__)}/SkippedTest/TC_*.rb"].each do |test_case|
-  puts "Adding Test Case #{test_case}" if RubyUnit.debug
-  require test_case
-end
+RubyUnit::TestSet.new Dir["#{File.dirname(__FILE__)}/SkippedTest/TC_*.rb"]

data/tests/TS_TestCase.rb

@@ -3,7 +3,4 @@
 require 'RubyUnit'
 
 # Test Cases
-Dir["#{File.dirname(__FILE__)}/TestCase/TC_*.rb"].each do |test_case|
-  puts "Adding Test Case #{test_case}" if RubyUnit.debug
-  require test_case
-end
+RubyUnit::TestSet.new Dir["#{File.dirname(__FILE__)}/TestCase/TC_*.rb"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubyunit
 version: !ruby/object:Gem::Version
-  version: 0.4.22
+  version: 0.4.23
 platform: ruby
 authors:
 - Matthew Clower
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-27 00:00:00.000000000 Z
+date: 2014-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -59,6 +59,8 @@ files:
 - lib/RubyUnit/Runner.rb
 - lib/RubyUnit/SkippedTest.rb
 - lib/RubyUnit/TestCase.rb
+- lib/RubyUnit/TestSet.rb
+- lib/RubyUnit/TestSuite.rb
 - tests/AssertionFailure/TC_Class.rb
 - tests/AssertionFailure/TC_Instance.rb
 - tests/AssertionFailure/data/Class.rb