More tests

gershnik · Jan 15, 2024 · b64a2f1 · b64a2f1
1 parent 6fcc58c
commit b64a2f1
Show file tree

Hide file tree

Showing 2 changed files with 56 additions and 2 deletions.
diff --git a/test/BlockUtilTest.mm b/test/BlockUtilTest.mm
@@ -1,5 +1,7 @@
 #include <objc-helpers/BlockUtil.h>
 
+#include <Foundation/Foundation.h>
+
 #include "doctest.h"
 
 TEST_SUITE_BEGIN( "BlockUtilTests" );
@@ -115,12 +117,47 @@ int operator()(int i) const {
     }
     CHECK(foo::record == "dmm~~o~");
 
+    {
+        foo::record.clear();
+        auto b = makeBlock(foo{});
+        decltype(b) b1 = std::move(b);
+        CHECK(b1(42) == 42);
+    }
+    CHECK(foo::record == "dm~mo~~");
+
+    {
+        foo::record.clear();
+        auto b = makeBlock(fooMoveOnly{});
+        decltype(b) b1 = std::move(b);
+        CHECK(b1(42) == 42);
+    }
+    CHECK(foo::record == "dm~mo~~");
+
     {
         foo::record.clear();
         auto b = makeBlock(fooCopyOnly{});
         decltype(b) b1 = std::move(b);
+        CHECK(b1(42) == 42);
     }
-    CHECK(foo::record == "dc~c~~");
+    CHECK(foo::record == "dc~co~~");
+}
+
+@interface MakeStrongCheck : NSObject {
+@public int i;
+}
+@end
+
+@implementation MakeStrongCheck
+@end
+
+TEST_CASE( "makeStrong" ) {
+
+    auto str = [MakeStrongCheck new];
+    auto weak = makeWeak(str);
+    REQUIRE(bool(weak));
+    auto str1 = makeStrong(weak);
+    bool equal = str == str1;
+    CHECK(equal);
 }
 
 TEST_SUITE_END();
diff --git a/test/BlockUtilTestCpp.cpp b/test/BlockUtilTestCpp.cpp
@@ -121,12 +121,29 @@ TEST_CASE( "makeBlock" ) {
     }
     CHECK(foo::record == "dmm~~o~");
 
+    {
+        foo::record.clear();
+        auto b = makeBlock(foo{});
+        decltype(b) b1 = std::move(b);
+        CHECK(b1(42) == 42);
+    }
+    CHECK(foo::record == "dm~mo~~");
+
+    {
+        foo::record.clear();
+        auto b = makeBlock(fooMoveOnly{});
+        decltype(b) b1 = std::move(b);
+        CHECK(b1(42) == 42);
+    }
+    CHECK(foo::record == "dm~mo~~");
+
     {
         foo::record.clear();
         auto b = makeBlock(fooCopyOnly{});
         decltype(b) b1 = std::move(b);
+        CHECK(b1(42) == 42);
     }
-    CHECK(foo::record == "dc~c~~");
+    CHECK(foo::record == "dc~co~~");
 }
 
 TEST_SUITE_END();