3 files changed, 179 insertions, 0 deletions
diff --git a/ruby_1_8_5/test/testunit/util/test_backtracefilter.rb b/ruby_1_8_5/test/testunit/util/test_backtracefilter.rb
new file mode 100644
index 0000000000..d4e40ea6ab
--- /dev/null
+++ b/ruby_1_8_5/test/testunit/util/test_backtracefilter.rb
@@ -0,0 +1,41 @@
+require 'test/unit'
+
+require 'test/unit/util/backtracefilter'
+
+module Test::Unit::Util
+  class TestBacktraceFilter < Test::Unit::TestCase
+    include BacktraceFilter
+    
+    def test_filter_backtrace
+      backtrace = [%q{C:\some\old\path/test/unit/assertions.rb:44:in 'assert'},
+        %q{tc_thing.rb:4:in 'a'},
+        %q{tc_thing.rb:4:in 'test_stuff'},
+        %q{C:\some\old\path/test/unit/testcase.rb:44:in 'send'},
+        %q{C:\some\old\path\test\unit\testcase.rb:44:in 'run'},
+        %q{C:\some\old\path\test\unit.rb:44:in 'run'},
+        %q{tc_thing.rb:3}]
+      assert_equal(backtrace[1..2], filter_backtrace(backtrace, %q{C:\some\old\path\test\unit}), "Should filter out all TestUnit-specific lines")
+
+backtrace = [%q{tc_thing.rb:4:in 'a'},
+        %q{tc_thing.rb:4:in 'test_stuff'},
+        %q{tc_thing.rb:3}]
+      assert_equal(backtrace, filter_backtrace(backtrace, %q{C:\some\old\path\test\unit}), "Shouldn't filter too much")
+
+      backtrace = [%q{C:\some\old\path/test/unit/assertions.rb:44:in 'assert'},
+        %q{tc_thing.rb:4:in 'a'},
+        %q{tc_thing.rb:4:in 'test_stuff'},
+        %q{tc_thing.rb:3}]
+      assert_equal(backtrace[1..3], filter_backtrace(backtrace, %q{C:\some\old\path\test\unit}), "Should filter out all TestUnit-specific lines")
+      
+      backtrace = [%q{C:\some\old\path/test/unit/assertions.rb:44:in 'assert'},
+        %q{C:\some\old\path/test/unit/testcase.rb:44:in 'send'},
+        %q{C:\some\old\path\test\unit\testcase.rb:44:in 'run'},
+        %q{C:\some\old\path\test\unit.rb:44:in 'run'}]
+      assert_equal(backtrace, filter_backtrace(backtrace, %q{C:\some\old\path\test\unit}), "Should filter out all TestUnit-specific lines")
+    end
+
+    def test_nil_backtrace
+      assert_equal(["No backtrace"], filter_backtrace(nil))
+    end
+  end
+end
diff --git a/ruby_1_8_5/test/testunit/util/test_observable.rb b/ruby_1_8_5/test/testunit/util/test_observable.rb
new file mode 100644
index 0000000000..6cd10184f1
--- /dev/null
+++ b/ruby_1_8_5/test/testunit/util/test_observable.rb
@@ -0,0 +1,102 @@
+# Author:: Nathaniel Talbott.
+# Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
+# License:: Ruby license.
+
+require 'test/unit/util/observable'
+
+module Test
+  module Unit
+    module Util
+      class TC_Observable < TestCase
+      
+        class TF_Observable
+          include Observable
+        end
+        
+        def setup
+          @observable = TF_Observable.new
+        end
+        
+        def test_simple_observation
+          assert_raises(ArgumentError, "add_listener should throw an exception if no callback is supplied") do
+            @observable.add_listener(:property, "a")
+          end
+      
+          heard = false
+          callback = proc { heard = true }
+          assert_equal("a", @observable.add_listener(:property, "a", &callback), "add_listener should return the listener that was added")
+      
+          count = 0
+          @observable.instance_eval do
+            count = notify_listeners(:property)
+          end
+          assert_equal(1, count, "notify_listeners should have returned the number of listeners that were notified")
+          assert(heard, "Should have heard the property changed")
+      
+          heard = false
+          assert_equal(callback, @observable.remove_listener(:property, "a"), "remove_listener should return the callback")
+          
+          count = 1
+          @observable.instance_eval do
+            count = notify_listeners(:property)
+          end
+          assert_equal(0, count, "notify_listeners should have returned the number of listeners that were notified")
+          assert(!heard, "Should not have heard the property change")
+        end
+        
+        def test_value_observation
+          value = nil
+          @observable.add_listener(:property, "a") do |passed_value|
+            value = passed_value
+          end
+          count = 0
+          @observable.instance_eval do
+            count = notify_listeners(:property, "stuff")
+          end
+          assert_equal(1, count, "Should have update the correct number of listeners")
+          assert_equal("stuff", value, "Should have received the value as an argument to the listener")
+        end
+        
+        def test_multiple_value_observation
+          values = []
+          @observable.add_listener(:property, "a") do |first_value, second_value|
+            values = [first_value, second_value]
+          end
+          count = 0
+          @observable.instance_eval do
+            count = notify_listeners(:property, "stuff", "more stuff")
+          end
+          assert_equal(1, count, "Should have update the correct number of listeners")
+          assert_equal(["stuff", "more stuff"], values, "Should have received the value as an argument to the listener")
+        end
+        
+        def test_add_remove_with_default_listener
+          assert_raises(ArgumentError, "add_listener should throw an exception if no callback is supplied") do
+            @observable.add_listener(:property)
+          end
+      
+          heard = false
+          callback = proc { heard = true }
+          assert_equal(callback, @observable.add_listener(:property, &callback), "add_listener should return the listener that was added")
+      
+          count = 0
+          @observable.instance_eval do
+            count = notify_listeners(:property)
+          end
+          assert_equal(1, count, "notify_listeners should have returned the number of listeners that were notified")
+          assert(heard, "Should have heard the property changed")
+      
+          heard = false
+          assert_equal(callback, @observable.remove_listener(:property, callback), "remove_listener should return the callback")
+      
+          count = 1
+          @observable.instance_eval do
+            count = notify_listeners(:property)
+          end
+          assert_equal(0, count, "notify_listeners should have returned the number of listeners that were notified")
+          assert(!heard, "Should not have heard the property change")
+        end
+      end
+    end
+  end
+end
diff --git a/ruby_1_8_5/test/testunit/util/test_procwrapper.rb b/ruby_1_8_5/test/testunit/util/test_procwrapper.rb
new file mode 100644
index 0000000000..3e552c7711
--- /dev/null
+++ b/ruby_1_8_5/test/testunit/util/test_procwrapper.rb
@@ -0,0 +1,36 @@
+# Author:: Nathaniel Talbott.
+# Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
+# License:: Ruby license.
+
+require 'test/unit'
+require 'test/unit/util/procwrapper'
+
+module Test
+  module Unit
+    module Util
+      class TC_ProcWrapper < TestCase
+        def munge_proc(&a_proc)
+          return a_proc
+        end
+        def setup
+          @original = proc {}
+          @munged = munge_proc(&@original)
+          @wrapped_original = ProcWrapper.new(@original)
+          @wrapped_munged = ProcWrapper.new(@munged)
+        end
+        def test_wrapping
+          assert_same(@original, @wrapped_original.to_proc, "The wrapper should return what was wrapped")
+        end
+        def test_hashing
+      
+          assert_equal(@wrapped_original.hash, @wrapped_munged.hash, "The original and munged should have the same hash when wrapped")
+          assert_equal(@wrapped_original, @wrapped_munged, "The wrappers should be equivalent")
+          
+          a_hash = {@wrapped_original => @original}
+          assert(a_hash[@wrapped_original], "Should be able to access the wrapper in the hash")
+          assert_equal(a_hash[@wrapped_original], @original, "Should be able to access the wrapper in the hash")
+        end
+      end
+    end
+  end
+end