test/test-window.rb in mireru-0.2.0 vs test/test-window.rb in mireru-0.2.1

@@ -1,8 +1,10 @@
 require "mireru/window"
 
 class WindowTest < Test::Unit::TestCase
+  include MireruTestUtils
+
   def setup
     @window = Mireru::Window.new
   end
 
   def test_add_container
@@ -10,28 +12,36 @@
     mock(container).shift { "a" }
     mock(@window).add_from_file("a")
     @window.add_container(container)
   end
 
-  def test_add_from_file_of_scrollable
-    file = __FILE__
-    mock(Mireru::Widget).create(file, *@window.size) do
-      Gtk::TextView.new
+  class AddFromFileTest
+    def test_scrollable
+      file = __FILE__
+      mock(Mireru::Widget).create(file, *@window.size) do
+        Gtk::TextView.new
+      end
+      mock(@window).show_all
+      @window.add_from_file(file)
+      assert_equal(Gtk::ScrolledWindow, @window.child.class)
+      assert_equal(Gtk::TextView, @window.child.child.class)
     end
-    mock(@window).show_all
-    @window.add_from_file(file)
-    assert_equal(Gtk::ScrolledWindow, @window.child.class)
-    assert_equal(Gtk::TextView, @window.child.child.class)
-  end
 
-  def test_add_from_file_of_no_scrollable
-    file = "fixtures/nijip.png"
-    mock(Mireru::Widget).create(file, *@window.size) do
-      Gtk::Image.new
+    def test_no_scrollable
+      file = File.join(fixtures_dir, "nijip.png")
+      mock(Mireru::Widget).create(file, *@window.size) do
+        Gtk::Image.new
+      end
+      mock(@window).show_all
+      @window.add_from_file(file)
+      assert_equal(Gtk::ScrolledWindow, @window.child.class)
+      assert_equal(Gtk::Viewport, @window.child.child.class)
+      assert_equal(Gtk::Image, @window.child.child.child.class)
     end
-    mock(@window).show_all
-    @window.add_from_file(file)
-    assert_equal(Gtk::ScrolledWindow, @window.child.class)
-    assert_equal(Gtk::Viewport, @window.child.child.class)
-    assert_equal(Gtk::Image, @window.child.child.child.class)
+
+    def test_enumable
+      file = [__FILE__]
+      @window.add_from_file(file)
+      assert_equal(Mireru::Widget::Thumbnail, @window.child.child.class)
+    end
   end
 end