etest-unit 0.7.1 → 0.7.2

data/lib/etest-unit.rb

@@ -6,6 +6,8 @@ require File.dirname(__FILE__) + "/module_ext"
 require "test/unit/ui/console/testrunner"
 
 module Etest
+  class Error < ArgumentError; end
+  
   class TestRunner < Test::Unit::UI::Console::TestRunner
     def setup_mediator
       super
@@ -26,21 +28,52 @@ module Etest
     end
   end
   
+  class TestSuiteCreator < Test::Unit::TestSuiteCreator
+    attr :tests, true
+    
+    private
+
+    def collect_test_names
+      return super if tests.empty?
+      
+      public_instance_methods = @test_case.public_instance_methods(true).map(&:to_s)
+      method_names = tests.map(&:to_s)
+
+      missing_tests = method_names - public_instance_methods
+      unless missing_tests.empty?
+        raise Error, "Missing test(s): #{missing_tests.join(", ")}"
+      end
+
+      send("sort_test_names_in_#{@test_case.test_order}_order", method_names)
+    end
+  end
+  
   class TestCase < Test::Unit::TestCase
-    def self.etest=(etest)
-      include @etest = etest
+    module ClassMethods
+      def etest=(etest)
+        @etest = etest
+        include etest
+      end
+      
+      attr :tests, true
     end
+
+    extend ClassMethods
     
     def self.suite
-      suite      = super
+      suite_creator = Etest::TestSuiteCreator.new(self)
+      suite_creator.tests = tests
+      suite = suite_creator.create
       suite.name = @etest.name
       suite
     end
   end
   
-  def self.run(etest)
+  def self.run(etest, *tests)
     test_case_klass = Class.new(TestCase)
+    
     test_case_klass.etest = etest
+    test_case_klass.tests = tests
     TestRunner.new(test_case_klass).start
   end
 end
@@ -48,49 +81,3 @@ end
 class Test::Unit::TestSuite
   attr :name, true
 end
-
-__END__
-
-  def self.autorun
-    auto_run
-  end
-  
-  def self.auto_run
-    #
-    # find all modules that are not named /::Etest$/, and try to load
-    # the respective Etest module.
-    etests = Module.instances.map { |mod|
-      #next if mod.name =~ /\bEtest$/
-      next if mod.name == "Object"
-      
-      Module.by_name "#{mod.name}::Etest"
-    }.compact.uniq.sort_by(&:name)
-
-    run(*etests)
-  end
-
-  def self.run(*etests)
-    #
-    # convert all Etest modules into a test case
-    test_cases = etests.map { |etest|
-      STDERR.puts "Running: #{etest}"
-      to_test_case etest
-    }
-    
-    MiniTest::Test.run_etests(*test_cases)
-  end
-
-  #
-  # convert an Etest moodule into a MiniTest testcase
-  def self.to_test_case(mod)
-    klass = Class.new TestCase
-    klass.send :include, mod
-    klass.send :include, Assertions
-
-    Kernel.silent do
-      mod.const_set("TestCase", klass)
-    end
-    klass
-  end
-end
-

data/lib/etest-unit/version.rb

@@ -1,3 +1,3 @@
 module Etest
-  VERSION = "0.7.1"
+  VERSION = "0.7.2"
 end

data/lib/module_ext.rb

@@ -12,9 +12,9 @@ end
 class Module
   #
   # reloads the module, and runs the module's etests.
-  def etest
+  def etest(*args)
     reload if respond_to?(:reload)
-    ::Etest.run self.const_get("Etest")
+    ::Etest.run self.const_get("Etest"), *args
   end
 
   #

data/test/etest_test.rb

@@ -5,16 +5,23 @@ Dir.chdir(DIRNAME)
 ETEST_TEST=true
 
 require "etest-unit"
+require "expectation"
 
 # ---------------------------------------------------------------------
 
+$etest_stats = Hash.new(0)
+
 module String::Etest
-  def test_camelize
+  def test_underscore
+    $etest_stats[:underscore] += 1
+
     assert_equal "x", "X".underscore
     assert_equal "xa_la_nder", "XaLaNder".underscore
   end
 
-  def test_underscore
+  def test_camelize
+    $etest_stats[:camelize] += 1
+
     assert_equal "X", "x".camelize
     assert_equal "XaLaNder", "xa_la_nder".camelize
   end
@@ -22,16 +29,32 @@ end
 
 module Fixnum::Etest
   def test_success
-    $etests_did_run = true
+    $etest_stats[:success] += 1
+
     assert true
   end
 end
 
-String.etest
+begin
+  String.etest
+  Fixnum.etest
+  expect! $etest_stats => { :underscore => 1, :camelize => 1, :success => 1 }
+
+  Fixnum.etest
+  expect! $etest_stats => { :underscore => 1, :camelize => 1, :success => 2 }
+
+  String.etest :test_camelize, :test_underscore
+  expect! $etest_stats => { :underscore => 2, :camelize => 2, :success => 2 }
 
-$etests_did_run = false
-Fixnum.etest
-exit(0) if $etests_did_run
+  begin
+    String.etest :test_camelize, :nosuchtest
+    expect! false
+  rescue Etest::Error
+  end
+
+  expect! $etest_stats => { :underscore => 2, :camelize => 2, :success => 2 }
+rescue ArgumentError
+  STDERR.puts "#{$!}; in #{$!.backtrace.first}"
+  exit 1
+end
 
-STDERR.puts "Etests didn't run"
-exit(1)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: etest-unit
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
   prerelease: 
 platform: ruby
 authors:
@@ -53,7 +53,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2430133208310339074
+      hash: 26857399825278854
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: