glib2 0.90.7-x86-mingw32 → 0.90.8-x86-mingw32

data/test-unit/test/test-fixture.rb

@@ -129,6 +129,43 @@ class TestUnitFixture < Test::Unit::TestCase
     assert_called_fixtures(expected_teardown_calls, test_case)
   end
 
+  def test_teardown_with_exception
+    test_case = Class.new(Test::Unit::TestCase) do
+      def called_ids
+        @called_ids ||= []
+      end
+
+      def called(id)
+        called_ids << id
+      end
+
+      def teardown
+        called(:teardown)
+        raise "teardown"
+      end
+
+      teardown
+      def custom_teardown_method0
+        called(:custom_teardown_method0)
+        raise "custom_teardown_method0"
+      end
+
+      teardown
+      def custom_teardown_method1
+        called(:custom_teardown_method1)
+        raise "custom_teardown_method1"
+      end
+
+      def test_nothing
+      end
+    end
+
+    assert_called_fixtures([:custom_teardown_method1,
+                            :custom_teardown_method0,
+                            :teardown],
+                           test_case)
+  end
+
   private
   def assert_called_fixtures(expected, test_case)
     test = test_case.new("test_nothing")

data/test-unit/test/test-testcase.rb

@@ -13,14 +13,14 @@ module Test
           def test_with_arguments(arg1, arg2)
           end
         end
-      
+
         caught = true
         catch(:invalid_test) do
           tc.new(:test_with_arguments)
           caught = false
         end
         check("Should have caught an invalid test when there are arguments", caught)
-        
+
         caught = true
         catch(:invalid_test) do
           tc.new(:non_existent_test)
@@ -28,7 +28,7 @@ module Test
         end
         check("Should have caught an invalid test when the method does not exist", caught)
       end
-      
+
       def setup
         @tc_failure_error = Class.new(TestCase) do
           def test_failure
@@ -75,7 +75,11 @@ module Test
         test_case.run(result) { |*arguments| progress << arguments }
         check("The failure should have triggered the listener", called)
         check("The failure should have set passed?", !test_case.return_passed?)
-        check("The progress block should have been updated correctly", [[TestCase::STARTED, test_case.name], [TestCase::FINISHED, test_case.name]] == progress)
+        check("The progress block should have been updated correctly",
+              [[TestCase::STARTED, test_case.name],
+               [TestCase::STARTED_OBJECT, test_case],
+               [TestCase::FINISHED, test_case.name],
+               [TestCase::FINISHED_OBJECT, test_case]] == progress)
       end
 
       def test_add_failure_nested
@@ -511,9 +515,9 @@ module Test
 
         test_case.test_order = :defined
 
-        assert_equal(["test_declarative_style_test_definition",
-                      "test_include_parenthesis",
-                      "test_1_2_3"],
+        assert_equal(["declarative style test definition",
+                      "include parenthesis",
+                      "1 + 2 = 3"],
                      test_case.suite.tests.collect {|test| test.method_name})
 
         assert_equal(["declarative style test definition",
@@ -522,6 +526,19 @@ module Test
                      test_case.suite.tests.collect {|test| test.description})
       end
 
+      def test_test_mark
+        test_case = Class.new(Test::Unit::TestCase) do
+          test
+          def my_test_method
+          end
+        end
+
+        test_case.test_order = :defined
+
+        assert_equal(["my_test_method"],
+                     test_case.suite.tests.collect {|test| test.method_name})
+      end
+
       def test_redefine_method
         test_case = Class.new(Test::Unit::TestCase) do
           def test_name

data/test-unit/test/test_testsuite.rb

@@ -6,7 +6,7 @@ require 'test/unit'
 
 module Test
   module Unit
-    class TC_TestSuite < TestCase
+    class TestTestSuite < TestCase
       def setup
         @testcase1 = Class.new(TestCase) do
           def test_succeed1
@@ -55,31 +55,39 @@ module Test
       def test_run
         progress = []
         suite = @testcase1.suite
+        tests = suite.tests.dup
         result = TestResult.new
         suite.run(result) { |*values| progress << values }
-  
+
         assert_equal(2, result.run_count, "Should have had four test runs")
         assert_equal(1, result.failure_count, "Should have had one test failure")
         assert_equal(0, result.error_count, "Should have had one test error")
         assert_equal([[TestSuite::STARTED, suite.name],
-                [TestCase::STARTED, "test_fail(#{suite.name})"],
-                [TestCase::FINISHED, "test_fail(#{suite.name})"],
-                [TestCase::STARTED, "test_succeed1(#{suite.name})"],
-                [TestCase::FINISHED, "test_succeed1(#{suite.name})"],
-                [TestSuite::FINISHED, suite.name]],
-                progress, "Should have had the correct progress")
-        
+                      [TestSuite::STARTED_OBJECT, suite],
+                      [TestCase::STARTED, "test_fail(#{suite.name})"],
+                      [TestCase::STARTED_OBJECT, tests[0]],
+                      [TestCase::FINISHED, "test_fail(#{suite.name})"],
+                      [TestCase::FINISHED_OBJECT, tests[0]],
+                      [TestCase::STARTED, "test_succeed1(#{suite.name})"],
+                      [TestCase::STARTED_OBJECT, tests[1]],
+                      [TestCase::FINISHED, "test_succeed1(#{suite.name})"],
+                      [TestCase::FINISHED_OBJECT, tests[1]],
+                      [TestSuite::FINISHED, suite.name],
+                      [TestSuite::FINISHED_OBJECT, suite]],
+                     progress, "Should have had the correct progress")
+
         suite = TestSuite.new
         suite << @testcase1.suite
         suite << @testcase2.suite
         result = TestResult.new
         progress = []
         suite.run(result) { |*values| progress << values }
-  
+
         assert_equal(4, result.run_count, "Should have had four test runs")
         assert_equal(1, result.failure_count, "Should have had one test failure")
         assert_equal(1, result.error_count, "Should have had one test error")
-        assert_equal(14, progress.size, "Should have had the correct number of progress calls")
+        assert_equal(28, progress.size,
+                     "Should have had the correct number of progress calls")
       end
       
       def test_empty?

data/test/test_iochannel.rb

@@ -6,7 +6,7 @@ require 'glib2'
 require 'tempfile'
 require 'nkf'
 
-$KCODE = "U"
+$KCODE = "U" unless defined?(:Encoding)
 
 class TestGIOChannel < Test::Unit::TestCase
   def setup
@@ -70,14 +70,14 @@ class TestGIOChannel < Test::Unit::TestCase
       3.times do 
 	assert_equal(v.unpack("U")[0], io.getc)
       end
-      assert_equal("\n"[0], io.getc)
+      assert_equal("\n".unpack("U")[0], io.getc)
     end
     assert_equal(nil, io.getc)
     io.close
   end
 
   def test_each_char
-    text = @content.split(//)
+    text = @content.split(//u)
     io = GLib::IOChannel.new(@file.path)
     i = 0
     io.each_char {|ch|
@@ -89,7 +89,7 @@ class TestGIOChannel < Test::Unit::TestCase
 
   def test_readchar
     io = GLib::IOChannel.new(@file.path)
-    text = @content.split(//)
+    text = @content.split(//u)
     text.each do |v|
       assert_equal(v.unpack("U")[0], io.readchar)
     end
@@ -196,18 +196,18 @@ class TestGIOChannel < Test::Unit::TestCase
     text = @content
     io = GLib::IOChannel.new(@file.path)
     io.seek(5)
-    assert_equal(text[5], io.getc)
+    assert_equal(text.unpack("U*")[5], io.getc)
     io.seek(6, GLib::IOChannel::SEEK_SET)
-    assert_equal(text[6], io.getc)
+    assert_equal(text.unpack("U*")[6], io.getc)
 
     io.seek(1, GLib::IOChannel::SEEK_CUR)
-    assert_equal(text[8], io.getc)
+    assert_equal(text.unpack("U*")[8], io.getc)
 
     io.pos = 0
-    assert_equal(text[0], io.getc)
+    assert_equal(text.unpack("U*")[0], io.getc)
 
     io.set_pos(2)
-    assert_equal(text[2], io.getc)
+    assert_equal(text.unpack("U*")[2], io.getc)
 
     io.close
   end

data/test/test_unicode.rb

@@ -154,26 +154,24 @@ class TestGLibUnicode < Test::Unit::TestCase
   end
 
   def test_unicode_canonical_ordering
-    require_uconv
     original = [unichar("a"), 0x0308, 0x0323,
                 unichar("e"), 0x0304, 0x0301, 0x0323].pack("U*")
     expected = [unichar("a"), 0x0323, 0x0308,
                 unichar("e"), 0x0323, 0x0304, 0x0301].pack("U*")
-    assert_equal(Uconv.u8tou4(expected),
-                 GLib::Unicode.canonical_ordering(Uconv.u8tou4(original)))
+    assert_equal(utf8_to_utf32(expected),
+                 GLib::Unicode.canonical_ordering(utf8_to_utf32(original)))
   end
 
   def test_unicode_canonical_decomposition
-    require_uconv
     a_with_acute = 0x00E1
     expected = [unichar("a"), 0x0301].pack("U*")
-    assert_equal(Uconv.u8tou4(expected),
+    assert_equal(utf8_to_utf32(expected),
                  GLib::Unicode.canonical_decomposition(a_with_acute))
 
     hiragana_ga = 0x304C
     hiragana_ka = 0x304B
     expected = [hiragana_ka, 0x3099].pack("U*")
-    assert_equal(Uconv.u8tou4(expected),
+    assert_equal(utf8_to_utf32(expected),
                  GLib::Unicode.canonical_decomposition(hiragana_ga))
   end
 
@@ -190,11 +188,10 @@ class TestGLibUnicode < Test::Unit::TestCase
   end
 
   def test_utf8_get_char
-    require_uconv
-    assert_equal(Uconv.u8tou4("あ").unpack("L*")[0],
+    assert_equal(utf8_to_utf32("あ").unpack("L*")[0],
                  GLib::UTF8.get_char("あ"))
 
-    assert_equal(Uconv.u8tou4("あ").unpack("L*")[0],
+    assert_equal(utf8_to_utf32("あ").unpack("L*")[0],
                  GLib::UTF8.get_char("あ", true))
     partial_input = "あ".unpack("c*")[0..-2].pack("c*")
     assert_equal(-2, GLib::UTF8.get_char(partial_input, true))
@@ -213,7 +210,7 @@ class TestGLibUnicode < Test::Unit::TestCase
 
   def test_utf8_validate
     assert(GLib::UTF8.validate("あ"))
-    assert(!GLib::UTF8.validate("あ"[1..-1]))
+    assert(!GLib::UTF8.validate(binary("あ")[1..-1]))
   end
 
   def test_utf8_upcase
@@ -251,7 +248,6 @@ class TestGLibUnicode < Test::Unit::TestCase
 
   def test_utf8_collate
     only_glib_version(2, 16, 0)
-    require_uconv
     assert_operator(0, :>, GLib::UTF8.collate("あ", "い"))
     assert_operator(0, :<, GLib::UTF8.collate("い", "あ"))
     assert_equal(0, GLib::UTF8.collate("あ", "あ"))
@@ -259,7 +255,6 @@ class TestGLibUnicode < Test::Unit::TestCase
 
   def test_utf8_collate_key
     only_glib_version(2, 16, 0)
-    require_uconv
     assert_operator(0, :>,
                     GLib::UTF8.collate_key("あ") <=>
                     GLib::UTF8.collate_key("い"))
@@ -284,57 +279,50 @@ class TestGLibUnicode < Test::Unit::TestCase
   end
 
   def test_utf8_to_utf16
-    require_uconv
-    assert_equal(Uconv.u8tou16("あいうえお"),
+    assert_equal(utf8_to_utf16("あいうえお"),
                  GLib::UTF8.to_utf16("あいうえお"))
   end
 
   def test_utf8_to_ucs4
-    require_uconv
-    assert_equal(Uconv.u8tou4("あいうえお"),
+    assert_equal(utf8_to_utf32("あいうえお"),
                  GLib::UTF8.to_ucs4("あいうえお"))
 
     assert_raise(GLib::ConvertError) do
-      GLib::UTF8.to_ucs4("あいうえお"[1..-1])
+      GLib::UTF8.to_ucs4(binary("あいうえお")[1..-1])
     end
     assert_nothing_raised do
-      GLib::UTF8.to_ucs4("あいうえお"[1..-1], true)
+      GLib::UTF8.to_ucs4(binary("あいうえお")[1..-1], true)
     end
   end
 
   def test_utf16_to_ucs4
-    require_uconv
-    assert_equal(Uconv.u8tou4("あいうえお"),
-                 GLib::UTF16.to_ucs4(Uconv.u8tou16("あいうえお")))
+    assert_equal(utf8_to_utf32("あいうえお"),
+                 GLib::UTF16.to_ucs4(utf8_to_utf16("あいうえお")))
   end
 
   def test_utf16_to_utf8
-    require_uconv
     assert_equal("あいうえお",
-                 GLib::UTF16.to_utf8(Uconv.u8tou16("あいうえお")))
+                 GLib::UTF16.to_utf8(utf8_to_utf16("あいうえお")))
   end
 
 
   def test_ucs4_to_utf16
-    require_uconv
-    assert_equal(Uconv.u8tou16("あいうえお"),
-                 GLib::UCS4.to_utf16(Uconv.u8tou4("あいうえお")))
+    assert_equal(utf8_to_utf16("あいうえお"),
+                 GLib::UCS4.to_utf16(utf8_to_utf32("あいうえお")))
 
     assert_raise(GLib::ConvertError) do
-      GLib::UCS4.to_utf16(Uconv.u8tou4("あいうえお")[1..-1])
+      GLib::UCS4.to_utf16(binary(utf8_to_utf32("あいうえお"))[1..-1])
     end
   end
 
   def test_ucs4_to_utf8
-    require_uconv
     assert_equal("あいうえお",
-                 GLib::UCS4.to_utf8(Uconv.u8tou4("あいうえお")))
+                 GLib::UCS4.to_utf8(utf8_to_utf32("あいうえお")))
   end
 
   def test_unichar_to_utf8
-    require_uconv
     assert_equal("あ",
-                 GLib::UniChar.to_utf8(Uconv.u8tou4("あ").unpack("L*")[0]))
+                 GLib::UniChar.to_utf8(utf8_to_utf32("あ").unpack("L*")[0]))
   end
 
   def test_unichar_combining_class
@@ -361,9 +349,34 @@ class TestGLibUnicode < Test::Unit::TestCase
     GLib::UTF8.get_char(char)
   end
 
+  def utf8_to_utf32(string)
+    if string.respond_to?(:encode)
+      string.encode("UTF-32LE")
+    else
+      require_uconv
+      Uconv.u8tou4(string)
+    end
+  end
+
+  def utf8_to_utf16(string)
+    if string.respond_to?(:encode)
+      string.encode("UTF-16LE")
+    else
+      require_uconv
+      Uconv.u8tou16(string)
+    end
+  end
+
   def require_uconv
     require 'uconv'
   rescue LoadError
     omit("Need uconv to run this test.")
   end
+
+  def binary(string)
+    if string.respond_to?(:force_encoding)
+      string.force_encoding("ascii-8bit")
+    end
+    string
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: glib2
 version: !ruby/object:Gem::Version 
-  hash: 377
+  hash: 359
   prerelease: false
   segments: 
   - 0
   - 90
-  - 7
-  version: 0.90.7
+  - 8
+  version: 0.90.8
 platform: x86-mingw32
 authors: 
 - The Ruby-GNOME2 Proejct Team
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-02 00:00:00 +09:00
+date: 2011-03-04 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -171,10 +171,12 @@ files:
 - test-unit/lib/test/unit/runner/emacs.rb
 - test-unit/lib/test/unit/runner/console.rb
 - test-unit/lib/test/unit/runner/tap.rb
+- test-unit/lib/test/unit/runner/xml.rb
 - test-unit/lib/test/unit/ui/testrunnerutilities.rb
 - test-unit/lib/test/unit/ui/emacs/testrunner.rb
 - test-unit/lib/test/unit/ui/testrunner.rb
 - test-unit/lib/test/unit/ui/tap/testrunner.rb
+- test-unit/lib/test/unit/ui/xml/testrunner.rb
 - test-unit/lib/test/unit/ui/console/outputlevel.rb
 - test-unit/lib/test/unit/ui/console/testrunner.rb
 - test-unit/lib/test/unit/ui/testrunnermediator.rb
@@ -188,6 +190,7 @@ files:
 - test-unit/lib/test/unit/fixture.rb
 - test-unit/lib/test/unit/collector/descendant.rb
 - test-unit/lib/test/unit/collector/load.rb
+- test-unit/lib/test/unit/collector/xml.rb
 - test-unit/lib/test/unit/collector/dir.rb
 - test-unit/lib/test/unit/collector/objectspace.rb
 - test-unit/lib/test/unit/color-scheme.rb
@@ -229,6 +232,7 @@ files:
 - test-unit/test/collector/test_dir.rb
 - test-unit/test/collector/test-load.rb
 - test-unit/test/run-test.rb
+- test-unit/test/test-assertions.rb
 - test-unit/test/test-priority.rb
 - test-unit/test/util/test_backtracefilter.rb
 - test-unit/test/util/test_observable.rb
@@ -241,7 +245,6 @@ files:
 - test-unit/test/test-color-scheme.rb
 - test-unit/test/test-omission.rb
 - test-unit/test/test-color.rb
-- test-unit/test/test_assertions.rb
 - lib/1.8/glib2.so
 - lib/1.9/glib2.so
 - vendor/local/src/tml/packaging/gettext_0.18.1.1-2_win32.sh