C++ generated code - use .obx.hpp and .obx.cpp extensions

objectbox · Aug 14, 2020 · 1d6b816 · 1d6b816
1 parent 49c3174
commit 1d6b816
Show file tree

Hide file tree

Showing 12 changed files with 13 additions and 12 deletions.
diff --git a/internal/generator/c/cgenerator.go b/internal/generator/c/cgenerator.go
@@ -48,7 +48,7 @@ func (gen *CGenerator) BindingFiles(forFile string, options generator.Options) [
 	if gen.PlainC {
 		return []string{base + ".obx.h"}
 	}
-	return []string{base + "-cpp.obx.h", base + ".obx.cpp"}
+	return []string{base + ".obx.hpp", base + ".obx.cpp"}
 }
 
 // ModelFile returns the model GO file for the given JSON info file path
@@ -64,6 +64,7 @@ func (CGenerator) IsGeneratedFile(file string) bool {
 	var name = filepath.Base(file)
 	return name == "objectbox-model.h" ||
 		strings.HasSuffix(name, ".obx.h") ||
+		strings.HasSuffix(name, ".obx.hpp") ||
 		strings.HasSuffix(name, ".obx.cpp")
 }
 

diff --git a/test/comparison/.gitignore b/test/comparison/.gitignore
@@ -4,4 +4,4 @@ objectbox-model.[ch]
 
 *.obx.go
 *.obx.[ch]
-*.obx.cpp
+*.obx.[ch]pp
diff --git a/test/comparison/README.md b/test/comparison/README.md
@@ -14,7 +14,7 @@ Therefore, the test works as follows:
     * negative tests: if the file has a fail infix in the name: `*.fail.<source-type>`, 
       it's considered a negative test case (the generation should fail)
 * `<source-type>/<test-case>/<target-type>/*.<target-type-ext>.expected` are files expected to be generated
-    e.g. `fbs/typeful/cpp/schema-cpp.obx.h`
+    e.g. `fbs/typeful/cpp/schema.obx.hpp`
     * there's an exception with `go` source & target type = the target type isn't present in the path
       e.g. `go/typeful/typebuf.obx.go.expected`
 * `<source-type>/<test-case>/objectbox-model.json.expected` is the expected model JSON file, it's common for all languages.     

diff --git a/test/comparison/conf.go b/test/comparison/conf.go
@@ -53,6 +53,6 @@ type testSpec struct {
 
 var confs = map[string]testSpec{
 	"fbs-c":   {"c", ".fbs", []string{".obx.h"}, &cgenerator.CGenerator{PlainC: true}, &cTestHelper{cpp: false}},
-	"fbs-cpp": {"cpp", ".fbs", []string{"-cpp.obx.h", ".obx.cpp"}, &cgenerator.CGenerator{PlainC: false}, &cTestHelper{cpp: true}},
+	"fbs-cpp": {"cpp", ".fbs", []string{".obx.hpp", ".obx.cpp"}, &cgenerator.CGenerator{PlainC: false}, &cTestHelper{cpp: true}},
 	"go":      {"go", ".go", []string{".obx.go"}, &gogenerator.GoGenerator{}, &goTestHelper{}},
 }
diff --git a/test/comparison/testdata/fbs/typeful/cpp/schema.obx.cpp.expected b/test/comparison/testdata/fbs/typeful/cpp/schema.obx.cpp.expected
@@ -1,6 +1,6 @@
 // Code generated by ObjectBox; DO NOT EDIT.
 
-#include "schema-cpp.obx.h"
+#include "schema.obx.hpp"
 
 const obx::Property<Typeful, OBXPropertyType_Long> Typeful_::id(1);
 const obx::Property<Typeful, OBXPropertyType_Int> Typeful_::int_(2);

diff --git a/...fbs/typeful/cpp/schema-cpp.obx.h.expected → ...a/fbs/typeful/cpp/schema.obx.hpp.expected b/...fbs/typeful/cpp/schema-cpp.obx.h.expected → ...a/fbs/typeful/cpp/schema.obx.hpp.expected
diff --git a/test/integration/.gitignore b/test/integration/.gitignore
@@ -3,7 +3,7 @@ CMakeLists.txt
 objectbox-model.json
 objectbox-model.[ch]
 *.obx.[ch]
-*.obx.cpp
+*.obx.[ch]pp
 
 # IDE
 .idea/

diff --git a/test/integration/property-clear/cpp/step-1.cpp b/test/integration/property-clear/cpp/step-1.cpp
@@ -2,7 +2,7 @@
 
 #include "catch2/catch.hpp"
 #include "objectbox-cpp.h"
-#include "schema-cpp.obx.h"
+#include "schema.obx.hpp"
 #include "shared/store-init.h"
 using namespace obx;
 

diff --git a/test/integration/property-clear/cpp/step-2.cpp b/test/integration/property-clear/cpp/step-2.cpp
@@ -2,7 +2,7 @@
 
 #include "catch2/catch.hpp"
 #include "objectbox-cpp.h"
-#include "schema-cpp.obx.h"
+#include "schema.obx.hpp"
 #include "shared/store-init.h"
 using namespace obx;
 

diff --git a/test/integration/renames/cpp/step-1.cpp b/test/integration/renames/cpp/step-1.cpp
@@ -2,7 +2,7 @@
 
 #include "catch2/catch.hpp"
 #include "objectbox-cpp.h"
-#include "schema-cpp.obx.h"
+#include "schema.obx.hpp"
 #include "shared/store-init.h"
 using namespace obx;
 

diff --git a/test/integration/renames/cpp/step-2.cpp b/test/integration/renames/cpp/step-2.cpp
@@ -2,7 +2,7 @@
 
 #include "catch2/catch.hpp"
 #include "objectbox-cpp.h"
-#include "schema-cpp.obx.h"
+#include "schema.obx.hpp"
 #include "shared/store-init.h"
 using namespace obx;
 

diff --git a/test/integration/typeful/cpp/main.cpp b/test/integration/typeful/cpp/main.cpp
@@ -1,10 +1,10 @@
 #define CATCH_CONFIG_MAIN
 
-#include "annotated-cpp.obx.h"
+#include "annotated.obx.hpp"
 #include "catch2/catch.hpp"
 #include "objectbox-cpp.h"
 #include "objectbox-model.h"
-#include "schema-cpp.obx.h"
+#include "schema.obx.hpp"
 
 using namespace obx;