rice 4.0.4 → 4.2.0

data/test/test_Module.cpp

@@ -8,17 +8,23 @@ using namespace Rice;
 
 TESTSUITE(Module);
 
-SETUP(Object)
+SETUP(Module)
 {
   embed_ruby();
 }
 
-TESTCASE(construct_from_value)
+TESTCASE(FromConstant)
 {
   Module m(rb_mEnumerable);
   ASSERT_EQUAL(rb_mEnumerable, m.value());
 }
 
+TESTCASE(FromName)
+{
+  Module m("Enumerable");
+  ASSERT_EQUAL(rb_mEnumerable, m.value());
+}
+
 namespace
 {
 
@@ -41,10 +47,11 @@ void throw_silly_exception(Object self)
 
 TESTCASE(add_handler)
 {
+  register_handler<Quite_Silly_Exception>(handle_silly_exception);
+
   Module m(anonymous_module());
-  m.add_handler<Quite_Silly_Exception>(handle_silly_exception);
   m.define_singleton_method("foo", throw_silly_exception);
-  Object exc = m.instance_eval("begin; foo; rescue Exception; $!; end");
+  Object exc = m.module_eval("begin; foo; rescue Exception; $!; end");
   ASSERT_EQUAL(rb_eRuntimeError, CLASS_OF(exc));
   Exception ex(exc);
   ASSERT_EQUAL(String("SILLY"), String(ex.what()));
@@ -80,8 +87,8 @@ TESTCASE(define_method)
   Module m(anonymous_module());
   m.define_method("some_method", some_method);
   
-  Object o = m.instance_eval("$o = Object.new");
-  Object result = m.instance_eval(R"EOS($o.extend(self)
+  Object o = m.module_eval("$o = Object.new");
+  Object result = m.module_eval(R"EOS($o.extend(self)
                                         $o.some_method)EOS");
   ASSERT_EQUAL(o, result);
 }
@@ -99,7 +106,7 @@ TESTCASE(define_module_function)
   Module m(anonymous_module());
   m.define_module_function("some_function", some_function);
 
-  Object result = m.instance_eval(R"EOS(o = Object.new
+  Object result = m.module_eval(R"EOS(o = Object.new
                                    o.extend(self)
                                    o.instance_eval do
                                      some_function
@@ -130,7 +137,7 @@ TESTCASE(define_function_int)
 {
   Module m(anonymous_module());
   m.define_function("foo", function_int);
-  Object result = m.instance_eval("o = Object.new; o.extend(self); o.foo(42)");
+  Object result = m.module_eval("o = Object.new; o.extend(self); o.foo(42)");
   ASSERT_EQUAL(42, detail::From_Ruby<int>().convert(result));
 }
 
@@ -138,7 +145,7 @@ TESTCASE(define_method_int)
 {
   Module m(anonymous_module());
   m.define_method("foo", method_int);
-  Object result = m.instance_eval("o = Object.new; o.extend(self); o.foo(42)");
+  Object result = m.module_eval("o = Object.new; o.extend(self); o.foo(42)");
   ASSERT_EQUAL(42, detail::From_Ruby<int>().convert(result));
 }
 
@@ -162,7 +169,7 @@ TESTCASE(define_module_function_int)
 {
   Module m(anonymous_module());
   m.define_module_function("foo", function_int);
-  Object result = m.instance_eval("o = Object.new; o.extend(self); o.instance_eval { foo(42) }");
+  Object result = m.module_eval("o = Object.new; o.extend(self); o.instance_eval { foo(42) }");
   ASSERT_EQUAL(42, detail::From_Ruby<int>().convert(result));
 
   result = m.call("foo", 42);
@@ -175,7 +182,7 @@ TESTCASE(method_int_passed_no_args)
   m.define_method("foo", method_int);
   ASSERT_EXCEPTION_CHECK(
       Exception,
-      m.instance_eval("o = Object.new; o.extend(self); o.foo"),
+      m.module_eval("o = Object.new; o.extend(self); o.foo"),
       ASSERT_EQUAL(
           Object(rb_eArgError),
           Object(CLASS_OF(ex.value()))
@@ -204,50 +211,6 @@ TESTCASE(include_module)
   ASSERT_EQUAL(expected_ancestors, ancestors);
 }
 
-TESTCASE(const_set_get_by_id)
-{
-  Module m(anonymous_module());
-  Object v = detail::to_ruby(42);
-  Module & m2(m.const_set(rb_intern("FOO"), v));
-  ASSERT_EQUAL(&m, &m2);
-  ASSERT_EQUAL(v, m.const_get(rb_intern("FOO")));
-}
-
-TESTCASE(const_set_get_by_identifier)
-{
-  Module m(anonymous_module());
-  Object v = detail::to_ruby(42);
-  Module & m2(m.const_set(Identifier("FOO"), v));
-  ASSERT_EQUAL(&m, &m2);
-  ASSERT_EQUAL(v, m.const_get(Identifier("FOO")));
-}
-
-TESTCASE(const_set_get_by_string)
-{
-  Module m(anonymous_module());
-  Object v = detail::to_ruby(42);
-  Module & m2(m.const_set("FOO", v));
-  ASSERT_EQUAL(&m, &m2);
-  ASSERT_EQUAL(v, m.const_get("FOO"));
-}
-
-TESTCASE(remove_const)
-{
-  Module m(anonymous_module());
-  Object v = detail::to_ruby(42);
-  m.const_set("FOO", v);
-  ASSERT_EQUAL(v, m.const_get("FOO"));
-  m.remove_const("FOO");
-  ASSERT_EXCEPTION_CHECK(
-      Exception,
-      m.const_get("FOO"),
-      ASSERT_EQUAL(
-          Object(rb_eNameError),
-          Object(CLASS_OF(ex.value()))
-          )
-      );
-}
-
 TESTCASE(mod_name_anonymous)
 {
   Module m(anonymous_module());
@@ -274,7 +237,7 @@ TESTCASE(define_method_default_arguments)
   Module m(anonymous_module());
   m.define_function("foo", &defaults_method_one, Arg("arg1"), Arg("arg2") = 3, Arg("arg3") = true);
 
-  Object o = m.instance_eval("o = Object.new; o.extend(self); o");
+  Object o = m.module_eval("o = Object.new; o.extend(self); o");
   o.call("foo", 2);
 
   ASSERT_EQUAL(2, defaults_method_one_arg1);
@@ -301,7 +264,7 @@ TESTCASE(default_arguments_still_throws_argument_error)
 
   ASSERT_EXCEPTION_CHECK(
       Exception,
-      m.instance_eval("o = Object.new; o.extend(self); o.foo()"),
+      m.module_eval("o = Object.new; o.extend(self); o.foo()"),
       ASSERT_EQUAL(
           Object(rb_eArgError),
           Object(CLASS_OF(ex.value()))
@@ -310,7 +273,7 @@ TESTCASE(default_arguments_still_throws_argument_error)
 
   ASSERT_EXCEPTION_CHECK(
       Exception,
-      m.instance_eval("o = Object.new; o.extend(self); o.foo(3, 4, false, 17)"),
+      m.module_eval("o = Object.new; o.extend(self); o.foo(3, 4, false, 17)"),
       ASSERT_EQUAL(
           Object(rb_eArgError),
           Object(CLASS_OF(ex.value()))
@@ -330,7 +293,7 @@ TESTCASE(defining_methods_with_single_default_argument)
   // define_method
   Module m(anonymous_module());
   m.define_function("foo", &method_with_one_default_arg, (Arg("num") = 4));
-  m.instance_eval("o = Object.new; o.extend(self); o.foo()");
+  m.module_eval("o = Object.new; o.extend(self); o.foo()");
   ASSERT_EQUAL(4, the_one_default_arg);
 
   the_one_default_arg = 0;
@@ -448,7 +411,7 @@ TESTCASE(define_method_works_with_const_reference_return)
 
   Module m(anonymous_module());
 
-  Object result = m.instance_eval("Factory.new.get_return_test");
+  Object result = m.module_eval("Factory.new.get_return_test");
 
   ASSERT_EQUAL("ReturnTest", result.class_of().name().c_str());
 }
@@ -531,7 +494,7 @@ TESTCASE(pointers)
   Module m = define_module("TestingModule");
 
   std::string code = "with_pointers(32, true, 33.0, 34.0)";
-  m.instance_eval(code);
+  m.module_eval(code);
 
   ASSERT_EQUAL(intValue, 32);
   ASSERT_EQUAL(boolValue, true);
@@ -546,7 +509,7 @@ TESTCASE(references)
   Module m = define_module("TestingModule");
 
   std::string code = "with_references(42, true, 43.0, 44.0)";
-  m.instance_eval(code);
+  m.module_eval(code);
 
   ASSERT_EQUAL(intValue, 42);
   ASSERT_EQUAL(boolValue, true);

data/test/test_Object.cpp

@@ -172,9 +172,81 @@ TESTCASE(call_return_rice_object)
   ASSERT_EQUAL(Object(detail::to_ruby(3)), three);
 }
 
-/*TESTCASE(test_mark)
+TESTCASE(call_with_keywords)
+{
+  Module m(anonymous_module());
+
+  m.module_eval(R"(
+    def self.keywords_test(value, exception:)
+      if exception
+        raise "An exception!"
+      end
+
+      value
+    end
+  )");
+
+  Hash keywords;
+  keywords[":exception"] = false;
+  Object result = m.call_kw("keywords_test", "charlie", keywords);
+  ASSERT_EQUAL("charlie", detail::From_Ruby<const char*>().convert(result.value()));
+
+  keywords[":exception"] = true;
+
+  ASSERT_EXCEPTION_CHECK(
+    Exception,
+    m.call_kw("keywords_test", "charlie", keywords),
+    ASSERT_EQUAL("An exception!", ex.what())
+  );
+}
+
+TESTCASE(const_set_get_by_id)
+{
+  Class c(anonymous_class());
+  Object v1 = detail::to_ruby(42);
+  Object v2 = c.const_set(rb_intern("FOO"), v1);
+  ASSERT_EQUAL(v1, v2);
+  ASSERT_EQUAL(v1, c.const_get(rb_intern("FOO")));
+}
+
+TESTCASE(const_set_get_by_identifier)
+{
+  Class c(anonymous_class());
+  Object v1 = detail::to_ruby(42);
+  Object v2 = c.const_set(Identifier("FOO"), v1);
+  ASSERT_EQUAL(v1, v2);
+  ASSERT_EQUAL(v1, c.const_get(Identifier("FOO")));
+}
+
+TESTCASE(const_set_get_by_string)
+{
+  Class c(anonymous_class());
+  Object v1 = detail::to_ruby(42);
+  Object v2 = c.const_set("FOO", v1);
+  ASSERT_EQUAL(v1, v2);
+  ASSERT_EQUAL(v1, c.const_get("FOO"));
+}
+
+TESTCASE(remove_const)
+{
+  Module m(anonymous_module());
+  Object v = detail::to_ruby(42);
+  m.const_set("FOO", v);
+  ASSERT_EQUAL(v, m.const_get("FOO"));
+  m.remove_const("FOO");
+  ASSERT_EXCEPTION_CHECK(
+    Exception,
+    m.const_get("FOO"),
+    ASSERT_EQUAL(
+      Object(rb_eNameError),
+      Object(CLASS_OF(ex.value()))
+    )
+  );
+}
+
+TESTCASE(test_mark)
 {
   Object o(INT2NUM(42));
   rb_gc_start();
-  ASSERT_EQUAL(42, detail::From_Ruby<int>::convert(o.value()));
-}*/
+  ASSERT_EQUAL(42, detail::From_Ruby<int>().convert(o.value()));
+}

data/test/test_Ownership.cpp

@@ -13,11 +13,11 @@ namespace
   class MyClass
   {
   public:
-    static inline uint32_t constructorCalls = 0;
-    static inline uint32_t copyConstructorCalls = 0;
-    static inline uint32_t moveConstructorCalls = 0;
-    static inline uint32_t destructorCalls = 0;
-    static inline uint32_t methodCalls = 0;
+    static inline int constructorCalls = 0;
+    static inline int copyConstructorCalls = 0;
+    static inline int moveConstructorCalls = 0;
+    static inline int destructorCalls = 0;
+    static inline int methodCalls = 0;
 
     static void reset()
     {
@@ -145,7 +145,7 @@ TESTCASE(TransferPointer)
                           my_class = nil
                         end)";
 
-  m.instance_eval(code);
+  m.module_eval(code);
   rb_gc_start();
 
   ASSERT_EQUAL(10, MyClass::constructorCalls);
@@ -169,7 +169,7 @@ TESTCASE(KeepPointer)
                           my_class.set_flag(i)
                         end)";
 
-  m.instance_eval(code);
+  m.module_eval(code);
   rb_gc_start();
 
   ASSERT_EQUAL(1, MyClass::constructorCalls);
@@ -193,7 +193,7 @@ TESTCASE(KeepReference)
                           my_class.set_flag(i)
                         end)";
 
-  m.instance_eval(code);
+  m.module_eval(code);
   rb_gc_start();
 
   ASSERT_EQUAL(1, MyClass::constructorCalls);
@@ -217,7 +217,7 @@ TESTCASE(CopyReference)
                           my_class.set_flag(i)
                         end)";
 
-  m.instance_eval(code);
+  m.module_eval(code);
   rb_gc_start();
 
   ASSERT_EQUAL(1, MyClass::constructorCalls);
@@ -227,7 +227,7 @@ TESTCASE(CopyReference)
   ASSERT_EQUAL(0, Factory::instance_->flag);
 }
 
-/*TESTCASE(TransferValue)
+TESTCASE(TransferValue)
 {
   Factory::reset();
   MyClass::reset();
@@ -240,7 +240,7 @@ TESTCASE(CopyReference)
                           my_class.set_flag(i)
                         end)";
 
-  m.instance_eval(code);
+  m.module_eval(code);
   rb_gc_start();
 
   ASSERT_EQUAL(10, MyClass::constructorCalls);
@@ -263,7 +263,7 @@ TESTCASE(MoveValue)
                           my_class.set_flag(i)
                         end)";
 
-  m.instance_eval(code);
+  m.module_eval(code);
   rb_gc_start();
 
   ASSERT_EQUAL(10, MyClass::constructorCalls);
@@ -272,4 +272,3 @@ TESTCASE(MoveValue)
   ASSERT_EQUAL(30, MyClass::destructorCalls);
   ASSERT(!Factory::instance_);
 }
-*/

data/test/test_Self.cpp

@@ -13,11 +13,11 @@ namespace
   class SelfClass
   {
   public:
-    static inline uint32_t constructorCalls = 0;
-    static inline uint32_t copyConstructorCalls = 0;
-    static inline uint32_t moveConstructorCalls = 0;
-    static inline uint32_t destructorCalls = 0;
-    static inline uint32_t methodCalls = 0;
+    static inline int constructorCalls = 0;
+    static inline int copyConstructorCalls = 0;
+    static inline int moveConstructorCalls = 0;
+    static inline int destructorCalls = 0;
+    static inline int methodCalls = 0;
 
     static void reset()
     {
@@ -94,7 +94,7 @@ TESTCASE(SelfPointer)
   SelfClass::reset();
 
   Module m = define_module("TestingModule");
-  Object selfClass1 = m.instance_eval("SelfClass.new");
+  Object selfClass1 = m.module_eval("SelfClass.new");
   Object selfClass2 = selfClass1.call("self_pointer");
   ASSERT(selfClass2.is_equal(selfClass1));
 
@@ -113,7 +113,7 @@ TESTCASE(SelfReference)
   SelfClass::reset();
 
   Module m = define_module("TestingModule");
-  Object selfClass1 = m.instance_eval("SelfClass.new");
+  Object selfClass1 = m.module_eval("SelfClass.new");
   Object selfClass2 = selfClass1.call("self_reference");
   ASSERT(selfClass2.is_equal(selfClass1));
 
@@ -132,7 +132,7 @@ TESTCASE(SelfValue)
   SelfClass::reset();
 
   Module m = define_module("TestingModule");
-  Object selfClass1 = m.instance_eval("SelfClass.new");
+  Object selfClass1 = m.module_eval("SelfClass.new");
   Object selfClass2 = selfClass1.call("self_value");
   ASSERT(!selfClass2.is_equal(selfClass1));
 
@@ -151,7 +151,7 @@ TESTCASE(SelfPointerLambda)
   SelfClass::reset();
 
   Module m = define_module("TestingModule");
-  Object selfClass1 = m.instance_eval("SelfClass.new");
+  Object selfClass1 = m.module_eval("SelfClass.new");
   Object selfClass2 = selfClass1.call("self_pointer_lambda");
   ASSERT(selfClass2.is_equal(selfClass1));
 
@@ -162,8 +162,7 @@ TESTCASE(SelfPointerLambda)
   ASSERT_EQUAL(1, SelfClass::constructorCalls);
   ASSERT_EQUAL(0, SelfClass::copyConstructorCalls);
   ASSERT_EQUAL(0, SelfClass::moveConstructorCalls);
-  // TODO: re-enable this. It fails regularly on Ubuntu + Ruby 2.7, and nothing else.
-  // ASSERT_EQUAL(0, SelfClass::destructorCalls);
+  ASSERT_EQUAL(0, SelfClass::destructorCalls);
 }
 
 TESTCASE(SelfReferenceLambda)
@@ -171,7 +170,7 @@ TESTCASE(SelfReferenceLambda)
   SelfClass::reset();
 
   Module m = define_module("TestingModule");
-  Object selfClass1 = m.instance_eval("SelfClass.new");
+  Object selfClass1 = m.module_eval("SelfClass.new");
   Object selfClass2 = selfClass1.call("self_reference_lambda");
   ASSERT(selfClass2.is_equal(selfClass1));
 
@@ -190,7 +189,7 @@ TESTCASE(SelfValueLambda)
   SelfClass::reset();
 
   Module m = define_module("TestingModule");
-  Object selfClass1 = m.instance_eval("SelfClass.new");
+  Object selfClass1 = m.module_eval("SelfClass.new");
   Object selfClass2 = selfClass1.call("self_value_lambda");
   ASSERT(!selfClass2.is_equal(selfClass1));