deep_test 1.1.2 → 1.1.3

data/test/test_helper.rb

@@ -2,79 +2,13 @@ require 'rubygems'
 require 'test/unit'
 require 'dust'
 require 'mocha'
-$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + "/lib")
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + "/../lib")
 require "deep_test"
 
-module TestFactory
-  def self.failing_test
-    test_class = Class.new(Test::Unit::TestCase) do
-      def test_failing
-        assert_equal 1, 0
-      end
-    end
-    test_class.new(:test_failing)
-  end
-
-  def self.passed_result
-    result = Test::Unit::TestResult.new
-    result.add_run
-    result.add_assertion
-    result
-  end
-
-  def self.passing_test
-    test_class = Class.new(Test::Unit::TestCase) do
-      def test_passing
-        assert_equal 0, 0
-      end
-    end
-    test_class.new(:test_passing)
-  end
-  
-  def self.passing_test_with_stdout
-    test_class = Class.new(Test::Unit::TestCase) do
-      def test_passing_with_stdout
-        print "message printed to stdout"
-        assert true
-      end
-    end
-    test_class.new :test_passing_with_stdout
-  end
-  
-  def self.deadlock_once_test
-    test_class = Class.new(Test::Unit::TestCase) do
-      def test_deadlock_once
-        if @deadlocked
-          assert true
-        else
-          @deadlocked = true
-          raise ActiveRecord::StatementInvalid.new("Deadlock found when trying to get lock")
-        end
-      end
-    end
-    test_class.new :test_deadlock_once
-  end
-  
-  def self.deadlock_always_test
-    test_class = Class.new(Test::Unit::TestCase) do
-      def test_deadlock_always
-        raise ActiveRecord::StatementInvalid.new("Deadlock found when trying to get lock")
-      end
-    end
-    test_class.new :test_deadlock_always
-  end
-
-  def self.suite
-    Test::Unit::TestSuite.new
-  end
-end
+require File.dirname(__FILE__) + "/fake_deadlock_error"
+require File.dirname(__FILE__) + "/simple_test_blackboard"
+require File.dirname(__FILE__) + "/test_factory"
+require File.dirname(__FILE__) + "/../spec/thread_worker"
 
 class SomeCustomException < RuntimeError
 end
-
-unless defined?(ActiveRecord::StatementInvalid)
-  module ActiveRecord
-    class StatementInvalid < StandardError
-    end
-  end
-end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: deep_test
 version: !ruby/object:Gem::Version 
-  version: 1.1.2
-date: 2008-02-09 00:00:00 -05:00
+  version: 1.1.3
+date: 2008-03-10 00:00:00 -04:00
 summary: DeepTest runs tests in multiple processes.
 require_paths: 
 - lib
@@ -30,33 +30,52 @@ authors:
 - anonymous z, Dan Manges, David Vollbracht
 files: 
 - lib/deep_test.rb
-- lib/deep_test/loader.rb
+- lib/deep_test/deadlock_detector.rb
+- lib/deep_test/logger.rb
+- lib/deep_test/null_worker_listener.rb
+- lib/deep_test/options.rb
+- lib/deep_test/process_orchestrator.rb
 - lib/deep_test/rake_tasks.rb
 - lib/deep_test/rinda_blackboard.rb
+- lib/deep_test/rspec_detector.rb
 - lib/deep_test/server.rb
-- lib/deep_test/simple_test_blackboard.rb
-- lib/deep_test/supervised_test_suite.rb
-- lib/deep_test/supervisor.rb
+- lib/deep_test/spec.rb
+- lib/deep_test/test.rb
 - lib/deep_test/test_task.rb
 - lib/deep_test/tuple_space_factory.rb
 - lib/deep_test/warlock.rb
 - lib/deep_test/worker.rb
-- lib/deep_test/extensions/error.rb
 - lib/deep_test/extensions/object_extension.rb
-- lib/deep_test/extensions/testresult.rb
+- lib/deep_test/spec/runner.rb
+- lib/deep_test/spec/work_result.rb
+- lib/deep_test/spec/work_unit.rb
+- lib/deep_test/spec/extensions/options.rb
+- lib/deep_test/spec/extensions/reporter.rb
+- lib/deep_test/spec/extensions/spec_task.rb
+- lib/deep_test/test/runner.rb
+- lib/deep_test/test/supervised_test_suite.rb
+- lib/deep_test/test/work_unit.rb
+- lib/deep_test/test/extensions/error.rb
+- lib/deep_test/test/extensions/test_result.rb
 - script/run_test_suite.rb
 - test/failing.rb
+- test/fake_deadlock_error.rb
+- test/logger_test.rb
+- test/simple_test_blackboard.rb
 - test/simple_test_blackboard_test.rb
-- test/supervised_test_suite_test.rb
-- test/supervisor_test.rb
+- test/test_factory.rb
 - test/test_helper.rb
 - test/test_task_test.rb
-- test/testresult_test.rb
-- test/worker_test.rb
-- test/deep_test/loader_test.rb
 - test/deep_test/rinda_blackboard_test.rb
+- test/deep_test/test_task_test.rb
 - test/deep_test/warlock_test.rb
+- test/deep_test/worker_test.rb
 - test/deep_test/extensions/object_extension_test.rb
+- test/deep_test/test/runner_test.rb
+- test/deep_test/test/supervised_test_suite_test.rb
+- test/deep_test/test/work_unit_test.rb
+- test/deep_test/test/extensions/test_result_test.rb
+- test/failing.rake
 - README
 - CHANGELOG
 - Rakefile

data/lib/deep_test/loader.rb

@@ -1,18 +0,0 @@
-module DeepTest
-  class Loader
-    NO_FILTERS = Object.new.instance_eval do
-      def filters; []; end;
-      self
-    end
-    
-    def self.run
-      require "deep_test"
-      suite = Test::Unit::AutoRunner::COLLECTORS[:objectspace].call NO_FILTERS
-      supervised_suite = DeepTest::SupervisedTestSuite.new(suite)
-      require 'test/unit/ui/console/testrunner'
-      result = Test::Unit::UI::Console::TestRunner.run(supervised_suite, Test::Unit::UI::NORMAL)
-      Test::Unit.run = true
-      return result.passed?
-    end 
-  end
-end

data/lib/deep_test/simple_test_blackboard.rb

@@ -1,24 +0,0 @@
-module DeepTest
-  class SimpleTestBlackboard
-    def initialize
-      @test_cases = []
-      @test_results = []
-    end
-
-    def take_result
-      @test_results.shift
-    end
-
-    def take_test
-      @test_cases.shift
-    end
-
-    def write_result(result)
-      @test_results.push result
-    end
-
-    def write_test(test_case)
-      @test_cases.push test_case
-    end
-  end
-end

data/lib/deep_test/supervised_test_suite.rb

@@ -1,19 +0,0 @@
-module DeepTest
-  class SupervisedTestSuite
-    def initialize(suite, supervisor = DeepTest::Supervisor.new)
-      @suite = suite
-      @supervisor = supervisor
-    end
-
-    def run(result, &progress_block)
-      yield Test::Unit::TestSuite::STARTED, @suite.name
-      @supervisor.add_tests @suite
-      @supervisor.read_results result, &progress_block
-      yield Test::Unit::TestSuite::FINISHED, @suite.name
-    end
-
-    def size
-      @suite.size
-    end
-  end
-end

data/lib/deep_test/supervisor.rb

@@ -1,27 +0,0 @@
-module DeepTest
-  class Supervisor
-    def initialize(blackboard = DeepTest::RindaBlackboard.new)
-      @blackboard = blackboard
-      @count = 0
-    end
-
-    def add_tests(test_suite)
-      if test_suite.respond_to? :tests
-        test_suite.tests.each {|test| add_tests(test)}
-      else
-        @count += 1
-        @blackboard.write_test test_suite
-      end
-    end
-
-    def read_results(result)
-      while (@count > 0 && remote_result = @blackboard.take_result)
-        @count -= 1
-        remote_result.add_to result
-        # TODO: is this the right place for this next line? -Dan
-        print remote_result.output if remote_result.output
-        yield Test::Unit::TestCase::FINISHED, nil if block_given?
-      end
-    end
-  end
-end

data/test/deep_test/loader_test.rb

@@ -1,8 +0,0 @@
-require File.dirname(__FILE__) + "/../test_helper"
-require "deep_test/loader" unless defined?(DeepTest::Loader)
-
-unit_tests do
-  test "no filters constant has empty filters" do
-    assert_equal [], DeepTest::Loader::NO_FILTERS.filters
-  end
-end

data/test/supervised_test_suite_test.rb

@@ -1,63 +0,0 @@
-require File.dirname(__FILE__) + "/test_helper"
-
-unit_tests do
-  test "run yields name for start and finished of underlying suite" do
-    suite = Test::Unit::TestSuite.new("name")
-    supervised_suite = DeepTest::SupervisedTestSuite.new(suite, stub_everything)
-
-    yielded = []
-    supervised_suite.run(stub_everything) do |channel,name|
-      yielded << [channel,name]
-    end
-
-    assert_equal [[Test::Unit::TestSuite::STARTED, "name"],
-                  [Test::Unit::TestSuite::FINISHED, "name"]], yielded
-  end
-
-  test "run adds test suite to supervisor" do
-    suite = Test::Unit::TestSuite.new("name")
-    supervisor = stub_everything
-    supervised_suite = DeepTest::SupervisedTestSuite.new(suite, supervisor)
-    supervisor.expects(:add_tests).with(suite)
-    supervised_suite.run(stub_everything) {|channel,name|}
-  end
-
-
-  test "run tells supervisor to read resuts with passed in results" do
-    suite = Test::Unit::TestSuite.new("name")
-    results = stub_everything
-    supervisor = stub_everything
-    supervised_suite = DeepTest::SupervisedTestSuite.new(suite, supervisor)
-    supervisor.expects(:read_results).with(results)
-    supervised_suite.run(results) {|channel,name|}
-  end
-
-
-  test "run passes progress block on to supervisor" do
-    suite = Test::Unit::TestSuite.new("name")
-    supervisor = stub_everything
-    supervised_suite = DeepTest::SupervisedTestSuite.new(suite, supervisor)
-    supervisor.stubs(:read_results).yields("from_supervisor", "event")
-    yielded = []
-    supervised_suite.run(stub_everything) do |channel,name|
-      yielded << [channel, name]
-    end
-
-    assert_equal true, yielded.include?(["from_supervisor", "event"])
-  end
-
-  test "has same size as underlyng suite" do
-    suite = Test::Unit::TestSuite.new("name")
-    suite << "test"
-    supervisor = stub_everything
-    supervised_suite = DeepTest::SupervisedTestSuite.new(suite, supervisor)
-    
-    assert_equal suite.size, supervised_suite.size
-  end
-  
-  test "defaults to using DeepTest::Supervisor" do
-    DeepTest::Supervisor.stubs(:new).returns(:supervisor)
-    supervised_suite = DeepTest::SupervisedTestSuite.new(stub)
-    assert_equal :supervisor, supervised_suite.instance_variable_get("@supervisor")
-  end
-end

data/test/supervisor_test.rb

@@ -1,80 +0,0 @@
-require File.dirname(__FILE__) + "/test_helper"
-
-unit_tests do
-  test "add_tests adds single test to blackboard" do
-    blackboard = DeepTest::SimpleTestBlackboard.new
-    supervisor = DeepTest::Supervisor.new(blackboard)
-    test_case = TestFactory.passing_test
-    supervisor.add_tests test_case
-    assert_equal test_case, blackboard.take_test
-  end
-
-  test "add_tests adds entire suite to blackboard" do
-    blackboard = DeepTest::SimpleTestBlackboard.new
-    supervisor = DeepTest::Supervisor.new(blackboard)
-    test_suite = TestFactory.suite
-    test_suite << (test_case_1 = TestFactory.passing_test)
-    test_suite << (test_case_2 = TestFactory.passing_test)
-
-    supervisor.add_tests test_suite
-
-    actual_tests = [blackboard.take_test, blackboard.take_test]
-
-    assert_equal true, actual_tests.member?(test_case_1), 
-                       "First test case is not on blackboard"
-
-    assert_equal true, actual_tests.member?(test_case_2),
-                       "Second test case is not on blackboard"
-  end
-
-  test "read_results adds blackboard result to local result" do
-    blackboard = DeepTest::SimpleTestBlackboard.new
-    supervisor = DeepTest::Supervisor.new(blackboard)
-
-    supervisor.add_tests TestFactory.passing_test
-
-    blackboard_result = Test::Unit::TestResult.new
-    blackboard_result.add_run
-
-    blackboard.write_result blackboard_result
-
-    local_result = Test::Unit::TestResult.new
-    supervisor.read_results local_result
-
-    assert_equal 1, local_result.run_count
-  end
-
-  test "read_results yields TestCase::Finished event when reading a result" do
-    blackboard = DeepTest::SimpleTestBlackboard.new
-    supervisor = DeepTest::Supervisor.new(blackboard)
-
-   supervisor.add_tests TestFactory.passing_test
-
-    blackboard.write_result Test::Unit::TestResult.new
-    yielded = nil
-
-    supervisor.read_results Test::Unit::TestResult.new do |channel,name|
-      yielded = [channel,name]
-    end
-
-    assert_equal [Test::Unit::TestCase::FINISHED, nil], yielded
-  end
-  
-  test "read_results prints output if any" do
-     blackboard = DeepTest::SimpleTestBlackboard.new
-     supervisor = DeepTest::Supervisor.new(blackboard)
-     supervisor.add_tests stub
-     result = Test::Unit::TestResult.new
-     result.output = "output"
-     blackboard.write_result result
-     supervisor.expects(:print).with("output")
-     supervisor.read_results Test::Unit::TestResult.new do |channel,name|
-     end
-  end
-  
-  test "defaults to using a rinda blackboard" do
-    DeepTest::RindaBlackboard.stubs(:new).returns(:rinda_blackboard)
-    supervisor = DeepTest::Supervisor.new
-    assert_equal :rinda_blackboard, supervisor.instance_variable_get("@blackboard")
-  end
-end

data/test/worker_test.rb

@@ -1,64 +0,0 @@
-require File.dirname(__FILE__) + "/test_helper"
-
-unit_tests do
-  test "puts result on blackboard" do
-    blackboard = DeepTest::SimpleTestBlackboard.new
-    blackboard.write_test TestFactory.passing_test
-
-    DeepTest::Worker.new(blackboard).run
-
-    assert_kind_of Test::Unit::TestResult, blackboard.take_result
-  end
-
-  test "puts passing and failing tests on blackboard for each test" do
-    blackboard = DeepTest::SimpleTestBlackboard.new
-    blackboard.write_test TestFactory.passing_test
-    blackboard.write_test TestFactory.failing_test
-
-    DeepTest::Worker.new(blackboard).run
-
-    result_1 = blackboard.take_result
-    result_2 = blackboard.take_result
-
-    assert_equal true, (result_1.passed? || result_2.passed?)
-    assert_equal false, (result_1.passed? && result_2.passed?)
-  end
-  
-  test "capturing stdout" do
-    blackboard = DeepTest::SimpleTestBlackboard.new
-    blackboard.write_test TestFactory.passing_test_with_stdout
-    DeepTest::Worker.new(blackboard).run
-    result = blackboard.take_result
-    assert_equal "message printed to stdout", result.output
-  end
-  
-  test "retry on deadlock" do
-    blackboard = DeepTest::SimpleTestBlackboard.new
-    blackboard.write_test TestFactory.deadlock_once_test
-    DeepTest::Worker.new(blackboard).run
-    result = blackboard.take_result
-    assert_equal 0, result.error_count
-    assert_equal 0, result.failure_count
-    assert_equal 1, result.assertion_count
-  end
-  
-  test "skip on deadlock twice" do
-    blackboard = DeepTest::SimpleTestBlackboard.new
-    blackboard.write_test TestFactory.deadlock_always_test
-    DeepTest::Worker.new(blackboard).run
-    result = blackboard.take_result
-    assert_equal 0, result.error_count
-    assert_equal 0, result.failure_count
-    assert_equal 0, result.assertion_count
-  end
-  
-  test "does not fork from rake" do
-    assert !defined?(Rake)
-  end
-  
-  test "defaults to using a rinda blackboard" do
-    DeepTest::RindaBlackboard.stubs(:new).returns(:rinda_blackboard)
-    worker = DeepTest::Worker.new
-    assert_equal :rinda_blackboard, worker.instance_variable_get("@blackboard")
-  end
-end