C++ Integration Tests: introduces CppDefaults, set to C++14

Author: dan-obx

test/integration/integration.go

@@ -33,7 +33,7 @@ import (
 	"testing"
 
 	"github.com/objectbox/objectbox-generator/internal/generator"
-	"github.com/objectbox/objectbox-generator/internal/generator/c"
+	cgenerator "github.com/objectbox/objectbox-generator/internal/generator/c"
 	"github.com/objectbox/objectbox-generator/test/assert"
 	"github.com/objectbox/objectbox-generator/test/build"
 	"github.com/objectbox/objectbox-generator/test/cmake"
@@ -56,8 +56,11 @@ func (std cCppStandard) year() (int, error) {
 }
 
 const Cpp11 = cCppStandard("C++11")
+const Cpp14 = cCppStandard("C++14")
 const Cpp17 = cCppStandard("C++17")
 
+const CppDefault = Cpp14
+
 // used during development to generate code into the source directory instead of temp
 var inSource = flag.Bool("insource", false, "Output generated code to the source dir for development")
 

test/integration/property-clear/property_clear_test.go

@@ -43,7 +43,7 @@ func TestCpp(t *testing.T) {
 	defer conf.Cleanup()
 
 	// BEFORE start
-	conf.CreateCMake(t, integration.Cpp11, "step-1.cpp")
+	conf.CreateCMake(t, integration.CppDefault, "step-1.cpp")
 	conf.Generate(t, map[string]string{"schema.fbs": `table EntityName {
 	id:uint64;
 	value:int;
@@ -68,7 +68,7 @@ func TestCpp(t *testing.T) {
 	t.Logf("Changing property '%s' %s UID to %d",
 		modelInfo.Entities[0].Properties[1].Name, modelInfo.Entities[0].Properties[1].Id, newUid)
 	assert.NoErr(t, err)
-	conf.CreateCMake(t, integration.Cpp11, "step-2.cpp")
+	conf.CreateCMake(t, integration.CppDefault, "step-2.cpp")
 	conf.Generate(t, map[string]string{"schema.fbs": `table EntityName {
 	id:uint64;
 ` + "/// objectbox: uid=" + strconv.FormatInt(int64(newUid), 10) + `

test/integration/removes/remove_test.go

@@ -46,7 +46,7 @@ func TestCpp(t *testing.T) {
 	defer conf.Cleanup()
 
 	// STEP-1 start
-	conf.CreateCMake(t, integration.Cpp11, "step-1.cpp")
+	conf.CreateCMake(t, integration.CppDefault, "step-1.cpp")
 	conf.Generate(t, map[string]string{"": "", "schema.fbs": `
 /// This entity will be removed in step 2
 /// objectbox:relation(to=EntityB,name=standaloneRel)
@@ -96,7 +96,7 @@ table EntityB {
 	// STEP-1 end
 
 	// STEP-2 start
-	conf.CreateCMake(t, integration.Cpp11, "step-2.cpp")
+	conf.CreateCMake(t, integration.CppDefault, "step-2.cpp")
 	conf.Generate(t, map[string]string{"": "", "schema.fbs": `
 table EntityB {
 	id:uint64;

test/integration/renames/rename_test.go

@@ -47,7 +47,7 @@ func TestCpp(t *testing.T) {
 	defer conf.Cleanup()
 
 	// BEFORE RENAME start
-	conf.CreateCMake(t, integration.Cpp11, "step-1.cpp")
+	conf.CreateCMake(t, integration.CppDefault, "step-1.cpp")
 	conf.Generate(t, map[string]string{"schema.fbs": `table OldEntityName {
 	id:uint64;
 	oldPropertyName:int;
@@ -65,7 +65,7 @@ func TestCpp(t *testing.T) {
 	// BEFORE RENAME end
 
 	// AFTER RENAME start
-	conf.CreateCMake(t, integration.Cpp11, "step-2.cpp")
+	conf.CreateCMake(t, integration.CppDefault, "step-2.cpp")
 	conf.Generate(t, map[string]string{"schema.fbs": "/// objectbox: uid=" + entityUid + `
 table NewEntityName {
 	id:uint64;

test/integration/sync/integration_test.go

@@ -28,5 +28,5 @@ import (
 func TestCpp(t *testing.T) {
 	conf := &integration.CCppTestConf{}
 	defer conf.Cleanup()
-	conf.CommonExecute(t, integration.Cpp11)
+	conf.CommonExecute(t, integration.CppDefault)
 }

test/integration/typeful/integration_test.go

@@ -28,5 +28,5 @@ import (
 func TestCpp(t *testing.T) {
 	conf := &integration.CCppTestConf{}
 	defer conf.Cleanup()
-	conf.CommonExecute(t, integration.Cpp11)
+	conf.CommonExecute(t, integration.CppDefault)
 }