repaired generator for c/cpp string compare, added new generated tests in C / C++

test-plugins/org.yakindu.sct.generator.c.test/gtests/AlwaysOncycle/AlwaysOncycle.cc

@@ -19,13 +19,13 @@ TEST(StatemachineTest, alwaysOncycleTest) {
 	alwaysOncycle_init(&handle);
 	alwaysOncycle_enter(&handle);
 	EXPECT_TRUE(alwaysOncycle_isActive(&handle, AlwaysOncycle_main_region_StateA));
-	while (alwaysOncycleIface_get_value(&handle) < 5) {
+	while (alwaysOncycleIface_get_value(&handle) < 5l) {
 		alwaysOncycle_runCycle(&handle);
 		EXPECT_TRUE(alwaysOncycle_isActive(&handle, AlwaysOncycle_main_region_StateA));
 	}
 	alwaysOncycle_runCycle(&handle);
 	EXPECT_TRUE(alwaysOncycle_isActive(&handle, AlwaysOncycle_main_region_StateB));
-	while (alwaysOncycleIface_get_value(&handle) < 5) {
+	while (alwaysOncycleIface_get_value(&handle) < 5l) {
 		alwaysOncycle_runCycle(&handle);
 		EXPECT_TRUE(alwaysOncycle_isActive(&handle, AlwaysOncycle_main_region_StateB));
 	}

test-plugins/org.yakindu.sct.generator.c.test/gtests/AssignmentAsExpression/AssignmentAsExpression.cc

@@ -19,33 +19,33 @@ TEST(StatemachineTest, simpleAssignment) {
 	assignmentAsExpression_init(&handle);
 	assignmentAsExpression_enter(&handle);
 	EXPECT_TRUE(assignmentAsExpression_isActive(&handle, AssignmentAsExpression_main_region_Add));
-	EXPECT_TRUE(assignmentAsExpressionIface_get_b(&handle) == 5);
-	EXPECT_TRUE(assignmentAsExpressionIface_get_a(&handle) == 9);
+	EXPECT_TRUE(assignmentAsExpressionIface_get_b(&handle) == 5l);
+	EXPECT_TRUE(assignmentAsExpressionIface_get_a(&handle) == 9l);
 	assignmentAsExpression_runCycle(&handle);
 	EXPECT_TRUE(assignmentAsExpression_isActive(&handle, AssignmentAsExpression_main_region_Subtract));
-	EXPECT_TRUE(assignmentAsExpressionIface_get_d(&handle) == 6);
+	EXPECT_TRUE(assignmentAsExpressionIface_get_d(&handle) == 6l);
 	assignmentAsExpression_runCycle(&handle);
 	EXPECT_TRUE(assignmentAsExpression_isActive(&handle, AssignmentAsExpression_main_region_Multiply));
-	EXPECT_TRUE(assignmentAsExpressionIface_get_e(&handle) == 15);
+	EXPECT_TRUE(assignmentAsExpressionIface_get_e(&handle) == 15l);
 	assignmentAsExpression_runCycle(&handle);
 	EXPECT_TRUE(assignmentAsExpression_isActive(&handle, AssignmentAsExpression_main_region_Divide));
-	EXPECT_TRUE(assignmentAsExpressionIface_get_g(&handle) == 1);
+	EXPECT_TRUE(assignmentAsExpressionIface_get_g(&handle) == 1l);
 	assignmentAsExpression_runCycle(&handle);
 	EXPECT_TRUE(assignmentAsExpression_isActive(&handle, AssignmentAsExpression_main_region_Modulo));
-	EXPECT_TRUE(assignmentAsExpressionIface_get_i(&handle) == 1);
+	EXPECT_TRUE(assignmentAsExpressionIface_get_i(&handle) == 1l);
 	assignmentAsExpression_runCycle(&handle);
 	EXPECT_TRUE(assignmentAsExpression_isActive(&handle, AssignmentAsExpression_main_region_Shift));
-	EXPECT_TRUE(assignmentAsExpressionIface_get_j(&handle) == 16);
-	EXPECT_TRUE(assignmentAsExpressionIface_get_k(&handle) == 4);
+	EXPECT_TRUE(assignmentAsExpressionIface_get_j(&handle) == 16l);
+	EXPECT_TRUE(assignmentAsExpressionIface_get_k(&handle) == 4l);
 	assignmentAsExpression_runCycle(&handle);
 	EXPECT_TRUE(assignmentAsExpression_isActive(&handle, AssignmentAsExpression_main_region_boolean_And));
-	EXPECT_TRUE(assignmentAsExpressionIface_get_l(&handle) == 1);
+	EXPECT_TRUE(assignmentAsExpressionIface_get_l(&handle) == 1l);
 	assignmentAsExpression_runCycle(&handle);
 	EXPECT_TRUE(assignmentAsExpression_isActive(&handle, AssignmentAsExpression_main_region_boolean_Or));
-	EXPECT_TRUE(assignmentAsExpressionIface_get_p(&handle) == 15);
+	EXPECT_TRUE(assignmentAsExpressionIface_get_p(&handle) == 15l);
 	assignmentAsExpression_runCycle(&handle);
 	EXPECT_TRUE(assignmentAsExpression_isActive(&handle, AssignmentAsExpression_main_region_boolean_Xor));
-	EXPECT_TRUE(assignmentAsExpressionIface_get_u(&handle) == 12);
+	EXPECT_TRUE(assignmentAsExpressionIface_get_u(&handle) == 12l);
 	assignmentAsExpression_exit(&handle);
 }
 

test-plugins/org.yakindu.sct.generator.c.test/gtests/BitExpressions/BitExpressions.cc

@@ -19,17 +19,17 @@ TEST(StatemachineTest, BitExpressions) {
 	bitExpressions_init(&handle);
 	bitExpressions_enter(&handle);
 	EXPECT_TRUE(bitExpressions_isActive(&handle, BitExpressions_main_region_StateA));
-	EXPECT_TRUE(bitExpressionsIface_get_myBit1(&handle) == 5);
-	EXPECT_TRUE(bitExpressionsIface_get_myBit2(&handle) == 7);
+	EXPECT_TRUE(bitExpressionsIface_get_myBit1(&handle) == 5l);
+	EXPECT_TRUE(bitExpressionsIface_get_myBit2(&handle) == 7l);
 	bitExpressionsIface_raise_e1(&handle);
 	bitExpressions_runCycle(&handle);
 	EXPECT_TRUE(bitExpressions_isActive(&handle, BitExpressions_main_region_StateB));
-	EXPECT_TRUE(bitExpressionsIface_get_leftBitshift(&handle) == 10);
-	EXPECT_TRUE(bitExpressionsIface_get_rightBitshift(&handle) == 2);
-	EXPECT_TRUE(bitExpressionsIface_get_complementBitshift(&handle) == - 6 );
-	EXPECT_TRUE(bitExpressionsIface_get_bitwiseAnd(&handle) == 5);
-	EXPECT_TRUE(bitExpressionsIface_get_bitwiseOr(&handle) == 7);
-	EXPECT_TRUE(bitExpressionsIface_get_bitwiseXor(&handle) == 2);
+	EXPECT_TRUE(bitExpressionsIface_get_leftBitshift(&handle) == 10l);
+	EXPECT_TRUE(bitExpressionsIface_get_rightBitshift(&handle) == 2l);
+	EXPECT_TRUE(bitExpressionsIface_get_complementBitshift(&handle) == - 6l );
+	EXPECT_TRUE(bitExpressionsIface_get_bitwiseAnd(&handle) == 5l);
+	EXPECT_TRUE(bitExpressionsIface_get_bitwiseOr(&handle) == 7l);
+	EXPECT_TRUE(bitExpressionsIface_get_bitwiseXor(&handle) == 2l);
 }
 
 		

test-plugins/org.yakindu.sct.generator.c.test/gtests/CastExpressions/CastExpressions.cc

@@ -18,13 +18,13 @@ CastExpressions handle;
 TEST(StatemachineTest, CastExpressionTest) {
 	castExpressions_init(&handle);
 	castExpressions_enter(&handle);
-	EXPECT_TRUE(castExpressionsIface_get_realValue(&handle) == 5);
-	EXPECT_TRUE(castExpressionsIface_get_intValue(&handle) == 5);
+	EXPECT_TRUE(castExpressionsIface_get_realValue(&handle) == 5l);
+	EXPECT_TRUE(castExpressionsIface_get_intValue(&handle) == 5l);
 	castExpressions_runCycle(&handle);
-	EXPECT_TRUE(castExpressionsIface_get_realValue(&handle) == 15);
+	EXPECT_TRUE(castExpressionsIface_get_realValue(&handle) == 15l);
 	castExpressions_runCycle(&handle);
 	EXPECT_TRUE(castExpressions_isActive(&handle, CastExpressions_main_region_C));
-	EXPECT_TRUE(castExpressionsIface_get_realValue(&handle) == 757);
+	EXPECT_TRUE(castExpressionsIface_get_realValue(&handle) == 757l);
 }
 
 		

test-plugins/org.yakindu.sct.generator.c.test/gtests/ConditionalExpression/ConditionalExpression.cc

@@ -19,11 +19,11 @@ TEST(StatemachineTest, ConditionalExpressionTest) {
 	conditionalExpressions_init(&handle);
 	conditionalExpressions_enter(&handle);
 	EXPECT_TRUE(conditionalExpressions_isActive(&handle, ConditionalExpressions_main_region_A));
-	EXPECT_TRUE(conditionalExpressionsIface_get_condition(&handle) == 1);
+	EXPECT_TRUE(conditionalExpressionsIface_get_condition(&handle) == 1l);
 	conditionalExpressionsIface_raise_e(&handle);
 	conditionalExpressions_runCycle(&handle);
 	EXPECT_TRUE(conditionalExpressions_isActive(&handle, ConditionalExpressions_main_region_B));
-	EXPECT_TRUE(conditionalExpressionsIface_get_condition(&handle) == 2);
+	EXPECT_TRUE(conditionalExpressionsIface_get_condition(&handle) == 2l);
 }
 
 		

test-plugins/org.yakindu.sct.generator.c.test/gtests/ConstantsTests/ConstantsTests.cc

@@ -19,19 +19,19 @@ TEST(StatemachineTest, constantDefinition) {
 	constants_init(&handle);
 	constants_enter(&handle);
 	EXPECT_TRUE(constants_isActive(&handle, Constants_main_region_A));
-	EXPECT_TRUE(constantsIface_get_x(&handle) == 10);
-	EXPECT_TRUE(constantsIface_get_y(&handle) == 20);
+	EXPECT_TRUE(constantsIface_get_x(&handle) == 10l);
+	EXPECT_TRUE(constantsIface_get_y(&handle) == 20l);
 	EXPECT_TRUE(strcmp(constantsIfaceNamed_get_y(&handle) , "Hello World") == 0);
 	constantsIface_raise_e(&handle);
 	constants_runCycle(&handle);
-	EXPECT_TRUE(constantsIface_get_result(&handle) == 20);
+	EXPECT_TRUE(constantsIface_get_result(&handle) == 20l);
 	constantsIface_raise_e(&handle);
 	constants_runCycle(&handle);
 	EXPECT_TRUE(constants_isActive(&handle, Constants_main_region_C));
-	EXPECT_TRUE(constantsIface_get_result(&handle) == 100);
+	EXPECT_TRUE(constantsIface_get_result(&handle) == 100l);
 	constantsIface_raise_e2(&handle, constantsIface_get_x(&handle) );
 	constants_runCycle(&handle);
-	EXPECT_TRUE(constantsIface_get_result(&handle) == 1000);
+	EXPECT_TRUE(constantsIface_get_result(&handle) == 1000l);
 	EXPECT_TRUE(constants_isActive(&handle, Constants_main_region_A));
 }
 

test-plugins/org.yakindu.sct.generator.c.test/gtests/DeepEntry/DeepEntry.cc

@@ -17,13 +17,13 @@ DeepEntry handle;
 
 TEST(StatemachineTest, enterToSubstate) {
 	deepEntry_init(&handle);
-	EXPECT_TRUE(deepEntryIface_get_x(&handle) == 0);
-	EXPECT_TRUE(deepEntryIface_get_y(&handle) == 0);
-	EXPECT_TRUE(deepEntryIface_get_z(&handle) == 0);
+	EXPECT_TRUE(deepEntryIface_get_x(&handle) == 0l);
+	EXPECT_TRUE(deepEntryIface_get_y(&handle) == 0l);
+	EXPECT_TRUE(deepEntryIface_get_z(&handle) == 0l);
 	deepEntry_enter(&handle);
-	EXPECT_TRUE(deepEntryIface_get_x(&handle) == 1);
-	EXPECT_TRUE(deepEntryIface_get_y(&handle) == 1);
-	EXPECT_TRUE(deepEntryIface_get_z(&handle) == 2);
+	EXPECT_TRUE(deepEntryIface_get_x(&handle) == 1l);
+	EXPECT_TRUE(deepEntryIface_get_y(&handle) == 1l);
+	EXPECT_TRUE(deepEntryIface_get_z(&handle) == 2l);
 	deepEntryIface_raise_e(&handle);
 	deepEntry_runCycle(&handle);
 	EXPECT_TRUE(deepEntry_isActive(&handle, DeepEntry_r2_B_r_BB));
@@ -33,7 +33,7 @@ TEST(StatemachineTest, enterToSubstate) {
 	deepEntryIface_raise_f(&handle);
 	deepEntry_runCycle(&handle);
 	EXPECT_TRUE(deepEntry_isActive(&handle, DeepEntry_r2_B_r_BB));
-	EXPECT_TRUE(deepEntryIface_get_y(&handle) == 1);
+	EXPECT_TRUE(deepEntryIface_get_y(&handle) == 1l);
 }
 
 		

test-plugins/org.yakindu.sct.generator.c.test/gtests/EntryExitSelfTransition/EntryExitSelfTransition.cc

@@ -19,31 +19,31 @@ TEST(StatemachineTest, SelfTransitionToChildState) {
 	entryExitSelfTransition_init(&handle);
 	entryExitSelfTransition_enter(&handle);
 	entryExitSelfTransition_runCycle(&handle);
-	EXPECT_TRUE(entryExitSelfTransitionIface_get_entries(&handle) == 1);
+	EXPECT_TRUE(entryExitSelfTransitionIface_get_entries(&handle) == 1l);
 	EXPECT_TRUE(entryExitSelfTransition_isActive(&handle, EntryExitSelfTransition_main_region_A__region0_B));
-	entryExitSelfTransitionIface_set_entries(&handle, 0);
+	entryExitSelfTransitionIface_set_entries(&handle, 0l);
 	entryExitSelfTransitionIface_raise_e(&handle);
 	entryExitSelfTransition_runCycle(&handle);
-	EXPECT_TRUE(entryExitSelfTransitionIface_get_entries(&handle) == 1);
-	EXPECT_TRUE(entryExitSelfTransitionIface_get_exits(&handle) == 1);
+	EXPECT_TRUE(entryExitSelfTransitionIface_get_entries(&handle) == 1l);
+	EXPECT_TRUE(entryExitSelfTransitionIface_get_exits(&handle) == 1l);
 	EXPECT_TRUE(entryExitSelfTransition_isActive(&handle, EntryExitSelfTransition_main_region_A__region0_C));
 }
 TEST(StatemachineTest, SelfTransitionFromChildState) {
 	entryExitSelfTransition_init(&handle);
 	entryExitSelfTransition_enter(&handle);
 	entryExitSelfTransition_runCycle(&handle);
-	EXPECT_TRUE(entryExitSelfTransitionIface_get_entries(&handle) == 1);
-	entryExitSelfTransitionIface_set_entries(&handle, 0);
+	EXPECT_TRUE(entryExitSelfTransitionIface_get_entries(&handle) == 1l);
+	entryExitSelfTransitionIface_set_entries(&handle, 0l);
 	entryExitSelfTransitionIface_raise_e1(&handle);
 	entryExitSelfTransition_runCycle(&handle);
-	EXPECT_TRUE(entryExitSelfTransitionIface_get_entries(&handle) == 0);
-	EXPECT_TRUE(entryExitSelfTransitionIface_get_exits(&handle) == 0);
+	EXPECT_TRUE(entryExitSelfTransitionIface_get_entries(&handle) == 0l);
+	EXPECT_TRUE(entryExitSelfTransitionIface_get_exits(&handle) == 0l);
 	EXPECT_TRUE(entryExitSelfTransition_isActive(&handle, EntryExitSelfTransition_main_region_A__region0_C));
 	entryExitSelfTransitionIface_raise_e1(&handle);
 	entryExitSelfTransition_runCycle(&handle);
 	EXPECT_TRUE(entryExitSelfTransition_isActive(&handle, EntryExitSelfTransition_main_region_A__region0_B));
-	EXPECT_TRUE(entryExitSelfTransitionIface_get_entries(&handle) == 1);
-	EXPECT_TRUE(entryExitSelfTransitionIface_get_exits(&handle) == 1);
+	EXPECT_TRUE(entryExitSelfTransitionIface_get_entries(&handle) == 1l);
+	EXPECT_TRUE(entryExitSelfTransitionIface_get_exits(&handle) == 1l);
 }
 
 		

test-plugins/org.yakindu.sct.generator.c.test/gtests/ExitOnSelfTransition/ExitOnSelfTransition.cc

@@ -19,16 +19,16 @@ TEST(StatemachineTest, ExitOnSelfTransitionTest) {
 	exitOnSelfTransition_init(&handle);
 	exitOnSelfTransition_enter(&handle);
 	EXPECT_TRUE(exitOnSelfTransition_isActive(&handle, ExitOnSelfTransition_main_region_A));
-	EXPECT_TRUE(exitOnSelfTransitionIface_get_entryCount(&handle) == 1);
-	EXPECT_TRUE(exitOnSelfTransitionIface_get_exitCount(&handle) == 0);
+	EXPECT_TRUE(exitOnSelfTransitionIface_get_entryCount(&handle) == 1l);
+	EXPECT_TRUE(exitOnSelfTransitionIface_get_exitCount(&handle) == 0l);
 	exitOnSelfTransitionIface_raise_e(&handle);
 	exitOnSelfTransition_runCycle(&handle);
-	EXPECT_TRUE(exitOnSelfTransitionIface_get_entryCount(&handle) == 2);
-	EXPECT_TRUE(exitOnSelfTransitionIface_get_exitCount(&handle) == 1);
+	EXPECT_TRUE(exitOnSelfTransitionIface_get_entryCount(&handle) == 2l);
+	EXPECT_TRUE(exitOnSelfTransitionIface_get_exitCount(&handle) == 1l);
 	exitOnSelfTransitionIface_raise_f(&handle);
 	exitOnSelfTransition_runCycle(&handle);
-	EXPECT_TRUE(exitOnSelfTransitionIface_get_entryCount(&handle) == 2);
-	EXPECT_TRUE(exitOnSelfTransitionIface_get_exitCount(&handle) == 2);
+	EXPECT_TRUE(exitOnSelfTransitionIface_get_entryCount(&handle) == 2l);
+	EXPECT_TRUE(exitOnSelfTransitionIface_get_exitCount(&handle) == 2l);
 }
 
 		

test-plugins/org.yakindu.sct.generator.c.test/gtests/InEventLifeCycle/InEventLifeCycle.cc

@@ -19,9 +19,9 @@ TEST(StatemachineTest, eventLifeCycle) {
 	inEventLifeCycle_init(&handle);
 	inEventLifeCycle_enter(&handle);
 	inEventLifeCycleIface_raise_e(&handle);
-	EXPECT_TRUE(inEventLifeCycleIface_get_i(&handle) == 0);
+	EXPECT_TRUE(inEventLifeCycleIface_get_i(&handle) == 0l);
 	inEventLifeCycle_runCycle(&handle);
-	EXPECT_TRUE(inEventLifeCycleIface_get_i(&handle) == 1);
+	EXPECT_TRUE(inEventLifeCycleIface_get_i(&handle) == 1l);
 }
 
 		

test-plugins/org.yakindu.sct.generator.c.test/gtests/IntegerExpressions/IntegerExpressions.cc

@@ -19,8 +19,8 @@ TEST(StatemachineTest, integerExpressions) {
 	integerExpressions_init(&handle);
 	integerExpressions_enter(&handle);
 	EXPECT_TRUE(integerExpressions_isActive(&handle, IntegerExpressions_main_region_StateA));
-	EXPECT_TRUE(integerExpressionsIface_get_myInt1(&handle) == 10);
-	EXPECT_TRUE(integerExpressionsIface_get_myInt2(&handle) == 5);
+	EXPECT_TRUE(integerExpressionsIface_get_myInt1(&handle) == 10l);
+	EXPECT_TRUE(integerExpressionsIface_get_myInt2(&handle) == 5l);
 	integerExpressionsIface_raise_e1(&handle);
 	integerExpressions_runCycle(&handle);
 	EXPECT_TRUE(integerExpressionsIface_get_less(&handle) == false);
@@ -29,17 +29,17 @@ TEST(StatemachineTest, integerExpressions) {
 	EXPECT_TRUE(integerExpressionsIface_get_equalOrGreater(&handle) == true);
 	EXPECT_TRUE(integerExpressionsIface_get_equal(&handle) == false);
 	EXPECT_TRUE(integerExpressionsIface_get_notEqual(&handle) == true);
-	EXPECT_TRUE(integerExpressionsIface_get_plus(&handle) == 15);
-	EXPECT_TRUE(integerExpressionsIface_get_minus(&handle) == 5);
-	EXPECT_TRUE(integerExpressionsIface_get_multiply(&handle) == 50);
-	EXPECT_TRUE(integerExpressionsIface_get_division(&handle) == 2);
-	EXPECT_TRUE(integerExpressionsIface_get_modulo(&handle) == 0);
-	EXPECT_TRUE(integerExpressionsIface_get_negat(&handle) == - 10 );
-	EXPECT_TRUE(integerExpressionsIface_get_multiAssign(&handle) == 20);
-	EXPECT_TRUE(integerExpressionsIface_get_divAssign(&handle) == 2);
-	EXPECT_TRUE(integerExpressionsIface_get_plusAssign(&handle) == 12);
-	EXPECT_TRUE(integerExpressionsIface_get_minusAssign(&handle) == - 8 );
-	EXPECT_TRUE(integerExpressionsIface_get_moduloAssign(&handle) == 0);
+	EXPECT_TRUE(integerExpressionsIface_get_plus(&handle) == 15l);
+	EXPECT_TRUE(integerExpressionsIface_get_minus(&handle) == 5l);
+	EXPECT_TRUE(integerExpressionsIface_get_multiply(&handle) == 50l);
+	EXPECT_TRUE(integerExpressionsIface_get_division(&handle) == 2l);
+	EXPECT_TRUE(integerExpressionsIface_get_modulo(&handle) == 0l);
+	EXPECT_TRUE(integerExpressionsIface_get_negat(&handle) == - 10l );
+	EXPECT_TRUE(integerExpressionsIface_get_multiAssign(&handle) == 20l);
+	EXPECT_TRUE(integerExpressionsIface_get_divAssign(&handle) == 2l);
+	EXPECT_TRUE(integerExpressionsIface_get_plusAssign(&handle) == 12l);
+	EXPECT_TRUE(integerExpressionsIface_get_minusAssign(&handle) == - 8l );
+	EXPECT_TRUE(integerExpressionsIface_get_moduloAssign(&handle) == 0l);
 }
 
 		

test-plugins/org.yakindu.sct.generator.c.test/gtests/LocalReactions/LocalReactions.cc

@@ -20,7 +20,7 @@ TEST(StatemachineTest, LocalReactionsTest) {
 	localReactions_enter(&handle);
 	EXPECT_TRUE(localReactions_isActive(&handle, LocalReactions_main_region_A));
 	localReactions_runCycle(&handle);
-	EXPECT_TRUE(localReactionsIface_get_x(&handle) == 1);
+	EXPECT_TRUE(localReactionsIface_get_x(&handle) == 1l);
 }
 
 		

test-plugins/org.yakindu.sct.generator.c.test/gtests/LogicalAndTests/LogicalAndTests.cc

@@ -19,7 +19,7 @@ TEST(StatemachineTest, operandEvaluationOrder) {
 	logicalAnd_init(&handle);
 	logicalAnd_enter(&handle);
 	logicalAnd_runCycle(&handle);
-	EXPECT_TRUE(logicalAndIface_get_x(&handle) == 4 && logicalAndIface_get_b(&handle) ) << "logical and expression was executed in wrong order..." ;
+	EXPECT_TRUE(logicalAndIface_get_x(&handle) == 4l && logicalAndIface_get_b(&handle) ) << "logical and expression was executed in wrong order..." ;
 }
 
 		

test-plugins/org.yakindu.sct.generator.c.test/gtests/LogicalOrTests/LogicalOrTests.cc

@@ -19,7 +19,7 @@ TEST(StatemachineTest, operandEvaluationOrder) {
 	logicalOr_init(&handle);
 	logicalOr_enter(&handle);
 	logicalOr_runCycle(&handle);
-	EXPECT_TRUE(logicalOrIface_get_x(&handle) == 4 && logicalOrIface_get_b(&handle) ) << "logical or expression was executed in wrong order..." ;
+	EXPECT_TRUE(logicalOrIface_get_x(&handle) == 4l && logicalOrIface_get_b(&handle) ) << "logical or expression was executed in wrong order..." ;
 }
 
 		

test-plugins/org.yakindu.sct.generator.c.test/gtests/NamedInterfaceAccess/NamedInterfaceAccess.cc

@@ -19,11 +19,11 @@ TEST(StatemachineTest, SafeOpenSuccess) {
 	namedInterfaceAccess_init(&handle);
 	namedInterfaceAccess_enter(&handle);
 	namedInterfaceAccess_runCycle(&handle);
-	namedInterfaceAccessIfaceUser_raise_numberPressed(&handle, 3);
+	namedInterfaceAccessIfaceUser_raise_numberPressed(&handle, 3l);
 	namedInterfaceAccess_runCycle(&handle);
-	namedInterfaceAccessIfaceUser_raise_numberPressed(&handle, 7);
+	namedInterfaceAccessIfaceUser_raise_numberPressed(&handle, 7l);
 	namedInterfaceAccess_runCycle(&handle);
-	namedInterfaceAccessIfaceUser_raise_numberPressed(&handle, 5);
+	namedInterfaceAccessIfaceUser_raise_numberPressed(&handle, 5l);
 	namedInterfaceAccess_runCycle(&handle);
 	EXPECT_TRUE(namedInterfaceAccessIfaceSafe_israised_open(&handle));
 }

test-plugins/org.yakindu.sct.generator.c.test/gtests/Parenthesis/Parenthesis.cc

@@ -19,7 +19,7 @@ TEST(StatemachineTest, simple) {
 	parenthesis_init(&handle);
 	parenthesis_enter(&handle);
 	EXPECT_TRUE(parenthesis_isActive(&handle, Parenthesis_mainRegion_A));
-	EXPECT_TRUE(parenthesisIface_get_erg(&handle) == 8);
+	EXPECT_TRUE(parenthesisIface_get_erg(&handle) == 8l);
 }
 
 		

test-plugins/org.yakindu.sct.generator.c.test/gtests/SimpleEvent/SimpleEvent.cc

@@ -19,7 +19,7 @@ TEST(StatemachineTest, simpleEventTest) {
 	simpleEvent_init(&handle);
 	simpleEvent_enter(&handle);
 	EXPECT_TRUE(simpleEvent_isActive(&handle, SimpleEvent_main_region_A)) << "Expected A to be active" ;
-	EXPECT_TRUE(5== 5);
+	EXPECT_TRUE(5l== 5l);
 	simpleEventIface_raise_event1(&handle);
 	simpleEvent_runCycle(&handle);
 	EXPECT_TRUE(simpleEvent_isActive(&handle, SimpleEvent_main_region_B)) << "Expected B to be active" ;

test-plugins/org.yakindu.sct.generator.c.test/gtests/StatechartLocalReactions/StatechartLocalReactions.cc

@@ -20,9 +20,9 @@ TEST(StatemachineTest, statechartLocalReactionsTest) {
 	statechartLocalReactions_enter(&handle);
 	EXPECT_TRUE(statechartLocalReactions_isActive(&handle, StatechartLocalReactions_main_region_S1));
 	EXPECT_TRUE(statechartLocalReactions_isActive(&handle, StatechartLocalReactions_region2_a));
-	while (statechartLocalReactionsIface_get_myInt(&handle) < 10) {
+	while (statechartLocalReactionsIface_get_myInt(&handle) < 10l) {
 		EXPECT_TRUE(statechartLocalReactions_isActive(&handle, StatechartLocalReactions_region2_a));
-		if (statechartLocalReactionsIface_get_myInt(&handle) %2== 0) {
+		if (statechartLocalReactionsIface_get_myInt(&handle) %2l== 0l) {
 					EXPECT_TRUE(statechartLocalReactions_isActive(&handle, StatechartLocalReactions_main_region_S1));;
 				  }
 				else {

test-plugins/org.yakindu.sct.generator.c.test/gtests/SyncJoin/SyncJoin.cc

@@ -93,7 +93,7 @@ TEST(StatemachineTest, doubleEntryActionBug) {
 	syncJoinIface_raise_jd(&handle);
 	syncJoin_runCycle(&handle);
 	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_A));
-	EXPECT_TRUE(syncJoinIface_get_x(&handle) == 1);
+	EXPECT_TRUE(syncJoinIface_get_x(&handle) == 1l);
 }
 
 		

test-plugins/org.yakindu.sct.generator.c.test/gtests/ValuedEvents/ValuedEvents.cc

@@ -19,7 +19,7 @@ TEST(StatemachineTest, valuedEventsTest) {
 	valuedEvents_init(&handle);
 	valuedEvents_enter(&handle);
 	valuedEvents_runCycle(&handle);
-	EXPECT_TRUE(strcmp(valuedEventsIface_get_myString(&handle) , ""sct"") == 0);
+	EXPECT_TRUE(strcmp(valuedEventsIface_get_myString(&handle) , "sct") == 0);
 	valuedEventsIface_raise_integerEvent(&handle, 23l);
 	valuedEventsIface_raise_booleanEvent(&handle, false);
 	valuedEventsIface_raise_realEvent(&handle, 20l);
@@ -32,7 +32,7 @@ TEST(StatemachineTest, valuedEventsTest) {
 	EXPECT_TRUE(valuedEventsIface_get_myInt(&handle) == 23l);
 	EXPECT_TRUE(valuedEventsIface_get_myBool(&handle) == false);
 	EXPECT_TRUE(valuedEventsIface_get_myReal(&handle) == 20l);
-	EXPECT_TRUE(strcmp(valuedEventsIface_get_myString(&handle) , ""tool"") == 0);
+	EXPECT_TRUE(strcmp(valuedEventsIface_get_myString(&handle) , "tool") == 0);
 }
 
 		

test-plugins/org.yakindu.sct.generator.cpp.test/gtests/AlwaysOncycleTest/AlwaysOncycleTest.cc

@@ -17,13 +17,13 @@ TEST(StatemachineTest, alwaysOncycleTest) {
 	statechart->init();
 	statechart->enter();
 	EXPECT_TRUE(statechart->isActive(AlwaysOncycle::main_region_StateA));
-	while (statechart->getDefaultSCI()->get_value()< 5) {
+	while (statechart->getDefaultSCI()->get_value()< 5l) {
 		statechart->runCycle();
 		EXPECT_TRUE(statechart->isActive(AlwaysOncycle::main_region_StateA));
 	}
 	statechart->runCycle();
 	EXPECT_TRUE(statechart->isActive(AlwaysOncycle::main_region_StateB));
-	while (statechart->getDefaultSCI()->get_value()< 5) {
+	while (statechart->getDefaultSCI()->get_value()< 5l) {
 		statechart->runCycle();
 		EXPECT_TRUE(statechart->isActive(AlwaysOncycle::main_region_StateB));
 	}

test-plugins/org.yakindu.sct.generator.cpp.test/gtests/AssignmentAsExpressionTest/AssignmentAsExpressionTest.cc

@@ -17,33 +17,33 @@ TEST(StatemachineTest, simpleAssignment) {
 	statechart->init();
 	statechart->enter();
 	EXPECT_TRUE(statechart->isActive(AssignmentAsExpression::main_region_Add));
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_b()== 5);
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_a()== 9);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_b()== 5l);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_a()== 9l);
 	statechart->runCycle();
 	EXPECT_TRUE(statechart->isActive(AssignmentAsExpression::main_region_Subtract));
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_d()== 6);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_d()== 6l);
 	statechart->runCycle();
 	EXPECT_TRUE(statechart->isActive(AssignmentAsExpression::main_region_Multiply));
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_e()== 15);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_e()== 15l);
 	statechart->runCycle();
 	EXPECT_TRUE(statechart->isActive(AssignmentAsExpression::main_region_Divide));
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_g()== 1);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_g()== 1l);
 	statechart->runCycle();
 	EXPECT_TRUE(statechart->isActive(AssignmentAsExpression::main_region_Modulo));
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_i()== 1);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_i()== 1l);
 	statechart->runCycle();
 	EXPECT_TRUE(statechart->isActive(AssignmentAsExpression::main_region_Shift));
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_j()== 16);
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_k()== 4);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_j()== 16l);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_k()== 4l);
 	statechart->runCycle();
 	EXPECT_TRUE(statechart->isActive(AssignmentAsExpression::main_region_boolean_And));
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_l()== 1);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_l()== 1l);
 	statechart->runCycle();
 	EXPECT_TRUE(statechart->isActive(AssignmentAsExpression::main_region_boolean_Or));
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_p()== 15);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_p()== 15l);
 	statechart->runCycle();
 	EXPECT_TRUE(statechart->isActive(AssignmentAsExpression::main_region_boolean_Xor));
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_u()== 12);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_u()== 12l);
 	statechart->exit();
 	delete statechart;
 }

test-plugins/org.yakindu.sct.generator.cpp.test/gtests/BitExpressionsTest/BitExpressionsTest.cc

@@ -17,16 +17,16 @@ TEST(StatemachineTest, BitExpressions) {
 	statechart->init();
 	statechart->enter();
 	EXPECT_TRUE(statechart->isActive(BitExpressions::main_region_StateA));
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_myBit1()== 5);
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_myBit2()== 7);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_myBit1()== 5l);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_myBit2()== 7l);
 	statechart->raise_e1();
 	statechart->runCycle();
 	EXPECT_TRUE(statechart->isActive(BitExpressions::main_region_StateB));
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_leftBitshift()== 10);
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_rightBitshift()== 2);
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_complementBitshift()== - 6 );
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_bitwiseAnd()== 5);
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_bitwiseOr()== 7);
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_bitwiseXor()== 2);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_leftBitshift()== 10l);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_rightBitshift()== 2l);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_complementBitshift()== - 6l );
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_bitwiseAnd()== 5l);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_bitwiseOr()== 7l);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_bitwiseXor()== 2l);
 	delete statechart;
 }

test-plugins/org.yakindu.sct.generator.cpp.test/gtests/CastExpressionsTest/CastExpressionsTest.cc

@@ -16,12 +16,12 @@ TEST(StatemachineTest, CastExpressionTest) {
 	CastExpressions* statechart = new CastExpressions();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_realValue()== 5);
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_intValue()== 5);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_realValue()== 5l);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_intValue()== 5l);
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_realValue()== 15);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_realValue()== 15l);
 	statechart->runCycle();
 	EXPECT_TRUE(statechart->isActive(CastExpressions::main_region_C));
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_realValue()== 757);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_realValue()== 757l);
 	delete statechart;
 }

test-plugins/org.yakindu.sct.generator.cpp.test/gtests/ConditionalExpressionTest/ConditionalExpressionTest.cc

@@ -17,10 +17,10 @@ TEST(StatemachineTest, ConditionalExpressionTest) {
 	statechart->init();
 	statechart->enter();
 	EXPECT_TRUE(statechart->isActive(ConditionalExpressions::main_region_A));
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_condition()== 1);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_condition()== 1l);
 	statechart->raise_e();
 	statechart->runCycle();
 	EXPECT_TRUE(statechart->isActive(ConditionalExpressions::main_region_B));
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_condition()== 2);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_condition()== 2l);
 	delete statechart;
 }

test-plugins/org.yakindu.sct.generator.cpp.test/gtests/ConstantsTestsTest/ConstantsTestsTest.cc

@@ -17,19 +17,19 @@ TEST(StatemachineTest, constantDefinition) {
 	statechart->init();
 	statechart->enter();
 	EXPECT_TRUE(statechart->isActive(Constants::main_region_A));
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_x()== 10);
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_y()== 20);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_x()== 10l);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_y()== 20l);
 	EXPECT_TRUE(strcmp(getSCI_Named().get_y(), "Hello World") == 0);
 	statechart->raise_e();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_result()== 20);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_result()== 20l);
 	statechart->raise_e();
 	statechart->runCycle();
 	EXPECT_TRUE(statechart->isActive(Constants::main_region_C));
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_result()== 100);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_result()== 100l);
 	statechart->raise_e2( statechart->getDefaultSCI()->get_x());
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_result()== 1000);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_result()== 1000l);
 	EXPECT_TRUE(statechart->isActive(Constants::main_region_A));
 	delete statechart;
 }

test-plugins/org.yakindu.sct.generator.cpp.test/gtests/DeepEntryTest/DeepEntryTest.cc

@@ -15,13 +15,13 @@
 TEST(StatemachineTest, enterToSubstate) {
 	DeepEntry* statechart = new DeepEntry();
 	statechart->init();
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_x()== 0);
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_y()== 0);
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_z()== 0);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_x()== 0l);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_y()== 0l);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_z()== 0l);
 	statechart->enter();
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_x()== 1);
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_y()== 1);
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_z()== 2);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_x()== 1l);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_y()== 1l);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_z()== 2l);
 	statechart->raise_e();
 	statechart->runCycle();
 	EXPECT_TRUE(statechart->isActive(DeepEntry::r2_B_r_BB));
@@ -31,6 +31,6 @@ TEST(StatemachineTest, enterToSubstate) {
 	statechart->raise_f();
 	statechart->runCycle();
 	EXPECT_TRUE(statechart->isActive(DeepEntry::r2_B_r_BB));
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_y()== 1);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_y()== 1l);
 	delete statechart;
 }

test-plugins/org.yakindu.sct.generator.cpp.test/gtests/EntryExitSelfTransitionTest/EntryExitSelfTransitionTest.cc

@@ -17,13 +17,13 @@ TEST(StatemachineTest, SelfTransitionToChildState) {
 	statechart->init();
 	statechart->enter();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_entries()== 1);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_entries()== 1l);
 	EXPECT_TRUE(statechart->isActive(EntryExitSelfTransition::main_region_A__region0_B));
-	statechart->getDefaultSCI()->set_entries(0);
+	statechart->getDefaultSCI()->set_entries(0l);
 	statechart->raise_e();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_entries()== 1);
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_exits()== 1);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_entries()== 1l);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_exits()== 1l);
 	EXPECT_TRUE(statechart->isActive(EntryExitSelfTransition::main_region_A__region0_C));
 	delete statechart;
 }
@@ -32,17 +32,17 @@ TEST(StatemachineTest, SelfTransitionFromChildState) {
 	statechart->init();
 	statechart->enter();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_entries()== 1);
-	statechart->getDefaultSCI()->set_entries(0);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_entries()== 1l);
+	statechart->getDefaultSCI()->set_entries(0l);
 	statechart->raise_e1();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_entries()== 0);
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_exits()== 0);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_entries()== 0l);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_exits()== 0l);
 	EXPECT_TRUE(statechart->isActive(EntryExitSelfTransition::main_region_A__region0_C));
 	statechart->raise_e1();
 	statechart->runCycle();
 	EXPECT_TRUE(statechart->isActive(EntryExitSelfTransition::main_region_A__region0_B));
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_entries()== 1);
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_exits()== 1);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_entries()== 1l);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_exits()== 1l);
 	delete statechart;
 }

test-plugins/org.yakindu.sct.generator.cpp.test/gtests/ExitOnSelfTransitionTest/ExitOnSelfTransitionTest.cc

@@ -17,15 +17,15 @@ TEST(StatemachineTest, ExitOnSelfTransitionTest) {
 	statechart->init();
 	statechart->enter();
 	EXPECT_TRUE(statechart->isActive(ExitOnSelfTransition::main_region_A));
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_entryCount()== 1);
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_exitCount()== 0);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_entryCount()== 1l);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_exitCount()== 0l);
 	statechart->raise_e();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_entryCount()== 2);
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_exitCount()== 1);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_entryCount()== 2l);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_exitCount()== 1l);
 	statechart->raise_f();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_entryCount()== 2);
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_exitCount()== 2);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_entryCount()== 2l);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_exitCount()== 2l);
 	delete statechart;
 }

test-plugins/org.yakindu.sct.generator.cpp.test/gtests/InEventLifeCycleTest/InEventLifeCycleTest.cc

@@ -17,8 +17,8 @@ TEST(StatemachineTest, eventLifeCycle) {
 	statechart->init();
 	statechart->enter();
 	statechart->raise_e();
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_i()== 0);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_i()== 0l);
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_i()== 1);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_i()== 1l);
 	delete statechart;
 }

test-plugins/org.yakindu.sct.generator.cpp.test/gtests/IntegerExpressionsTest/IntegerExpressionsTest.cc

@@ -17,8 +17,8 @@ TEST(StatemachineTest, integerExpressions) {
 	statechart->init();
 	statechart->enter();
 	EXPECT_TRUE(statechart->isActive(IntegerExpressions::main_region_StateA));
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_myInt1()== 10);
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_myInt2()== 5);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_myInt1()== 10l);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_myInt2()== 5l);
 	statechart->raise_e1();
 	statechart->runCycle();
 	EXPECT_TRUE(statechart->getDefaultSCI()->get_less()== false);
@@ -27,16 +27,16 @@ TEST(StatemachineTest, integerExpressions) {
 	EXPECT_TRUE(statechart->getDefaultSCI()->get_equalOrGreater()== true);
 	EXPECT_TRUE(statechart->getDefaultSCI()->get_equal()== false);
 	EXPECT_TRUE(statechart->getDefaultSCI()->get_notEqual()== true);
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_plus()== 15);
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_minus()== 5);
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_multiply()== 50);
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_division()== 2);
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_modulo()== 0);
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_negat()== - 10 );
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_multiAssign()== 20);
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_divAssign()== 2);
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_plusAssign()== 12);
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_minusAssign()== - 8 );
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_moduloAssign()== 0);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_plus()== 15l);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_minus()== 5l);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_multiply()== 50l);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_division()== 2l);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_modulo()== 0l);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_negat()== - 10l );
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_multiAssign()== 20l);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_divAssign()== 2l);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_plusAssign()== 12l);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_minusAssign()== - 8l );
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_moduloAssign()== 0l);
 	delete statechart;
 }

test-plugins/org.yakindu.sct.generator.cpp.test/gtests/LocalReactionsTest/LocalReactionsTest.cc

@@ -18,6 +18,6 @@ TEST(StatemachineTest, LocalReactionsTest) {
 	statechart->enter();
 	EXPECT_TRUE(statechart->isActive(LocalReactions::main_region_A));
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_x()== 1);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_x()== 1l);
 	delete statechart;
 }

test-plugins/org.yakindu.sct.generator.cpp.test/gtests/LogicalAndTestsTest/LogicalAndTestsTest.cc

@@ -17,6 +17,6 @@ TEST(StatemachineTest, operandEvaluationOrder) {
 	statechart->init();
 	statechart->enter();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_x()== 4 && statechart->getDefaultSCI()->get_b()) << "logical and expression was executed in wrong order..." ;
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_x()== 4l && statechart->getDefaultSCI()->get_b()) << "logical and expression was executed in wrong order..." ;
 	delete statechart;
 }

test-plugins/org.yakindu.sct.generator.cpp.test/gtests/LogicalOrTestsTest/LogicalOrTestsTest.cc

@@ -17,6 +17,6 @@ TEST(StatemachineTest, operandEvaluationOrder) {
 	statechart->init();
 	statechart->enter();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_x()== 4 && statechart->getDefaultSCI()->get_b()) << "logical or expression was executed in wrong order..." ;
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_x()== 4l && statechart->getDefaultSCI()->get_b()) << "logical or expression was executed in wrong order..." ;
 	delete statechart;
 }

test-plugins/org.yakindu.sct.generator.cpp.test/gtests/NamedInterfaceAccessTest/NamedInterfaceAccessTest.cc

@@ -17,11 +17,11 @@ TEST(StatemachineTest, SafeOpenSuccess) {
 	statechart->init();
 	statechart->enter();
 	statechart->runCycle();
-	statechart->getSCI_User()->raise_numberPressed(3);
+	statechart->getSCI_User()->raise_numberPressed(3l);
 	statechart->runCycle();
-	statechart->getSCI_User()->raise_numberPressed(7);
+	statechart->getSCI_User()->raise_numberPressed(7l);
 	statechart->runCycle();
-	statechart->getSCI_User()->raise_numberPressed(5);
+	statechart->getSCI_User()->raise_numberPressed(5l);
 	statechart->runCycle();
 	EXPECT_TRUE(statechart->getSCI_Safe()->isRaised_open());
 	delete statechart;

test-plugins/org.yakindu.sct.generator.cpp.test/gtests/ParenthesisTest/ParenthesisTest.cc

@@ -17,6 +17,6 @@ TEST(StatemachineTest, simple) {
 	statechart->init();
 	statechart->enter();
 	EXPECT_TRUE(statechart->isActive(Parenthesis::mainRegion_A));
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_erg()== 8);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_erg()== 8l);
 	delete statechart;
 }

test-plugins/org.yakindu.sct.generator.cpp.test/gtests/SimpleEventTest/SimpleEventTest.cc

@@ -17,7 +17,7 @@ TEST(StatemachineTest, simpleEventTest) {
 	statechart->init();
 	statechart->enter();
 	EXPECT_TRUE(statechart->isActive(SimpleEvent::main_region_A)) << "Expected A to be active" ;
-	EXPECT_TRUE(5== 5);
+	EXPECT_TRUE(5l== 5l);
 	statechart->raise_event1();
 	statechart->runCycle();
 	EXPECT_TRUE(statechart->isActive(SimpleEvent::main_region_B)) << "Expected B to be active" ;

test-plugins/org.yakindu.sct.generator.cpp.test/gtests/StatechartLocalReactionsTest/StatechartLocalReactionsTest.cc

@@ -18,9 +18,9 @@ TEST(StatemachineTest, statechartLocalReactionsTest) {
 	statechart->enter();
 	EXPECT_TRUE(statechart->isActive(StatechartLocalReactions::main_region_S1));
 	EXPECT_TRUE(statechart->isActive(StatechartLocalReactions::region2_a));
-	while (statechart->getDefaultSCI()->get_myInt()< 10) {
+	while (statechart->getDefaultSCI()->get_myInt()< 10l) {
 		EXPECT_TRUE(statechart->isActive(StatechartLocalReactions::region2_a));
-		if (statechart->getDefaultSCI()->get_myInt()%2== 0) {
+		if (statechart->getDefaultSCI()->get_myInt()%2l== 0l) {
 					EXPECT_TRUE(statechart->isActive(StatechartLocalReactions::main_region_S1));
 				  }
 				else {

test-plugins/org.yakindu.sct.generator.cpp.test/gtests/SyncJoinTest/SyncJoinTest.cc

@@ -95,6 +95,6 @@ TEST(StatemachineTest, doubleEntryActionBug) {
 	statechart->raise_jd();
 	statechart->runCycle();
 	EXPECT_TRUE(statechart->isActive(SyncJoin::main_region_A));
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_x()== 1);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_x()== 1l);
 	delete statechart;
 }

test-plugins/org.yakindu.sct.generator.cpp.test/gtests/ValuedEventsTest/ValuedEventsTest.cc

@@ -17,7 +17,7 @@ TEST(StatemachineTest, valuedEventsTest) {
 	statechart->init();
 	statechart->enter();
 	statechart->runCycle();
-	EXPECT_TRUE(strcmp(statechart->getDefaultSCI()->get_myString(), ""sct"") == 0);
+	EXPECT_TRUE(strcmp(statechart->getDefaultSCI()->get_myString(), "sct") == 0);
 	statechart->raise_integerEvent( 23l);
 	statechart->raise_booleanEvent( false);
 	statechart->raise_realEvent( 20l);
@@ -30,6 +30,6 @@ TEST(StatemachineTest, valuedEventsTest) {
 	EXPECT_TRUE(statechart->getDefaultSCI()->get_myInt()== 23l);
 	EXPECT_TRUE(statechart->getDefaultSCI()->get_myBool()== false);
 	EXPECT_TRUE(statechart->getDefaultSCI()->get_myReal()== 20l);
-	EXPECT_TRUE(strcmp(statechart->getDefaultSCI()->get_myString(), ""tool"") == 0);
+	EXPECT_TRUE(strcmp(statechart->getDefaultSCI()->get_myString(), "tool") == 0);
 	delete statechart;
 }