C++ tests: update third-party objectbox C lib to use 0.21

dan-obx · dan-obx · commit 8f6750af84b2 · 2024-03-04T15:41:58.000+01:00
diff --git a/test/integration/optional/cpp/main.cpp b/test/integration/optional/cpp/main.cpp
@@ -1,5 +1,7 @@
 #define CATCH_CONFIG_MAIN
 
+#define OBX_CPP_FILE
+
 #include <type_traits>
 
 #include "c-ptr.obx.h"
diff --git a/test/integration/property-clear/cpp/step-1.cpp b/test/integration/property-clear/cpp/step-1.cpp
@@ -1,5 +1,7 @@
 #define CATCH_CONFIG_MAIN
 
+#define OBX_CPP_FILE
+
 #include "catch2/catch.hpp"
 #include "objectbox.hpp"
 #include "schema.obx.hpp"
diff --git a/test/integration/property-clear/cpp/step-2.cpp b/test/integration/property-clear/cpp/step-2.cpp
@@ -1,5 +1,7 @@
 #define CATCH_CONFIG_MAIN
 
+#define OBX_CPP_FILE
+
 #include "catch2/catch.hpp"
 #include "objectbox.hpp"
 #include "schema.obx.hpp"
diff --git a/test/integration/removes/cpp/step-1.cpp b/test/integration/removes/cpp/step-1.cpp
@@ -1,5 +1,7 @@
 #define CATCH_CONFIG_MAIN
 
+#define OBX_CPP_FILE
+
 #include "catch2/catch.hpp"
 #include "objectbox.hpp"
 #include "schema.obx.hpp"
diff --git a/test/integration/removes/cpp/step-2.cpp b/test/integration/removes/cpp/step-2.cpp
@@ -1,5 +1,7 @@
 #define CATCH_CONFIG_MAIN
 
+#define OBX_CPP_FILE
+
 #include "catch2/catch.hpp"
 #include "objectbox.hpp"
 #include "schema.obx.hpp"
diff --git a/test/integration/renames/cpp/step-1.cpp b/test/integration/renames/cpp/step-1.cpp
@@ -1,5 +1,7 @@
 #define CATCH_CONFIG_MAIN
 
+#define OBX_CPP_FILE
+
 #include "catch2/catch.hpp"
 #include "objectbox.hpp"
 #include "schema.obx.hpp"
diff --git a/test/integration/renames/cpp/step-2.cpp b/test/integration/renames/cpp/step-2.cpp
@@ -1,5 +1,7 @@
 #define CATCH_CONFIG_MAIN
 
+#define OBX_CPP_FILE
+
 #include "catch2/catch.hpp"
 #include "objectbox.hpp"
 #include "schema.obx.hpp"
diff --git a/test/integration/shared/store-init.h b/test/integration/shared/store-init.h
@@ -9,7 +9,10 @@ obx::Store testStore(bool removeBeforeOpening, const char* dbDir = nullptr) {
     	if (!dbDir) throw std::invalid_argument("dbDir environment variable not given");
     }
     if (removeBeforeOpening) obx_remove_db_files(dbDir);
-    obx::Store::Options options(create_obx_model());
-    options.directory(dbDir);
+    obx::Options options;
+    options
+        .model(create_obx_model())
+        .directory(dbDir)
+    ;
     return obx::Store(options);
 }
diff --git a/test/integration/sync/cpp/main.cpp b/test/integration/sync/cpp/main.cpp
@@ -1,5 +1,7 @@
 #define CATCH_CONFIG_MAIN
 
+#define OBX_CPP_FILE
+
 #include "catch2/catch.hpp"
 #include "objectbox.hpp"
 #include "objectbox-model.h"
diff --git a/test/integration/typeful/cpp/main.cpp b/test/integration/typeful/cpp/main.cpp
@@ -1,5 +1,7 @@
 #define CATCH_CONFIG_MAIN
 
+#define OBX_CPP_FILE
+
 #include "annotated.obx.hpp"
 #include "catch2/catch.hpp"
 #include "objectbox.hpp"
diff --git a/third_party/objectbox-c/get-objectbox-c.sh b/third_party/objectbox-c/get-objectbox-c.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-cVersion=0.14.0
+cVersion=0.21.0
 
 scriptDir=$(dirname "${BASH_SOURCE[0]}")
 

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,10 @@ obx::Store testStore(bool removeBeforeOpening, const char* dbDir = nullptr) {`
`9`	`9`	`if (!dbDir) throw std::invalid_argument("dbDir environment variable not given");`
`10`	`10`	`}`
`11`	`11`	`if (removeBeforeOpening) obx_remove_db_files(dbDir);`
`12`		`- obx::Store::Options options(create_obx_model());`
`13`		`- options.directory(dbDir);`
	`12`	`+ obx::Options options;`
	`13`	`+ options`
	`14`	`+ .model(create_obx_model())`
	`15`	`+ .directory(dbDir)`
	`16`	`+ ;`
`14`	`17`	`return obx::Store(options);`
`15`	`18`	`}`