added functionality for is_active and is_final to cpp generator

plugins/org.yakindu.sct.generator.cpp/src/org/yakindu/sct/generator/cpp/Naming.xtend

@@ -155,7 +155,7 @@ class Naming extends org.yakindu.sct.generator.c.Naming {
 	}
 
 	override isStateActiveFctID(ExecutionFlow it) {
-		"isActive"
+		"isStateActive"
 	}
 
 	override dispatch access(OperationDefinition it) {

plugins/org.yakindu.sct.generator.cpp/src/org/yakindu/sct/generator/cpp/StatemachineHeader.xtend

@@ -224,8 +224,12 @@ class StatemachineHeader extends Statemachine {
 		void exit();
 		
 		void runCycle();
+		
+		sc_boolean isActive();
+		
+		sc_boolean isFinal();
 	'''
-
+	
 	def timedStatemachineFunctions(ExecutionFlow it) '''
 		void setTimer(«timerInterface»* timer);
 		

plugins/org.yakindu.sct.generator.cpp/src/org/yakindu/sct/generator/cpp/StatemachineImplementation.xtend

@@ -18,6 +18,7 @@ import org.yakindu.sct.generator.cpp.features.GenmodelEntriesExtension
 import org.yakindu.sct.model.sexec.Check
 import org.yakindu.sct.model.sexec.ExecutionFlow
 import org.yakindu.sct.model.sexec.Step
+import org.yakindu.sct.model.sexec.extensions.StateVectorExtensions
 import org.yakindu.sct.model.sexec.naming.INamingService
 import org.yakindu.sct.model.sgen.GeneratorEntry
 import org.yakindu.sct.model.sgraph.Statechart
@@ -34,6 +35,7 @@ class StatemachineImplementation {
 	@Inject extension ICodegenTypeSystemAccess
 	@Inject extension INamingService
 	@Inject extension ExpressionCode
+	@Inject protected extension StateVectorExtensions
 	
 	protected GeneratorEntry entry
 	
@@ -62,6 +64,10 @@ class StatemachineImplementation {
 		
 		«exitFunction»
 		
+		«activeFunction»
+		
+		«finalFunction»
+		
 		«runCycleFunction»
 		
 		«clearInEventsFunction»
@@ -70,7 +76,7 @@ class StatemachineImplementation {
 
 		«timedStatemachineFunctions»
 
-		«isActiveFunction»
+		«isStateActiveFunction»
 		
 		«interfaceFunctions»
 		
@@ -211,7 +217,7 @@ class StatemachineImplementation {
 		«ENDIF»
 	'''
 	
-	def isActiveFunction(ExecutionFlow it) '''
+	def isStateActiveFunction(ExecutionFlow it) '''
 		sc_boolean «module»::«stateActiveFctID»(«statesEnumType» state) {
 			switch (state) {
 				«FOR s : states»
@@ -225,6 +231,32 @@ class StatemachineImplementation {
 		}
 	'''
 	
+	
+	def isActiveFunction(ExecutionFlow it) '''
+		sc_boolean «module»::isActive() {
+			return «FOR i : 0 ..< stateVector.size SEPARATOR '||'»stateConfVector[«i»] != «null_state»«ENDFOR»;
+		}
+	'''
+	
+	def protected isFinalFunction(ExecutionFlow it) {
+		val finalStateImpactVector = flow.finalStateImpactVector
+		'''
+			«IF !finalStateImpactVector.isCompletelyCovered»
+			/* 
+			 * Always returns 'false' since this state machine can never become final.
+			 */
+			«ENDIF»
+			sc_boolean «module»::isFinal(){
+		''' +
+		// only if the impact vector is completely covered by final states the state machine 
+		// can become final
+		{if (finalStateImpactVector.isCompletelyCovered) {'''	return «FOR i : 0 ..<finalStateImpactVector.size SEPARATOR ' && '»(«FOR fs : finalStateImpactVector.get(i) SEPARATOR ' || '»stateConfVector[«i»] == «IF fs.stateVector.offset == i»«fs.stateName.asEscapedIdentifier»«ELSE»«null_state»«ENDIF»«ENDFOR»)«ENDFOR»;
+		'''} else {'''   return false;'''} }		
+		+ '''
+		}'''
+	}
+	
+	
 	/* ===================================================================================
 	 * Implementation of interface element access functions
 	 */

plugins/org.yakindu.sct.generator.cpp/src/org/yakindu/sct/generator/cpp/StatemachineInterface.xtend

@@ -61,6 +61,18 @@ class StatemachineInterface {
 				* Start a run-to-completion cycle.
 				*/
 				virtual void runCycle() = 0;
+				
+				/*
+				* Checks if the statemachine is active. 
+			 	* A statemachine is active if it was entered. It is inactive if it has not been entered at all or if it was exited.
+			 	*/	
+				virtual	sc_boolean isActive() = 0;
+				
+				/*
+				* Checks if all active states are final. 
+			 	* If there are no active states then the statemachine is considered as inactive and this method returns false.
+			 	*/
+				virtual sc_boolean isFinal() = 0;
 		};
 		
 		inline StatemachineInterface::~StatemachineInterface() {}

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

@@ -16,18 +16,18 @@ TEST(StatemachineTest, alwaysOncycleTest) {
 	AlwaysOncycle* statechart = new AlwaysOncycle();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(AlwaysOncycle::main_region_StateA));
+	EXPECT_TRUE(statechart->isStateActive(AlwaysOncycle::main_region_StateA));
 	while (statechart->getDefaultSCI()->get_value()< 5l) {
 		statechart->runCycle();
-		EXPECT_TRUE(statechart->isActive(AlwaysOncycle::main_region_StateA));
+		EXPECT_TRUE(statechart->isStateActive(AlwaysOncycle::main_region_StateA));
 	}
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(AlwaysOncycle::main_region_StateB));
+	EXPECT_TRUE(statechart->isStateActive(AlwaysOncycle::main_region_StateB));
 	while (statechart->getDefaultSCI()->get_value()< 5l) {
 		statechart->runCycle();
-		EXPECT_TRUE(statechart->isActive(AlwaysOncycle::main_region_StateB));
+		EXPECT_TRUE(statechart->isStateActive(AlwaysOncycle::main_region_StateB));
 	}
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(AlwaysOncycle::main_region_StateA));
+	EXPECT_TRUE(statechart->isStateActive(AlwaysOncycle::main_region_StateA));
 	delete statechart;
 }

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

@@ -16,33 +16,33 @@ TEST(StatemachineTest, simpleAssignment) {
 	AssignmentAsExpression* statechart = new AssignmentAsExpression();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(AssignmentAsExpression::main_region_Add));
+	EXPECT_TRUE(statechart->isStateActive(AssignmentAsExpression::main_region_Add));
 	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->isStateActive(AssignmentAsExpression::main_region_Subtract));
 	EXPECT_TRUE(statechart->getDefaultSCI()->get_d()== 6l);
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(AssignmentAsExpression::main_region_Multiply));
+	EXPECT_TRUE(statechart->isStateActive(AssignmentAsExpression::main_region_Multiply));
 	EXPECT_TRUE(statechart->getDefaultSCI()->get_e()== 15l);
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(AssignmentAsExpression::main_region_Divide));
+	EXPECT_TRUE(statechart->isStateActive(AssignmentAsExpression::main_region_Divide));
 	EXPECT_TRUE(statechart->getDefaultSCI()->get_g()== 1l);
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(AssignmentAsExpression::main_region_Modulo));
+	EXPECT_TRUE(statechart->isStateActive(AssignmentAsExpression::main_region_Modulo));
 	EXPECT_TRUE(statechart->getDefaultSCI()->get_i()== 1l);
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(AssignmentAsExpression::main_region_Shift));
+	EXPECT_TRUE(statechart->isStateActive(AssignmentAsExpression::main_region_Shift));
 	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->isStateActive(AssignmentAsExpression::main_region_boolean_And));
 	EXPECT_TRUE(statechart->getDefaultSCI()->get_l()== 1l);
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(AssignmentAsExpression::main_region_boolean_Or));
+	EXPECT_TRUE(statechart->isStateActive(AssignmentAsExpression::main_region_boolean_Or));
 	EXPECT_TRUE(statechart->getDefaultSCI()->get_p()== 15l);
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(AssignmentAsExpression::main_region_boolean_Xor));
+	EXPECT_TRUE(statechart->isStateActive(AssignmentAsExpression::main_region_boolean_Xor));
 	EXPECT_TRUE(statechart->getDefaultSCI()->get_u()== 12l);
 	statechart->exit();
 	delete statechart;

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

@@ -16,12 +16,12 @@ TEST(StatemachineTest, BitExpressions) {
 	BitExpressions* statechart = new BitExpressions();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(BitExpressions::main_region_StateA));
+	EXPECT_TRUE(statechart->isStateActive(BitExpressions::main_region_StateA));
 	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->isStateActive(BitExpressions::main_region_StateB));
 	EXPECT_TRUE(statechart->getDefaultSCI()->get_leftBitshift()== 10l);
 	EXPECT_TRUE(statechart->getDefaultSCI()->get_rightBitshift()== 2l);
 	EXPECT_TRUE(statechart->getDefaultSCI()->get_complementBitshift()== - 6l );

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

@@ -16,12 +16,12 @@ TEST(StatemachineTest, booleanExpressions) {
 	BooleanExpressions* statechart = new BooleanExpressions();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(BooleanExpressions::main_region_StateA));
+	EXPECT_TRUE(statechart->isStateActive(BooleanExpressions::main_region_StateA));
 	EXPECT_TRUE(statechart->getDefaultSCI()->get_myBool1()== true);
 	EXPECT_TRUE(statechart->getDefaultSCI()->get_myBool2()== false);
 	statechart->raise_e1();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(BooleanExpressions::main_region_StateB));
+	EXPECT_TRUE(statechart->isStateActive(BooleanExpressions::main_region_StateB));
 	EXPECT_TRUE(statechart->getDefaultSCI()->get_and()== false);
 	EXPECT_TRUE(statechart->getDefaultSCI()->get_or()== true);
 	EXPECT_TRUE(statechart->getDefaultSCI()->get_not()== false);

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

@@ -16,11 +16,11 @@ TEST(StatemachineTest, CKeywordsTest) {
 	CKeywords* statechart = new CKeywords();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(CKeywords::auto_char));
+	EXPECT_TRUE(statechart->isStateActive(CKeywords::auto_char));
 	statechart->raise_auto();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(CKeywords::auto_loop));
-	EXPECT_TRUE(statechart->isActive(CKeywords::auto_loop_switch_case));
-	EXPECT_TRUE(statechart->isActive(CKeywords::auto_loop_switch_case_enum_asm));
+	EXPECT_TRUE(statechart->isStateActive(CKeywords::auto_loop));
+	EXPECT_TRUE(statechart->isStateActive(CKeywords::auto_loop_switch_case));
+	EXPECT_TRUE(statechart->isStateActive(CKeywords::auto_loop_switch_case_enum_asm));
 	delete statechart;
 }

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

@@ -21,7 +21,7 @@ TEST(StatemachineTest, CastExpressionTest) {
 	statechart->runCycle();
 	EXPECT_TRUE(statechart->getDefaultSCI()->get_realValue()== 15l);
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(CastExpressions::main_region_C));
+	EXPECT_TRUE(statechart->isStateActive(CastExpressions::main_region_C));
 	EXPECT_TRUE(statechart->getDefaultSCI()->get_realValue()== 757l);
 	delete statechart;
 }

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

@@ -16,76 +16,76 @@ TEST(StatemachineTest, elseChoiceUsingNonDefaultTransition) {
 	Choice* statechart = new Choice();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(Choice::main_region_A));
+	EXPECT_TRUE(statechart->isStateActive(Choice::main_region_A));
 	statechart->getDefaultSCI()->set_c(true);
 	statechart->raise_e();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(Choice::main_region_C));
+	EXPECT_TRUE(statechart->isStateActive(Choice::main_region_C));
 	delete statechart;
 }
 TEST(StatemachineTest, elseChoiceUsingDefaultTransition) {
 	Choice* statechart = new Choice();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(Choice::main_region_A));
+	EXPECT_TRUE(statechart->isStateActive(Choice::main_region_A));
 	statechart->getDefaultSCI()->set_c(false);
 	statechart->raise_e();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(Choice::main_region_B));
+	EXPECT_TRUE(statechart->isStateActive(Choice::main_region_B));
 	delete statechart;
 }
 TEST(StatemachineTest, defaultChoiceUsingNonDefaultTransition) {
 	Choice* statechart = new Choice();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(Choice::main_region_A));
+	EXPECT_TRUE(statechart->isStateActive(Choice::main_region_A));
 	statechart->getDefaultSCI()->set_c(true);
 	statechart->raise_g();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(Choice::main_region_C));
+	EXPECT_TRUE(statechart->isStateActive(Choice::main_region_C));
 	delete statechart;
 }
 TEST(StatemachineTest, defaultChoiceUsingDefaultTransition) {
 	Choice* statechart = new Choice();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(Choice::main_region_A));
+	EXPECT_TRUE(statechart->isStateActive(Choice::main_region_A));
 	statechart->getDefaultSCI()->set_c(false);
 	statechart->raise_g();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(Choice::main_region_B));
+	EXPECT_TRUE(statechart->isStateActive(Choice::main_region_B));
 	delete statechart;
 }
 TEST(StatemachineTest, uncheckedChoiceUsingNonDefaultTransition) {
 	Choice* statechart = new Choice();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(Choice::main_region_A));
+	EXPECT_TRUE(statechart->isStateActive(Choice::main_region_A));
 	statechart->getDefaultSCI()->set_c(true);
 	statechart->raise_f();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(Choice::main_region_C));
+	EXPECT_TRUE(statechart->isStateActive(Choice::main_region_C));
 	delete statechart;
 }
 TEST(StatemachineTest, uncheckedChoiceUsingDefaultTransition) {
 	Choice* statechart = new Choice();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(Choice::main_region_A));
+	EXPECT_TRUE(statechart->isStateActive(Choice::main_region_A));
 	statechart->getDefaultSCI()->set_c(false);
 	statechart->raise_f();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(Choice::main_region_B));
+	EXPECT_TRUE(statechart->isStateActive(Choice::main_region_B));
 	delete statechart;
 }
 TEST(StatemachineTest, alwaysTrueTransitionInChoice) {
 	Choice* statechart = new Choice();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(Choice::main_region_A));
+	EXPECT_TRUE(statechart->isStateActive(Choice::main_region_A));
 	statechart->getDefaultSCI()->set_c(true);
 	statechart->raise_h();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(Choice::main_region_C));
+	EXPECT_TRUE(statechart->isStateActive(Choice::main_region_C));
 	delete statechart;
 }

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

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

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

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

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

@@ -24,13 +24,13 @@ TEST(StatemachineTest, enterToSubstate) {
 	EXPECT_TRUE(statechart->getDefaultSCI()->get_z()== 2l);
 	statechart->raise_e();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(DeepEntry::r2_B_r_BB));
+	EXPECT_TRUE(statechart->isStateActive(DeepEntry::r2_B_r_BB));
 	statechart->raise_f();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(DeepEntry::r2_C));
+	EXPECT_TRUE(statechart->isStateActive(DeepEntry::r2_C));
 	statechart->raise_f();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(DeepEntry::r2_B_r_BB));
+	EXPECT_TRUE(statechart->isStateActive(DeepEntry::r2_B_r_BB));
 	EXPECT_TRUE(statechart->getDefaultSCI()->get_y()== 1l);
 	delete statechart;
 }

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

@@ -24,15 +24,15 @@ TEST(StatemachineTest, deepHistoryTest) {
 	statechart->runCycle();
 	statechart->raise_event7();
 	statechart->runCycle();
-	EXPECT_TRUE(!statechart->isActive(DeepHistory::mainRegion_State1));
-	EXPECT_TRUE(statechart->isActive(DeepHistory::mainRegion_State2__region0_State4__region0_State7__region0_State9));
+	EXPECT_TRUE(!statechart->isStateActive(DeepHistory::mainRegion_State1));
+	EXPECT_TRUE(statechart->isStateActive(DeepHistory::mainRegion_State2__region0_State4__region0_State7__region0_State9));
 	statechart->raise_event2();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(DeepHistory::mainRegion_State1));
-	EXPECT_TRUE(!statechart->isActive(DeepHistory::mainRegion_State2__region0_State4__region0_State7__region0_State9));
+	EXPECT_TRUE(statechart->isStateActive(DeepHistory::mainRegion_State1));
+	EXPECT_TRUE(!statechart->isStateActive(DeepHistory::mainRegion_State2__region0_State4__region0_State7__region0_State9));
 	statechart->raise_event1();
 	statechart->runCycle();
-	EXPECT_TRUE(!statechart->isActive(DeepHistory::mainRegion_State1));
-	EXPECT_TRUE(statechart->isActive(DeepHistory::mainRegion_State2__region0_State4__region0_State7__region0_State9));
+	EXPECT_TRUE(!statechart->isStateActive(DeepHistory::mainRegion_State1));
+	EXPECT_TRUE(statechart->isStateActive(DeepHistory::mainRegion_State2__region0_State4__region0_State7__region0_State9));
 	delete statechart;
 }

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

@@ -16,8 +16,8 @@ TEST(StatemachineTest, DynamicChoiceTest) {
 	DynamicChoice* statechart = new DynamicChoice();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(DynamicChoice::main_region_Start));
+	EXPECT_TRUE(statechart->isStateActive(DynamicChoice::main_region_Start));
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(DynamicChoice::main_region_A));
+	EXPECT_TRUE(statechart->isStateActive(DynamicChoice::main_region_A));
 	delete statechart;
 }

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

@@ -17,7 +17,7 @@ TEST(StatemachineTest, EmptyTransitionTest) {
 	statechart->init();
 	statechart->enter();
 	statechart->runCycle();
-	EXPECT_TRUE(!statechart->isActive(EmptyTransition::main_region_B));
-	EXPECT_TRUE(statechart->isActive(EmptyTransition::main_region_A));
+	EXPECT_TRUE(!statechart->isStateActive(EmptyTransition::main_region_B));
+	EXPECT_TRUE(statechart->isStateActive(EmptyTransition::main_region_A));
 	delete statechart;
 }

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

@@ -16,29 +16,29 @@ TEST(StatemachineTest, defaultEntry) {
 	EnterState* statechart = new EnterState();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(EnterState::r_A));
+	EXPECT_TRUE(statechart->isStateActive(EnterState::r_A));
 	statechart->raise_e();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(EnterState::r_B_r_E));
+	EXPECT_TRUE(statechart->isStateActive(EnterState::r_B_r_E));
 	delete statechart;
 }
 TEST(StatemachineTest, namedEntryThroughNamedTransition) {
 	EnterState* statechart = new EnterState();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(EnterState::r_A));
+	EXPECT_TRUE(statechart->isStateActive(EnterState::r_A));
 	statechart->raise_f();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(EnterState::r_B_r_F));
+	EXPECT_TRUE(statechart->isStateActive(EnterState::r_B_r_F));
 	delete statechart;
 }
 TEST(StatemachineTest, namedEntryThroughDefaultTransition) {
 	EnterState* statechart = new EnterState();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(EnterState::r_A));
+	EXPECT_TRUE(statechart->isStateActive(EnterState::r_A));
 	statechart->raise_g();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(EnterState::r_B_r_E));
+	EXPECT_TRUE(statechart->isStateActive(EnterState::r_B_r_E));
 	delete statechart;
 }

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

@@ -18,6 +18,6 @@ TEST(StatemachineTest, EntryChoiceTest) {
 	statechart->enter();
 	statechart->runCycle();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(EntryChoice::main_region_A));
+	EXPECT_TRUE(statechart->isStateActive(EntryChoice::main_region_A));
 	delete statechart;
 }

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

@@ -18,13 +18,13 @@ TEST(StatemachineTest, SelfTransitionToChildState) {
 	statechart->enter();
 	statechart->runCycle();
 	EXPECT_TRUE(statechart->getDefaultSCI()->get_entries()== 1l);
-	EXPECT_TRUE(statechart->isActive(EntryExitSelfTransition::main_region_A__region0_B));
+	EXPECT_TRUE(statechart->isStateActive(EntryExitSelfTransition::main_region_A__region0_B));
 	statechart->getDefaultSCI()->set_entries(0l);
 	statechart->raise_e();
 	statechart->runCycle();
 	EXPECT_TRUE(statechart->getDefaultSCI()->get_entries()== 1l);
 	EXPECT_TRUE(statechart->getDefaultSCI()->get_exits()== 1l);
-	EXPECT_TRUE(statechart->isActive(EntryExitSelfTransition::main_region_A__region0_C));
+	EXPECT_TRUE(statechart->isStateActive(EntryExitSelfTransition::main_region_A__region0_C));
 	delete statechart;
 }
 TEST(StatemachineTest, SelfTransitionFromChildState) {
@@ -38,10 +38,10 @@ TEST(StatemachineTest, SelfTransitionFromChildState) {
 	statechart->runCycle();
 	EXPECT_TRUE(statechart->getDefaultSCI()->get_entries()== 0l);
 	EXPECT_TRUE(statechart->getDefaultSCI()->get_exits()== 0l);
-	EXPECT_TRUE(statechart->isActive(EntryExitSelfTransition::main_region_A__region0_C));
+	EXPECT_TRUE(statechart->isStateActive(EntryExitSelfTransition::main_region_A__region0_C));
 	statechart->raise_e1();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(EntryExitSelfTransition::main_region_A__region0_B));
+	EXPECT_TRUE(statechart->isStateActive(EntryExitSelfTransition::main_region_A__region0_B));
 	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

@@ -16,7 +16,7 @@ TEST(StatemachineTest, ExitOnSelfTransitionTest) {
 	ExitOnSelfTransition* statechart = new ExitOnSelfTransition();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(ExitOnSelfTransition::main_region_A));
+	EXPECT_TRUE(statechart->isStateActive(ExitOnSelfTransition::main_region_A));
 	EXPECT_TRUE(statechart->getDefaultSCI()->get_entryCount()== 1l);
 	EXPECT_TRUE(statechart->getDefaultSCI()->get_exitCount()== 0l);
 	statechart->raise_e();

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

@@ -16,38 +16,38 @@ TEST(StatemachineTest, defaultExit) {
 	ExitState* statechart = new ExitState();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(ExitState::r_A));
+	EXPECT_TRUE(statechart->isStateActive(ExitState::r_A));
 	statechart->raise_e();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(ExitState::r_E));
+	EXPECT_TRUE(statechart->isStateActive(ExitState::r_E));
 	delete statechart;
 }
 TEST(StatemachineTest, namedExitThroughNamedTransition) {
 	ExitState* statechart = new ExitState();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(ExitState::r_A));
+	EXPECT_TRUE(statechart->isStateActive(ExitState::r_A));
 	statechart->raise_f();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(ExitState::r_F));
+	EXPECT_TRUE(statechart->isStateActive(ExitState::r_F));
 	delete statechart;
 }
 TEST(StatemachineTest, namedExitThroughDefaultTransition) {
 	ExitState* statechart = new ExitState();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(ExitState::r_A));
+	EXPECT_TRUE(statechart->isStateActive(ExitState::r_A));
 	statechart->raise_g();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(ExitState::r_E));
+	EXPECT_TRUE(statechart->isStateActive(ExitState::r_E));
 	delete statechart;
 }
 TEST(StatemachineTest, remainInA) {
 	ExitState* statechart = new ExitState();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(ExitState::r_A));
+	EXPECT_TRUE(statechart->isStateActive(ExitState::r_A));
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(ExitState::r_A));
+	EXPECT_TRUE(statechart->isStateActive(ExitState::r_A));
 	delete statechart;
 }

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

@@ -16,8 +16,8 @@ TEST(StatemachineTest, FeatureCalls) {
 	FeatureCalls* statechart = new FeatureCalls();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(FeatureCalls::main_region_A));
+	EXPECT_TRUE(statechart->isStateActive(FeatureCalls::main_region_A));
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(FeatureCalls::main_region_A));
+	EXPECT_TRUE(statechart->isStateActive(FeatureCalls::main_region_A));
 	delete statechart;
 }

test-plugins/org.yakindu.sct.generator.cpp.test/gtests/FinalStateTest/FinalState.sgen

@@ -0,0 +1,19 @@
+GeneratorModel for yakindu::cpp {
+	statechart FinalState {
+		feature Outlet {
+			targetProject = "gtests"
+			targetFolder = "FinalStateTest"
+		}
+		feature FunctionInlining {
+			inlineReactions = false
+			inlineEntryActions = false
+			inlineEnterSequences = false 
+			inlineExitActions = false
+			inlineExitSequences = false
+			inlineChoices = false
+			inlineEntries = false
+			inlineEnterRegion = false
+			inlineExitRegion = false
+		}
+	}
+}

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

@@ -0,0 +1,22 @@
+/**
+* Copyright (c) 2015 committers of YAKINDU and others.
+* All rights reserved. This program and the accompanying materials
+* are made available under the terms of the Eclipse Public License v1.0
+* which accompanies this distribution, and is available at
+* http://www.eclipse.org/legal/epl-v10.html
+*
+* Contributors:
+*     committers of YAKINDU - initial API and implementation
+*/
+#include <string>
+#include "gtest/gtest.h"
+#include "FinalState.h"
+
+TEST(StatemachineTest, StatechartNameTest) {
+	FinalState* statechart = new FinalState();
+	statechart->init();
+	statechart->enter();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isFinal());
+	delete statechart;
+}

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

@@ -16,21 +16,21 @@ TEST(StatemachineTest, guardTest) {
 	Guard* statechart = new Guard();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(Guard::main_region_A));
+	EXPECT_TRUE(statechart->isStateActive(Guard::main_region_A));
 	statechart->raise_event1();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(Guard::main_region_A));
+	EXPECT_TRUE(statechart->isStateActive(Guard::main_region_A));
 	statechart->raise_event2();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(Guard::main_region_B));
+	EXPECT_TRUE(statechart->isStateActive(Guard::main_region_B));
 	statechart->raise_return();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(Guard::main_region_A));
+	EXPECT_TRUE(statechart->isStateActive(Guard::main_region_A));
 	statechart->raise_event1();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(Guard::main_region_B));
+	EXPECT_TRUE(statechart->isStateActive(Guard::main_region_B));
 	statechart->raise_return();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(Guard::main_region_A));
+	EXPECT_TRUE(statechart->isStateActive(Guard::main_region_A));
 	delete statechart;
 }

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

@@ -17,7 +17,7 @@ TEST(StatemachineTest, EntryNotTakenOnStatechartEnter) {
 	statechart->init();
 	EXPECT_TRUE(statechart->getDefaultSCI()->get_guard()== false);
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(GuardedEntry::main_region_A));
+	EXPECT_TRUE(statechart->isStateActive(GuardedEntry::main_region_A));
 	EXPECT_TRUE(statechart->getDefaultSCI()->get_done()== false);
 	delete statechart;
 }
@@ -26,7 +26,7 @@ TEST(StatemachineTest, EntryTakenOnStatechartEnter) {
 	statechart->init();
 	statechart->getDefaultSCI()->set_guard(true);
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(GuardedEntry::main_region_A));
+	EXPECT_TRUE(statechart->isStateActive(GuardedEntry::main_region_A));
 	EXPECT_TRUE(statechart->getDefaultSCI()->get_done()== true);
 	delete statechart;
 }
@@ -34,15 +34,15 @@ TEST(StatemachineTest, EntryTakenInTransition) {
 	GuardedEntry* statechart = new GuardedEntry();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(GuardedEntry::main_region_A));
+	EXPECT_TRUE(statechart->isStateActive(GuardedEntry::main_region_A));
 	statechart->raise_e();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(GuardedEntry::main_region_B));
+	EXPECT_TRUE(statechart->isStateActive(GuardedEntry::main_region_B));
 	statechart->getDefaultSCI()->set_guard(true);
 	statechart->getDefaultSCI()->set_done(false);
 	statechart->raise_e();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(GuardedEntry::main_region_A));
+	EXPECT_TRUE(statechart->isStateActive(GuardedEntry::main_region_A));
 	EXPECT_TRUE(statechart->getDefaultSCI()->get_done());
 	delete statechart;
 }
@@ -50,15 +50,15 @@ TEST(StatemachineTest, EntryNotTakenInTransition) {
 	GuardedEntry* statechart = new GuardedEntry();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(GuardedEntry::main_region_A));
+	EXPECT_TRUE(statechart->isStateActive(GuardedEntry::main_region_A));
 	statechart->raise_e();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(GuardedEntry::main_region_B));
+	EXPECT_TRUE(statechart->isStateActive(GuardedEntry::main_region_B));
 	statechart->getDefaultSCI()->set_guard(false);
 	statechart->getDefaultSCI()->set_done(false);
 	statechart->raise_e();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(GuardedEntry::main_region_A));
+	EXPECT_TRUE(statechart->isStateActive(GuardedEntry::main_region_A));
 	EXPECT_TRUE(!statechart->getDefaultSCI()->get_done());
 	delete statechart;
 }

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

@@ -16,11 +16,11 @@ TEST(StatemachineTest, ExitTaken) {
 	GuardedExit* statechart = new GuardedExit();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(GuardedExit::main_region_A));
+	EXPECT_TRUE(statechart->isStateActive(GuardedExit::main_region_A));
 	EXPECT_TRUE(!statechart->getDefaultSCI()->get_guard());
 	statechart->raise_e();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(GuardedExit::main_region_B));
+	EXPECT_TRUE(statechart->isStateActive(GuardedExit::main_region_B));
 	EXPECT_TRUE(!statechart->getDefaultSCI()->get_done());
 	delete statechart;
 }
@@ -28,11 +28,11 @@ TEST(StatemachineTest, ExitNotTaken) {
 	GuardedExit* statechart = new GuardedExit();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(GuardedExit::main_region_A));
+	EXPECT_TRUE(statechart->isStateActive(GuardedExit::main_region_A));
 	statechart->getDefaultSCI()->set_guard(true);
 	statechart->raise_e();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(GuardedExit::main_region_B));
+	EXPECT_TRUE(statechart->isStateActive(GuardedExit::main_region_B));
 	EXPECT_TRUE(statechart->getDefaultSCI()->get_done());
 	delete statechart;
 }

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

@@ -16,21 +16,21 @@ TEST(StatemachineTest, historyEntryAfterExit) {
 	HistoryWithExitPoint* statechart = new HistoryWithExitPoint();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(HistoryWithExitPoint::mr_A_r_X1));
+	EXPECT_TRUE(statechart->isStateActive(HistoryWithExitPoint::mr_A_r_X1));
 	statechart->raise_push();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(HistoryWithExitPoint::mr_B));
+	EXPECT_TRUE(statechart->isStateActive(HistoryWithExitPoint::mr_B));
 	statechart->raise_back();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(HistoryWithExitPoint::mr_A_r_X1));
+	EXPECT_TRUE(statechart->isStateActive(HistoryWithExitPoint::mr_A_r_X1));
 	statechart->raise_next();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(HistoryWithExitPoint::mr_A_r_X2));
+	EXPECT_TRUE(statechart->isStateActive(HistoryWithExitPoint::mr_A_r_X2));
 	statechart->raise_push();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(HistoryWithExitPoint::mr_B));
+	EXPECT_TRUE(statechart->isStateActive(HistoryWithExitPoint::mr_B));
 	statechart->raise_back();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(HistoryWithExitPoint::mr_A_r_X2));
+	EXPECT_TRUE(statechart->isStateActive(HistoryWithExitPoint::mr_A_r_X2));
 	delete statechart;
 }

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

@@ -16,46 +16,46 @@ TEST(StatemachineTest, enterThroughInitialEntry) {
 	HistoryWithoutInitialStep* statechart = new HistoryWithoutInitialStep();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(HistoryWithoutInitialStep::main_region_A));
+	EXPECT_TRUE(statechart->isStateActive(HistoryWithoutInitialStep::main_region_A));
 	statechart->raise_toB();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(HistoryWithoutInitialStep::main_region_B_r1_C));
+	EXPECT_TRUE(statechart->isStateActive(HistoryWithoutInitialStep::main_region_B_r1_C));
 	statechart->raise_next();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(HistoryWithoutInitialStep::main_region_B_r1_D));
+	EXPECT_TRUE(statechart->isStateActive(HistoryWithoutInitialStep::main_region_B_r1_D));
 	delete statechart;
 }
 TEST(StatemachineTest, enterCThroughHistory) {
 	HistoryWithoutInitialStep* statechart = new HistoryWithoutInitialStep();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(HistoryWithoutInitialStep::main_region_A));
+	EXPECT_TRUE(statechart->isStateActive(HistoryWithoutInitialStep::main_region_A));
 	statechart->raise_toB();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(HistoryWithoutInitialStep::main_region_B_r1_C));
+	EXPECT_TRUE(statechart->isStateActive(HistoryWithoutInitialStep::main_region_B_r1_C));
 	statechart->raise_toA();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(HistoryWithoutInitialStep::main_region_A));
+	EXPECT_TRUE(statechart->isStateActive(HistoryWithoutInitialStep::main_region_A));
 	statechart->raise_toHistory();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(HistoryWithoutInitialStep::main_region_B_r1_C));
+	EXPECT_TRUE(statechart->isStateActive(HistoryWithoutInitialStep::main_region_B_r1_C));
 	delete statechart;
 }
 TEST(StatemachineTest, enterDThroughHistory) {
 	HistoryWithoutInitialStep* statechart = new HistoryWithoutInitialStep();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(HistoryWithoutInitialStep::main_region_A));
+	EXPECT_TRUE(statechart->isStateActive(HistoryWithoutInitialStep::main_region_A));
 	statechart->raise_toB();
 	statechart->runCycle();
 	statechart->raise_next();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(HistoryWithoutInitialStep::main_region_B_r1_D));
+	EXPECT_TRUE(statechart->isStateActive(HistoryWithoutInitialStep::main_region_B_r1_D));
 	statechart->raise_toA();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(HistoryWithoutInitialStep::main_region_A));
+	EXPECT_TRUE(statechart->isStateActive(HistoryWithoutInitialStep::main_region_A));
 	statechart->raise_toHistory();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(HistoryWithoutInitialStep::main_region_B_r1_D));
+	EXPECT_TRUE(statechart->isStateActive(HistoryWithoutInitialStep::main_region_B_r1_D));
 	delete statechart;
 }

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

@@ -16,7 +16,7 @@ TEST(StatemachineTest, integerExpressions) {
 	IntegerExpressions* statechart = new IntegerExpressions();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(IntegerExpressions::main_region_StateA));
+	EXPECT_TRUE(statechart->isStateActive(IntegerExpressions::main_region_StateA));
 	EXPECT_TRUE(statechart->getDefaultSCI()->get_myInt1()== 10l);
 	EXPECT_TRUE(statechart->getDefaultSCI()->get_myInt2()== 5l);
 	statechart->raise_e1();

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

@@ -16,21 +16,21 @@ TEST(StatemachineTest, InternalEventLifeCycleTest) {
 	InternalEventLifeCycle* statechart = new InternalEventLifeCycle();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(InternalEventLifeCycle::r1_A));
-	EXPECT_TRUE(statechart->isActive(InternalEventLifeCycle::r2_C));
+	EXPECT_TRUE(statechart->isStateActive(InternalEventLifeCycle::r1_A));
+	EXPECT_TRUE(statechart->isStateActive(InternalEventLifeCycle::r2_C));
 	statechart->raise_e();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(InternalEventLifeCycle::r1_A));
-	EXPECT_TRUE(statechart->isActive(InternalEventLifeCycle::r2_D));
+	EXPECT_TRUE(statechart->isStateActive(InternalEventLifeCycle::r1_A));
+	EXPECT_TRUE(statechart->isStateActive(InternalEventLifeCycle::r2_D));
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(InternalEventLifeCycle::r1_A));
-	EXPECT_TRUE(statechart->isActive(InternalEventLifeCycle::r2_D));
+	EXPECT_TRUE(statechart->isStateActive(InternalEventLifeCycle::r1_A));
+	EXPECT_TRUE(statechart->isStateActive(InternalEventLifeCycle::r2_D));
 	statechart->raise_f();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(InternalEventLifeCycle::r1_A));
-	EXPECT_TRUE(statechart->isActive(InternalEventLifeCycle::r2_C));
+	EXPECT_TRUE(statechart->isStateActive(InternalEventLifeCycle::r1_A));
+	EXPECT_TRUE(statechart->isStateActive(InternalEventLifeCycle::r2_C));
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(InternalEventLifeCycle::r1_A));
-	EXPECT_TRUE(statechart->isActive(InternalEventLifeCycle::r2_C));
+	EXPECT_TRUE(statechart->isStateActive(InternalEventLifeCycle::r1_A));
+	EXPECT_TRUE(statechart->isStateActive(InternalEventLifeCycle::r2_C));
 	delete statechart;
 }

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

@@ -16,7 +16,7 @@ TEST(StatemachineTest, LocalReactionsTest) {
 	LocalReactions* statechart = new LocalReactions();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(LocalReactions::main_region_A));
+	EXPECT_TRUE(statechart->isStateActive(LocalReactions::main_region_A));
 	statechart->runCycle();
 	EXPECT_TRUE(statechart->getDefaultSCI()->get_x()== 1l);
 	delete statechart;

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

@@ -16,8 +16,8 @@ TEST(StatemachineTest, SimpleNullCheckTest) {
 	NullCheck* statechart = new NullCheck();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(NullCheck::main_region_A));
+	EXPECT_TRUE(statechart->isStateActive(NullCheck::main_region_A));
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(NullCheck::main_region_B));
+	EXPECT_TRUE(statechart->isStateActive(NullCheck::main_region_B));
 	delete statechart;
 }

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

@@ -16,7 +16,7 @@ TEST(StatemachineTest, simple) {
 	Parenthesis* statechart = new Parenthesis();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(Parenthesis::mainRegion_A));
+	EXPECT_TRUE(statechart->isStateActive(Parenthesis::mainRegion_A));
 	EXPECT_TRUE(statechart->getDefaultSCI()->get_erg()== 8l);
 	delete statechart;
 }

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

@@ -16,20 +16,20 @@ TEST(StatemachineTest, transitionPriority) {
 	PriorityValues* statechart = new PriorityValues();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(PriorityValues::main_region_A));
+	EXPECT_TRUE(statechart->isStateActive(PriorityValues::main_region_A));
 	statechart->raise_event1();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(PriorityValues::main_region_C));
+	EXPECT_TRUE(statechart->isStateActive(PriorityValues::main_region_C));
 	delete statechart;
 }
 TEST(StatemachineTest, regionPriority) {
 	PriorityValues* statechart = new PriorityValues();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(PriorityValues::someRegion_A));
+	EXPECT_TRUE(statechart->isStateActive(PriorityValues::someRegion_A));
 	statechart->raise_event2();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(PriorityValues::someRegion_B));
-	EXPECT_TRUE(!statechart->isActive(PriorityValues::main_region_E));
+	EXPECT_TRUE(statechart->isStateActive(PriorityValues::someRegion_B));
+	EXPECT_TRUE(!statechart->isStateActive(PriorityValues::main_region_E));
 	delete statechart;
 }

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

@@ -16,12 +16,12 @@ TEST(StatemachineTest, raiseEvent) {
 	RaiseEvent* statechart = new RaiseEvent();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(RaiseEvent::second_region_SateA));
-	EXPECT_TRUE(statechart->isActive(RaiseEvent::main_region_StateA));
+	EXPECT_TRUE(statechart->isStateActive(RaiseEvent::second_region_SateA));
+	EXPECT_TRUE(statechart->isStateActive(RaiseEvent::main_region_StateA));
 	statechart->raise_e2();
 	statechart->runCycle();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(RaiseEvent::second_region_StateB));
-	EXPECT_TRUE(statechart->isActive(RaiseEvent::main_region_StateB));
+	EXPECT_TRUE(statechart->isStateActive(RaiseEvent::second_region_StateB));
+	EXPECT_TRUE(statechart->isStateActive(RaiseEvent::main_region_StateB));
 	delete statechart;
 }

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

@@ -16,465 +16,465 @@ TEST(StatemachineTest, activeCheckWithSTextNamedStates) {
 	STextKeywordsInStatesAndRegions* statechart = new STextKeywordsInStatesAndRegions();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::default_namespace));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::operation_interface));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::namespace_event));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::local_in));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::interface_var));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::internal_external));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::event_default));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::in_entry));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::out_always));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::var_raise));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::readonly_active));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::external_interface));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_event));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::entry_in));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_var));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::always_external));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle_default));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::raise_entry));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::valueof_always));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::active_raise));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::default_namespace));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::operation_interface));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::namespace_event));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::local_in));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::interface_var));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::internal_external));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::event_default));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::in_entry));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::out_always));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::var_raise));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::readonly_active));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::external_interface));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::else_event));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::entry_in));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::exit_var));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::always_external));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::oncycle_default));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::raise_entry));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::valueof_always));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::active_raise));
 	statechart->raise_e1();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::default_namespace));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::operation_internal));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::namespace_event));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::local_in));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::interface_var));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::internal_external));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::event_default));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::in_entry));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::out_always));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::var_raise));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::readonly_active));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::external_interface));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_event));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::entry_in));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_var));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::always_external));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle_default));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::raise_entry));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::valueof_always));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::active_raise));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::default_namespace));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::operation_internal));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::namespace_event));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::local_in));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::interface_var));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::internal_external));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::event_default));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::in_entry));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::out_always));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::var_raise));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::readonly_active));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::external_interface));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::else_event));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::entry_in));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::exit_var));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::always_external));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::oncycle_default));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::raise_entry));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::valueof_always));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::active_raise));
 	statechart->raise_e2();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::default_namespace));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::operation_internal));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::namespace_local));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::local_in));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::interface_var));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::internal_external));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::event_default));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::in_entry));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::out_always));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::var_raise));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::readonly_active));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::external_interface));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_event));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::entry_in));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_var));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::always_external));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle_default));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::raise_entry));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::valueof_always));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::active_raise));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::default_namespace));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::operation_internal));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::namespace_local));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::local_in));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::interface_var));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::internal_external));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::event_default));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::in_entry));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::out_always));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::var_raise));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::readonly_active));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::external_interface));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::else_event));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::entry_in));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::exit_var));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::always_external));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::oncycle_default));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::raise_entry));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::valueof_always));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::active_raise));
 	statechart->raise_e1();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::default_namespace));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::operation_internal));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::namespace_local));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::local_out));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::interface_var));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::internal_external));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::event_default));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::in_entry));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::out_always));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::var_raise));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::readonly_active));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::external_interface));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_event));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::entry_in));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_var));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::always_external));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle_default));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::raise_entry));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::valueof_always));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::active_raise));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::default_namespace));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::operation_internal));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::namespace_local));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::local_out));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::interface_var));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::internal_external));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::event_default));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::in_entry));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::out_always));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::var_raise));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::readonly_active));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::external_interface));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::else_event));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::entry_in));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::exit_var));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::always_external));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::oncycle_default));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::raise_entry));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::valueof_always));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::active_raise));
 	statechart->raise_e2();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::default_namespace));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::operation_internal));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::namespace_local));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::local_out));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::interface_readonly));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::internal_external));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::event_default));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::in_entry));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::out_always));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::var_raise));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::readonly_active));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::external_interface));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_event));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::entry_in));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_var));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::always_external));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle_default));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::raise_entry));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::valueof_always));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::active_raise));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::default_namespace));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::operation_internal));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::namespace_local));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::local_out));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::interface_readonly));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::internal_external));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::event_default));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::in_entry));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::out_always));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::var_raise));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::readonly_active));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::external_interface));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::else_event));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::entry_in));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::exit_var));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::always_external));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::oncycle_default));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::raise_entry));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::valueof_always));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::active_raise));
 	statechart->raise_e1();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::default_namespace));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::operation_internal));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::namespace_local));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::local_out));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::interface_readonly));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::internal_operation));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::event_default));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::in_entry));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::out_always));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::var_raise));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::readonly_active));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::external_interface));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_event));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::entry_in));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_var));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::always_external));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle_default));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::raise_entry));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::valueof_always));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::active_raise));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::default_namespace));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::operation_internal));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::namespace_local));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::local_out));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::interface_readonly));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::internal_operation));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::event_default));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::in_entry));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::out_always));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::var_raise));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::readonly_active));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::external_interface));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::else_event));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::entry_in));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::exit_var));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::always_external));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::oncycle_default));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::raise_entry));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::valueof_always));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::active_raise));
 	statechart->raise_e2();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::default_namespace));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::operation_internal));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::namespace_local));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::local_out));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::interface_readonly));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::internal_operation));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::event_else));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::in_entry));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::out_always));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::var_raise));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::readonly_active));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::external_interface));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_event));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::entry_in));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_var));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::always_external));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle_default));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::raise_entry));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::valueof_always));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::active_raise));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::default_namespace));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::operation_internal));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::namespace_local));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::local_out));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::interface_readonly));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::internal_operation));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::event_else));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::in_entry));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::out_always));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::var_raise));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::readonly_active));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::external_interface));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::else_event));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::entry_in));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::exit_var));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::always_external));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::oncycle_default));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::raise_entry));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::valueof_always));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::active_raise));
 	statechart->raise_e1();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::default_namespace));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::operation_internal));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::namespace_local));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::local_out));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::interface_readonly));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::internal_operation));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::event_else));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::in_exit));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::out_always));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::var_raise));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::readonly_active));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::external_interface));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_event));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::entry_in));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_var));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::always_external));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle_default));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::raise_entry));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::valueof_always));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::active_raise));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::default_namespace));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::operation_internal));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::namespace_local));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::local_out));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::interface_readonly));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::internal_operation));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::event_else));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::in_exit));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::out_always));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::var_raise));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::readonly_active));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::external_interface));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::else_event));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::entry_in));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::exit_var));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::always_external));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::oncycle_default));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::raise_entry));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::valueof_always));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::active_raise));
 	statechart->raise_e2();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::default_namespace));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::operation_internal));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::namespace_local));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::local_out));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::interface_readonly));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::internal_operation));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::event_else));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::in_exit));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::out_oncycle));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::var_raise));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::readonly_active));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::external_interface));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_event));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::entry_in));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_var));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::always_external));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle_default));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::raise_entry));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::valueof_always));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::active_raise));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::default_namespace));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::operation_internal));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::namespace_local));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::local_out));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::interface_readonly));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::internal_operation));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::event_else));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::in_exit));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::out_oncycle));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::var_raise));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::readonly_active));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::external_interface));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::else_event));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::entry_in));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::exit_var));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::always_external));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::oncycle_default));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::raise_entry));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::valueof_always));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::active_raise));
 	statechart->raise_e1();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::default_namespace));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::operation_internal));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::namespace_local));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::local_out));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::interface_readonly));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::internal_operation));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::event_else));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::in_exit));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::out_oncycle));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::var_valueof));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::readonly_active));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::external_interface));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_event));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::entry_in));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_var));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::always_external));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle_default));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::raise_entry));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::valueof_always));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::active_raise));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::default_namespace));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::operation_internal));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::namespace_local));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::local_out));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::interface_readonly));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::internal_operation));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::event_else));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::in_exit));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::out_oncycle));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::var_valueof));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::readonly_active));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::external_interface));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::else_event));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::entry_in));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::exit_var));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::always_external));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::oncycle_default));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::raise_entry));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::valueof_always));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::active_raise));
 	statechart->raise_e2();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::default_namespace));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::operation_internal));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::namespace_local));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::local_out));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::interface_readonly));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::internal_operation));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::event_else));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::in_exit));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::out_oncycle));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::var_valueof));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::readonly_namespace));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::external_interface));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_event));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::entry_in));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_var));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::always_external));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle_default));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::raise_entry));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::valueof_always));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::active_raise));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::default_namespace));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::operation_internal));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::namespace_local));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::local_out));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::interface_readonly));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::internal_operation));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::event_else));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::in_exit));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::out_oncycle));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::var_valueof));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::readonly_namespace));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::external_interface));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::else_event));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::entry_in));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::exit_var));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::always_external));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::oncycle_default));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::raise_entry));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::valueof_always));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::active_raise));
 	statechart->raise_e1();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::default_namespace));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::operation_internal));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::namespace_local));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::local_out));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::interface_readonly));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::internal_operation));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::event_else));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::in_exit));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::out_oncycle));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::var_valueof));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::readonly_namespace));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::external_internal));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_event));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::entry_in));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_var));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::always_external));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle_default));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::raise_entry));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::valueof_always));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::active_raise));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::default_namespace));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::operation_internal));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::namespace_local));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::local_out));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::interface_readonly));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::internal_operation));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::event_else));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::in_exit));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::out_oncycle));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::var_valueof));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::readonly_namespace));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::external_internal));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::else_event));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::entry_in));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::exit_var));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::always_external));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::oncycle_default));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::raise_entry));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::valueof_always));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::active_raise));
 	statechart->raise_e2();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::default_namespace));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::operation_internal));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::namespace_local));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::local_out));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::interface_readonly));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::internal_operation));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::event_else));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::in_exit));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::out_oncycle));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::var_valueof));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::readonly_namespace));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::external_internal));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_local));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::entry_in));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_var));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::always_external));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle_default));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::raise_entry));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::valueof_always));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::active_raise));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::default_namespace));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::operation_internal));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::namespace_local));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::local_out));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::interface_readonly));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::internal_operation));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::event_else));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::in_exit));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::out_oncycle));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::var_valueof));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::readonly_namespace));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::external_internal));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::else_local));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::entry_in));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::exit_var));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::always_external));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::oncycle_default));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::raise_entry));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::valueof_always));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::active_raise));
 	statechart->raise_e1();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::default_namespace));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::operation_internal));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::namespace_local));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::local_out));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::interface_readonly));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::internal_operation));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::event_else));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::in_exit));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::out_oncycle));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::var_valueof));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::readonly_namespace));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::external_internal));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_local));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::entry_out));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_var));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::always_external));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle_default));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::raise_entry));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::valueof_always));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::active_raise));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::default_namespace));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::operation_internal));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::namespace_local));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::local_out));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::interface_readonly));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::internal_operation));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::event_else));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::in_exit));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::out_oncycle));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::var_valueof));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::readonly_namespace));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::external_internal));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::else_local));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::entry_out));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::exit_var));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::always_external));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::oncycle_default));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::raise_entry));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::valueof_always));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::active_raise));
 	statechart->raise_e2();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::default_namespace));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::operation_internal));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::namespace_local));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::local_out));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::interface_readonly));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::internal_operation));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::event_else));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::in_exit));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::out_oncycle));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::var_valueof));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::readonly_namespace));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::external_internal));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_local));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::entry_out));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_readonly));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::always_external));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle_default));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::raise_entry));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::valueof_always));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::active_raise));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::default_namespace));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::operation_internal));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::namespace_local));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::local_out));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::interface_readonly));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::internal_operation));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::event_else));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::in_exit));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::out_oncycle));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::var_valueof));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::readonly_namespace));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::external_internal));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::else_local));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::entry_out));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::exit_readonly));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::always_external));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::oncycle_default));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::raise_entry));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::valueof_always));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::active_raise));
 	statechart->raise_e1();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::default_namespace));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::operation_internal));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::namespace_local));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::local_out));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::interface_readonly));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::internal_operation));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::event_else));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::in_exit));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::out_oncycle));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::var_valueof));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::readonly_namespace));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::external_internal));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_local));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::entry_out));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_readonly));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::always_operation));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle_default));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::raise_entry));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::valueof_always));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::active_raise));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::default_namespace));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::operation_internal));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::namespace_local));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::local_out));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::interface_readonly));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::internal_operation));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::event_else));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::in_exit));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::out_oncycle));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::var_valueof));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::readonly_namespace));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::external_internal));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::else_local));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::entry_out));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::exit_readonly));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::always_operation));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::oncycle_default));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::raise_entry));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::valueof_always));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::active_raise));
 	statechart->raise_e2();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::default_namespace));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::operation_internal));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::namespace_local));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::local_out));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::interface_readonly));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::internal_operation));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::event_else));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::in_exit));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::out_oncycle));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::var_valueof));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::readonly_namespace));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::external_internal));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_local));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::entry_out));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_readonly));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::always_operation));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle_else));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::raise_entry));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::valueof_always));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::active_raise));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::default_namespace));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::operation_internal));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::namespace_local));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::local_out));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::interface_readonly));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::internal_operation));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::event_else));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::in_exit));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::out_oncycle));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::var_valueof));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::readonly_namespace));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::external_internal));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::else_local));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::entry_out));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::exit_readonly));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::always_operation));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::oncycle_else));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::raise_entry));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::valueof_always));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::active_raise));
 	statechart->raise_e1();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::default_namespace));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::operation_internal));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::namespace_local));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::local_out));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::interface_readonly));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::internal_operation));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::event_else));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::in_exit));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::out_oncycle));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::var_valueof));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::readonly_namespace));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::external_internal));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_local));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::entry_out));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_readonly));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::always_operation));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle_else));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::raise_exit));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::valueof_always));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::active_raise));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::default_namespace));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::operation_internal));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::namespace_local));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::local_out));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::interface_readonly));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::internal_operation));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::event_else));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::in_exit));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::out_oncycle));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::var_valueof));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::readonly_namespace));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::external_internal));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::else_local));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::entry_out));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::exit_readonly));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::always_operation));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::oncycle_else));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::raise_exit));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::valueof_always));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::active_raise));
 	statechart->raise_e2();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::default_namespace));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::operation_internal));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::namespace_local));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::local_out));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::interface_readonly));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::internal_operation));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::event_else));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::in_exit));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::out_oncycle));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::var_valueof));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::readonly_namespace));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::external_internal));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_local));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::entry_out));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_readonly));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::always_operation));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle_else));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::raise_exit));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::valueof_oncycle));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::active_raise));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::default_namespace));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::operation_internal));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::namespace_local));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::local_out));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::interface_readonly));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::internal_operation));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::event_else));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::in_exit));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::out_oncycle));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::var_valueof));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::readonly_namespace));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::external_internal));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::else_local));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::entry_out));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::exit_readonly));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::always_operation));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::oncycle_else));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::raise_exit));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::valueof_oncycle));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::active_raise));
 	statechart->raise_e1();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::default_namespace));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::operation_internal));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::namespace_local));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::local_out));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::interface_readonly));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::internal_operation));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::event_else));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::in_exit));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::out_oncycle));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::var_valueof));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::readonly_namespace));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::external_internal));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_local));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::entry_out));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_readonly));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::always_operation));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle_else));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::raise_exit));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::valueof_oncycle));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::active_valueof));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::default_namespace));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::operation_internal));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::namespace_local));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::local_out));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::interface_readonly));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::internal_operation));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::event_else));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::in_exit));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::out_oncycle));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::var_valueof));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::readonly_namespace));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::external_internal));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::else_local));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::entry_out));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::exit_readonly));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::always_operation));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::oncycle_else));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::raise_exit));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::valueof_oncycle));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::active_valueof));
 	statechart->raise_e2();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::default_namespace));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::operation_internal));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::namespace_local));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::local_out));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::interface_readonly));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::internal_operation));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::event_else));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::in_exit));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::out_oncycle));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::var_valueof));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::readonly_namespace));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::external_internal));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_local));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::entry_out));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_readonly));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::always_operation));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle_else));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::raise_exit));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::valueof_oncycle));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::active_valueof));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::default_namespace));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::operation_internal));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::namespace_local));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::local_out));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::interface_readonly));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::internal_operation));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::event_else));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::in_exit));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::out_oncycle));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::var_valueof));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::readonly_namespace));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::external_internal));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::else_local));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::entry_out));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::exit_readonly));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::always_operation));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::oncycle_else));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::raise_exit));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::valueof_oncycle));
+	EXPECT_TRUE(statechart->isStateActive(STextKeywordsInStatesAndRegions::active_valueof));
 	delete statechart;
 }

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

@@ -16,14 +16,14 @@ TEST(StatemachineTest, sameNameDifferenRegionTest) {
 	SameNameDifferentRegion* statechart = new SameNameDifferentRegion();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(SameNameDifferentRegion::main_region_StateA));
+	EXPECT_TRUE(statechart->isStateActive(SameNameDifferentRegion::main_region_StateA));
 	statechart->raise_e1();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(SameNameDifferentRegion::main_region_StateB));
-	EXPECT_TRUE(statechart->isActive(SameNameDifferentRegion::main_region_StateB_r1_StateA));
+	EXPECT_TRUE(statechart->isStateActive(SameNameDifferentRegion::main_region_StateB));
+	EXPECT_TRUE(statechart->isStateActive(SameNameDifferentRegion::main_region_StateB_r1_StateA));
 	statechart->raise_e1();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(SameNameDifferentRegion::main_region_StateB));
-	EXPECT_TRUE(statechart->isActive(SameNameDifferentRegion::main_region_StateB_r1_StateB));
+	EXPECT_TRUE(statechart->isStateActive(SameNameDifferentRegion::main_region_StateB));
+	EXPECT_TRUE(statechart->isStateActive(SameNameDifferentRegion::main_region_StateB_r1_StateB));
 	delete statechart;
 }

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

@@ -24,27 +24,27 @@ TEST(StatemachineTest, shallowHistoryTest) {
 	statechart->runCycle();
 	statechart->raise_event7();
 	statechart->runCycle();
-	EXPECT_TRUE(!statechart->isActive(ShallowHistory::mainRegion_State1));
-	EXPECT_TRUE(statechart->isActive(ShallowHistory::mainRegion_State2__region0_State4__region0_State7__region0_State9));
+	EXPECT_TRUE(!statechart->isStateActive(ShallowHistory::mainRegion_State1));
+	EXPECT_TRUE(statechart->isStateActive(ShallowHistory::mainRegion_State2__region0_State4__region0_State7__region0_State9));
 	statechart->raise_event6();
 	statechart->runCycle();
-	EXPECT_TRUE(!statechart->isActive(ShallowHistory::mainRegion_State2__region0_State4__region0_State7__region0_State9));
-	EXPECT_TRUE(statechart->isActive(ShallowHistory::mainRegion_State2__region0_State4__region0_State6));
+	EXPECT_TRUE(!statechart->isStateActive(ShallowHistory::mainRegion_State2__region0_State4__region0_State7__region0_State9));
+	EXPECT_TRUE(statechart->isStateActive(ShallowHistory::mainRegion_State2__region0_State4__region0_State6));
 	statechart->raise_event5();
 	statechart->runCycle();
-	EXPECT_TRUE(!statechart->isActive(ShallowHistory::mainRegion_State2__region0_State4__region0_State7__region0_State8));
-	EXPECT_TRUE(statechart->isActive(ShallowHistory::mainRegion_State2__region0_State4__region0_State7__region0_State9));
+	EXPECT_TRUE(!statechart->isStateActive(ShallowHistory::mainRegion_State2__region0_State4__region0_State7__region0_State8));
+	EXPECT_TRUE(statechart->isStateActive(ShallowHistory::mainRegion_State2__region0_State4__region0_State7__region0_State9));
 	statechart->raise_event2();
 	statechart->runCycle();
-	EXPECT_TRUE(!statechart->isActive(ShallowHistory::mainRegion_State2__region0_State4__region0_State7__region0_State9));
-	EXPECT_TRUE(statechart->isActive(ShallowHistory::mainRegion_State1));
+	EXPECT_TRUE(!statechart->isStateActive(ShallowHistory::mainRegion_State2__region0_State4__region0_State7__region0_State9));
+	EXPECT_TRUE(statechart->isStateActive(ShallowHistory::mainRegion_State1));
 	statechart->raise_event1();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(ShallowHistory::mainRegion_State2__region0_State4__region0_State6));
-	EXPECT_TRUE(!statechart->isActive(ShallowHistory::mainRegion_State1));
+	EXPECT_TRUE(statechart->isStateActive(ShallowHistory::mainRegion_State2__region0_State4__region0_State6));
+	EXPECT_TRUE(!statechart->isStateActive(ShallowHistory::mainRegion_State1));
 	statechart->raise_event5();
 	statechart->runCycle();
-	EXPECT_TRUE(!statechart->isActive(ShallowHistory::mainRegion_State2__region0_State4__region0_State6));
-	EXPECT_TRUE(statechart->isActive(ShallowHistory::mainRegion_State2__region0_State4__region0_State7__region0_State9));
+	EXPECT_TRUE(!statechart->isStateActive(ShallowHistory::mainRegion_State2__region0_State4__region0_State6));
+	EXPECT_TRUE(statechart->isStateActive(ShallowHistory::mainRegion_State2__region0_State4__region0_State7__region0_State9));
 	delete statechart;
 }

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

@@ -16,54 +16,54 @@ TEST(StatemachineTest, noDeepEntryWithinHistory) {
 	ShallowHistoryWithDeepEntry* statechart = new ShallowHistoryWithDeepEntry();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(ShallowHistoryWithDeepEntry::main_region_Y));
+	EXPECT_TRUE(statechart->isStateActive(ShallowHistoryWithDeepEntry::main_region_Y));
 	statechart->raise_toZ();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(ShallowHistoryWithDeepEntry::main_region_Z__region0_A));
+	EXPECT_TRUE(statechart->isStateActive(ShallowHistoryWithDeepEntry::main_region_Z__region0_A));
 	statechart->raise_toY();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(ShallowHistoryWithDeepEntry::main_region_Y));
+	EXPECT_TRUE(statechart->isStateActive(ShallowHistoryWithDeepEntry::main_region_Y));
 	statechart->raise_toZ();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(ShallowHistoryWithDeepEntry::main_region_Z__region0_A));
+	EXPECT_TRUE(statechart->isStateActive(ShallowHistoryWithDeepEntry::main_region_Z__region0_A));
 	delete statechart;
 }
 TEST(StatemachineTest, deepEntryWithinHistory) {
 	ShallowHistoryWithDeepEntry* statechart = new ShallowHistoryWithDeepEntry();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(ShallowHistoryWithDeepEntry::main_region_Y));
+	EXPECT_TRUE(statechart->isStateActive(ShallowHistoryWithDeepEntry::main_region_Y));
 	statechart->raise_toZ();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(ShallowHistoryWithDeepEntry::main_region_Z__region0_A));
+	EXPECT_TRUE(statechart->isStateActive(ShallowHistoryWithDeepEntry::main_region_Z__region0_A));
 	statechart->raise_toC();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(ShallowHistoryWithDeepEntry::main_region_Z__region0_B__region0_C));
-	EXPECT_TRUE(statechart->isActive(ShallowHistoryWithDeepEntry::main_region_Z__region0_B));
+	EXPECT_TRUE(statechart->isStateActive(ShallowHistoryWithDeepEntry::main_region_Z__region0_B__region0_C));
+	EXPECT_TRUE(statechart->isStateActive(ShallowHistoryWithDeepEntry::main_region_Z__region0_B));
 	statechart->raise_toY();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(ShallowHistoryWithDeepEntry::main_region_Y));
+	EXPECT_TRUE(statechart->isStateActive(ShallowHistoryWithDeepEntry::main_region_Y));
 	statechart->raise_toZ();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(ShallowHistoryWithDeepEntry::main_region_Z__region0_B__region0_C));
-	EXPECT_TRUE(statechart->isActive(ShallowHistoryWithDeepEntry::main_region_Z__region0_B));
+	EXPECT_TRUE(statechart->isStateActive(ShallowHistoryWithDeepEntry::main_region_Z__region0_B__region0_C));
+	EXPECT_TRUE(statechart->isStateActive(ShallowHistoryWithDeepEntry::main_region_Z__region0_B));
 	delete statechart;
 }
 TEST(StatemachineTest, directDeepEntryIntoHistory) {
 	ShallowHistoryWithDeepEntry* statechart = new ShallowHistoryWithDeepEntry();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(ShallowHistoryWithDeepEntry::main_region_Y));
+	EXPECT_TRUE(statechart->isStateActive(ShallowHistoryWithDeepEntry::main_region_Y));
 	statechart->raise_toC();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(ShallowHistoryWithDeepEntry::main_region_Z__region0_B__region0_C));
-	EXPECT_TRUE(statechart->isActive(ShallowHistoryWithDeepEntry::main_region_Z__region0_B));
+	EXPECT_TRUE(statechart->isStateActive(ShallowHistoryWithDeepEntry::main_region_Z__region0_B__region0_C));
+	EXPECT_TRUE(statechart->isStateActive(ShallowHistoryWithDeepEntry::main_region_Z__region0_B));
 	statechart->raise_toY();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(ShallowHistoryWithDeepEntry::main_region_Y));
+	EXPECT_TRUE(statechart->isStateActive(ShallowHistoryWithDeepEntry::main_region_Y));
 	statechart->raise_toZ();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(ShallowHistoryWithDeepEntry::main_region_Z__region0_B__region0_C));
-	EXPECT_TRUE(statechart->isActive(ShallowHistoryWithDeepEntry::main_region_Z__region0_B));
+	EXPECT_TRUE(statechart->isStateActive(ShallowHistoryWithDeepEntry::main_region_Z__region0_B__region0_C));
+	EXPECT_TRUE(statechart->isStateActive(ShallowHistoryWithDeepEntry::main_region_Z__region0_B));
 	delete statechart;
 }

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

@@ -16,12 +16,12 @@ TEST(StatemachineTest, simpleEventTest) {
 	SimpleEvent* statechart = new SimpleEvent();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(SimpleEvent::main_region_A)) << "Expected A to be active" ;
+	EXPECT_TRUE(statechart->isStateActive(SimpleEvent::main_region_A)) << "Expected A to be active" ;
 	EXPECT_TRUE(5l== 5l);
 	statechart->raise_event1();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(SimpleEvent::main_region_B)) << "Expected B to be active" ;
+	EXPECT_TRUE(statechart->isStateActive(SimpleEvent::main_region_B)) << "Expected B to be active" ;
 	statechart->runCycle();
-	EXPECT_TRUE(!statechart->isActive(SimpleEvent::main_region_B));
+	EXPECT_TRUE(!statechart->isStateActive(SimpleEvent::main_region_B));
 	delete statechart;
 }

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

@@ -16,12 +16,12 @@ TEST(StatemachineTest, simpleHierachyTest) {
 	SimpleHierachy* statechart = new SimpleHierachy();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(SimpleHierachy::main_region_A));
+	EXPECT_TRUE(statechart->isStateActive(SimpleHierachy::main_region_A));
 	statechart->raise_event1();
 	statechart->raise_event1();
 	statechart->raise_event1();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(SimpleHierachy::main_region_B));
-	EXPECT_TRUE(statechart->isActive(SimpleHierachy::main_region_B_subregion1_B1));
+	EXPECT_TRUE(statechart->isStateActive(SimpleHierachy::main_region_B));
+	EXPECT_TRUE(statechart->isStateActive(SimpleHierachy::main_region_B_subregion1_B1));
 	delete statechart;
 }

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

@@ -16,12 +16,12 @@ TEST(StatemachineTest, stateIsActive) {
 	StateIsActive* statechart = new StateIsActive();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(StateIsActive::R1_R1A));
-	EXPECT_TRUE(statechart->isActive(StateIsActive::R2_R2A));
+	EXPECT_TRUE(statechart->isStateActive(StateIsActive::R1_R1A));
+	EXPECT_TRUE(statechart->isStateActive(StateIsActive::R2_R2A));
 	statechart->raise_event1();
 	statechart->runCycle();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(StateIsActive::R1_R1B));
-	EXPECT_TRUE(statechart->isActive(StateIsActive::R2_R2B));
+	EXPECT_TRUE(statechart->isStateActive(StateIsActive::R1_R1B));
+	EXPECT_TRUE(statechart->isStateActive(StateIsActive::R2_R2B));
 	delete statechart;
 }

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

@@ -15,14 +15,14 @@
 TEST(StatemachineTest, inactiveBeforeEnter) {
 	StatechartActive* statechart = new StatechartActive();
 	statechart->init();
-	EXPECT_TRUE(false);
+	EXPECT_TRUE(!statechart->isActive());
 	delete statechart;
 }
 TEST(StatemachineTest, activeAfterEnter) {
 	StatechartActive* statechart = new StatechartActive();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(false);
+	EXPECT_TRUE(statechart->isActive());
 	delete statechart;
 }
 TEST(StatemachineTest, inactiveAfterExit) {
@@ -30,7 +30,7 @@ TEST(StatemachineTest, inactiveAfterExit) {
 	statechart->init();
 	statechart->enter();
 	statechart->exit();
-	EXPECT_TRUE(false);
+	EXPECT_TRUE(!statechart->isActive());
 	delete statechart;
 }
 TEST(StatemachineTest, activeAfterReenter) {
@@ -39,6 +39,6 @@ TEST(StatemachineTest, activeAfterReenter) {
 	statechart->enter();
 	statechart->exit();
 	statechart->enter();
-	EXPECT_TRUE(false);
+	EXPECT_TRUE(statechart->isActive());
 	delete statechart;
 }

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

@@ -16,15 +16,15 @@ TEST(StatemachineTest, statechartLocalReactionsTest) {
 	StatechartLocalReactions* statechart = new StatechartLocalReactions();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(StatechartLocalReactions::main_region_S1));
-	EXPECT_TRUE(statechart->isActive(StatechartLocalReactions::region2_a));
+	EXPECT_TRUE(statechart->isStateActive(StatechartLocalReactions::main_region_S1));
+	EXPECT_TRUE(statechart->isStateActive(StatechartLocalReactions::region2_a));
 	while (statechart->getDefaultSCI()->get_myInt()< 10l) {
-		EXPECT_TRUE(statechart->isActive(StatechartLocalReactions::region2_a));
+		EXPECT_TRUE(statechart->isStateActive(StatechartLocalReactions::region2_a));
 		if (statechart->getDefaultSCI()->get_myInt()%2l== 0l) {
-					EXPECT_TRUE(statechart->isActive(StatechartLocalReactions::main_region_S1));
+					EXPECT_TRUE(statechart->isStateActive(StatechartLocalReactions::main_region_S1));
 				  }
 				else {
-					EXPECT_TRUE(statechart->isActive(StatechartLocalReactions::main_region_S2));;
+					EXPECT_TRUE(statechart->isStateActive(StatechartLocalReactions::main_region_S2));;
 				}
 		statechart->runCycle();
 	}

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

@@ -16,7 +16,7 @@ TEST(StatemachineTest, StaticChoiceTest) {
 	StaticChoice* statechart = new StaticChoice();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(StaticChoice::main_region_Start));
+	EXPECT_TRUE(statechart->isStateActive(StaticChoice::main_region_Start));
 	statechart->runCycle();
 	delete statechart;
 }

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

@@ -18,31 +18,31 @@ TEST(StatemachineTest, StringExpressionsTest) {
 	EXPECT_TRUE(strcmp(statechart->getDefaultSCI()->get_quotedStringX(), "\"X\"") == 0);
 	EXPECT_TRUE(strcmp(statechart->getDefaultSCI()->get_quotedStringY(), "\"Y\"") == 0);
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(StringExpressions::main_region_AssignmentChecked));
+	EXPECT_TRUE(statechart->isStateActive(StringExpressions::main_region_AssignmentChecked));
 	statechart->raise_e();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(StringExpressions::main_region_VarToVarCompareSucceeded));
+	EXPECT_TRUE(statechart->isStateActive(StringExpressions::main_region_VarToVarCompareSucceeded));
 	EXPECT_TRUE(statechart->getDefaultSCI()->get_guardStringEqual());
 	EXPECT_TRUE(statechart->getDefaultSCI()->get_guardStringNotEqual());
 	EXPECT_TRUE(statechart->getDefaultSCI()->get_stringVarEqual());
 	EXPECT_TRUE(statechart->getDefaultSCI()->get_stringVarNotEqual());
 	statechart->raise_e();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(StringExpressions::main_region_VarToConstCompareSucceeded));
+	EXPECT_TRUE(statechart->isStateActive(StringExpressions::main_region_VarToConstCompareSucceeded));
 	EXPECT_TRUE(statechart->getDefaultSCI()->get_guardStringEqual());
 	EXPECT_TRUE(statechart->getDefaultSCI()->get_guardStringNotEqual());
 	EXPECT_TRUE(statechart->getDefaultSCI()->get_stringVarEqual());
 	EXPECT_TRUE(statechart->getDefaultSCI()->get_stringVarNotEqual());
 	statechart->raise_e();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(StringExpressions::main_region_ConstToVarCompareSucceeded));
+	EXPECT_TRUE(statechart->isStateActive(StringExpressions::main_region_ConstToVarCompareSucceeded));
 	EXPECT_TRUE(statechart->getDefaultSCI()->get_guardStringEqual());
 	EXPECT_TRUE(statechart->getDefaultSCI()->get_guardStringNotEqual());
 	EXPECT_TRUE(statechart->getDefaultSCI()->get_stringVarEqual());
 	EXPECT_TRUE(statechart->getDefaultSCI()->get_stringVarNotEqual());
 	statechart->raise_e();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(StringExpressions::main_region_ConstToConstCompareSucceeded));
+	EXPECT_TRUE(statechart->isStateActive(StringExpressions::main_region_ConstToConstCompareSucceeded));
 	EXPECT_TRUE(statechart->getDefaultSCI()->get_guardStringEqual());
 	EXPECT_TRUE(statechart->getDefaultSCI()->get_guardStringNotEqual());
 	EXPECT_TRUE(statechart->getDefaultSCI()->get_stringVarEqual());

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

@@ -16,24 +16,24 @@ TEST(StatemachineTest, syncForkTest) {
 	SyncFork* statechart = new SyncFork();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(SyncFork::main_region_A));
+	EXPECT_TRUE(statechart->isStateActive(SyncFork::main_region_A));
 	statechart->raise_f();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(SyncFork::main_region_B));
-	EXPECT_TRUE(statechart->isActive(SyncFork::main_region_B_r1_C1));
-	EXPECT_TRUE(statechart->isActive(SyncFork::main_region_B_r2_D1));
+	EXPECT_TRUE(statechart->isStateActive(SyncFork::main_region_B));
+	EXPECT_TRUE(statechart->isStateActive(SyncFork::main_region_B_r1_C1));
+	EXPECT_TRUE(statechart->isStateActive(SyncFork::main_region_B_r2_D1));
 	statechart->raise_f();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(SyncFork::main_region_B));
-	EXPECT_TRUE(statechart->isActive(SyncFork::main_region_B_r1_C2));
-	EXPECT_TRUE(statechart->isActive(SyncFork::main_region_B_r2_D2));
+	EXPECT_TRUE(statechart->isStateActive(SyncFork::main_region_B));
+	EXPECT_TRUE(statechart->isStateActive(SyncFork::main_region_B_r1_C2));
+	EXPECT_TRUE(statechart->isStateActive(SyncFork::main_region_B_r2_D2));
 	statechart->raise_e();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(SyncFork::main_region_A));
+	EXPECT_TRUE(statechart->isStateActive(SyncFork::main_region_A));
 	statechart->raise_f();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(SyncFork::main_region_B));
-	EXPECT_TRUE(statechart->isActive(SyncFork::main_region_B_r1_C1));
-	EXPECT_TRUE(statechart->isActive(SyncFork::main_region_B_r2_D1));
+	EXPECT_TRUE(statechart->isStateActive(SyncFork::main_region_B));
+	EXPECT_TRUE(statechart->isStateActive(SyncFork::main_region_B_r1_C1));
+	EXPECT_TRUE(statechart->isStateActive(SyncFork::main_region_B_r2_D1));
 	delete statechart;
 }

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

@@ -16,72 +16,72 @@ TEST(StatemachineTest, syncJoin_C2_Waits) {
 	SyncJoin* statechart = new SyncJoin();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(SyncJoin::main_region_B));
-	EXPECT_TRUE(statechart->isActive(SyncJoin::main_region_B_r1_C1));
-	EXPECT_TRUE(statechart->isActive(SyncJoin::main_region_B_r2_D1));
+	EXPECT_TRUE(statechart->isStateActive(SyncJoin::main_region_B));
+	EXPECT_TRUE(statechart->isStateActive(SyncJoin::main_region_B_r1_C1));
+	EXPECT_TRUE(statechart->isStateActive(SyncJoin::main_region_B_r2_D1));
 	statechart->raise_e();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(SyncJoin::main_region_B_r1_C2));
-	EXPECT_TRUE(statechart->isActive(SyncJoin::main_region_B_r2_D1));
+	EXPECT_TRUE(statechart->isStateActive(SyncJoin::main_region_B_r1_C2));
+	EXPECT_TRUE(statechart->isStateActive(SyncJoin::main_region_B_r2_D1));
 	statechart->raise_jc();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(SyncJoin::main_region_B_r1_C2));
-	EXPECT_TRUE(statechart->isActive(SyncJoin::main_region_B_r2_D1));
+	EXPECT_TRUE(statechart->isStateActive(SyncJoin::main_region_B_r1_C2));
+	EXPECT_TRUE(statechart->isStateActive(SyncJoin::main_region_B_r2_D1));
 	statechart->raise_jd();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(SyncJoin::main_region_B_r1_C2));
-	EXPECT_TRUE(statechart->isActive(SyncJoin::main_region_B_r2_D1));
+	EXPECT_TRUE(statechart->isStateActive(SyncJoin::main_region_B_r1_C2));
+	EXPECT_TRUE(statechart->isStateActive(SyncJoin::main_region_B_r2_D1));
 	statechart->raise_jc();
 	statechart->raise_jd();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(SyncJoin::main_region_B_r1_C2));
-	EXPECT_TRUE(statechart->isActive(SyncJoin::main_region_B_r2_D1));
+	EXPECT_TRUE(statechart->isStateActive(SyncJoin::main_region_B_r1_C2));
+	EXPECT_TRUE(statechart->isStateActive(SyncJoin::main_region_B_r2_D1));
 	statechart->raise_f();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(SyncJoin::main_region_B_r1_C2));
-	EXPECT_TRUE(statechart->isActive(SyncJoin::main_region_B_r2_D2));
+	EXPECT_TRUE(statechart->isStateActive(SyncJoin::main_region_B_r1_C2));
+	EXPECT_TRUE(statechart->isStateActive(SyncJoin::main_region_B_r2_D2));
 	statechart->raise_jc();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(SyncJoin::main_region_B_r1_C2));
-	EXPECT_TRUE(statechart->isActive(SyncJoin::main_region_B_r2_D2));
+	EXPECT_TRUE(statechart->isStateActive(SyncJoin::main_region_B_r1_C2));
+	EXPECT_TRUE(statechart->isStateActive(SyncJoin::main_region_B_r2_D2));
 	statechart->raise_jd();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(SyncJoin::main_region_B_r1_C2));
-	EXPECT_TRUE(statechart->isActive(SyncJoin::main_region_B_r2_D2));
+	EXPECT_TRUE(statechart->isStateActive(SyncJoin::main_region_B_r1_C2));
+	EXPECT_TRUE(statechart->isStateActive(SyncJoin::main_region_B_r2_D2));
 	statechart->raise_jc();
 	statechart->raise_jd();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(SyncJoin::main_region_A));
+	EXPECT_TRUE(statechart->isStateActive(SyncJoin::main_region_A));
 	delete statechart;
 }
 TEST(StatemachineTest, syncJoin_D2_Waits) {
 	SyncJoin* statechart = new SyncJoin();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(SyncJoin::main_region_B));
-	EXPECT_TRUE(statechart->isActive(SyncJoin::main_region_B_r1_C1));
-	EXPECT_TRUE(statechart->isActive(SyncJoin::main_region_B_r2_D1));
+	EXPECT_TRUE(statechart->isStateActive(SyncJoin::main_region_B));
+	EXPECT_TRUE(statechart->isStateActive(SyncJoin::main_region_B_r1_C1));
+	EXPECT_TRUE(statechart->isStateActive(SyncJoin::main_region_B_r2_D1));
 	statechart->raise_f();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(SyncJoin::main_region_B_r1_C1));
-	EXPECT_TRUE(statechart->isActive(SyncJoin::main_region_B_r2_D2));
+	EXPECT_TRUE(statechart->isStateActive(SyncJoin::main_region_B_r1_C1));
+	EXPECT_TRUE(statechart->isStateActive(SyncJoin::main_region_B_r2_D2));
 	statechart->raise_jc();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(SyncJoin::main_region_B_r1_C1));
-	EXPECT_TRUE(statechart->isActive(SyncJoin::main_region_B_r2_D2));
+	EXPECT_TRUE(statechart->isStateActive(SyncJoin::main_region_B_r1_C1));
+	EXPECT_TRUE(statechart->isStateActive(SyncJoin::main_region_B_r2_D2));
 	statechart->raise_jd();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(SyncJoin::main_region_B_r1_C1));
-	EXPECT_TRUE(statechart->isActive(SyncJoin::main_region_B_r2_D2));
+	EXPECT_TRUE(statechart->isStateActive(SyncJoin::main_region_B_r1_C1));
+	EXPECT_TRUE(statechart->isStateActive(SyncJoin::main_region_B_r2_D2));
 	statechart->raise_jc();
 	statechart->raise_jd();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(SyncJoin::main_region_B_r1_C1));
-	EXPECT_TRUE(statechart->isActive(SyncJoin::main_region_B_r2_D2));
+	EXPECT_TRUE(statechart->isStateActive(SyncJoin::main_region_B_r1_C1));
+	EXPECT_TRUE(statechart->isStateActive(SyncJoin::main_region_B_r2_D2));
 	statechart->raise_e();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(SyncJoin::main_region_B_r1_C2));
-	EXPECT_TRUE(statechart->isActive(SyncJoin::main_region_B_r2_D2));
+	EXPECT_TRUE(statechart->isStateActive(SyncJoin::main_region_B_r1_C2));
+	EXPECT_TRUE(statechart->isStateActive(SyncJoin::main_region_B_r2_D2));
 	delete statechart;
 }
 TEST(StatemachineTest, doubleEntryActionBug) {
@@ -94,7 +94,7 @@ TEST(StatemachineTest, doubleEntryActionBug) {
 	statechart->raise_jc();
 	statechart->raise_jd();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(SyncJoin::main_region_A));
+	EXPECT_TRUE(statechart->isStateActive(SyncJoin::main_region_A));
 	EXPECT_TRUE(statechart->getDefaultSCI()->get_x()== 1l);
 	delete statechart;
 }

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

@@ -16,9 +16,9 @@ TEST(StatemachineTest, Timer01) {
 	TimedTransitions* statechart = new TimedTransitions();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(TimedTransitions::main_region_Start));
+	EXPECT_TRUE(statechart->isStateActive(TimedTransitions::main_region_Start));
 	/*not implemented: WaitStatement*/
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(TimedTransitions::main_region_End));
+	EXPECT_TRUE(statechart->isStateActive(TimedTransitions::main_region_End));
 	delete statechart;
 }

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

@@ -16,8 +16,8 @@ TEST(StatemachineTest, TransitionWithoutConditionTest) {
 	TransitionWithoutCondition* statechart = new TransitionWithoutCondition();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(TransitionWithoutCondition::main_region_A));
+	EXPECT_TRUE(statechart->isStateActive(TransitionWithoutCondition::main_region_A));
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(TransitionWithoutCondition::main_region_B));
+	EXPECT_TRUE(statechart->isStateActive(TransitionWithoutCondition::main_region_B));
 	delete statechart;
 }

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

@@ -16,39 +16,39 @@ TEST(StatemachineTest, trueGuard) {
 	TriggerGuardExpressions* statechart = new TriggerGuardExpressions();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(TriggerGuardExpressions::main_region_A));
+	EXPECT_TRUE(statechart->isStateActive(TriggerGuardExpressions::main_region_A));
 	statechart->raise_e1();
 	statechart->getDefaultSCI()->set_b(true);
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(TriggerGuardExpressions::main_region_B));
+	EXPECT_TRUE(statechart->isStateActive(TriggerGuardExpressions::main_region_B));
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(TriggerGuardExpressions::main_region_A));
+	EXPECT_TRUE(statechart->isStateActive(TriggerGuardExpressions::main_region_A));
 	statechart->raise_e2();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(TriggerGuardExpressions::main_region_B));
+	EXPECT_TRUE(statechart->isStateActive(TriggerGuardExpressions::main_region_B));
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(TriggerGuardExpressions::main_region_A));
+	EXPECT_TRUE(statechart->isStateActive(TriggerGuardExpressions::main_region_A));
 	statechart->raise_e1();
 	statechart->raise_e2();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(TriggerGuardExpressions::main_region_B));
+	EXPECT_TRUE(statechart->isStateActive(TriggerGuardExpressions::main_region_B));
 	delete statechart;
 }
 TEST(StatemachineTest, falseGuard) {
 	TriggerGuardExpressions* statechart = new TriggerGuardExpressions();
 	statechart->init();
 	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(TriggerGuardExpressions::main_region_A));
+	EXPECT_TRUE(statechart->isStateActive(TriggerGuardExpressions::main_region_A));
 	statechart->getDefaultSCI()->set_b(false);
 	statechart->raise_e1();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(TriggerGuardExpressions::main_region_A));
+	EXPECT_TRUE(statechart->isStateActive(TriggerGuardExpressions::main_region_A));
 	statechart->raise_e2();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(TriggerGuardExpressions::main_region_A));
+	EXPECT_TRUE(statechart->isStateActive(TriggerGuardExpressions::main_region_A));
 	statechart->raise_e1();
 	statechart->raise_e2();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(TriggerGuardExpressions::main_region_A));
+	EXPECT_TRUE(statechart->isStateActive(TriggerGuardExpressions::main_region_A));
 	delete statechart;
 }

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

@@ -23,10 +23,10 @@ TEST(StatemachineTest, valuedEventsTest) {
 	statechart->raise_realEvent( 20l);
 	statechart->raise_stringEvent( "tool");
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(ValuedEvents::integer_region_D));
-	EXPECT_TRUE(statechart->isActive(ValuedEvents::string_region_D));
-	EXPECT_TRUE(statechart->isActive(ValuedEvents::boolean_region_D));
-	EXPECT_TRUE(statechart->isActive(ValuedEvents::real_region_D));
+	EXPECT_TRUE(statechart->isStateActive(ValuedEvents::integer_region_D));
+	EXPECT_TRUE(statechart->isStateActive(ValuedEvents::string_region_D));
+	EXPECT_TRUE(statechart->isStateActive(ValuedEvents::boolean_region_D));
+	EXPECT_TRUE(statechart->isStateActive(ValuedEvents::real_region_D));
 	EXPECT_TRUE(statechart->getDefaultSCI()->get_myInt()== 23l);
 	EXPECT_TRUE(statechart->getDefaultSCI()->get_myBool()== false);
 	EXPECT_TRUE(statechart->getDefaultSCI()->get_myReal()== 20l);

test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/AllTestsTest.java

@@ -22,8 +22,8 @@ import org.junit.runners.Suite.SuiteClasses;
 		DynamicChoiceTest.class, EmptyTransitionTest.class,
 		EnterStateTest.class, EntryChoiceTest.class,
 		EntryExitSelfTransitionTest.class, ExitOnSelfTransitionTest.class,
-		ExitStateTest.class, FeatureCallsTest.class, GuardTest.class,
-		GuardedEntryTest.class, GuardedExitTest.class,
+		ExitStateTest.class, FeatureCallsTest.class, FinalStateTest.class,
+		GuardTest.class, GuardedEntryTest.class, GuardedExitTest.class,
 		HistoryWithExitPointTest.class, HistoryWithoutInitialStepTest.class,
 		InEventLifeCycleTest.class, IntegerExpressionsTest.class,
 		InternalEventLifeCycleTest.class, LocalReactionsTest.class,

test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/FinalStateTest.java

@@ -0,0 +1,39 @@
+/**
+ * Copyright (c) 2015 committers of YAKINDU and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     committers of YAKINDU - initial API and implementation
+ */
+package org.yakindu.sct.generator.cpp.test;
+
+import java.util.Collection;
+
+import org.junit.Before;
+import org.junit.runner.RunWith;
+import org.yakindu.sct.generator.c.gtest.GTest;
+import org.yakindu.sct.generator.c.gtest.GTestRunner;
+import org.yakindu.sct.generator.c.gtest.GTestHelper;
+
+@GTest(sourceFile = "gtests/FinalStateTest/FinalStateTest.cc", program = "gtests/FinalStateTest/FinalState", model = "testmodels/SCTUnit/FinalState.sct")
+@RunWith(GTestRunner.class)
+public class FinalStateTest {
+
+	protected final GTestHelper helper = new GTestHelper(this) {
+
+		@Override
+		protected void getSourceFiles(Collection<String> files) {
+			super.getSourceFiles(files);
+			files.add(getFileName(getTestProgram()) + ".cpp");
+		}
+	};
+
+	@Before
+	public void setUp() {
+		helper.generate();
+		helper.compile();
+	}
+}