Quellcode durchsuchen

Remove obsolete setting from test

René Beckmann vor 7 Jahren
Ursprung
Commit
c749b11d8c

+ 1 - 4
test-plugins/org.yakindu.sct.generator.c.test/gtests/StringExpressions/StringExpressions.sgen

@@ -4,10 +4,7 @@ GeneratorModel for yakindu::c {
 			targetProject = "gtests"
 			targetProject = "gtests"
 			targetFolder = "StringExpressions"
 			targetFolder = "StringExpressions"
 		}
 		}
-		feature IdentifierSettings {
-			maxIdentifierLength = 254
-			separator =  "_" 
-		}
+
 		feature FunctionInlining {
 		feature FunctionInlining {
 			inlineReactions = false
 			inlineReactions = false
 			inlineEntryActions = false
 			inlineEntryActions = false

+ 5 - 5
test-plugins/org.yakindu.sct.generator.c.test/gtests/StringExpressions/StringExpressionsTest.cc

@@ -32,31 +32,31 @@ TEST_F(StringExpressionsTest, StringExpressionsTest) {
 	EXPECT_TRUE(strcmp(stringExpressionsIface_get_quotedStringX(&statechart), "\"X\"") == 0);
 	EXPECT_TRUE(strcmp(stringExpressionsIface_get_quotedStringX(&statechart), "\"X\"") == 0);
 	EXPECT_TRUE(strcmp(stringExpressionsIface_get_quotedStringY(&statechart), "\"Y\"") == 0);
 	EXPECT_TRUE(strcmp(stringExpressionsIface_get_quotedStringY(&statechart), "\"Y\"") == 0);
 	stringExpressions_enter(&statechart);
 	stringExpressions_enter(&statechart);
-	EXPECT_TRUE(stringExpressions_isStateActive(&statechart, StringExpressions_AssignmentChecked));
+	EXPECT_TRUE(stringExpressions_isStateActive(&statechart, StringExpressions_main_region_AssignmentChecked));
 	stringExpressionsIface_raise_e(&statechart);
 	stringExpressionsIface_raise_e(&statechart);
 	sc_timer_service_proceed_cycles(&timer_service, 1);
 	sc_timer_service_proceed_cycles(&timer_service, 1);
-	EXPECT_TRUE(stringExpressions_isStateActive(&statechart, StringExpressions_VarToVarCompareSucceeded));
+	EXPECT_TRUE(stringExpressions_isStateActive(&statechart, StringExpressions_main_region_VarToVarCompareSucceeded));
 	EXPECT_TRUE(stringExpressionsIface_get_guardStringEqual(&statechart));
 	EXPECT_TRUE(stringExpressionsIface_get_guardStringEqual(&statechart));
 	EXPECT_TRUE(stringExpressionsIface_get_guardStringNotEqual(&statechart));
 	EXPECT_TRUE(stringExpressionsIface_get_guardStringNotEqual(&statechart));
 	EXPECT_TRUE(stringExpressionsIface_get_stringVarEqual(&statechart));
 	EXPECT_TRUE(stringExpressionsIface_get_stringVarEqual(&statechart));
 	EXPECT_TRUE(stringExpressionsIface_get_stringVarNotEqual(&statechart));
 	EXPECT_TRUE(stringExpressionsIface_get_stringVarNotEqual(&statechart));
 	stringExpressionsIface_raise_e(&statechart);
 	stringExpressionsIface_raise_e(&statechart);
 	sc_timer_service_proceed_cycles(&timer_service, 1);
 	sc_timer_service_proceed_cycles(&timer_service, 1);
-	EXPECT_TRUE(stringExpressions_isStateActive(&statechart, StringExpressions_VarToConstCompareSucceeded));
+	EXPECT_TRUE(stringExpressions_isStateActive(&statechart, StringExpressions_main_region_VarToConstCompareSucceeded));
 	EXPECT_TRUE(stringExpressionsIface_get_guardStringEqual(&statechart));
 	EXPECT_TRUE(stringExpressionsIface_get_guardStringEqual(&statechart));
 	EXPECT_TRUE(stringExpressionsIface_get_guardStringNotEqual(&statechart));
 	EXPECT_TRUE(stringExpressionsIface_get_guardStringNotEqual(&statechart));
 	EXPECT_TRUE(stringExpressionsIface_get_stringVarEqual(&statechart));
 	EXPECT_TRUE(stringExpressionsIface_get_stringVarEqual(&statechart));
 	EXPECT_TRUE(stringExpressionsIface_get_stringVarNotEqual(&statechart));
 	EXPECT_TRUE(stringExpressionsIface_get_stringVarNotEqual(&statechart));
 	stringExpressionsIface_raise_e(&statechart);
 	stringExpressionsIface_raise_e(&statechart);
 	sc_timer_service_proceed_cycles(&timer_service, 1);
 	sc_timer_service_proceed_cycles(&timer_service, 1);
-	EXPECT_TRUE(stringExpressions_isStateActive(&statechart, StringExpressions_ConstToVarCompareSucceeded));
+	EXPECT_TRUE(stringExpressions_isStateActive(&statechart, StringExpressions_main_region_ConstToVarCompareSucceeded));
 	EXPECT_TRUE(stringExpressionsIface_get_guardStringEqual(&statechart));
 	EXPECT_TRUE(stringExpressionsIface_get_guardStringEqual(&statechart));
 	EXPECT_TRUE(stringExpressionsIface_get_guardStringNotEqual(&statechart));
 	EXPECT_TRUE(stringExpressionsIface_get_guardStringNotEqual(&statechart));
 	EXPECT_TRUE(stringExpressionsIface_get_stringVarEqual(&statechart));
 	EXPECT_TRUE(stringExpressionsIface_get_stringVarEqual(&statechart));
 	EXPECT_TRUE(stringExpressionsIface_get_stringVarNotEqual(&statechart));
 	EXPECT_TRUE(stringExpressionsIface_get_stringVarNotEqual(&statechart));
 	stringExpressionsIface_raise_e(&statechart);
 	stringExpressionsIface_raise_e(&statechart);
 	sc_timer_service_proceed_cycles(&timer_service, 1);
 	sc_timer_service_proceed_cycles(&timer_service, 1);
-	EXPECT_TRUE(stringExpressions_isStateActive(&statechart, StringExpressions_ConstToConstCompareSucceeded));
+	EXPECT_TRUE(stringExpressions_isStateActive(&statechart, StringExpressions_main_region_ConstToConstCompareSucceeded));
 	EXPECT_TRUE(stringExpressionsIface_get_guardStringEqual(&statechart));
 	EXPECT_TRUE(stringExpressionsIface_get_guardStringEqual(&statechart));
 	EXPECT_TRUE(stringExpressionsIface_get_guardStringNotEqual(&statechart));
 	EXPECT_TRUE(stringExpressionsIface_get_guardStringNotEqual(&statechart));
 	EXPECT_TRUE(stringExpressionsIface_get_stringVarEqual(&statechart));
 	EXPECT_TRUE(stringExpressionsIface_get_stringVarEqual(&statechart));

+ 0 - 5
test-plugins/org.yakindu.sct.generator.c.test/model/test.sgen

@@ -1670,11 +1670,6 @@ GeneratorModel for sctunit::c {
 			WrapToJUnit = true
 			WrapToJUnit = true
 		}
 		}
 
 
-		feature IdentifierSettings {
-			maxIdentifierLength = 254
-			separator = "_"
-		}
-
 		feature FunctionInlining {
 		feature FunctionInlining {
 			inlineReactions = false
 			inlineReactions = false
 			inlineEntryActions = false
 			inlineEntryActions = false