test/rscm/difftool_test.rb in rscm-0.2.1.1404 vs test/rscm/difftool_test.rb in rscm-0.3.0

@@ -6,28 +6,34 @@
   module Unit
     class TestCase
       # assertion method that reports differences as diff.
       # useful when comparing big strings
       def assert_equal_with_diff(expected, actual)
+        diff(expected, actual) do |diff_io|
+          diff_string = diff_io.read
+          assert_equal("", diff_string, diff_string)
+        end
+      end
+      
+      def diff(expected, actual, &block)
         dir = RSCM.new_temp_dir("diff")
         
         expected_file = "#{dir}/expected"
         actual_file = "#{dir}/actual"
         File.open(expected_file, "w") {|io| io.write(expected)}
         File.open(actual_file, "w") {|io| io.write(actual)}
 
         difftool = WINDOWS ? File.dirname(__FILE__) + "/../../bin/diff.exe" : "diff"
         IO.popen("#{difftool} #{RSCM::PathConverter.filepath_to_nativepath(expected_file, false)} #{RSCM::PathConverter.filepath_to_nativepath(actual_file, false)}") do |io|
-          diff = io.read
-          assert_equal("", diff, diff)
+          yield io
         end
       end
     end
   end
 end
 
 module RSCM
-  class DiffPersisterTest < Test::Unit::TestCase
+  class DifftoolTest < Test::Unit::TestCase
     def test_diffing_fails_with_diff_when_different
       assert_raises(Test::Unit::AssertionFailedError) {
         assert_equal_with_diff("This is a\nmessage with\nsome text", "This is a\nmessage without\nsome text")
       }
     end
\ No newline at end of file