Merge branch '10-upgrade-test-dependency-objectbox-clib-0-14-0-21' in…

…to 'dev' Resolve "Upgrade test dependency objectbox-clib 0.14 -> 0.21+" Closes #10 See merge request objectbox/objectbox-generator!12
objectbox · Mar 4, 2024 · 503210c · 503210c
2 parents 2b9ef44 + 52887c5
commit 503210c
Show file tree

Hide file tree

Showing 15 changed files with 39 additions and 12 deletions.
diff --git a/test/build/c-compiler.go b/test/build/c-compiler.go
@@ -35,18 +35,18 @@ func CanCompileObjectBoxCCpp(t *testing.T, repoRoot string, cpp, required bool)
 
 	// check objectbox lib
 	if cpp {
-		err = cmake.LibraryExists("objectbox", []string{"objectbox.hpp"}, includeDirs, libDirs)
+		err = cmake.LibraryExists("objectbox", []string{"objectbox.hpp"}, includeDirs, libDirs, []string{"OBX_CPP_FILE"})
 	} else {
-		err = cmake.LibraryExists("objectbox", []string{"objectbox.h"}, includeDirs, libDirs)
+		err = cmake.LibraryExists("objectbox", []string{"objectbox.h"}, includeDirs, libDirs, nil)
 	}
 	assert.NoErr(t, err)
 
 	// check flatbuffers library availability
 	if cpp {
 		// Note: we don't need flatbuffers library explicitly, it's part of objectbox at the moment.
-		err = cmake.LibraryExists("", []string{"flatbuffers/flatbuffers.h"}, includeDirs, libDirs)
+		err = cmake.LibraryExists("", []string{"flatbuffers/flatbuffers.h"}, includeDirs, libDirs, nil)
 	} else {
-		err = cmake.LibraryExists("flatccrt", []string{"stddef.h", "flatcc/flatcc.h", "flatcc/flatcc_builder.h"}, includeDirs, libDirs)
+		err = cmake.LibraryExists("flatccrt", []string{"stddef.h", "flatcc/flatcc.h", "flatcc/flatcc_builder.h"}, includeDirs, libDirs, nil)
 	}
 
 	if required {

diff --git a/test/cmake/libcheck.go b/test/cmake/libcheck.go
@@ -26,7 +26,7 @@ import (
 )
 
 // LibraryExists tries to compile a simple program linking to the given library
-func LibraryExists(name string, includeFiles, includeDirs, linkDirs []string) error {
+func LibraryExists(name string, includeFiles, includeDirs, linkDirs, predefines []string) error {
 	build := Cmake{
 		Name:        "check-" + name,
 		IsCpp:       true,
@@ -51,6 +51,11 @@ func LibraryExists(name string, includeFiles, includeDirs, linkDirs []string) er
 	{ // write main.cpp
 		mainPath := filepath.Join(build.ConfDir, build.Files[0])
 		var mainSrc string
+		if len(predefines) > 0 {
+			for _, predefine := range predefines {
+				mainSrc = mainSrc + "#define " + predefine + "\n"
+			}
+		}
 		if len(includeFiles) > 0 {
 			for _, inc := range includeFiles {
 				mainSrc = mainSrc + "#include <" + inc + ">\n"

diff --git a/test/cmake/libcheck_test.go b/test/cmake/libcheck_test.go
@@ -32,16 +32,16 @@ func TestLibExists(t *testing.T) {
 		t.SkipNow()
 	}
 
-	err := cmake.LibraryExists("nonsense", nil, nil, nil)
+	err := cmake.LibraryExists("nonsense", nil, nil, nil, nil)
 	assert.Err(t, err)
 
-	err = cmake.LibraryExists("", []string{"non-existent-lib/include.h"}, nil, nil)
+	err = cmake.LibraryExists("", []string{"non-existent-lib/include.h"}, nil, nil, nil)
 	assert.Err(t, err)
 
 	if runtime.GOOS == "windows" {
-		err = cmake.LibraryExists("", []string{"array"}, nil, nil)
+		err = cmake.LibraryExists("", []string{"array"}, nil, nil, nil)
 	} else {
-		err = cmake.LibraryExists("stdc++", []string{"array"}, nil, nil)
+		err = cmake.LibraryExists("stdc++", []string{"array"}, nil, nil, nil)
 	}
 	assert.NoErr(t, err)
 }
diff --git a/test/comparison/c-helper.go b/test/comparison/c-helper.go
@@ -104,6 +104,7 @@ func (h cTestHelper) build(t *testing.T, conf testSpec, dir string, expectedErro
 	{ // write main.c/cpp to the conf dir - a simple one, just include all sources
 		var mainSrc = ""
 		if cmak.IsCpp {
+			mainSrc = mainSrc + "#define OBX_CPP_FILE\n"
 			mainSrc = mainSrc + "#include \"objectbox.hpp\"\n"
 		} else {
 			mainSrc = mainSrc + "#include \"objectbox.h\"\n"

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]}")