From bbd7f802573b146a2cc9fc2c2b7d6c92453dcf4a Mon Sep 17 00:00:00 2001
From: Kouhei Sutou <kou@clear-code.com>
Date: Fri, 17 Jan 2014 23:58:01 +0900
Subject: [PATCH 2/2] gi test: follow (maybe) GObjectIntrospection change
GitHub: #217
Reported by mtasaka. Thanks!!!
---
gobject-introspection/test/test-interface-info.rb | 6 +++---
gobject-introspection/test/test-repository.rb | 7 +++++--
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/gobject-introspection/test/test-interface-info.rb b/gobject-introspection/test/test-interface-info.rb
index e724df3..fe7eb7d 100644
--- a/gobject-introspection/test/test-interface-info.rb
+++ b/gobject-introspection/test/test-interface-info.rb
@@ -1,4 +1,4 @@
-# Copyright (C) 2012 Ruby-GNOME2 Project Team
+# Copyright (C) 2012-2014 Ruby-GNOME2 Project Team
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
@@ -67,9 +67,9 @@ class TestInterfaceInfo < Test::Unit::TestCase
end
def test_get_signal_name
- require_version(1, 34, 0)
+ require_version(1, 36, 0)
info = @repository.find("Gio", "Volume")
- assert_kind_of(GObjectIntrospection::FunctionInfo,
+ assert_kind_of(GObjectIntrospection::SignalInfo,
info.get_signal("changed"))
end
diff --git a/gobject-introspection/test/test-repository.rb b/gobject-introspection/test/test-repository.rb
index a180d64..7dd2903 100644
--- a/gobject-introspection/test/test-repository.rb
+++ b/gobject-introspection/test/test-repository.rb
@@ -1,4 +1,4 @@
-# Copyright (C) 2012 Ruby-GNOME2 Project Team
+# Copyright (C) 2012-2014 Ruby-GNOME2 Project Team
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
@@ -15,6 +15,8 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
class TestRepository < Test::Unit::TestCase
+ include GObjectIntrospectionTestUtils
+
def setup
@repository = GObjectIntrospection::Repository.default
@repository.require("GObject")
@@ -31,7 +33,8 @@ class TestRepository < Test::Unit::TestCase
end
def test_get_dependencies
- assert_equal(["GLib-2.0", "GObject-2.0"].sort,
+ require_version(1, 36, 0)
+ assert_equal(["GObject-2.0"].sort,
@repository.get_dependencies("Gio").sort)
end
--
1.8.5.2
commit 71e27982fb9145684f5afb76303d93f87b03e0a4
Author: Kouhei Sutou <kou@clear-code.com>
Date: Fri Jan 17 23:59:11 2014 +0900
gi test: follow (maybe) GObjectIntrospection change
GitHub: fix #217
Reported by mtasaka. Thanks!!!
diff --git a/gobject-introspection/test/test-signal-info.rb b/gobject-introspection/test/test-signal-info.rb
index 93fbb89..232ec2f 100644
--- a/gobject-introspection/test/test-signal-info.rb
+++ b/gobject-introspection/test/test-signal-info.rb
@@ -15,6 +15,8 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
class TestSignalInfo < Test::Unit::TestCase
+ include GObjectIntrospectionTestUtils
+
def setup
@repository = GObjectIntrospection::Repository.default
@repository.require("Gio")
@@ -23,7 +25,8 @@ class TestSignalInfo < Test::Unit::TestCase
end
def test_flags
- assert_equal(GLib::SignalFlags::RUN_CLEANUP,
+ require_version(1, 38, 0)
+ assert_equal(GLib::SignalFlags::RUN_LAST,
@info.flags)
end