aboutsummaryrefslogtreecommitdiffstats
path: root/test/core
diff options
context:
space:
mode:
authorToshiaki Asai <toshi.alternative@gmail.com>2016-11-27 09:47:22 +0900
committerToshiaki Asai <toshi.alternative@gmail.com>2016-11-27 09:47:22 +0900
commite3f5cabd7fde059713f07af415ec8b423ed577cc (patch)
treeeaa1d05ba7f8034fd1e8535a6a99ec57bec4611c /test/core
parent6f6d2cb9223cd15a304c544f7ea948813ac2ad0a (diff)
parent732e9dbbb5c133209dbd53965f5aa50d74424de9 (diff)
downloadmikutter-e3f5cabd7fde059713f07af415ec8b423ed577cc.tar.gz
Merge branch 'master' into develop
Diffstat (limited to 'test/core')
-rw-r--r--test/core/test_gtk_webicon.rb4
-rw-r--r--test/core/test_web_image_loader.rb6
2 files changed, 5 insertions, 5 deletions
diff --git a/test/core/test_gtk_webicon.rb b/test/core/test_gtk_webicon.rb
index ffb4b83e..bd23d720 100644
--- a/test/core/test_gtk_webicon.rb
+++ b/test/core/test_gtk_webicon.rb
@@ -12,14 +12,14 @@ class TC_GtkWebIcon < Test::Unit::TestCase
must "local image load" do
image = Gtk::WebIcon.new(Skin.get('icon.png'), 48, 48)
- assert_kind_of(Gdk::Pixbuf, image.pixbuf)
+ assert_kind_of(GdkPixbuf::Pixbuf, image.pixbuf)
assert_not_equal(Gdk::WebImageLoader.loading_pixbuf(48, 48), image.pixbuf)
assert_not_equal(Gdk::WebImageLoader.notfound_pixbuf(48, 48), image.pixbuf)
end
must "local image not found" do
image = Gtk::WebIcon.new('notfound-file', 48, 48)
- assert_kind_of(Gdk::Pixbuf, image.pixbuf)
+ assert_kind_of(GdkPixbuf::Pixbuf, image.pixbuf)
assert_equal(Gdk::WebImageLoader.notfound_pixbuf(48, 48), image.pixbuf)
end
diff --git a/test/core/test_web_image_loader.rb b/test/core/test_web_image_loader.rb
index e939b324..523cc615 100644
--- a/test/core/test_web_image_loader.rb
+++ b/test/core/test_web_image_loader.rb
@@ -24,7 +24,7 @@ class TC_GtkWebImageLoader < Test::Unit::TestCase
(Thread.list - [Thread.current]).each &:join
Delayer.run
assert_equal(true, response[1])
- assert_kind_of(Gdk::Pixbuf, response[0])
+ assert_kind_of(GdkPixbuf::Pixbuf, response[0])
end
must "internal server error" do
@@ -36,7 +36,7 @@ class TC_GtkWebImageLoader < Test::Unit::TestCase
(Thread.list - [Thread.current]).each &:join
Delayer.run(0)
assert_equal(true, response_success)
- assert_kind_of(Gdk::Pixbuf, response_pixbuf)
+ assert_kind_of(GdkPixbuf::Pixbuf, response_pixbuf)
end
must "successfully load image" do
@@ -113,7 +113,7 @@ class TC_GtkWebImageLoader < Test::Unit::TestCase
assert_equal(0, Delayer.size)
response.each { |r|
- assert_kind_of(Gdk::Pixbuf, r)
+ assert_kind_of(GdkPixbuf::Pixbuf, r)
assert_not_equal(Gdk::WebImageLoader.loading_pixbuf(48, 48), r)
assert_not_equal(Gdk::WebImageLoader.notfound_pixbuf(48, 48), r) }
end