Changeset 2298Tweet

Timestamp:

04/19/08 13:48:32 (5 years ago)

Author:

pterjan

Message:

Fix args type checks in Caca::Display.new

Location:

libcaca/trunk/ruby

Files:

• caca-display.c (modified) (1 diff)
• t/tc_display.rb (modified) (1 diff)

libcaca/trunk/ruby/caca-display.c

@@ -54 +54 @@
     }
 
-    if(CLASS_OF(arg1) == T_STRING)
+    if(TYPE(arg1) == T_STRING)
     {
         driver = StringValuePtr(arg1);
-        if(CLASS_OF(arg2) == T_STRING)
+        if(TYPE(arg2) == T_STRING)
         {
             rb_raise(rb_eArgError, "Only one argument can be a string");
         }
     }
-    else if(CLASS_OF(arg2) == T_STRING)
+    else if(TYPE(arg2) == T_STRING)
     {
         driver = StringValuePtr(arg2);

libcaca/trunk/ruby/t/tc_display.rb

@@ -4 +4 @@
 class TC_Canvas < Test::Unit::TestCase
     def test_create
-        d = Caca::Display.new
+        d = Caca::Display.new
         assert_not_nil(d, 'Display creation failed')
     end
     def test_create_with_driver
-        d = Caca::Display.new(nil, Caca::Display.driver_list[0])
+        d = Caca::Display.new(Caca::Display.driver_list[0])
         assert_not_nil(d, 'Display creation failed')
+    end
+    def test_create_wrong_args
+        assert_raise(RuntimeError){Caca::Display.new("plop")}
+        driver = Caca::Display.driver_list[0]
+        assert_raise(ArgumentError){Caca::Display.new(driver, driver)}
+        c = Cucul::Canvas.new(3, 3)
+        assert_raise(ArgumentError){Caca::Display.new(c, c)}
     end
     def test_create_from_canvas
         c = Cucul::Canvas.new(3, 3)
-        d = Caca::Display.new(c)
+        d = Caca::Display.new(c)
         assert_not_nil(d, 'Display creation failed')
-        assert_equal(d.canvas, c, 'Wrong canvas')
+        assert_equal(d.canvas, c, 'Wrong canvas')
     end
     def test_set_title