more_unit_test 0.1.0 → 0.1.2

data/lib/more_unit_test/assert_equal_filecontent.rb

@@ -12,47 +12,75 @@ the expected and the real result.
 Here it is: Test::Unit::TestCase#assert_equal_filecontent
 
 See http://rubyforge.org/tracker/?func=detail&aid=19509&group_id=5650&atid=21859
+
+==Ruby 1.9
+With ruby 1.9 you get an additional encoding problem.
+The "expected"-file is read with a default encoding, 
+your test result may differ.
+
+You can set the default encoding for reading files with 
+  Encoding.default_external 
+
+Or you define a read option for the test:
+  class MyTest < Test::Unit::TestCase
+    def test_utf()
+      self.readoption = 'r:utf-8'
+      assert_equal_filecontent( "expected/test_utf.txt", mycall() )
+    end
+  end
+
 =end
 require 'test/unit'
-require 'ftools'
-#
-#Extend the class TestCase with additional methods/assertions
-#
+#~ puts RUBY_VERSION
+#~ require 'ftools' #not in Ruby 1.9
+require 'fileutils'
+require 'date'  #needed for Ruby 1.9 (class Date no standard?)
+
+=begin rdoc
+Extend the class TestCase with additional methods/assertions
+=end
 class Test::Unit::TestCase
-  #
-  #Takes the content of the file 'filename' and compares it with 'actual' like in assert_equal.
-  #If 'filname' doesn't exist, the failure 
-  # Reference file <#{filename}> missing
-  #is returned.
-  #
-  #'folder_for_failure' will contain all results with differences.
-  #
-  #Example of the usage:
-  #    assert_equal_filecontent( "expected/test_section.html", text.to_doc(:html))
-  #
-  #What will happen:
-  #1. text.to_doc(:html) is the test. It creates some HTML-Text
-  #2. "expected/test_section.html" is read and compared to text.to_doc(:html)
-  #   1. If the file is missing -> error
-  #   2. If it is the same -> fine 
-  #   3. If there are differences:
-  #3. A message is given (like in assert_equal)
-  #4. A folder "failure#{Date.today}" is created if not already exist
-  #5. The file 'test_section.html' with the result is created in "failure#{Date.today}/"
-  #6. I can use a compare tool to compare the expected result and the real result.
-  #
-  #Recommendation to build up your test.
-  #1. Create two folders: 'expected' and 'failure'
-  #2. Define your assertion with a non-existing filename
-  #3. Run the test with folder_for_failure = 'failure'
-  #4. You will get a failure (filename is missing).
-  #5. Copy the file in 'failure' to 'expected'
-  #6. Rerun again, you have no failure (hopefully ;-) )
+  #define option to read "expected"-file. may define conversions.
+  attr_writer :readoption
+
+=begin rdoc
+Takes the content of the file 'filename' and compares it with 'actual' like in assert_equal.
+If 'filname' doesn't exist, the failure 
+ Reference file <#{filename}> missing
+is returned.
+
+'folder_for_failure' will contain all results with differences.
+
+Example of the usage:
+    assert_equal_filecontent( "expected/test_section.html", text.to_doc(:html))
+
+What will happen:
+1. text.to_doc(:html) is the test. It creates some HTML-Text
+2. "expected/test_section.html" is read and compared to text.to_doc(:html)
+   1. If the file is missing -> error
+   2. If it is the same -> fine 
+   3. If there are differences:
+3. A message is given (like in assert_equal)
+4. A folder "failure#{Date.today}" is created if not already exist
+5. The file 'test_section.html' with the result is created in "failure#{Date.today}/"
+6. I can use a compare tool to compare the expected result and the real result.
+
+Recommendation to build up your test.
+1. Create two folders: 'expected' and 'failure'
+2. Define your assertion with a non-existing filename
+3. Run the test with folder_for_failure = 'failure'
+4. You will get a failure (filename is missing).
+5. Copy the file in 'failure' to 'expected'
+6. Rerun again, you have no failure (hopefully ;-) )
+=end
   def assert_equal_filecontent( filename, actual, folder_for_failure = "failure#{Date.today}", message = nil )
     #
+    @readoption = 'r' unless @readoption
     #Make the tests
     if File.exist?(filename)
-      expected = File.read(filename) 
+      #~ expected = File.read(filename) 
+      expected = nil
+      File.open(filename, @readoption){|file| expected = file.read }
       full_message = build_message(message, "<?> expected (#{filename}) but was\n<?>.\n", expected, actual).to_s
     else
       full_message = "Reference file <#{filename}> missing"
@@ -60,7 +88,7 @@ class Test::Unit::TestCase
 
     #Write the real result to a file if a failure folder is given.
     if folder_for_failure and expected  != actual
-      File.makedirs(folder_for_failure) if ! File.directory?(folder_for_failure)
+      FileUtils.makedirs(folder_for_failure) if ! File.directory?(folder_for_failure)
       File.open( "#{folder_for_failure}/#{File.basename(filename)}", 'w'){|f|
         f << actual
       }
@@ -68,9 +96,22 @@ class Test::Unit::TestCase
     end
 
     if File.exist?(filename)
-      assert_block( full_message ){ expected  == actual }
+      #~ assert_block( full_message ){ expected  == actual }
+      case RUBY_VERSION
+        when /^1\.8/
+          assert_block( full_message ){ expected  == actual }
+        when /^1.9/
+          #ruby 1.9: Add "\nExpected block to return true value." to message with assert_block
+          assert( expected  == actual, full_message )
+        end
     else
-      assert_block( full_message ){ false }
+      case RUBY_VERSION
+        when /^1\.8/
+          assert_block( full_message ){ false }
+        when /^1.9/
+          #ruby 1.9: Add "\nExpected block to return true value." to message with assert_block
+          assert( false, full_message  )
+        end
     end
   end
   #

data/lib/more_unit_test/assert_stdout.rb

@@ -21,12 +21,12 @@ require 'test/unit'
 module Test::Unit
 
 #Class to catch the std output and stderr
-class Catch_IO	< String
+class Catch_IO  < String
   #Receive content
-	def write( cont )
-		self	<< cont
-	end
-end	#MyIO
+  def write( cont )
+    self  << cont
+  end
+end  #MyIO
 
 #
 #Extend the class TestCase with additional methods/assertions
@@ -76,10 +76,14 @@ Example:
   end
 =end  
   def assert_stdout_block( expected, message = nil )
+    previous_stdout = $stdout
+    previous_STDOUT = STDOUT
     if block_given? 
       $stdout = output = Catch_IO.new #temporary copy
+      #~ STDOUT.reopen($stdout)
       yield
-      $stdout = STDOUT
+      $stdout = previous_stdout
+      #~ STDOUT.reopen(previous_STDOUT)
       full_message = build_message(message, "<?> expected in stdout, but was\n<?>.\n", expected, output)
       assert_block( full_message ){ expected  == output }
     else
@@ -159,17 +163,17 @@ end   #module Test::Unit
 
 __END__
 
-class MyIO	< String
-	def write( cont )
-		self	<< cont
-	end
+class MyIO  < String
+  def write( cont )
+    self  << cont
+  end
   def self.catch_stdout( procedure )
     $stdout = output = MyIO.new #temporary copy
     procedure.call
     $stdout = STDOUT
     output
   end
-end	#MyIO
+end  #MyIO
 
 #How to get stdout
 puts 'vorher'

data/lib/more_unit_test.rb

@@ -1,7 +1,7 @@
 =begin rdoc
 ==Extend test/unit
 The more_unit_test-package extends test/unit with some additional tests
-to hande staou/stderr
+to hande stdout/stderr
 
 ===more_unit_test/assert_equal_filecontent.rb
 

data/readme.rd

@@ -0,0 +1,32 @@
+=Extend test/unit
+The more_unit_test-package extends test/unit with some additional tests
+to hande staou/stderr
+
+==more_unit_test/assert_equal_filecontent.rb
+
+Compare expected result with file content
+==more_unit_test/assert_stdout.rb
+Test for stdout/stderr
+
+
+
+=Version history:
+0.0.1:
+* Initial version.
+
+0.0.2:
+* modified folder structure
+* more documentation.
+* published at gemcutter
+
+0.1.0 2010-02-07
+* Restructured lib-directory
+* Restructured the tests (using knut_tools/rake/testtask.rb)
+* removed catch_output (is available in knut_tools.gem)
+
+0.1.1 2010-05-03
+* first steps to Ruby 1.9
+
+0.1.2 2011-02-17
+* Add readoption for read options of expected-file
+

data/unittest/test_assert_equal_filecontent.rb

@@ -1,4 +1,13 @@
+#~ #encoding: utf-8
+gem 'test-unit', '>= 2.1.1' #defines omit, pend...
 require 'test/unit'
+if $0 == __FILE__
+  if RUBY_VERSION == '1.9.1'  
+  $:.unshift("../lib")
+  else
+  $: << "../lib"
+  end
+end
 require "more_unit_test/assert_equal_filecontent.rb"
 
 #Some content to be tested.
@@ -7,6 +16,13 @@ Some text to be tested.
 More text.
 dummytext
 
+DUMMYTEXT_utf = <<dummytext
+Some text to be tested.
+More text.
+
+Umlauts: öäü
+dummytext
+
 #
 #This two directories will be created.
 #
@@ -21,32 +37,65 @@ $folder_for_failure  = File.dirname(__FILE__) + '/tmp_failure'
 
 #
 class MyTest < Test::Unit::TestCase
-#~ class MyTest < Test::Unit::TC_Assertions #-> get check fails
+  
+  #Machte Probleme ohne gem laden
+  #~ case RUBY_VERSION 
+    #~ when /1.9/
+      #~ AssertionFailedError = MiniTest::Assertion
+    #~ when /1.8/
+      #~ AssertionFailedError = Test::Unit::AssertionFailedError
+    #~ else
+      #~ puts "!Check Ruby-Version! #{RUBY_VERSION }"
+      #~ AssertionFailedError = Test::Unit::AssertionFailedError
+  #~ end
+  AssertionFailedError = Test::Unit::AssertionFailedError
+
   def test_ok()
     #Build reference data
-    File.makedirs($expected)
+    self.readoption = 'r:cp1252' unless RUBY_VERSION <= '1.8'
+    FileUtils.makedirs($expected)
     File.open("#{$expected}/test.txt", 'w'){|f| f << DUMMYTEXT }
     #Make test
     assert_equal_filecontent( "#{$expected}/test.txt", DUMMYTEXT )
   end
-  #Check error
+  
+  def test_utf()
+    omit_if(RUBY_VERSION <= '1.8', "No encoding check for ruby #{RUBY_VERSION}")
+    #Build reference data
+    FileUtils.makedirs($expected)
+    File.open("#{$expected}/test_utf.txt", 'w:utf-8'){|f| f << DUMMYTEXT_utf }
+    #Make test
+    self.readoption = 'r:utf-8'
+    assert_equal_filecontent( "#{$expected}/test_utf.txt", DUMMYTEXT_utf )
+  end
+
+#Check error
   def test_no_reference_file()
     
     #Check exception and get the message
-    msg = assert_raise( Test::Unit::AssertionFailedError ){
+    msg = assert_raise( AssertionFailedError ){
       assert_equal_filecontent( "#{$expected}/not_available.txt", DUMMYTEXT, nil )
     }    
-    assert_equal( "Reference file <#{$expected}/not_available.txt> missing", msg.to_s)
+    #fixme 1.9 assert_block ändert wert
+    case RUBY_VERSION 
+      when /1.9/
+        pend("Check for Ruby-Version #{RUBY_VERSION }")
+        assert_equal( "Reference file <#{$expected}/not_available.txt> missing.\nExpected block to return true value.", msg.to_s)
+      when /1.8/
+        assert_equal( "Reference file <#{$expected}/not_available.txt> missing", msg.to_s)
+      else
+        notify("Ruby-Version #{RUBY_VERSION } undefined")
+    end
   end
   #Check, if "Failure" is created.
   def test_build_reference_file()
     #Initial expected file
-    File.makedirs($expected)
+    FileUtils.makedirs($expected)
     File.open("#{$expected}/test_build.txt", 'w'){|f| f << DUMMYTEXT*2 }
     #
     
     #First check. There is a difference, in failure we get the correct result
-    msg = assert_raise( Test::Unit::AssertionFailedError ){
+    msg = assert_raise( AssertionFailedError ){
       assert_equal_filecontent( "#{$expected}/test_build.txt", DUMMYTEXT, $folder_for_failure )
     }
     assert_match( %r{.*expected \(#{$expected}/test_build.txt\) but was.*-> Build <#{$folder_for_failure}/test_build.txt}m, 

data/unittest/test_assert_stdout.rb

@@ -1,4 +1,7 @@
+gem 'test-unit'
 require 'test/unit'
+
+$:.unshift('../lib') if $0 == __FILE__
 require 'more_unit_test/assert_stdout.rb'
 
 
@@ -38,3 +41,37 @@ class MyTest < Test::Unit::TestCase
     assert_raise(RuntimeError){ assert_stderr_block("xx\n") }
   end
 end #class MyTest
+
+
+
+require 'log4r'
+require 'tempfile'
+=begin rdoc
+This gem does not work with log4r.
+
+Check Log4rTest#test_alternative as another solution.
+=end
+class Log4rTest < Test::Unit::TestCase  
+  def test_not_working()
+    log = Log4r::Logger.new('testlog')
+    log.outputters << Log4r::StdoutOutputter.new('log_stdout')
+    #Geht nicht. Wohin schreibt log4r?
+    #~ assert_stdout("[INFO ]testlog   : a\n", proc{ log.info('a') })
+    #~ assert_stdout_block("[INFO ]testlog   : a\n"){ log.info('a') }
+  end
+
+  def test_alternative()
+    log = Log4r::Logger.new('testlog')
+    begin 
+    io = Tempfile.new(self.object_id)
+    rescue ArgumentError
+      omit("Tempfile error (ruby 1.9.2)")
+    end
+    log.outputters << Log4r::IOOutputter.new('log_stdout', io)
+    log.info('a')
+    assert_equal(" INFO testlog: a\n", io.open.read.to_s)
+    io.rewind #clear previous content
+    log.info('a')
+    assert_equal(" INFO testlog: a\n", io.open.read.to_s)
+  end
+end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: more_unit_test
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  hash: 31
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Knut Lickert
@@ -9,19 +15,37 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-07 00:00:00 +01:00
+date: 2011-02-17 00:00:00 +01:00
 default_executable: 
 dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: test-unit
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: knut_tools
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id002
 description: |
   The more_unit_test-package extends test/unit with some additional tests:
   - assert_equal_filecontent.rb: Compare expected result with file content
@@ -32,40 +56,47 @@ executables: []
 
 extensions: []
 
-extra_rdoc_files: []
-
+extra_rdoc_files: 
+- readme.rd
 files: 
-- readme.txt
-- readme.html
+- readme.rd
 - lib/more_unit_test.rb
 - lib/more_unit_test/assert_equal_filecontent.rb
 - lib/more_unit_test/assert_stdout.rb
+- unittest/test_assert_stdout.rb
+- unittest/test_assert_equal_filecontent.rb
 has_rdoc: true
-homepage: http://gems.rubypla.net/
+homepage: http://gems.rubypla.net/more_unit_test/
 licenses: []
 
 post_install_message: 
 rdoc_options: 
 - --main
-- lib/more_unit_test.rb
+- readme.rd
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: more_unit_test
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Additional assertions for big text results.

data/readme.html

@@ -1,48 +0,0 @@
-<!--
-
-	Build by	C:/Program Files/ruby/lib/ruby/gems/1.8/gems/docgenerator-1.2.0/lib/docgenerator/document.rb
-	Dir:		C:/usr/Script/more_unit_test
-	Creator:	rakefile_more_unit_test.rb
-	Target:		readme.html
-	2010/02/06 20:03:43
-	
-	Generation-Info-End
--->
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head ></head>
-<body ><h1 >Extend test/unit</h1>
-<p >
-The more_unit_test-package extends test/unit with some additional tests to hande staou/stderr  
-</p>
-<h2 >more_unit_test/assert_equal_filecontent.rb</h2>
-<p >
-Compare expected result with file content  
-</p>
-<h2 >more_unit_test/assert_stdout.rb</h2>
-<p >
-Test for stdout/stderr  
-</p>
-<h1 >Version history:</h1>
-<p >
-0.0.1: Initial version.  
-</p>
-<p >
-0.0.2:  
-</p>
-<ul >
-<li > modified folder structure  </li>
-<li > more documentation.  </li>
-<li > published at gemcutter  </li>
-</ul>
-<p >
-0.1.0  
-</p>
-<ul >
-<li > Restructured lib-directory  </li>
-<li > Restructured the tests (using knut_tools/rake/testtask.rb)  </li>
-<li > removed catch_output (is available in knut_tools.gem)  </li>
-<li > added testtask.rb  </li>
-</ul>
-</body>
-</html>

data/readme.txt

@@ -1,33 +0,0 @@
-
-
-Extend test/unit
-    ------------------------------
-
-The more_unit_test-package extends test/unit with some additional tests to hande staou/stderr  
-
-more_unit_test/assert_equal_filecontent.rb
-      ------------------------------
-
-Compare expected result with file content  
-
-more_unit_test/assert_stdout.rb
-      ------------------------------
-
-Test for stdout/stderr  
-
-Version history:
-    ------------------------------
-
-0.0.1: Initial version.  
-
-0.0.2:  
--  modified folder structure  
--  more documentation.  
--  published at gemcutter  
-
-0.1.0  
--  Restructured lib-directory  
--  Restructured the tests (using knut_tools/rake/testtask.rb)  
--  removed catch_output (is available in knut_tools.gem)  
--  added testtask.rb  
-