rice 4.0.4 → 4.1.0

data/test/test_Object.cpp

@@ -172,9 +172,72 @@ TESTCASE(call_return_rice_object)
   ASSERT_EQUAL(Object(detail::to_ruby(3)), three);
 }
 
-/*TESTCASE(test_mark)
+TESTCASE(call_with_keywords)
+{
+  Module kernel = Module("Kernel");
+
+
+  Hash keywords;
+  keywords[":exception"] = false;
+  Object result = kernel.call("Integer", "charlie", keywords);
+  ASSERT_EQUAL(Qnil, result.value());
+
+  keywords[":exception"] = true;
+
+  ASSERT_EXCEPTION_CHECK(
+    Exception,
+    kernel.call("Integer", "charlie", keywords),
+    ASSERT_EQUAL("invalid value for Integer(): \"charlie\"", 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));