Fixed errors in name wrangling mechanism.

plugins/org.yakindu.sct.generator.c/src/org/yakindu/sct/generator/c/GenmodelEntries.xtend

@@ -41,9 +41,14 @@ class GenmodelEntries {
 	
 	def getIdentifierLength(GeneratorEntry it) {
 		if (maxIdentifierLengthParameter != null) {
-			return Integer.valueOf(maxIdentifierLengthParameter.stringValue)
+			try {
+				return Integer.valueOf(maxIdentifierLengthParameter.stringValue)
+			}
+			catch (NumberFormatException e) {
+				return 0
+			}
 		}
-		return null
+		return 0
 	}
 	
 	def private FeatureParameterValue getSeparatorParameter(GeneratorEntry it) {

plugins/org.yakindu.sct.model.sexec/src/org/yakindu/sct/model/sexec/naming/DefaultNamingService.xtend

@@ -22,6 +22,7 @@ import org.yakindu.sct.model.sexec.ExecutionNode
 import org.eclipse.emf.ecore.EObject
 import java.util.List
 import org.yakindu.sct.model.sgraph.Region
+import org.yakindu.sct.model.stext.naming.StextNameProvider
 
 class StepDepthComparator implements Comparator<Step> {
 	@Inject
@@ -42,7 +43,8 @@ class ExecutionScopeDepthComparator implements Comparator<ExecutionScope> {
 }
 
 enum NameShorteningStrategy {
-	STANDARD,
+	FQN_NAME,
+	SHORT_NAME,
 	REMOVE_VOWELS,
 	INDEX_POSITION
 }
@@ -56,15 +58,17 @@ class DefaultNamingService implements INamingService {
 	@Inject extension StepDepthComparator stepDepthComparator
 	@Inject extension ExecutionScopeDepthComparator executionScopeDepthComparator
 	@Inject extension NamingHelper
+	
+	@Inject private StextNameProvider provider
 
-	var protected int maxLength = Integer.MAX_VALUE
+	var protected int maxLength = 0
 
 	var protected char separator = '_'
 
 	var protected Map<NamedElement, String> map
 
 	var protected ExecutionFlow activeFlow
-	
+
 	var protected Statechart activeStatechart
 
 	new(int maxLength, char separator) {
@@ -73,10 +77,10 @@ class DefaultNamingService implements INamingService {
 	}
 
 	new() {
-		this.maxLength = Integer.MAX_VALUE
+		this.maxLength = 0
 		this.separator = '_'
 	}
-	
+
 	override void initializeNamingService(Statechart statechart) {
 		if (map == null || activeStatechart != statechart) {
 			activeFlow = null
@@ -84,7 +88,7 @@ class DefaultNamingService implements INamingService {
 			map = statechart.createShortNameMap(maxLength, separator)
 		}
 	}
-	
+
 	override void initializeNamingService(ExecutionFlow flow) {
 		if (map == null || activeFlow != flow) {
 			activeFlow = flow
@@ -92,49 +96,50 @@ class DefaultNamingService implements INamingService {
 			map = flow.createShortNameMap(maxLength, separator)
 		}
 	}
-	
+
 	override getShortNameMap(Statechart statechart) {
 		if (map == null || activeStatechart != statechart) {
 			statechart.initializeNamingService()
 		}
 		return map
 	}
-	
+
 	override Map<NamedElement, String> getShortNameMap(ExecutionFlow flow) {
 		if (map == null || activeFlow != flow) {
 			flow.initializeNamingService()
 		}
 		return map
 	}
-	
+
 	override getShortName(NamedElement element) {
 		if (map == null || !map.containsKey(element)) {
 			var statechart = element.statechart
 			if (statechart != null) {
 				statechart.initializeNamingService
-			}
-			else {
+			} else {
 				element.flow?.initializeNamingService
 			}
 		}
 		map?.get(element)
 	}
-	
+
 	def Map<NamedElement, String> createShortNameMap(Statechart statechart, int maxLength, char separator) {
 		var HashMap<NamedElement, String> map = new HashMap<NamedElement, String>
 		map.addShortVertexNames(statechart, maxLength, separator)
 		return map;
 	}
-	
+
 	def protected void addShortVertexNames(Map<NamedElement, String> map, CompositeElement element, int maxLength,
 		char separator) {
 		for (region : element.regions) {
 			for (vertex : region.vertices) {
 				switch vertex {
-					State :
-						map.putShortName(vertex, vertex.prefix(separator), vertex.suffix(separator), maxLength, separator)
+					State:
+						map.putShortName(vertex, vertex.prefix(separator), vertex.suffix(separator), maxLength,
+							separator)
 					default:
-						map.putShortName(vertex, vertex.prefix(separator), vertex.suffix(separator), maxLength, separator)
+						map.putShortName(vertex, vertex.prefix(separator), vertex.suffix(separator), maxLength,
+							separator)
 				}
 			}
 		}
@@ -229,11 +234,11 @@ class DefaultNamingService implements INamingService {
 	def protected suffix(TimeEventSpec it, State state, char separator) {
 		"tev" + state.timeEventSpecs.indexOf(it)
 	}
-	
+
 	def protected prefix(State it, char separator) {
 		activeStatechart.name
 	}
-	
+
 	def protected prefix(Vertex it, char separator) {
 		""
 	}
@@ -241,40 +246,50 @@ class DefaultNamingService implements INamingService {
 	def protected suffix(Vertex it, char separator) {
 		""
 	}
-	
+
 	override asIdentifier(String string) {
 		string.replaceAll('[^a-z&&[^A-Z&&[^0-9]]]', separator.toString)
 	}
-	
+
 	override asEscapedIdentifier(String string) {
 		string.asIdentifier
 	}
-	
+
 	override isKeyword(String string) {
 		return false
 	}
-	
-	def protected String getShortName(NamedElement element, String prefix, String suffix, List<String> nameList, int maxLength,
-		char separator) {
-		var shortName = element.createShortName(prefix, suffix, nameList, NameShorteningStrategy::STANDARD, separator)
 
-		//second reduction removing vowels
-		if (shortName.length > maxLength) {
-			shortName = element.createShortName(prefix, suffix, nameList, NameShorteningStrategy::REMOVE_VOWELS,
-				separator);
-		}
+	def protected String getShortName(NamedElement element, String prefix, String suffix, List<String> nameList,
+		int maxLength, char separator) {
+		var shortName = ""
 
-		//third reduction using index position as name
-		if (shortName.length > maxLength) {
-			shortName = element.createShortName(prefix, suffix, nameList, NameShorteningStrategy::INDEX_POSITION,
-				separator);
-		}
+		if (maxLength > 0) {
 
-		//fourth reduction using hash value
-		if (shortName.length > maxLength) {
+			//first reduction use short name
+			shortName = element.createShortName(prefix, suffix, nameList, NameShorteningStrategy::SHORT_NAME,
+				separator)
 
-			//Important: FQN has to be the same if the input model is a Statechart or an ExecutionFlow
-			shortName = prefix + separator + element.fqElementName.asIdentifier.getHash(maxLength)
+			//second reduction removing vowels
+			if (shortName.length > maxLength) {
+				shortName = element.createShortName(prefix, suffix, nameList, NameShorteningStrategy::REMOVE_VOWELS,
+					separator);
+			}
+
+			//third reduction using index position as name
+			if (shortName.length > maxLength) {
+				shortName = element.createShortName(prefix, suffix, nameList, NameShorteningStrategy::INDEX_POSITION,
+					separator);
+			}
+
+			//fourth reduction using hash value
+			if (shortName.length > maxLength) {
+
+				//Important: FQN has to be the same if the input model is a Statechart or an ExecutionFlow
+				shortName = element.fqElementName(separator).asIdentifier.getHash(maxLength)
+			}
+		} else {
+			//use full qualified name
+			shortName = element.createShortName(prefix, suffix, nameList, NameShorteningStrategy::FQN_NAME, separator)
 		}
 		return shortName
 	}
@@ -283,11 +298,11 @@ class DefaultNamingService implements INamingService {
 		NameShorteningStrategy nameShorteningType, char separator) {
 
 		var name = element.elementName(nameShorteningType)
-		
+
 		if (name.nullOrEmpty) {
 			name = element.class.simpleName
 		}
-		
+
 		if (!suffix.nullOrEmpty) {
 			if (!name.nullOrEmpty) {
 				name = name + separator + suffix
@@ -305,19 +320,18 @@ class DefaultNamingService implements INamingService {
 				shortName = (prefix + separator + name).asEscapedIdentifier
 			}
 		}
-		
+
 		if (nameList.containsName(shortName)) {
 			switch element {
 				ExecutionScope:
 					shortName = element.superScope.createShortName(prefix, name, nameList, nameShorteningType, separator)
 				Step: {
 					if (element.scopeDepth > 0) {
-					shortName = element.parentExecutionScope.superScope.createShortName(prefix, name, nameList,
-						nameShorteningType, separator)
-					}
-					else {
+						shortName = element.parentExecutionScope.superScope.createShortName(prefix, name, nameList,
+							nameShorteningType, separator)
+					} else {
 						shortName = element.parentExecutionScope.createShortName(prefix, name, nameList,
-						nameShorteningType, separator)
+							nameShorteningType, separator)
 					}
 				}
 				default: {
@@ -330,18 +344,20 @@ class DefaultNamingService implements INamingService {
 		}
 		return shortName;
 	}
-	
+
 	def protected dispatch String elementName(NamedElement it, NameShorteningStrategy nameShorteningType) {
 		switch nameShorteningType {
-			case NameShorteningStrategy::STANDARD: return name
+			case NameShorteningStrategy::FQN_NAME: return provider.getFullyQualifiedName(it).skipFirst(1).toString(separator.toString)
+			case NameShorteningStrategy::SHORT_NAME: return name
 			case NameShorteningStrategy::REMOVE_VOWELS: return name?.removeVowels
 			case NameShorteningStrategy::INDEX_POSITION: return name?.removeVowels
 		}
 	}
-	
+
 	def protected dispatch String elementName(ExecutionScope it, NameShorteningStrategy nameShorteningType) {
 		switch nameShorteningType {
-			case NameShorteningStrategy::STANDARD: return name
+			case NameShorteningStrategy::FQN_NAME: return provider.getFullyQualifiedName(it).skipFirst(2).toString(separator.toString)
+			case NameShorteningStrategy::SHORT_NAME: return name
 			case NameShorteningStrategy::REMOVE_VOWELS: return name?.removeVowels
 			case NameShorteningStrategy::INDEX_POSITION: return asIndexPosition
 		}
@@ -349,15 +365,31 @@ class DefaultNamingService implements INamingService {
 
 	def protected dispatch String elementName(ExecutionState it, NameShorteningStrategy nameShorteningType) {
 		switch nameShorteningType {
-			case NameShorteningStrategy::STANDARD: return simpleName
+			case NameShorteningStrategy::FQN_NAME: return provider.getFullyQualifiedName(it).skipFirst(2).toString(separator.toString)
+			case NameShorteningStrategy::SHORT_NAME: return simpleName
 			case NameShorteningStrategy::REMOVE_VOWELS: return simpleName.removeVowels
 			case NameShorteningStrategy::INDEX_POSITION: return asIndexPosition
 		}
 	}
+
+	def protected dispatch String elementName(ExecutionNode it, NameShorteningStrategy nameShorteningType) {
+		switch nameShorteningType {
+			case NameShorteningStrategy::FQN_NAME: return provider.getFullyQualifiedName(it).skipFirst(2).toString(separator.toString)
+			case NameShorteningStrategy::SHORT_NAME: return simpleName
+			case NameShorteningStrategy::REMOVE_VOWELS: return simpleName
+			case NameShorteningStrategy::INDEX_POSITION: return simpleName
+		}
+	}
 	
 	def protected dispatch String elementName(Region it, NameShorteningStrategy nameShorteningType) {
 		switch nameShorteningType {
-			case NameShorteningStrategy::STANDARD: return name
+			case NameShorteningStrategy::FQN_NAME: return provider.getFullyQualifiedName(it).skipFirst(1).toString(separator.toString)
+			case NameShorteningStrategy::SHORT_NAME: {
+				if (name.nullOrEmpty) {		
+					return provider.getFullyQualifiedName(it).lastSegment.toString.substring(1)
+				}
+				return name
+			}
 			case NameShorteningStrategy::REMOVE_VOWELS: return name?.removeVowels
 			case NameShorteningStrategy::INDEX_POSITION: return asSGraphIndexPosition
 		}
@@ -365,16 +397,13 @@ class DefaultNamingService implements INamingService {
 
 	def protected dispatch String elementName(Vertex it, NameShorteningStrategy nameShorteningType) {
 		switch nameShorteningType {
-			case NameShorteningStrategy::STANDARD: return name
+			case NameShorteningStrategy::FQN_NAME: return provider.getFullyQualifiedName(it).skipFirst(1).toString(separator.toString)
+			case NameShorteningStrategy::SHORT_NAME: return name
 			case NameShorteningStrategy::REMOVE_VOWELS: return name?.removeVowels
 			case NameShorteningStrategy::INDEX_POSITION: return asSGraphIndexPosition
 		}
 	}
 
-	def protected dispatch String elementName(ExecutionNode it, NameShorteningStrategy nameShorteningType) {
-		simpleName
-	}
-
 	def protected dispatch String elementName(ExecutionFlow it, NameShorteningStrategy nameShorteningType) {
 		""
 	}
@@ -390,15 +419,15 @@ class DefaultNamingService implements INamingService {
 	def protected asIndexPosition(ExecutionScope it) {
 		superScope.subScopes.indexOf(it).toString;
 	}
-	
+
 	def protected dispatch asSGraphIndexPosition(Region it) {
 		composite.regions.toList.indexOf(it).toString
 	}
-	
+
 	def protected dispatch asSGraphIndexPosition(State it) {
 		parentRegion.vertices.filter(typeof(State)).toList.indexOf(it).toString
 	}
-	
+
 	def protected dispatch asSGraphIndexPosition(Vertex it) {
 		parentRegion.vertices.toList.indexOf(it).toString
 	}
@@ -406,4 +435,4 @@ class DefaultNamingService implements INamingService {
 	def protected removeVowels(String it) {
 		replaceAll('[aeiou]', '')
 	}
-}
+}

plugins/org.yakindu.sct.model.sexec/src/org/yakindu/sct/model/sexec/naming/NamingHelper.xtend

@@ -21,6 +21,9 @@ import org.yakindu.sct.model.sexec.ExecutionNode
 import org.yakindu.sct.model.sexec.ExecutionState
 import org.yakindu.sct.model.sgraph.Statechart
 import java.util.List
+import org.yakindu.sct.model.sexec.ExecutionScope
+import com.google.inject.Inject
+import org.yakindu.sct.model.stext.naming.StextNameProvider
 
 /**
  * Helper class with methods to create meaningful short names for {@link ExecutionFlow}
@@ -31,30 +34,35 @@ import java.util.List
  * 
  */
 class NamingHelper {
+	
+	@Inject private StextNameProvider provider
 
-	def dispatch String fqElementName(ExecutionState it) {
-		(if(superScope != null && ! superScope.fqElementName.empty) superScope.fqElementName + "_" else "") + simpleName
+	def dispatch String fqElementName(ExecutionState it, char separator) {
+		provider.getFullyQualifiedName(it).skipFirst(2).toString(separator.toString)
+	}
+	
+	def dispatch String fqElementName(ExecutionScope it, char separator) {
+		provider.getFullyQualifiedName(it).skipFirst(2).toString(separator.toString)
 	}
 
-	def dispatch String fqElementName(EObject it) {
-		eContainer.fqElementName
+	def dispatch String fqElementName(EObject it, char separator) {
+		eContainer.fqElementName(separator)
 	}
 
-	def dispatch String fqElementName(ExecutionNode it) {
-		name
+	def dispatch String fqElementName(ExecutionNode it, char separator) {
+		provider.getFullyQualifiedName(it).skipFirst(2).toString(separator.toString)
 	}
 
-	def dispatch String fqElementName(ExecutionFlow it) {
+	def dispatch String fqElementName(ExecutionFlow it, char separator) {
 		""
 	}
 
-	def dispatch String fqElementName(Statechart it) {
+	def dispatch String fqElementName(Statechart it, char separator) {
 		""
 	}
-
-	def dispatch String fqElementName(NamedElement it) {
-		(if(eContainer instanceof NamedElement && !(eContainer as NamedElement).fqElementName.nullOrEmpty) (eContainer as NamedElement).
-			fqElementName + "_" else "") + name
+	
+	def dispatch String fqElementName(NamedElement it, char separator) {
+		provider.getFullyQualifiedName(it).skipFirst(1).toString(separator.toString)
 	}
 	
 	def containsName(List<String> it, String shortName) {

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

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

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

@@ -18,33 +18,33 @@ AssignmentAsExpression handle;
 TEST(StatemachineTest, simpleAssignment) {
 	assignmentAsExpression_init(&handle);
 	assignmentAsExpression_enter(&handle);
-	EXPECT_TRUE(assignmentAsExpression_isActive(&handle, AssignmentAsExpression_Add));
+	EXPECT_TRUE(assignmentAsExpression_isActive(&handle, AssignmentAsExpression_main_region_Add));
 	EXPECT_TRUE(assignmentAsExpressionIface_get_b(&handle) == 5);
 	EXPECT_TRUE(assignmentAsExpressionIface_get_a(&handle) == 9);
 	assignmentAsExpression_runCycle(&handle);
-	EXPECT_TRUE(assignmentAsExpression_isActive(&handle, AssignmentAsExpression_Subtract));
+	EXPECT_TRUE(assignmentAsExpression_isActive(&handle, AssignmentAsExpression_main_region_Subtract));
 	EXPECT_TRUE(assignmentAsExpressionIface_get_d(&handle) == 6);
 	assignmentAsExpression_runCycle(&handle);
-	EXPECT_TRUE(assignmentAsExpression_isActive(&handle, AssignmentAsExpression_Multiply));
+	EXPECT_TRUE(assignmentAsExpression_isActive(&handle, AssignmentAsExpression_main_region_Multiply));
 	EXPECT_TRUE(assignmentAsExpressionIface_get_e(&handle) == 15);
 	assignmentAsExpression_runCycle(&handle);
-	EXPECT_TRUE(assignmentAsExpression_isActive(&handle, AssignmentAsExpression_Divide));
+	EXPECT_TRUE(assignmentAsExpression_isActive(&handle, AssignmentAsExpression_main_region_Divide));
 	EXPECT_TRUE(assignmentAsExpressionIface_get_g(&handle) == 1);
 	assignmentAsExpression_runCycle(&handle);
-	EXPECT_TRUE(assignmentAsExpression_isActive(&handle, AssignmentAsExpression_Modulo));
+	EXPECT_TRUE(assignmentAsExpression_isActive(&handle, AssignmentAsExpression_main_region_Modulo));
 	EXPECT_TRUE(assignmentAsExpressionIface_get_i(&handle) == 1);
 	assignmentAsExpression_runCycle(&handle);
-	EXPECT_TRUE(assignmentAsExpression_isActive(&handle, AssignmentAsExpression_Shift));
+	EXPECT_TRUE(assignmentAsExpression_isActive(&handle, AssignmentAsExpression_main_region_Shift));
 	EXPECT_TRUE(assignmentAsExpressionIface_get_j(&handle) == 16);
 	EXPECT_TRUE(assignmentAsExpressionIface_get_k(&handle) == 4);
 	assignmentAsExpression_runCycle(&handle);
-	EXPECT_TRUE(assignmentAsExpression_isActive(&handle, AssignmentAsExpression_boolean_And));
+	EXPECT_TRUE(assignmentAsExpression_isActive(&handle, AssignmentAsExpression_main_region_boolean_And));
 	EXPECT_TRUE(assignmentAsExpressionIface_get_l(&handle) == 1);
 	assignmentAsExpression_runCycle(&handle);
-	EXPECT_TRUE(assignmentAsExpression_isActive(&handle, AssignmentAsExpression_boolean_Or));
+	EXPECT_TRUE(assignmentAsExpression_isActive(&handle, AssignmentAsExpression_main_region_boolean_Or));
 	EXPECT_TRUE(assignmentAsExpressionIface_get_p(&handle) == 15);
 	assignmentAsExpression_runCycle(&handle);
-	EXPECT_TRUE(assignmentAsExpression_isActive(&handle, AssignmentAsExpression_boolean_Xor));
+	EXPECT_TRUE(assignmentAsExpression_isActive(&handle, AssignmentAsExpression_main_region_boolean_Xor));
 	EXPECT_TRUE(assignmentAsExpressionIface_get_u(&handle) == 12);
 	assignmentAsExpression_exit(&handle);
 }

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

@@ -18,12 +18,12 @@ BitExpressions handle;
 TEST(StatemachineTest, BitExpressions) {
 	bitExpressions_init(&handle);
 	bitExpressions_enter(&handle);
-	EXPECT_TRUE(bitExpressions_isActive(&handle, BitExpressions_StateA));
+	EXPECT_TRUE(bitExpressions_isActive(&handle, BitExpressions_main_region_StateA));
 	EXPECT_TRUE(bitExpressionsIface_get_myBit1(&handle) == 5);
 	EXPECT_TRUE(bitExpressionsIface_get_myBit2(&handle) == 7);
 	bitExpressionsIface_raise_e1(&handle);
 	bitExpressions_runCycle(&handle);
-	EXPECT_TRUE(bitExpressions_isActive(&handle, BitExpressions_StateB));
+	EXPECT_TRUE(bitExpressions_isActive(&handle, BitExpressions_main_region_StateB));
 	EXPECT_TRUE(bitExpressionsIface_get_leftBitshift(&handle) == 10);
 	EXPECT_TRUE(bitExpressionsIface_get_rightBitshift(&handle) == 2);
 	EXPECT_TRUE(bitExpressionsIface_get_complementBitshift(&handle) == - 6 );

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

@@ -18,12 +18,12 @@ BooleanExpressions handle;
 TEST(StatemachineTest, booleanExpressions) {
 	booleanExpressions_init(&handle);
 	booleanExpressions_enter(&handle);
-	EXPECT_TRUE(booleanExpressions_isActive(&handle, BooleanExpressions_StateA));
+	EXPECT_TRUE(booleanExpressions_isActive(&handle, BooleanExpressions_main_region_StateA));
 	EXPECT_TRUE(booleanExpressionsIface_get_myBool1(&handle) == true);
 	EXPECT_TRUE(booleanExpressionsIface_get_myBool2(&handle) == false);
 	booleanExpressionsIface_raise_e1(&handle);
 	booleanExpressions_runCycle(&handle);
-	EXPECT_TRUE(booleanExpressions_isActive(&handle, BooleanExpressions_StateB));
+	EXPECT_TRUE(booleanExpressions_isActive(&handle, BooleanExpressions_main_region_StateB));
 	EXPECT_TRUE(booleanExpressionsIface_get_and(&handle) == false);
 	EXPECT_TRUE(booleanExpressionsIface_get_or(&handle) == true);
 	EXPECT_TRUE(booleanExpressionsIface_get_not(&handle) == false);

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

@@ -18,12 +18,12 @@ CKeywords handle;
 TEST(StatemachineTest, CKeywordsTest) {
 	cKeywords_init(&handle);
 	cKeywords_enter(&handle);
-	EXPECT_TRUE(cKeywords_isActive(&handle, CKeywords_char));
+	EXPECT_TRUE(cKeywords_isActive(&handle, CKeywords_auto_char));
 	cKeywordsIface_raise_auto(&handle);
 	cKeywords_runCycle(&handle);
-	EXPECT_TRUE(cKeywords_isActive(&handle, CKeywords_const));
-	EXPECT_TRUE(cKeywords_isActive(&handle, CKeywords_case));
-	EXPECT_TRUE(cKeywords_isActive(&handle, CKeywords_asm));
+	EXPECT_TRUE(cKeywords_isActive(&handle, CKeywords_auto_const));
+	EXPECT_TRUE(cKeywords_isActive(&handle, CKeywords_auto_const_switch_case));
+	EXPECT_TRUE(cKeywords_isActive(&handle, CKeywords_auto_const_switch_case_enum_asm));
 }
 
 		

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

@@ -18,65 +18,65 @@ Choice handle;
 TEST(StatemachineTest, elseChoiceUsingNonDefaultTransition) {
 	choice_init(&handle);
 	choice_enter(&handle);
-	EXPECT_TRUE(choice_isActive(&handle, Choice_A));
+	EXPECT_TRUE(choice_isActive(&handle, Choice_main_region_A));
 	choiceIface_set_c(&handle, true);
 	choiceIface_raise_e(&handle);
 	choice_runCycle(&handle);
-	EXPECT_TRUE(choice_isActive(&handle, Choice_C));
+	EXPECT_TRUE(choice_isActive(&handle, Choice_main_region_C));
 }
 TEST(StatemachineTest, elseChoiceUsingDefaultTransition) {
 	choice_init(&handle);
 	choice_enter(&handle);
-	EXPECT_TRUE(choice_isActive(&handle, Choice_A));
+	EXPECT_TRUE(choice_isActive(&handle, Choice_main_region_A));
 	choiceIface_set_c(&handle, false);
 	choiceIface_raise_e(&handle);
 	choice_runCycle(&handle);
-	EXPECT_TRUE(choice_isActive(&handle, Choice_B));
+	EXPECT_TRUE(choice_isActive(&handle, Choice_main_region_B));
 }
 TEST(StatemachineTest, defaultChoiceUsingNonDefaultTransition) {
 	choice_init(&handle);
 	choice_enter(&handle);
-	EXPECT_TRUE(choice_isActive(&handle, Choice_A));
+	EXPECT_TRUE(choice_isActive(&handle, Choice_main_region_A));
 	choiceIface_set_c(&handle, true);
 	choiceIface_raise_g(&handle);
 	choice_runCycle(&handle);
-	EXPECT_TRUE(choice_isActive(&handle, Choice_C));
+	EXPECT_TRUE(choice_isActive(&handle, Choice_main_region_C));
 }
 TEST(StatemachineTest, defaultChoiceUsingDefaultTransition) {
 	choice_init(&handle);
 	choice_enter(&handle);
-	EXPECT_TRUE(choice_isActive(&handle, Choice_A));
+	EXPECT_TRUE(choice_isActive(&handle, Choice_main_region_A));
 	choiceIface_set_c(&handle, false);
 	choiceIface_raise_g(&handle);
 	choice_runCycle(&handle);
-	EXPECT_TRUE(choice_isActive(&handle, Choice_B));
+	EXPECT_TRUE(choice_isActive(&handle, Choice_main_region_B));
 }
 TEST(StatemachineTest, uncheckedChoiceUsingNonDefaultTransition) {
 	choice_init(&handle);
 	choice_enter(&handle);
-	EXPECT_TRUE(choice_isActive(&handle, Choice_A));
+	EXPECT_TRUE(choice_isActive(&handle, Choice_main_region_A));
 	choiceIface_set_c(&handle, true);
 	choiceIface_raise_f(&handle);
 	choice_runCycle(&handle);
-	EXPECT_TRUE(choice_isActive(&handle, Choice_C));
+	EXPECT_TRUE(choice_isActive(&handle, Choice_main_region_C));
 }
 TEST(StatemachineTest, uncheckedChoiceUsingDefaultTransition) {
 	choice_init(&handle);
 	choice_enter(&handle);
-	EXPECT_TRUE(choice_isActive(&handle, Choice_A));
+	EXPECT_TRUE(choice_isActive(&handle, Choice_main_region_A));
 	choiceIface_set_c(&handle, false);
 	choiceIface_raise_f(&handle);
 	choice_runCycle(&handle);
-	EXPECT_TRUE(choice_isActive(&handle, Choice_B));
+	EXPECT_TRUE(choice_isActive(&handle, Choice_main_region_B));
 }
 TEST(StatemachineTest, alwaysTrueTransitionInChoice) {
 	choice_init(&handle);
 	choice_enter(&handle);
-	EXPECT_TRUE(choice_isActive(&handle, Choice_A));
+	EXPECT_TRUE(choice_isActive(&handle, Choice_main_region_A));
 	choiceIface_set_c(&handle, true);
 	choiceIface_raise_h(&handle);
 	choice_runCycle(&handle);
-	EXPECT_TRUE(choice_isActive(&handle, Choice_C));
+	EXPECT_TRUE(choice_isActive(&handle, Choice_main_region_C));
 }
 
 		

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

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

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

@@ -26,13 +26,13 @@ TEST(StatemachineTest, enterToSubstate) {
 	EXPECT_TRUE(deepEntryIface_get_z(&handle) == 2);
 	deepEntryIface_raise_e(&handle);
 	deepEntry_runCycle(&handle);
-	EXPECT_TRUE(deepEntry_isActive(&handle, DeepEntry_BB));
+	EXPECT_TRUE(deepEntry_isActive(&handle, DeepEntry_r2_B_r_BB));
 	deepEntryIface_raise_f(&handle);
 	deepEntry_runCycle(&handle);
-	EXPECT_TRUE(deepEntry_isActive(&handle, DeepEntry_C));
+	EXPECT_TRUE(deepEntry_isActive(&handle, DeepEntry_r2_C));
 	deepEntryIface_raise_f(&handle);
 	deepEntry_runCycle(&handle);
-	EXPECT_TRUE(deepEntry_isActive(&handle, DeepEntry_BB));
+	EXPECT_TRUE(deepEntry_isActive(&handle, DeepEntry_r2_B_r_BB));
 	EXPECT_TRUE(deepEntryIface_get_y(&handle) == 1);
 }
 

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

@@ -26,16 +26,16 @@ TEST(StatemachineTest, deepHistoryTest) {
 	deepHistory_runCycle(&handle);
 	deepHistoryIface_raise_event7(&handle);
 	deepHistory_runCycle(&handle);
-	EXPECT_TRUE(!deepHistory_isActive(&handle, DeepHistory_State1));
-	EXPECT_TRUE(deepHistory_isActive(&handle, DeepHistory_State9));
+	EXPECT_TRUE(!deepHistory_isActive(&handle, DeepHistory_mainRegion_State1));
+	EXPECT_TRUE(deepHistory_isActive(&handle, DeepHistory_mainRegion_State2__region0_State4__region0_State7__region0_State9));
 	deepHistoryIface_raise_event2(&handle);
 	deepHistory_runCycle(&handle);
-	EXPECT_TRUE(deepHistory_isActive(&handle, DeepHistory_State1));
-	EXPECT_TRUE(!deepHistory_isActive(&handle, DeepHistory_State9));
+	EXPECT_TRUE(deepHistory_isActive(&handle, DeepHistory_mainRegion_State1));
+	EXPECT_TRUE(!deepHistory_isActive(&handle, DeepHistory_mainRegion_State2__region0_State4__region0_State7__region0_State9));
 	deepHistoryIface_raise_event1(&handle);
 	deepHistory_runCycle(&handle);
-	EXPECT_TRUE(!deepHistory_isActive(&handle, DeepHistory_State1));
-	EXPECT_TRUE(deepHistory_isActive(&handle, DeepHistory_State9));
+	EXPECT_TRUE(!deepHistory_isActive(&handle, DeepHistory_mainRegion_State1));
+	EXPECT_TRUE(deepHistory_isActive(&handle, DeepHistory_mainRegion_State2__region0_State4__region0_State7__region0_State9));
 }
 
 		

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

@@ -18,9 +18,9 @@ DynamicChoice handle;
 TEST(StatemachineTest, DynamicChoiceTest) {
 	dynamicChoice_init(&handle);
 	dynamicChoice_enter(&handle);
-	EXPECT_TRUE(dynamicChoice_isActive(&handle, DynamicChoice_Start));
+	EXPECT_TRUE(dynamicChoice_isActive(&handle, DynamicChoice_main_region_Start));
 	dynamicChoice_runCycle(&handle);
-	EXPECT_TRUE(dynamicChoice_isActive(&handle, DynamicChoice_A));
+	EXPECT_TRUE(dynamicChoice_isActive(&handle, DynamicChoice_main_region_A));
 }
 
 		

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

@@ -18,26 +18,26 @@ EnterState handle;
 TEST(StatemachineTest, defaultEntry) {
 	enterState_init(&handle);
 	enterState_enter(&handle);
-	EXPECT_TRUE(enterState_isActive(&handle, EnterState_A));
+	EXPECT_TRUE(enterState_isActive(&handle, EnterState_r_A));
 	enterStateIface_raise_e(&handle);
 	enterState_runCycle(&handle);
-	EXPECT_TRUE(enterState_isActive(&handle, EnterState_E));
+	EXPECT_TRUE(enterState_isActive(&handle, EnterState_r_B_r_E));
 }
 TEST(StatemachineTest, namedEntryThroughNamedTransition) {
 	enterState_init(&handle);
 	enterState_enter(&handle);
-	EXPECT_TRUE(enterState_isActive(&handle, EnterState_A));
+	EXPECT_TRUE(enterState_isActive(&handle, EnterState_r_A));
 	enterStateIface_raise_f(&handle);
 	enterState_runCycle(&handle);
-	EXPECT_TRUE(enterState_isActive(&handle, EnterState_F));
+	EXPECT_TRUE(enterState_isActive(&handle, EnterState_r_B_r_F));
 }
 TEST(StatemachineTest, namedEntryThroughDefaultTransition) {
 	enterState_init(&handle);
 	enterState_enter(&handle);
-	EXPECT_TRUE(enterState_isActive(&handle, EnterState_A));
+	EXPECT_TRUE(enterState_isActive(&handle, EnterState_r_A));
 	enterStateIface_raise_g(&handle);
 	enterState_runCycle(&handle);
-	EXPECT_TRUE(enterState_isActive(&handle, EnterState_E));
+	EXPECT_TRUE(enterState_isActive(&handle, EnterState_r_B_r_E));
 }
 
 		

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

@@ -20,7 +20,7 @@ TEST(StatemachineTest, EntryChoiceTest) {
 	entryChoice_enter(&handle);
 	entryChoice_runCycle(&handle);
 	entryChoice_runCycle(&handle);
-	EXPECT_TRUE(entryChoice_isActive(&handle, EntryChoice_A));
+	EXPECT_TRUE(entryChoice_isActive(&handle, EntryChoice_main_region_A));
 }
 
 		

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

@@ -20,13 +20,13 @@ TEST(StatemachineTest, SelfTransitionToChildState) {
 	entryExitSelfTransition_enter(&handle);
 	entryExitSelfTransition_runCycle(&handle);
 	EXPECT_TRUE(entryExitSelfTransitionIface_get_entries(&handle) == 1);
-	EXPECT_TRUE(entryExitSelfTransition_isActive(&handle, EntryExitSelfTransition_B));
+	EXPECT_TRUE(entryExitSelfTransition_isActive(&handle, EntryExitSelfTransition_main_region_A__region0_B));
 	entryExitSelfTransitionIface_set_entries(&handle, 0);
 	entryExitSelfTransitionIface_raise_e(&handle);
 	entryExitSelfTransition_runCycle(&handle);
 	EXPECT_TRUE(entryExitSelfTransitionIface_get_entries(&handle) == 1);
 	EXPECT_TRUE(entryExitSelfTransitionIface_get_exits(&handle) == 1);
-	EXPECT_TRUE(entryExitSelfTransition_isActive(&handle, EntryExitSelfTransition_C));
+	EXPECT_TRUE(entryExitSelfTransition_isActive(&handle, EntryExitSelfTransition_main_region_A__region0_C));
 }
 TEST(StatemachineTest, SelfTransitionFromChildState) {
 	entryExitSelfTransition_init(&handle);
@@ -38,10 +38,10 @@ TEST(StatemachineTest, SelfTransitionFromChildState) {
 	entryExitSelfTransition_runCycle(&handle);
 	EXPECT_TRUE(entryExitSelfTransitionIface_get_entries(&handle) == 0);
 	EXPECT_TRUE(entryExitSelfTransitionIface_get_exits(&handle) == 0);
-	EXPECT_TRUE(entryExitSelfTransition_isActive(&handle, EntryExitSelfTransition_C));
+	EXPECT_TRUE(entryExitSelfTransition_isActive(&handle, EntryExitSelfTransition_main_region_A__region0_C));
 	entryExitSelfTransitionIface_raise_e1(&handle);
 	entryExitSelfTransition_runCycle(&handle);
-	EXPECT_TRUE(entryExitSelfTransition_isActive(&handle, EntryExitSelfTransition_B));
+	EXPECT_TRUE(entryExitSelfTransition_isActive(&handle, EntryExitSelfTransition_main_region_A__region0_B));
 	EXPECT_TRUE(entryExitSelfTransitionIface_get_entries(&handle) == 1);
 	EXPECT_TRUE(entryExitSelfTransitionIface_get_exits(&handle) == 1);
 }

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

@@ -18,7 +18,7 @@ ExitOnSelfTransition handle;
 TEST(StatemachineTest, ExitOnSelfTransitionTest) {
 	exitOnSelfTransition_init(&handle);
 	exitOnSelfTransition_enter(&handle);
-	EXPECT_TRUE(exitOnSelfTransition_isActive(&handle, ExitOnSelfTransition_A));
+	EXPECT_TRUE(exitOnSelfTransition_isActive(&handle, ExitOnSelfTransition_main_region_A));
 	EXPECT_TRUE(exitOnSelfTransitionIface_get_entryCount(&handle) == 1);
 	EXPECT_TRUE(exitOnSelfTransitionIface_get_exitCount(&handle) == 0);
 	exitOnSelfTransitionIface_raise_e(&handle);

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

@@ -18,33 +18,33 @@ ExitState handle;
 TEST(StatemachineTest, defaultExit) {
 	exitState_init(&handle);
 	exitState_enter(&handle);
-	EXPECT_TRUE(exitState_isActive(&handle, ExitState_A));
+	EXPECT_TRUE(exitState_isActive(&handle, ExitState_r_A));
 	exitStateIface_raise_e(&handle);
 	exitState_runCycle(&handle);
-	EXPECT_TRUE(exitState_isActive(&handle, ExitState_E));
+	EXPECT_TRUE(exitState_isActive(&handle, ExitState_r_E));
 }
 TEST(StatemachineTest, namedExitThroughNamedTransition) {
 	exitState_init(&handle);
 	exitState_enter(&handle);
-	EXPECT_TRUE(exitState_isActive(&handle, ExitState_A));
+	EXPECT_TRUE(exitState_isActive(&handle, ExitState_r_A));
 	exitStateIface_raise_f(&handle);
 	exitState_runCycle(&handle);
-	EXPECT_TRUE(exitState_isActive(&handle, ExitState_F));
+	EXPECT_TRUE(exitState_isActive(&handle, ExitState_r_F));
 }
 TEST(StatemachineTest, namedExitThroughDefaultTransition) {
 	exitState_init(&handle);
 	exitState_enter(&handle);
-	EXPECT_TRUE(exitState_isActive(&handle, ExitState_A));
+	EXPECT_TRUE(exitState_isActive(&handle, ExitState_r_A));
 	exitStateIface_raise_g(&handle);
 	exitState_runCycle(&handle);
-	EXPECT_TRUE(exitState_isActive(&handle, ExitState_E));
+	EXPECT_TRUE(exitState_isActive(&handle, ExitState_r_E));
 }
 TEST(StatemachineTest, remainInA) {
 	exitState_init(&handle);
 	exitState_enter(&handle);
-	EXPECT_TRUE(exitState_isActive(&handle, ExitState_A));
+	EXPECT_TRUE(exitState_isActive(&handle, ExitState_r_A));
 	exitState_runCycle(&handle);
-	EXPECT_TRUE(exitState_isActive(&handle, ExitState_A));
+	EXPECT_TRUE(exitState_isActive(&handle, ExitState_r_A));
 }
 
 		

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

@@ -18,9 +18,9 @@ FeatureCalls handle;
 TEST(StatemachineTest, FeatureCalls) {
 	featureCalls_init(&handle);
 	featureCalls_enter(&handle);
-	EXPECT_TRUE(featureCalls_isActive(&handle, FeatureCalls_A));
+	EXPECT_TRUE(featureCalls_isActive(&handle, FeatureCalls_main_region_A));
 	featureCalls_runCycle(&handle);
-	EXPECT_TRUE(featureCalls_isActive(&handle, FeatureCalls_A));
+	EXPECT_TRUE(featureCalls_isActive(&handle, FeatureCalls_main_region_A));
 }
 
 		

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

@@ -18,22 +18,22 @@ Guard handle;
 TEST(StatemachineTest, guardTest) {
 	guard_init(&handle);
 	guard_enter(&handle);
-	EXPECT_TRUE(guard_isActive(&handle, Guard_A));
+	EXPECT_TRUE(guard_isActive(&handle, Guard_main_region_A));
 	guardIface_raise_event1(&handle);
 	guard_runCycle(&handle);
-	EXPECT_TRUE(guard_isActive(&handle, Guard_A));
+	EXPECT_TRUE(guard_isActive(&handle, Guard_main_region_A));
 	guardIface_raise_event2(&handle);
 	guard_runCycle(&handle);
-	EXPECT_TRUE(guard_isActive(&handle, Guard_B));
+	EXPECT_TRUE(guard_isActive(&handle, Guard_main_region_B));
 	guardIface_raise_return(&handle);
 	guard_runCycle(&handle);
-	EXPECT_TRUE(guard_isActive(&handle, Guard_A));
+	EXPECT_TRUE(guard_isActive(&handle, Guard_main_region_A));
 	guardIface_raise_event1(&handle);
 	guard_runCycle(&handle);
-	EXPECT_TRUE(guard_isActive(&handle, Guard_B));
+	EXPECT_TRUE(guard_isActive(&handle, Guard_main_region_B));
 	guardIface_raise_return(&handle);
 	guard_runCycle(&handle);
-	EXPECT_TRUE(guard_isActive(&handle, Guard_A));
+	EXPECT_TRUE(guard_isActive(&handle, Guard_main_region_A));
 }
 
 		

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

@@ -19,42 +19,42 @@ TEST(StatemachineTest, EntryNotTakenOnStatechartEnter) {
 	guardedEntry_init(&handle);
 	EXPECT_TRUE(guardedEntryIface_get_guard(&handle) == false);
 	guardedEntry_enter(&handle);
-	EXPECT_TRUE(guardedEntry_isActive(&handle, GuardedEntry_A));
+	EXPECT_TRUE(guardedEntry_isActive(&handle, GuardedEntry_main_region_A));
 	EXPECT_TRUE(guardedEntryIface_get_done(&handle) == false);
 }
 TEST(StatemachineTest, EntryTakenOnStatechartEnter) {
 	guardedEntry_init(&handle);
 	guardedEntryIface_set_guard(&handle, true);
 	guardedEntry_enter(&handle);
-	EXPECT_TRUE(guardedEntry_isActive(&handle, GuardedEntry_A));
+	EXPECT_TRUE(guardedEntry_isActive(&handle, GuardedEntry_main_region_A));
 	EXPECT_TRUE(guardedEntryIface_get_done(&handle) == true);
 }
 TEST(StatemachineTest, EntryTakenInTransition) {
 	guardedEntry_init(&handle);
 	guardedEntry_enter(&handle);
-	EXPECT_TRUE(guardedEntry_isActive(&handle, GuardedEntry_A));
+	EXPECT_TRUE(guardedEntry_isActive(&handle, GuardedEntry_main_region_A));
 	guardedEntryIface_raise_e(&handle);
 	guardedEntry_runCycle(&handle);
-	EXPECT_TRUE(guardedEntry_isActive(&handle, GuardedEntry_B));
+	EXPECT_TRUE(guardedEntry_isActive(&handle, GuardedEntry_main_region_B));
 	guardedEntryIface_set_guard(&handle, true);
 	guardedEntryIface_set_done(&handle, false);
 	guardedEntryIface_raise_e(&handle);
 	guardedEntry_runCycle(&handle);
-	EXPECT_TRUE(guardedEntry_isActive(&handle, GuardedEntry_A));
+	EXPECT_TRUE(guardedEntry_isActive(&handle, GuardedEntry_main_region_A));
 	EXPECT_TRUE(guardedEntryIface_get_done(&handle) );
 }
 TEST(StatemachineTest, EntryNotTakenInTransition) {
 	guardedEntry_init(&handle);
 	guardedEntry_enter(&handle);
-	EXPECT_TRUE(guardedEntry_isActive(&handle, GuardedEntry_A));
+	EXPECT_TRUE(guardedEntry_isActive(&handle, GuardedEntry_main_region_A));
 	guardedEntryIface_raise_e(&handle);
 	guardedEntry_runCycle(&handle);
-	EXPECT_TRUE(guardedEntry_isActive(&handle, GuardedEntry_B));
+	EXPECT_TRUE(guardedEntry_isActive(&handle, GuardedEntry_main_region_B));
 	guardedEntryIface_set_guard(&handle, false);
 	guardedEntryIface_set_done(&handle, false);
 	guardedEntryIface_raise_e(&handle);
 	guardedEntry_runCycle(&handle);
-	EXPECT_TRUE(guardedEntry_isActive(&handle, GuardedEntry_A));
+	EXPECT_TRUE(guardedEntry_isActive(&handle, GuardedEntry_main_region_A));
 	EXPECT_TRUE(!guardedEntryIface_get_done(&handle) );
 }
 

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

@@ -18,21 +18,21 @@ GuardedExit handle;
 TEST(StatemachineTest, ExitTaken) {
 	guardedExit_init(&handle);
 	guardedExit_enter(&handle);
-	EXPECT_TRUE(guardedExit_isActive(&handle, GuardedExit_A));
+	EXPECT_TRUE(guardedExit_isActive(&handle, GuardedExit_main_region_A));
 	EXPECT_TRUE(!guardedExitIface_get_guard(&handle) );
 	guardedExitIface_raise_e(&handle);
 	guardedExit_runCycle(&handle);
-	EXPECT_TRUE(guardedExit_isActive(&handle, GuardedExit_B));
+	EXPECT_TRUE(guardedExit_isActive(&handle, GuardedExit_main_region_B));
 	EXPECT_TRUE(!guardedExitIface_get_done(&handle) );
 }
 TEST(StatemachineTest, ExitNotTaken) {
 	guardedExit_init(&handle);
 	guardedExit_enter(&handle);
-	EXPECT_TRUE(guardedExit_isActive(&handle, GuardedExit_A));
+	EXPECT_TRUE(guardedExit_isActive(&handle, GuardedExit_main_region_A));
 	guardedExitIface_set_guard(&handle, true);
 	guardedExitIface_raise_e(&handle);
 	guardedExit_runCycle(&handle);
-	EXPECT_TRUE(guardedExit_isActive(&handle, GuardedExit_B));
+	EXPECT_TRUE(guardedExit_isActive(&handle, GuardedExit_main_region_B));
 	EXPECT_TRUE(guardedExitIface_get_done(&handle) );
 }
 

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

@@ -18,22 +18,22 @@ HistoryWithExitPoint handle;
 TEST(StatemachineTest, historyEntryAfterExit) {
 	historyWithExitPoint_init(&handle);
 	historyWithExitPoint_enter(&handle);
-	EXPECT_TRUE(historyWithExitPoint_isActive(&handle, HistoryWithExitPoint_X1));
+	EXPECT_TRUE(historyWithExitPoint_isActive(&handle, HistoryWithExitPoint_mr_A_r_X1));
 	historyWithExitPointIface_raise_push(&handle);
 	historyWithExitPoint_runCycle(&handle);
-	EXPECT_TRUE(historyWithExitPoint_isActive(&handle, HistoryWithExitPoint_B));
+	EXPECT_TRUE(historyWithExitPoint_isActive(&handle, HistoryWithExitPoint_mr_B));
 	historyWithExitPointIface_raise_back(&handle);
 	historyWithExitPoint_runCycle(&handle);
-	EXPECT_TRUE(historyWithExitPoint_isActive(&handle, HistoryWithExitPoint_X1));
+	EXPECT_TRUE(historyWithExitPoint_isActive(&handle, HistoryWithExitPoint_mr_A_r_X1));
 	historyWithExitPointIface_raise_next(&handle);
 	historyWithExitPoint_runCycle(&handle);
-	EXPECT_TRUE(historyWithExitPoint_isActive(&handle, HistoryWithExitPoint_X2));
+	EXPECT_TRUE(historyWithExitPoint_isActive(&handle, HistoryWithExitPoint_mr_A_r_X2));
 	historyWithExitPointIface_raise_push(&handle);
 	historyWithExitPoint_runCycle(&handle);
-	EXPECT_TRUE(historyWithExitPoint_isActive(&handle, HistoryWithExitPoint_B));
+	EXPECT_TRUE(historyWithExitPoint_isActive(&handle, HistoryWithExitPoint_mr_B));
 	historyWithExitPointIface_raise_back(&handle);
 	historyWithExitPoint_runCycle(&handle);
-	EXPECT_TRUE(historyWithExitPoint_isActive(&handle, HistoryWithExitPoint_X2));
+	EXPECT_TRUE(historyWithExitPoint_isActive(&handle, HistoryWithExitPoint_mr_A_r_X2));
 }
 
 		

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

@@ -18,43 +18,43 @@ HistoryWithoutInitialStep handle;
 TEST(StatemachineTest, enterThroughInitialEntry) {
 	historyWithoutInitialStep_init(&handle);
 	historyWithoutInitialStep_enter(&handle);
-	EXPECT_TRUE(historyWithoutInitialStep_isActive(&handle, HistoryWithoutInitialStep_A));
+	EXPECT_TRUE(historyWithoutInitialStep_isActive(&handle, HistoryWithoutInitialStep_main_region_A));
 	historyWithoutInitialStepIface_raise_e1(&handle);
 	historyWithoutInitialStep_runCycle(&handle);
-	EXPECT_TRUE(historyWithoutInitialStep_isActive(&handle, HistoryWithoutInitialStep_C));
+	EXPECT_TRUE(historyWithoutInitialStep_isActive(&handle, HistoryWithoutInitialStep_main_region_B_r1_C));
 	historyWithoutInitialStepIface_raise_e2(&handle);
 	historyWithoutInitialStep_runCycle(&handle);
-	EXPECT_TRUE(historyWithoutInitialStep_isActive(&handle, HistoryWithoutInitialStep_D));
+	EXPECT_TRUE(historyWithoutInitialStep_isActive(&handle, HistoryWithoutInitialStep_main_region_B_r1_D));
 }
 TEST(StatemachineTest, enterCThroughHistory) {
 	historyWithoutInitialStep_init(&handle);
 	historyWithoutInitialStep_enter(&handle);
-	EXPECT_TRUE(historyWithoutInitialStep_isActive(&handle, HistoryWithoutInitialStep_A));
+	EXPECT_TRUE(historyWithoutInitialStep_isActive(&handle, HistoryWithoutInitialStep_main_region_A));
 	historyWithoutInitialStepIface_raise_e1(&handle);
 	historyWithoutInitialStep_runCycle(&handle);
-	EXPECT_TRUE(historyWithoutInitialStep_isActive(&handle, HistoryWithoutInitialStep_C));
+	EXPECT_TRUE(historyWithoutInitialStep_isActive(&handle, HistoryWithoutInitialStep_main_region_B_r1_C));
 	historyWithoutInitialStepIface_raise_e1(&handle);
 	historyWithoutInitialStep_runCycle(&handle);
-	EXPECT_TRUE(historyWithoutInitialStep_isActive(&handle, HistoryWithoutInitialStep_A));
+	EXPECT_TRUE(historyWithoutInitialStep_isActive(&handle, HistoryWithoutInitialStep_main_region_A));
 	historyWithoutInitialStepIface_raise_e2(&handle);
 	historyWithoutInitialStep_runCycle(&handle);
-	EXPECT_TRUE(historyWithoutInitialStep_isActive(&handle, HistoryWithoutInitialStep_C));
+	EXPECT_TRUE(historyWithoutInitialStep_isActive(&handle, HistoryWithoutInitialStep_main_region_B_r1_C));
 }
 TEST(StatemachineTest, enterDThroughHistory) {
 	historyWithoutInitialStep_init(&handle);
 	historyWithoutInitialStep_enter(&handle);
-	EXPECT_TRUE(historyWithoutInitialStep_isActive(&handle, HistoryWithoutInitialStep_A));
+	EXPECT_TRUE(historyWithoutInitialStep_isActive(&handle, HistoryWithoutInitialStep_main_region_A));
 	historyWithoutInitialStepIface_raise_e1(&handle);
 	historyWithoutInitialStep_runCycle(&handle);
 	historyWithoutInitialStepIface_raise_e2(&handle);
 	historyWithoutInitialStep_runCycle(&handle);
-	EXPECT_TRUE(historyWithoutInitialStep_isActive(&handle, HistoryWithoutInitialStep_D));
+	EXPECT_TRUE(historyWithoutInitialStep_isActive(&handle, HistoryWithoutInitialStep_main_region_B_r1_D));
 	historyWithoutInitialStepIface_raise_e1(&handle);
 	historyWithoutInitialStep_runCycle(&handle);
-	EXPECT_TRUE(historyWithoutInitialStep_isActive(&handle, HistoryWithoutInitialStep_A));
+	EXPECT_TRUE(historyWithoutInitialStep_isActive(&handle, HistoryWithoutInitialStep_main_region_A));
 	historyWithoutInitialStepIface_raise_e2(&handle);
 	historyWithoutInitialStep_runCycle(&handle);
-	EXPECT_TRUE(historyWithoutInitialStep_isActive(&handle, HistoryWithoutInitialStep_D));
+	EXPECT_TRUE(historyWithoutInitialStep_isActive(&handle, HistoryWithoutInitialStep_main_region_B_r1_D));
 }
 
 		

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

@@ -18,7 +18,7 @@ IntegerExpressions handle;
 TEST(StatemachineTest, integerExpressions) {
 	integerExpressions_init(&handle);
 	integerExpressions_enter(&handle);
-	EXPECT_TRUE(integerExpressions_isActive(&handle, IntegerExpressions_StateA));
+	EXPECT_TRUE(integerExpressions_isActive(&handle, IntegerExpressions_main_region_StateA));
 	EXPECT_TRUE(integerExpressionsIface_get_myInt1(&handle) == 10);
 	EXPECT_TRUE(integerExpressionsIface_get_myInt2(&handle) == 5);
 	integerExpressionsIface_raise_e1(&handle);

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

@@ -18,22 +18,22 @@ InternalEventLifeCycle handle;
 TEST(StatemachineTest, InternalEventLifeCycleTest) {
 	internalEventLifeCycle_init(&handle);
 	internalEventLifeCycle_enter(&handle);
-	EXPECT_TRUE(internalEventLifeCycle_isActive(&handle, InternalEventLifeCycle_A));
-	EXPECT_TRUE(internalEventLifeCycle_isActive(&handle, InternalEventLifeCycle_C));
+	EXPECT_TRUE(internalEventLifeCycle_isActive(&handle, InternalEventLifeCycle_r1_A));
+	EXPECT_TRUE(internalEventLifeCycle_isActive(&handle, InternalEventLifeCycle_r2_C));
 	internalEventLifeCycleIface_raise_e(&handle);
 	internalEventLifeCycle_runCycle(&handle);
-	EXPECT_TRUE(internalEventLifeCycle_isActive(&handle, InternalEventLifeCycle_A));
-	EXPECT_TRUE(internalEventLifeCycle_isActive(&handle, InternalEventLifeCycle_D));
+	EXPECT_TRUE(internalEventLifeCycle_isActive(&handle, InternalEventLifeCycle_r1_A));
+	EXPECT_TRUE(internalEventLifeCycle_isActive(&handle, InternalEventLifeCycle_r2_D));
 	internalEventLifeCycle_runCycle(&handle);
-	EXPECT_TRUE(internalEventLifeCycle_isActive(&handle, InternalEventLifeCycle_A));
-	EXPECT_TRUE(internalEventLifeCycle_isActive(&handle, InternalEventLifeCycle_D));
+	EXPECT_TRUE(internalEventLifeCycle_isActive(&handle, InternalEventLifeCycle_r1_A));
+	EXPECT_TRUE(internalEventLifeCycle_isActive(&handle, InternalEventLifeCycle_r2_D));
 	internalEventLifeCycleIface_raise_f(&handle);
 	internalEventLifeCycle_runCycle(&handle);
-	EXPECT_TRUE(internalEventLifeCycle_isActive(&handle, InternalEventLifeCycle_A));
-	EXPECT_TRUE(internalEventLifeCycle_isActive(&handle, InternalEventLifeCycle_C));
+	EXPECT_TRUE(internalEventLifeCycle_isActive(&handle, InternalEventLifeCycle_r1_A));
+	EXPECT_TRUE(internalEventLifeCycle_isActive(&handle, InternalEventLifeCycle_r2_C));
 	internalEventLifeCycle_runCycle(&handle);
-	EXPECT_TRUE(internalEventLifeCycle_isActive(&handle, InternalEventLifeCycle_A));
-	EXPECT_TRUE(internalEventLifeCycle_isActive(&handle, InternalEventLifeCycle_C));
+	EXPECT_TRUE(internalEventLifeCycle_isActive(&handle, InternalEventLifeCycle_r1_A));
+	EXPECT_TRUE(internalEventLifeCycle_isActive(&handle, InternalEventLifeCycle_r2_C));
 }
 
 		

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

@@ -18,7 +18,7 @@ LocalReactions handle;
 TEST(StatemachineTest, LocalReactionsTest) {
 	localReactions_init(&handle);
 	localReactions_enter(&handle);
-	EXPECT_TRUE(localReactions_isActive(&handle, LocalReactions_A));
+	EXPECT_TRUE(localReactions_isActive(&handle, LocalReactions_main_region_A));
 	localReactions_runCycle(&handle);
 	EXPECT_TRUE(localReactionsIface_get_x(&handle) == 1);
 }

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

@@ -18,9 +18,9 @@ NullCheck handle;
 TEST(StatemachineTest, SimpleNullCheckTest) {
 	nullCheck_init(&handle);
 	nullCheck_enter(&handle);
-	EXPECT_TRUE(nullCheck_isActive(&handle, NullCheck_A));
+	EXPECT_TRUE(nullCheck_isActive(&handle, NullCheck_main_region_A));
 	nullCheck_runCycle(&handle);
-	EXPECT_TRUE(nullCheck_isActive(&handle, NullCheck_B));
+	EXPECT_TRUE(nullCheck_isActive(&handle, NullCheck_main_region_B));
 }
 
 		

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

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

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

@@ -21,16 +21,16 @@ TEST(StatemachineTest, transitionPriority) {
 	EXPECT_TRUE(priorityValues_isActive(&handle, PriorityValues_main_region_A));
 	priorityValuesIface_raise_event1(&handle);
 	priorityValues_runCycle(&handle);
-	EXPECT_TRUE(priorityValues_isActive(&handle, PriorityValues_C));
+	EXPECT_TRUE(priorityValues_isActive(&handle, PriorityValues_main_region_C));
 }
 TEST(StatemachineTest, regionPriority) {
 	priorityValues_init(&handle);
 	priorityValues_enter(&handle);
-	EXPECT_TRUE(priorityValues_isActive(&handle, PriorityValues_A));
+	EXPECT_TRUE(priorityValues_isActive(&handle, PriorityValues_someRegion_A));
 	priorityValuesIface_raise_event2(&handle);
 	priorityValues_runCycle(&handle);
-	EXPECT_TRUE(priorityValues_isActive(&handle, PriorityValues_B));
-	EXPECT_TRUE(!priorityValues_isActive(&handle, PriorityValues_E));
+	EXPECT_TRUE(priorityValues_isActive(&handle, PriorityValues_someRegion_B));
+	EXPECT_TRUE(!priorityValues_isActive(&handle, PriorityValues_main_region_E));
 }
 
 		

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

@@ -18,13 +18,13 @@ RaiseEvent handle;
 TEST(StatemachineTest, raiseEvent) {
 	raiseEvent_init(&handle);
 	raiseEvent_enter(&handle);
-	EXPECT_TRUE(raiseEvent_isActive(&handle, RaiseEvent_SateA));
-	EXPECT_TRUE(raiseEvent_isActive(&handle, RaiseEvent_StateA));
+	EXPECT_TRUE(raiseEvent_isActive(&handle, RaiseEvent_second_region_SateA));
+	EXPECT_TRUE(raiseEvent_isActive(&handle, RaiseEvent_main_region_StateA));
 	raiseEventIface_raise_e2(&handle);
 	raiseEvent_runCycle(&handle);
 	raiseEvent_runCycle(&handle);
 	EXPECT_TRUE(raiseEvent_isActive(&handle, RaiseEvent_second_region_StateB));
-	EXPECT_TRUE(raiseEvent_isActive(&handle, RaiseEvent_StateB));
+	EXPECT_TRUE(raiseEvent_isActive(&handle, RaiseEvent_main_region_StateB));
 }
 
 		

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

@@ -18,17 +18,17 @@ STextKeywordsInStatesAndRegions handle;
 TEST(StatemachineTest, activeCheckWithSTextNamedStates) {
 	sTextKeywordsInStatesAndRegions_init(&handle);
 	sTextKeywordsInStatesAndRegions_enter(&handle);
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_namespace));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_interface));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_event));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_in));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_var));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_external));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_default));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_entry));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_always));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_raise));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_active));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_default_namespace));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_operation_interface));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_namespace_event));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_local_in));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_interface_var));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_internal_external));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_event_default));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_in_entry));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_out_always));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_var_raise));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_readonly_active));
 	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_external_interface));
 	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_else_event));
 	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_entry_in));
@@ -40,17 +40,17 @@ TEST(StatemachineTest, activeCheckWithSTextNamedStates) {
 	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_active_raise));
 	sTextKeywordsInStatesAndRegionsIface_raise_e1(&handle);
 	sTextKeywordsInStatesAndRegions_runCycle(&handle);
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_namespace));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_internal));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_event));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_in));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_var));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_external));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_default));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_entry));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_always));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_raise));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_active));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_default_namespace));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_operation_internal));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_namespace_event));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_local_in));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_interface_var));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_internal_external));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_event_default));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_in_entry));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_out_always));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_var_raise));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_readonly_active));
 	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_external_interface));
 	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_else_event));
 	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_entry_in));
@@ -62,17 +62,17 @@ TEST(StatemachineTest, activeCheckWithSTextNamedStates) {
 	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_active_raise));
 	sTextKeywordsInStatesAndRegionsIface_raise_e2(&handle);
 	sTextKeywordsInStatesAndRegions_runCycle(&handle);
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_namespace));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_internal));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_local));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_in));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_var));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_external));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_default));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_entry));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_always));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_raise));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_active));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_default_namespace));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_operation_internal));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_namespace_local));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_local_in));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_interface_var));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_internal_external));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_event_default));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_in_entry));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_out_always));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_var_raise));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_readonly_active));
 	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_external_interface));
 	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_else_event));
 	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_entry_in));
@@ -84,17 +84,17 @@ TEST(StatemachineTest, activeCheckWithSTextNamedStates) {
 	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_active_raise));
 	sTextKeywordsInStatesAndRegionsIface_raise_e1(&handle);
 	sTextKeywordsInStatesAndRegions_runCycle(&handle);
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_namespace));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_internal));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_local));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_out));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_var));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_external));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_default));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_entry));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_always));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_raise));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_active));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_default_namespace));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_operation_internal));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_namespace_local));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_local_out));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_interface_var));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_internal_external));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_event_default));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_in_entry));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_out_always));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_var_raise));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_readonly_active));
 	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_external_interface));
 	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_else_event));
 	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_entry_in));
@@ -106,17 +106,17 @@ TEST(StatemachineTest, activeCheckWithSTextNamedStates) {
 	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_active_raise));
 	sTextKeywordsInStatesAndRegionsIface_raise_e2(&handle);
 	sTextKeywordsInStatesAndRegions_runCycle(&handle);
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_namespace));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_internal));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_local));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_out));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_readonly));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_external));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_default));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_entry));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_always));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_raise));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_active));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_default_namespace));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_operation_internal));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_namespace_local));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_local_out));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_interface_readonly));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_internal_external));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_event_default));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_in_entry));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_out_always));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_var_raise));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_readonly_active));
 	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_external_interface));
 	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_else_event));
 	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_entry_in));
@@ -128,17 +128,17 @@ TEST(StatemachineTest, activeCheckWithSTextNamedStates) {
 	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_active_raise));
 	sTextKeywordsInStatesAndRegionsIface_raise_e1(&handle);
 	sTextKeywordsInStatesAndRegions_runCycle(&handle);
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_namespace));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_internal));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_local));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_out));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_readonly));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_operation));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_default));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_entry));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_always));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_raise));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_active));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_default_namespace));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_operation_internal));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_namespace_local));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_local_out));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_interface_readonly));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_internal_operation));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_event_default));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_in_entry));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_out_always));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_var_raise));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_readonly_active));
 	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_external_interface));
 	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_else_event));
 	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_entry_in));
@@ -150,17 +150,17 @@ TEST(StatemachineTest, activeCheckWithSTextNamedStates) {
 	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_active_raise));
 	sTextKeywordsInStatesAndRegionsIface_raise_e2(&handle);
 	sTextKeywordsInStatesAndRegions_runCycle(&handle);
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_namespace));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_internal));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_local));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_out));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_readonly));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_operation));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_else));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_entry));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_always));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_raise));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_active));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_default_namespace));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_operation_internal));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_namespace_local));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_local_out));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_interface_readonly));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_internal_operation));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_event_else));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_in_entry));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_out_always));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_var_raise));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_readonly_active));
 	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_external_interface));
 	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_else_event));
 	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_entry_in));
@@ -172,17 +172,17 @@ TEST(StatemachineTest, activeCheckWithSTextNamedStates) {
 	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_active_raise));
 	sTextKeywordsInStatesAndRegionsIface_raise_e1(&handle);
 	sTextKeywordsInStatesAndRegions_runCycle(&handle);
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_namespace));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_internal));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_local));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_out));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_readonly));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_operation));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_else));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_exit));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_always));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_raise));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_active));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_default_namespace));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_operation_internal));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_namespace_local));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_local_out));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_interface_readonly));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_internal_operation));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_event_else));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_in_exit));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_out_always));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_var_raise));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_readonly_active));
 	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_external_interface));
 	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_else_event));
 	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_entry_in));
@@ -194,17 +194,17 @@ TEST(StatemachineTest, activeCheckWithSTextNamedStates) {
 	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_active_raise));
 	sTextKeywordsInStatesAndRegionsIface_raise_e2(&handle);
 	sTextKeywordsInStatesAndRegions_runCycle(&handle);
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_namespace));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_internal));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_local));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_out));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_readonly));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_operation));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_else));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_exit));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_oncycle));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_raise));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_active));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_default_namespace));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_operation_internal));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_namespace_local));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_local_out));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_interface_readonly));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_internal_operation));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_event_else));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_in_exit));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_out_oncycle));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_var_raise));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_readonly_active));
 	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_external_interface));
 	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_else_event));
 	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_entry_in));
@@ -216,17 +216,17 @@ TEST(StatemachineTest, activeCheckWithSTextNamedStates) {
 	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_active_raise));
 	sTextKeywordsInStatesAndRegionsIface_raise_e1(&handle);
 	sTextKeywordsInStatesAndRegions_runCycle(&handle);
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_namespace));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_internal));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_local));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_out));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_readonly));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_operation));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_else));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_exit));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_oncycle));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_valueof));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_active));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_default_namespace));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_operation_internal));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_namespace_local));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_local_out));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_interface_readonly));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_internal_operation));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_event_else));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_in_exit));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_out_oncycle));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_var_valueof));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_readonly_active));
 	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_external_interface));
 	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_else_event));
 	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_entry_in));
@@ -238,16 +238,16 @@ TEST(StatemachineTest, activeCheckWithSTextNamedStates) {
 	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_active_raise));
 	sTextKeywordsInStatesAndRegionsIface_raise_e2(&handle);
 	sTextKeywordsInStatesAndRegions_runCycle(&handle);
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_namespace));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_internal));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_local));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_out));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_readonly));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_operation));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_else));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_exit));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_oncycle));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_valueof));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_default_namespace));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_operation_internal));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_namespace_local));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_local_out));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_interface_readonly));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_internal_operation));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_event_else));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_in_exit));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_out_oncycle));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_var_valueof));
 	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_readonly_namespace));
 	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_external_interface));
 	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_else_event));
@@ -260,16 +260,16 @@ TEST(StatemachineTest, activeCheckWithSTextNamedStates) {
 	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_active_raise));
 	sTextKeywordsInStatesAndRegionsIface_raise_e1(&handle);
 	sTextKeywordsInStatesAndRegions_runCycle(&handle);
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_namespace));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_internal));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_local));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_out));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_readonly));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_operation));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_else));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_exit));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_oncycle));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_valueof));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_default_namespace));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_operation_internal));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_namespace_local));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_local_out));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_interface_readonly));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_internal_operation));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_event_else));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_in_exit));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_out_oncycle));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_var_valueof));
 	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_readonly_namespace));
 	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_external_internal));
 	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_else_event));
@@ -282,16 +282,16 @@ TEST(StatemachineTest, activeCheckWithSTextNamedStates) {
 	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_active_raise));
 	sTextKeywordsInStatesAndRegionsIface_raise_e2(&handle);
 	sTextKeywordsInStatesAndRegions_runCycle(&handle);
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_namespace));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_internal));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_local));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_out));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_readonly));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_operation));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_else));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_exit));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_oncycle));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_valueof));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_default_namespace));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_operation_internal));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_namespace_local));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_local_out));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_interface_readonly));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_internal_operation));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_event_else));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_in_exit));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_out_oncycle));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_var_valueof));
 	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_readonly_namespace));
 	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_external_internal));
 	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_else_local));
@@ -304,16 +304,16 @@ TEST(StatemachineTest, activeCheckWithSTextNamedStates) {
 	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_active_raise));
 	sTextKeywordsInStatesAndRegionsIface_raise_e1(&handle);
 	sTextKeywordsInStatesAndRegions_runCycle(&handle);
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_namespace));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_internal));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_local));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_out));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_readonly));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_operation));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_else));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_exit));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_oncycle));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_valueof));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_default_namespace));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_operation_internal));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_namespace_local));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_local_out));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_interface_readonly));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_internal_operation));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_event_else));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_in_exit));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_out_oncycle));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_var_valueof));
 	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_readonly_namespace));
 	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_external_internal));
 	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_else_local));
@@ -326,16 +326,16 @@ TEST(StatemachineTest, activeCheckWithSTextNamedStates) {
 	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_active_raise));
 	sTextKeywordsInStatesAndRegionsIface_raise_e2(&handle);
 	sTextKeywordsInStatesAndRegions_runCycle(&handle);
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_namespace));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_internal));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_local));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_out));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_readonly));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_operation));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_else));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_exit));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_oncycle));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_valueof));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_default_namespace));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_operation_internal));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_namespace_local));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_local_out));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_interface_readonly));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_internal_operation));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_event_else));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_in_exit));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_out_oncycle));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_var_valueof));
 	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_readonly_namespace));
 	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_external_internal));
 	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_else_local));
@@ -348,16 +348,16 @@ TEST(StatemachineTest, activeCheckWithSTextNamedStates) {
 	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_active_raise));
 	sTextKeywordsInStatesAndRegionsIface_raise_e1(&handle);
 	sTextKeywordsInStatesAndRegions_runCycle(&handle);
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_namespace));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_internal));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_local));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_out));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_readonly));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_operation));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_else));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_exit));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_oncycle));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_valueof));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_default_namespace));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_operation_internal));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_namespace_local));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_local_out));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_interface_readonly));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_internal_operation));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_event_else));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_in_exit));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_out_oncycle));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_var_valueof));
 	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_readonly_namespace));
 	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_external_internal));
 	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_else_local));
@@ -370,16 +370,16 @@ TEST(StatemachineTest, activeCheckWithSTextNamedStates) {
 	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_active_raise));
 	sTextKeywordsInStatesAndRegionsIface_raise_e2(&handle);
 	sTextKeywordsInStatesAndRegions_runCycle(&handle);
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_namespace));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_internal));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_local));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_out));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_readonly));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_operation));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_else));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_exit));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_oncycle));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_valueof));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_default_namespace));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_operation_internal));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_namespace_local));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_local_out));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_interface_readonly));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_internal_operation));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_event_else));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_in_exit));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_out_oncycle));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_var_valueof));
 	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_readonly_namespace));
 	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_external_internal));
 	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_else_local));
@@ -392,16 +392,16 @@ TEST(StatemachineTest, activeCheckWithSTextNamedStates) {
 	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_active_raise));
 	sTextKeywordsInStatesAndRegionsIface_raise_e1(&handle);
 	sTextKeywordsInStatesAndRegions_runCycle(&handle);
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_namespace));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_internal));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_local));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_out));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_readonly));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_operation));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_else));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_exit));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_oncycle));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_valueof));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_default_namespace));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_operation_internal));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_namespace_local));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_local_out));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_interface_readonly));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_internal_operation));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_event_else));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_in_exit));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_out_oncycle));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_var_valueof));
 	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_readonly_namespace));
 	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_external_internal));
 	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_else_local));
@@ -414,16 +414,16 @@ TEST(StatemachineTest, activeCheckWithSTextNamedStates) {
 	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_active_raise));
 	sTextKeywordsInStatesAndRegionsIface_raise_e2(&handle);
 	sTextKeywordsInStatesAndRegions_runCycle(&handle);
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_namespace));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_internal));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_local));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_out));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_readonly));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_operation));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_else));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_exit));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_oncycle));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_valueof));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_default_namespace));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_operation_internal));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_namespace_local));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_local_out));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_interface_readonly));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_internal_operation));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_event_else));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_in_exit));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_out_oncycle));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_var_valueof));
 	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_readonly_namespace));
 	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_external_internal));
 	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_else_local));
@@ -436,16 +436,16 @@ TEST(StatemachineTest, activeCheckWithSTextNamedStates) {
 	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_active_raise));
 	sTextKeywordsInStatesAndRegionsIface_raise_e1(&handle);
 	sTextKeywordsInStatesAndRegions_runCycle(&handle);
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_namespace));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_internal));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_local));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_out));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_readonly));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_operation));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_else));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_exit));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_oncycle));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_valueof));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_default_namespace));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_operation_internal));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_namespace_local));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_local_out));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_interface_readonly));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_internal_operation));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_event_else));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_in_exit));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_out_oncycle));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_var_valueof));
 	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_readonly_namespace));
 	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_external_internal));
 	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_else_local));
@@ -458,16 +458,16 @@ TEST(StatemachineTest, activeCheckWithSTextNamedStates) {
 	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_active_valueof));
 	sTextKeywordsInStatesAndRegionsIface_raise_e2(&handle);
 	sTextKeywordsInStatesAndRegions_runCycle(&handle);
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_namespace));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_internal));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_local));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_out));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_readonly));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_operation));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_else));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_exit));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_oncycle));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_valueof));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_default_namespace));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_operation_internal));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_namespace_local));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_local_out));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_interface_readonly));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_internal_operation));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_event_else));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_in_exit));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_out_oncycle));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_var_valueof));
 	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_readonly_namespace));
 	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_external_internal));
 	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_else_local));

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

@@ -18,15 +18,15 @@ SameNameDifferentRegion handle;
 TEST(StatemachineTest, sameNameDifferenRegionTest) {
 	sameNameDifferentRegion_init(&handle);
 	sameNameDifferentRegion_enter(&handle);
-	EXPECT_TRUE(sameNameDifferentRegion_isActive(&handle, SameNameDifferentRegion_StateA));
+	EXPECT_TRUE(sameNameDifferentRegion_isActive(&handle, SameNameDifferentRegion_main_region_StateA));
 	sameNameDifferentRegionIface_raise_e1(&handle);
 	sameNameDifferentRegion_runCycle(&handle);
-	EXPECT_TRUE(sameNameDifferentRegion_isActive(&handle, SameNameDifferentRegion_StateB));
-	EXPECT_TRUE(sameNameDifferentRegion_isActive(&handle, SameNameDifferentRegion_r1_StateA));
+	EXPECT_TRUE(sameNameDifferentRegion_isActive(&handle, SameNameDifferentRegion_main_region_StateB));
+	EXPECT_TRUE(sameNameDifferentRegion_isActive(&handle, SameNameDifferentRegion_main_region_StateB_r1_StateA));
 	sameNameDifferentRegionIface_raise_e1(&handle);
 	sameNameDifferentRegion_runCycle(&handle);
-	EXPECT_TRUE(sameNameDifferentRegion_isActive(&handle, SameNameDifferentRegion_StateB));
-	EXPECT_TRUE(sameNameDifferentRegion_isActive(&handle, SameNameDifferentRegion_r1_StateB));
+	EXPECT_TRUE(sameNameDifferentRegion_isActive(&handle, SameNameDifferentRegion_main_region_StateB));
+	EXPECT_TRUE(sameNameDifferentRegion_isActive(&handle, SameNameDifferentRegion_main_region_StateB_r1_StateB));
 }
 
 		

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

@@ -26,28 +26,28 @@ TEST(StatemachineTest, shallowHistoryTest) {
 	shallowHistory_runCycle(&handle);
 	shallowHistoryIface_raise_event7(&handle);
 	shallowHistory_runCycle(&handle);
-	EXPECT_TRUE(!shallowHistory_isActive(&handle, ShallowHistory_State1));
-	EXPECT_TRUE(shallowHistory_isActive(&handle, ShallowHistory_State9));
+	EXPECT_TRUE(!shallowHistory_isActive(&handle, ShallowHistory_mainRegion_State1));
+	EXPECT_TRUE(shallowHistory_isActive(&handle, ShallowHistory_mainRegion_State2__region0_State4__region0_State7__region0_State9));
 	shallowHistoryIface_raise_event6(&handle);
 	shallowHistory_runCycle(&handle);
-	EXPECT_TRUE(!shallowHistory_isActive(&handle, ShallowHistory_State9));
-	EXPECT_TRUE(shallowHistory_isActive(&handle, ShallowHistory_State6));
+	EXPECT_TRUE(!shallowHistory_isActive(&handle, ShallowHistory_mainRegion_State2__region0_State4__region0_State7__region0_State9));
+	EXPECT_TRUE(shallowHistory_isActive(&handle, ShallowHistory_mainRegion_State2__region0_State4__region0_State6));
 	shallowHistoryIface_raise_event5(&handle);
 	shallowHistory_runCycle(&handle);
-	EXPECT_TRUE(!shallowHistory_isActive(&handle, ShallowHistory_State8));
-	EXPECT_TRUE(shallowHistory_isActive(&handle, ShallowHistory_State9));
+	EXPECT_TRUE(!shallowHistory_isActive(&handle, ShallowHistory_mainRegion_State2__region0_State4__region0_State7__region0_State8));
+	EXPECT_TRUE(shallowHistory_isActive(&handle, ShallowHistory_mainRegion_State2__region0_State4__region0_State7__region0_State9));
 	shallowHistoryIface_raise_event2(&handle);
 	shallowHistory_runCycle(&handle);
-	EXPECT_TRUE(!shallowHistory_isActive(&handle, ShallowHistory_State9));
-	EXPECT_TRUE(shallowHistory_isActive(&handle, ShallowHistory_State1));
+	EXPECT_TRUE(!shallowHistory_isActive(&handle, ShallowHistory_mainRegion_State2__region0_State4__region0_State7__region0_State9));
+	EXPECT_TRUE(shallowHistory_isActive(&handle, ShallowHistory_mainRegion_State1));
 	shallowHistoryIface_raise_event1(&handle);
 	shallowHistory_runCycle(&handle);
-	EXPECT_TRUE(shallowHistory_isActive(&handle, ShallowHistory_State6));
-	EXPECT_TRUE(!shallowHistory_isActive(&handle, ShallowHistory_State1));
+	EXPECT_TRUE(shallowHistory_isActive(&handle, ShallowHistory_mainRegion_State2__region0_State4__region0_State6));
+	EXPECT_TRUE(!shallowHistory_isActive(&handle, ShallowHistory_mainRegion_State1));
 	shallowHistoryIface_raise_event5(&handle);
 	shallowHistory_runCycle(&handle);
-	EXPECT_TRUE(!shallowHistory_isActive(&handle, ShallowHistory_State6));
-	EXPECT_TRUE(shallowHistory_isActive(&handle, ShallowHistory_State9));
+	EXPECT_TRUE(!shallowHistory_isActive(&handle, ShallowHistory_mainRegion_State2__region0_State4__region0_State6));
+	EXPECT_TRUE(shallowHistory_isActive(&handle, ShallowHistory_mainRegion_State2__region0_State4__region0_State7__region0_State9));
 }
 
 		

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

@@ -18,13 +18,13 @@ SimpleEvent handle;
 TEST(StatemachineTest, simpleEventTest) {
 	simpleEvent_init(&handle);
 	simpleEvent_enter(&handle);
-	EXPECT_TRUE(simpleEvent_isActive(&handle, SimpleEvent_A)) << "Expected A to be active" ;
+	EXPECT_TRUE(simpleEvent_isActive(&handle, SimpleEvent_main_region_A)) << "Expected A to be active" ;
 	EXPECT_TRUE(5== 5);
 	simpleEventIface_raise_event1(&handle);
 	simpleEvent_runCycle(&handle);
-	EXPECT_TRUE(simpleEvent_isActive(&handle, SimpleEvent_B)) << "Expected B to be active" ;
+	EXPECT_TRUE(simpleEvent_isActive(&handle, SimpleEvent_main_region_B)) << "Expected B to be active" ;
 	simpleEvent_runCycle(&handle);
-	EXPECT_TRUE(!simpleEvent_isActive(&handle, SimpleEvent_B));
+	EXPECT_TRUE(!simpleEvent_isActive(&handle, SimpleEvent_main_region_B));
 }
 
 		

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

@@ -18,13 +18,13 @@ SimpleHierachy handle;
 TEST(StatemachineTest, simpleHierachyTest) {
 	simpleHierachy_init(&handle);
 	simpleHierachy_enter(&handle);
-	EXPECT_TRUE(simpleHierachy_isActive(&handle, SimpleHierachy_A));
+	EXPECT_TRUE(simpleHierachy_isActive(&handle, SimpleHierachy_main_region_A));
 	simpleHierachyIface_raise_event1(&handle);
 	simpleHierachyIface_raise_event1(&handle);
 	simpleHierachyIface_raise_event1(&handle);
 	simpleHierachy_runCycle(&handle);
-	EXPECT_TRUE(simpleHierachy_isActive(&handle, SimpleHierachy_B));
-	EXPECT_TRUE(simpleHierachy_isActive(&handle, SimpleHierachy_B1));
+	EXPECT_TRUE(simpleHierachy_isActive(&handle, SimpleHierachy_main_region_B));
+	EXPECT_TRUE(simpleHierachy_isActive(&handle, SimpleHierachy_main_region_B_subregion1_B1));
 }
 
 		

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

@@ -18,13 +18,13 @@ StateIsActive handle;
 TEST(StatemachineTest, stateIsActive) {
 	stateIsActive_init(&handle);
 	stateIsActive_enter(&handle);
-	EXPECT_TRUE(stateIsActive_isActive(&handle, StateIsActive_R1A));
-	EXPECT_TRUE(stateIsActive_isActive(&handle, StateIsActive_R2A));
+	EXPECT_TRUE(stateIsActive_isActive(&handle, StateIsActive_R1_R1A));
+	EXPECT_TRUE(stateIsActive_isActive(&handle, StateIsActive_R2_R2A));
 	stateIsActiveIface_raise_event1(&handle);
 	stateIsActive_runCycle(&handle);
 	stateIsActive_runCycle(&handle);
-	EXPECT_TRUE(stateIsActive_isActive(&handle, StateIsActive_R1B));
-	EXPECT_TRUE(stateIsActive_isActive(&handle, StateIsActive_R2B));
+	EXPECT_TRUE(stateIsActive_isActive(&handle, StateIsActive_R1_R1B));
+	EXPECT_TRUE(stateIsActive_isActive(&handle, StateIsActive_R2_R2B));
 }
 
 		

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

@@ -18,15 +18,15 @@ StatechartLocalReactions handle;
 TEST(StatemachineTest, statechartLocalReactionsTest) {
 	statechartLocalReactions_init(&handle);
 	statechartLocalReactions_enter(&handle);
-	EXPECT_TRUE(statechartLocalReactions_isActive(&handle, StatechartLocalReactions_S1));
-	EXPECT_TRUE(statechartLocalReactions_isActive(&handle, StatechartLocalReactions_a));
+	EXPECT_TRUE(statechartLocalReactions_isActive(&handle, StatechartLocalReactions_main_region_S1));
+	EXPECT_TRUE(statechartLocalReactions_isActive(&handle, StatechartLocalReactions_region2_a));
 	while (statechartLocalReactionsIface_get_myInt(&handle) < 10) {
-		EXPECT_TRUE(statechartLocalReactions_isActive(&handle, StatechartLocalReactions_a));
+		EXPECT_TRUE(statechartLocalReactions_isActive(&handle, StatechartLocalReactions_region2_a));
 		if (statechartLocalReactionsIface_get_myInt(&handle) %2== 0) {
-					EXPECT_TRUE(statechartLocalReactions_isActive(&handle, StatechartLocalReactions_S1));;
+					EXPECT_TRUE(statechartLocalReactions_isActive(&handle, StatechartLocalReactions_main_region_S1));;
 				  }
 				else {
-					EXPECT_TRUE(statechartLocalReactions_isActive(&handle, StatechartLocalReactions_S2));;
+					EXPECT_TRUE(statechartLocalReactions_isActive(&handle, StatechartLocalReactions_main_region_S2));;
 				}
 		statechartLocalReactions_runCycle(&handle);
 	}

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

@@ -18,7 +18,7 @@ StaticChoice handle;
 TEST(StatemachineTest, StaticChoiceTest) {
 	staticChoice_init(&handle);
 	staticChoice_enter(&handle);
-	EXPECT_TRUE(staticChoice_isActive(&handle, StaticChoice_Start));
+	EXPECT_TRUE(staticChoice_isActive(&handle, StaticChoice_main_region_Start));
 	staticChoice_runCycle(&handle);
 }
 

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

@@ -18,25 +18,25 @@ SyncFork handle;
 TEST(StatemachineTest, syncForkTest) {
 	syncFork_init(&handle);
 	syncFork_enter(&handle);
-	EXPECT_TRUE(syncFork_isActive(&handle, SyncFork_A));
+	EXPECT_TRUE(syncFork_isActive(&handle, SyncFork_main_region_A));
 	syncForkIface_raise_f(&handle);
 	syncFork_runCycle(&handle);
-	EXPECT_TRUE(syncFork_isActive(&handle, SyncFork_B));
-	EXPECT_TRUE(syncFork_isActive(&handle, SyncFork_C1));
-	EXPECT_TRUE(syncFork_isActive(&handle, SyncFork_D1));
+	EXPECT_TRUE(syncFork_isActive(&handle, SyncFork_main_region_B));
+	EXPECT_TRUE(syncFork_isActive(&handle, SyncFork_main_region_B_r1_C1));
+	EXPECT_TRUE(syncFork_isActive(&handle, SyncFork_main_region_B_r2_D1));
 	syncForkIface_raise_f(&handle);
 	syncFork_runCycle(&handle);
-	EXPECT_TRUE(syncFork_isActive(&handle, SyncFork_B));
-	EXPECT_TRUE(syncFork_isActive(&handle, SyncFork_C2));
-	EXPECT_TRUE(syncFork_isActive(&handle, SyncFork_D2));
+	EXPECT_TRUE(syncFork_isActive(&handle, SyncFork_main_region_B));
+	EXPECT_TRUE(syncFork_isActive(&handle, SyncFork_main_region_B_r1_C2));
+	EXPECT_TRUE(syncFork_isActive(&handle, SyncFork_main_region_B_r2_D2));
 	syncForkIface_raise_e(&handle);
 	syncFork_runCycle(&handle);
-	EXPECT_TRUE(syncFork_isActive(&handle, SyncFork_A));
+	EXPECT_TRUE(syncFork_isActive(&handle, SyncFork_main_region_A));
 	syncForkIface_raise_f(&handle);
 	syncFork_runCycle(&handle);
-	EXPECT_TRUE(syncFork_isActive(&handle, SyncFork_B));
-	EXPECT_TRUE(syncFork_isActive(&handle, SyncFork_C1));
-	EXPECT_TRUE(syncFork_isActive(&handle, SyncFork_D1));
+	EXPECT_TRUE(syncFork_isActive(&handle, SyncFork_main_region_B));
+	EXPECT_TRUE(syncFork_isActive(&handle, SyncFork_main_region_B_r1_C1));
+	EXPECT_TRUE(syncFork_isActive(&handle, SyncFork_main_region_B_r2_D1));
 }
 
 		

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

@@ -18,70 +18,70 @@ SyncJoin handle;
 TEST(StatemachineTest, syncJoin_C2_Waits) {
 	syncJoin_init(&handle);
 	syncJoin_enter(&handle);
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_B));
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_C1));
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_D1));
+	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B));
+	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B_r1_C1));
+	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B_r2_D1));
 	syncJoinIface_raise_e(&handle);
 	syncJoin_runCycle(&handle);
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_C2));
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_D1));
+	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B_r1_C2));
+	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B_r2_D1));
 	syncJoinIface_raise_jc(&handle);
 	syncJoin_runCycle(&handle);
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_C2));
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_D1));
+	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B_r1_C2));
+	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B_r2_D1));
 	syncJoinIface_raise_jd(&handle);
 	syncJoin_runCycle(&handle);
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_C2));
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_D1));
+	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B_r1_C2));
+	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B_r2_D1));
 	syncJoinIface_raise_jc(&handle);
 	syncJoinIface_raise_jd(&handle);
 	syncJoin_runCycle(&handle);
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_C2));
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_D1));
+	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B_r1_C2));
+	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B_r2_D1));
 	syncJoinIface_raise_f(&handle);
 	syncJoin_runCycle(&handle);
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_C2));
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_D2));
+	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B_r1_C2));
+	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B_r2_D2));
 	syncJoinIface_raise_jc(&handle);
 	syncJoin_runCycle(&handle);
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_C2));
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_D2));
+	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B_r1_C2));
+	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B_r2_D2));
 	syncJoinIface_raise_jd(&handle);
 	syncJoin_runCycle(&handle);
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_C2));
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_D2));
+	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B_r1_C2));
+	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B_r2_D2));
 	syncJoinIface_raise_jc(&handle);
 	syncJoinIface_raise_jd(&handle);
 	syncJoin_runCycle(&handle);
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_A));
+	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_A));
 }
 TEST(StatemachineTest, syncJoin_D2_Waits) {
 	syncJoin_init(&handle);
 	syncJoin_enter(&handle);
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_B));
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_C1));
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_D1));
+	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B));
+	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B_r1_C1));
+	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B_r2_D1));
 	syncJoinIface_raise_f(&handle);
 	syncJoin_runCycle(&handle);
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_C1));
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_D2));
+	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B_r1_C1));
+	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B_r2_D2));
 	syncJoinIface_raise_jc(&handle);
 	syncJoin_runCycle(&handle);
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_C1));
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_D2));
+	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B_r1_C1));
+	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B_r2_D2));
 	syncJoinIface_raise_jd(&handle);
 	syncJoin_runCycle(&handle);
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_C1));
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_D2));
+	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B_r1_C1));
+	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B_r2_D2));
 	syncJoinIface_raise_jc(&handle);
 	syncJoinIface_raise_jd(&handle);
 	syncJoin_runCycle(&handle);
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_C1));
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_D2));
+	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B_r1_C1));
+	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B_r2_D2));
 	syncJoinIface_raise_e(&handle);
 	syncJoin_runCycle(&handle);
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_C2));
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_D2));
+	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B_r1_C2));
+	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B_r2_D2));
 }
 TEST(StatemachineTest, doubleEntryActionBug) {
 	syncJoin_init(&handle);
@@ -92,7 +92,7 @@ TEST(StatemachineTest, doubleEntryActionBug) {
 	syncJoinIface_raise_jc(&handle);
 	syncJoinIface_raise_jd(&handle);
 	syncJoin_runCycle(&handle);
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_A));
+	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_A));
 	EXPECT_TRUE(syncJoinIface_get_x(&handle) == 1);
 }
 

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

@@ -19,10 +19,10 @@ TimedTransitions handle;
 TEST(StatemachineTest, Timer01) {
 	timedTransitions_init(&handle);
 	timedTransitions_enter(&handle);
-	EXPECT_TRUE(timedTransitions_isActive(&handle, TimedTransitions_Start));
+	EXPECT_TRUE(timedTransitions_isActive(&handle, TimedTransitions_main_region_Start));
 	// here should be waited 2030 Seconds
 	timedTransitions_runCycle(&handle);
-	EXPECT_TRUE(timedTransitions_isActive(&handle, TimedTransitions_End));
+	EXPECT_TRUE(timedTransitions_isActive(&handle, TimedTransitions_main_region_End));
 }
 
 		

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

@@ -18,9 +18,9 @@ TransitionWithoutCondition handle;
 TEST(StatemachineTest, TransitionWithoutConditionTest) {
 	transitionWithoutCondition_init(&handle);
 	transitionWithoutCondition_enter(&handle);
-	EXPECT_TRUE(transitionWithoutCondition_isActive(&handle, TransitionWithoutCondition_A));
+	EXPECT_TRUE(transitionWithoutCondition_isActive(&handle, TransitionWithoutCondition_main_region_A));
 	transitionWithoutCondition_runCycle(&handle);
-	EXPECT_TRUE(transitionWithoutCondition_isActive(&handle, TransitionWithoutCondition_B));
+	EXPECT_TRUE(transitionWithoutCondition_isActive(&handle, TransitionWithoutCondition_main_region_B));
 }
 
 		

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

@@ -19,8 +19,8 @@ TEST(StatemachineTest, valuedEventsTest) {
 	valuedEvents_init(&handle);
 	valuedEvents_enter(&handle);
 	valuedEvents_runCycle(&handle);
-	EXPECT_TRUE(valuedEvents_isActive(&handle, ValuedEvents_A));
-	EXPECT_TRUE(valuedEvents_isActive(&handle, ValuedEvents_C));
+	EXPECT_TRUE(valuedEvents_isActive(&handle, ValuedEvents_main_region_A));
+	EXPECT_TRUE(valuedEvents_isActive(&handle, ValuedEvents__region1_C));
 	EXPECT_TRUE(valuedEventsIface_get_myVar(&handle) == 42);
 }
 

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

@@ -9,10 +9,7 @@ GeneratorModel for sctunit::c {
 				
 		feature JUnitWrapper {
 			WrapToJUnit="true"	
-		}	
-		
-		
-  
+		}
 	}	
 		
 	test AlwaysOncycle{

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

@@ -1,8 +1,8 @@
-GeneratorModel for yakindu::cpp {
-	statechart AlwaysOncycle {
-		feature Outlet {
-			targetProject = "gtests"
-			targetFolder = "AlwaysOncycleTest"
-		}
-	}
-}
+GeneratorModel for yakindu::cpp {
+	statechart AlwaysOncycle {
+		feature Outlet {
+			targetProject = "gtests"
+			targetFolder = "AlwaysOncycleTest"
+		}
+	}
+}

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

@@ -1,33 +1,33 @@
-/**
-* Copyright (c) 2014 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 "AlwaysOncycle.h"
-
-TEST(StatemachineTest, alwaysOncycleTest) {
-	AlwaysOncycle* statechart = new AlwaysOncycle();
-	statechart->init();
-	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(AlwaysOncycle::StateA));
-	while (statechart->getDefaultSCI()->get_value()< 5) {
-		statechart->runCycle();
-		EXPECT_TRUE(statechart->isActive(AlwaysOncycle::StateA));
-	}
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(AlwaysOncycle::StateB));
-	while (statechart->getDefaultSCI()->get_value()< 5) {
-		statechart->runCycle();
-		EXPECT_TRUE(statechart->isActive(AlwaysOncycle::StateB));
-	}
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(AlwaysOncycle::StateA));
-	delete statechart;
-}
+/**
+* Copyright (c) 2014 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 "AlwaysOncycle.h"
+
+TEST(StatemachineTest, alwaysOncycleTest) {
+	AlwaysOncycle* statechart = new AlwaysOncycle();
+	statechart->init();
+	statechart->enter();
+	EXPECT_TRUE(statechart->isActive(AlwaysOncycle::main_region_StateA));
+	while (statechart->getDefaultSCI()->get_value()< 5) {
+		statechart->runCycle();
+		EXPECT_TRUE(statechart->isActive(AlwaysOncycle::main_region_StateA));
+	}
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(AlwaysOncycle::main_region_StateB));
+	while (statechart->getDefaultSCI()->get_value()< 5) {
+		statechart->runCycle();
+		EXPECT_TRUE(statechart->isActive(AlwaysOncycle::main_region_StateB));
+	}
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(AlwaysOncycle::main_region_StateA));
+	delete statechart;
+}

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

@@ -1,8 +1,8 @@
-GeneratorModel for yakindu::cpp {
-	statechart AssignmentAsExpression {
-		feature Outlet {
-			targetProject = "gtests"
-			targetFolder = "AssignmentAsExpressionTest"
-		}
-	}
-}
+GeneratorModel for yakindu::cpp {
+	statechart AssignmentAsExpression {
+		feature Outlet {
+			targetProject = "gtests"
+			targetFolder = "AssignmentAsExpressionTest"
+		}
+	}
+}

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

@@ -1,49 +1,49 @@
-/**
-* Copyright (c) 2014 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 "AssignmentAsExpression.h"
-
-TEST(StatemachineTest, simpleAssignment) {
-	AssignmentAsExpression* statechart = new AssignmentAsExpression();
-	statechart->init();
-	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(AssignmentAsExpression::Add));
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_b()== 5);
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_a()== 9);
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(AssignmentAsExpression::Subtract));
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_d()== 6);
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(AssignmentAsExpression::Multiply));
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_e()== 15);
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(AssignmentAsExpression::Divide));
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_g()== 1);
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(AssignmentAsExpression::Modulo));
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_i()== 1);
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(AssignmentAsExpression::Shift));
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_j()== 16);
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_k()== 4);
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(AssignmentAsExpression::boolean_And));
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_l()== 1);
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(AssignmentAsExpression::boolean_Or));
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_p()== 15);
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(AssignmentAsExpression::boolean_Xor));
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_u()== 12);
-	statechart->exit();
-	delete statechart;
-}
+/**
+* Copyright (c) 2014 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 "AssignmentAsExpression.h"
+
+TEST(StatemachineTest, simpleAssignment) {
+	AssignmentAsExpression* statechart = new AssignmentAsExpression();
+	statechart->init();
+	statechart->enter();
+	EXPECT_TRUE(statechart->isActive(AssignmentAsExpression::main_region_Add));
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_b()== 5);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_a()== 9);
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(AssignmentAsExpression::main_region_Subtract));
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_d()== 6);
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(AssignmentAsExpression::main_region_Multiply));
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_e()== 15);
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(AssignmentAsExpression::main_region_Divide));
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_g()== 1);
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(AssignmentAsExpression::main_region_Modulo));
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_i()== 1);
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(AssignmentAsExpression::main_region_Shift));
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_j()== 16);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_k()== 4);
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(AssignmentAsExpression::main_region_boolean_And));
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_l()== 1);
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(AssignmentAsExpression::main_region_boolean_Or));
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_p()== 15);
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(AssignmentAsExpression::main_region_boolean_Xor));
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_u()== 12);
+	statechart->exit();
+	delete statechart;
+}

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

@@ -1,8 +1,8 @@
-GeneratorModel for yakindu::cpp {
-	statechart BitExpressions {
-		feature Outlet {
-			targetProject = "gtests"
-			targetFolder = "BitExpressionsTest"
-		}
-	}
-}
+GeneratorModel for yakindu::cpp {
+	statechart BitExpressions {
+		feature Outlet {
+			targetProject = "gtests"
+			targetFolder = "BitExpressionsTest"
+		}
+	}
+}

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

@@ -1,32 +1,32 @@
-/**
-* Copyright (c) 2014 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 "BitExpressions.h"
-
-TEST(StatemachineTest, BitExpressions) {
-	BitExpressions* statechart = new BitExpressions();
-	statechart->init();
-	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(BitExpressions::StateA));
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_myBit1()== 5);
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_myBit2()== 7);
-	statechart->raise_e1();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(BitExpressions::StateB));
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_leftBitshift()== 10);
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_rightBitshift()== 2);
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_complementBitshift()== - 6 );
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_bitwiseAnd()== 5);
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_bitwiseOr()== 7);
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_bitwiseXor()== 2);
-	delete statechart;
-}
+/**
+* Copyright (c) 2014 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 "BitExpressions.h"
+
+TEST(StatemachineTest, BitExpressions) {
+	BitExpressions* statechart = new BitExpressions();
+	statechart->init();
+	statechart->enter();
+	EXPECT_TRUE(statechart->isActive(BitExpressions::main_region_StateA));
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_myBit1()== 5);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_myBit2()== 7);
+	statechart->raise_e1();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(BitExpressions::main_region_StateB));
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_leftBitshift()== 10);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_rightBitshift()== 2);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_complementBitshift()== - 6 );
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_bitwiseAnd()== 5);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_bitwiseOr()== 7);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_bitwiseXor()== 2);
+	delete statechart;
+}

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

@@ -1,8 +1,8 @@
-GeneratorModel for yakindu::cpp {
-	statechart BooleanExpressions {
-		feature Outlet {
-			targetProject = "gtests"
-			targetFolder = "BooleanExpressionsTest"
-		}
-	}
-}
+GeneratorModel for yakindu::cpp {
+	statechart BooleanExpressions {
+		feature Outlet {
+			targetProject = "gtests"
+			targetFolder = "BooleanExpressionsTest"
+		}
+	}
+}

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

@@ -1,31 +1,31 @@
-/**
-* Copyright (c) 2014 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 "BooleanExpressions.h"
-
-TEST(StatemachineTest, booleanExpressions) {
-	BooleanExpressions* statechart = new BooleanExpressions();
-	statechart->init();
-	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(BooleanExpressions::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::StateB));
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_and()== false);
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_or()== true);
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_not()== false);
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_equal()== false);
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_notequal()== true);
-	delete statechart;
-}
+/**
+* Copyright (c) 2014 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 "BooleanExpressions.h"
+
+TEST(StatemachineTest, booleanExpressions) {
+	BooleanExpressions* statechart = new BooleanExpressions();
+	statechart->init();
+	statechart->enter();
+	EXPECT_TRUE(statechart->isActive(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->getDefaultSCI()->get_and()== false);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_or()== true);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_not()== false);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_equal()== false);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_notequal()== true);
+	delete statechart;
+}

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

@@ -1,8 +1,8 @@
-GeneratorModel for yakindu::cpp {
-	statechart CKeywords {
-		feature Outlet {
-			targetProject = "gtests"
-			targetFolder = "CKeywordsTest"
-		}
-	}
-}
+GeneratorModel for yakindu::cpp {
+	statechart CKeywords {
+		feature Outlet {
+			targetProject = "gtests"
+			targetFolder = "CKeywordsTest"
+		}
+	}
+}

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

@@ -1,26 +1,26 @@
-/**
-* Copyright (c) 2014 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 "CKeywords.h"
-
-TEST(StatemachineTest, CKeywordsTest) {
-	CKeywords* statechart = new CKeywords();
-	statechart->init();
-	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(CKeywords::char_ID));
-	statechart->raise_auto();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(CKeywords::const_ID));
-	EXPECT_TRUE(statechart->isActive(CKeywords::case_ID));
-	EXPECT_TRUE(statechart->isActive(CKeywords::asm_ID));
-	delete statechart;
-}
+/**
+* Copyright (c) 2014 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 "CKeywords.h"
+
+TEST(StatemachineTest, CKeywordsTest) {
+	CKeywords* statechart = new CKeywords();
+	statechart->init();
+	statechart->enter();
+	EXPECT_TRUE(statechart->isActive(CKeywords::auto_char));
+	statechart->raise_auto();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(CKeywords::auto_const));
+	EXPECT_TRUE(statechart->isActive(CKeywords::auto_const_switch_case));
+	EXPECT_TRUE(statechart->isActive(CKeywords::auto_const_switch_case_enum_asm));
+	delete statechart;
+}

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

@@ -1,8 +1,8 @@
-GeneratorModel for yakindu::cpp {
-	statechart Choice {
-		feature Outlet {
-			targetProject = "gtests"
-			targetFolder = "ChoiceTest"
-		}
-	}
-}
+GeneratorModel for yakindu::cpp {
+	statechart Choice {
+		feature Outlet {
+			targetProject = "gtests"
+			targetFolder = "ChoiceTest"
+		}
+	}
+}

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

@@ -1,91 +1,91 @@
-/**
-* Copyright (c) 2014 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 "Choice.h"
-
-TEST(StatemachineTest, elseChoiceUsingNonDefaultTransition) {
-	Choice* statechart = new Choice();
-	statechart->init();
-	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(Choice::A));
-	statechart->getDefaultSCI()->set_c(true);
-	statechart->raise_e();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(Choice::C));
-	delete statechart;
-}
-TEST(StatemachineTest, elseChoiceUsingDefaultTransition) {
-	Choice* statechart = new Choice();
-	statechart->init();
-	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(Choice::A));
-	statechart->getDefaultSCI()->set_c(false);
-	statechart->raise_e();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(Choice::B));
-	delete statechart;
-}
-TEST(StatemachineTest, defaultChoiceUsingNonDefaultTransition) {
-	Choice* statechart = new Choice();
-	statechart->init();
-	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(Choice::A));
-	statechart->getDefaultSCI()->set_c(true);
-	statechart->raise_g();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(Choice::C));
-	delete statechart;
-}
-TEST(StatemachineTest, defaultChoiceUsingDefaultTransition) {
-	Choice* statechart = new Choice();
-	statechart->init();
-	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(Choice::A));
-	statechart->getDefaultSCI()->set_c(false);
-	statechart->raise_g();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(Choice::B));
-	delete statechart;
-}
-TEST(StatemachineTest, uncheckedChoiceUsingNonDefaultTransition) {
-	Choice* statechart = new Choice();
-	statechart->init();
-	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(Choice::A));
-	statechart->getDefaultSCI()->set_c(true);
-	statechart->raise_f();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(Choice::C));
-	delete statechart;
-}
-TEST(StatemachineTest, uncheckedChoiceUsingDefaultTransition) {
-	Choice* statechart = new Choice();
-	statechart->init();
-	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(Choice::A));
-	statechart->getDefaultSCI()->set_c(false);
-	statechart->raise_f();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(Choice::B));
-	delete statechart;
-}
-TEST(StatemachineTest, alwaysTrueTransitionInChoice) {
-	Choice* statechart = new Choice();
-	statechart->init();
-	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(Choice::A));
-	statechart->getDefaultSCI()->set_c(true);
-	statechart->raise_h();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(Choice::C));
-	delete statechart;
-}
+/**
+* Copyright (c) 2014 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 "Choice.h"
+
+TEST(StatemachineTest, elseChoiceUsingNonDefaultTransition) {
+	Choice* statechart = new Choice();
+	statechart->init();
+	statechart->enter();
+	EXPECT_TRUE(statechart->isActive(Choice::main_region_A));
+	statechart->getDefaultSCI()->set_c(true);
+	statechart->raise_e();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(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));
+	statechart->getDefaultSCI()->set_c(false);
+	statechart->raise_e();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(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));
+	statechart->getDefaultSCI()->set_c(true);
+	statechart->raise_g();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(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));
+	statechart->getDefaultSCI()->set_c(false);
+	statechart->raise_g();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(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));
+	statechart->getDefaultSCI()->set_c(true);
+	statechart->raise_f();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(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));
+	statechart->getDefaultSCI()->set_c(false);
+	statechart->raise_f();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(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));
+	statechart->getDefaultSCI()->set_c(true);
+	statechart->raise_h();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(Choice::main_region_C));
+	delete statechart;
+}

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

@@ -1,26 +1,26 @@
-/**
-* Copyright (c) 2014 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 "ConditionalExpressions.h"
-
-TEST(StatemachineTest, ConditionalExpressionTest) {
-	ConditionalExpressions* statechart = new ConditionalExpressions();
-	statechart->init();
-	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(ConditionalExpressions::A));
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_condition()== 1);
-	statechart->raise_e();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(ConditionalExpressions::B));
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_condition()== 2);
-	delete statechart;
-}
+/**
+* Copyright (c) 2014 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 "ConditionalExpressions.h"
+
+TEST(StatemachineTest, ConditionalExpressionTest) {
+	ConditionalExpressions* statechart = new ConditionalExpressions();
+	statechart->init();
+	statechart->enter();
+	EXPECT_TRUE(statechart->isActive(ConditionalExpressions::main_region_A));
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_condition()== 1);
+	statechart->raise_e();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(ConditionalExpressions::main_region_B));
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_condition()== 2);
+	delete statechart;
+}

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

@@ -1,8 +1,8 @@
-GeneratorModel for yakindu::cpp {
-	statechart ConditionalExpressions {
-		feature Outlet {
-			targetProject = "gtests"
-			targetFolder = "ConditionalExpressionTest"
-		}
-	}
-}
+GeneratorModel for yakindu::cpp {
+	statechart ConditionalExpressions {
+		feature Outlet {
+			targetProject = "gtests"
+			targetFolder = "ConditionalExpressionTest"
+		}
+	}
+}

test-plugins/org.yakindu.sct.generator.cpp.test/gtests/DeclarationsTest/Declarations.sgen

@@ -1,8 +1,8 @@
-GeneratorModel for yakindu::cpp {
-	statechart Declarations {
-		feature Outlet {
-			targetProject = "gtests"
-			targetFolder = "DeclarationsTest"
-		}
-	}
-}
+GeneratorModel for yakindu::cpp {
+	statechart Declarations {
+		feature Outlet {
+			targetProject = "gtests"
+			targetFolder = "DeclarationsTest"
+		}
+	}
+}

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

@@ -1,20 +1,20 @@
-/**
-* Copyright (c) 2014 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 "Declarations.h"
-
-TEST(StatemachineTest, declarationsTest) {
-	Declarations* statechart = new Declarations();
-	statechart->init();
-	statechart->enter();
-	delete statechart;
-}
+/**
+* Copyright (c) 2014 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 "Declarations.h"
+
+TEST(StatemachineTest, declarationsTest) {
+	Declarations* statechart = new Declarations();
+	statechart->init();
+	statechart->enter();
+	delete statechart;
+}

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

@@ -1,8 +1,8 @@
-GeneratorModel for yakindu::cpp {
-	statechart DeepEntry {
-		feature Outlet {
-			targetProject = "gtests"
-			targetFolder = "DeepEntryTest"
-		}
-	}
-}
+GeneratorModel for yakindu::cpp {
+	statechart DeepEntry {
+		feature Outlet {
+			targetProject = "gtests"
+			targetFolder = "DeepEntryTest"
+		}
+	}
+}

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

@@ -1,36 +1,36 @@
-/**
-* Copyright (c) 2014 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 "DeepEntry.h"
-
-TEST(StatemachineTest, enterToSubstate) {
-	DeepEntry* statechart = new DeepEntry();
-	statechart->init();
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_x()== 0);
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_y()== 0);
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_z()== 0);
-	statechart->enter();
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_x()== 1);
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_y()== 1);
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_z()== 2);
-	statechart->raise_e();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(DeepEntry::BB));
-	statechart->raise_f();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(DeepEntry::C));
-	statechart->raise_f();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(DeepEntry::BB));
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_y()== 1);
-	delete statechart;
-}
+/**
+* Copyright (c) 2014 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 "DeepEntry.h"
+
+TEST(StatemachineTest, enterToSubstate) {
+	DeepEntry* statechart = new DeepEntry();
+	statechart->init();
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_x()== 0);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_y()== 0);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_z()== 0);
+	statechart->enter();
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_x()== 1);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_y()== 1);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_z()== 2);
+	statechart->raise_e();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(DeepEntry::r2_B_r_BB));
+	statechart->raise_f();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(DeepEntry::r2_C));
+	statechart->raise_f();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(DeepEntry::r2_B_r_BB));
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_y()== 1);
+	delete statechart;
+}

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

@@ -1,8 +1,8 @@
-GeneratorModel for yakindu::cpp {
-	statechart DeepHistory {
-		feature Outlet {
-			targetProject = "gtests"
-			targetFolder = "DeepHistoryTest"
-		}
-	}
-}
+GeneratorModel for yakindu::cpp {
+	statechart DeepHistory {
+		feature Outlet {
+			targetProject = "gtests"
+			targetFolder = "DeepHistoryTest"
+		}
+	}
+}

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

@@ -1,38 +1,38 @@
-/**
-* Copyright (c) 2014 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 "DeepHistory.h"
-
-TEST(StatemachineTest, deepHistoryTest) {
-	DeepHistory* statechart = new DeepHistory();
-	statechart->init();
-	statechart->enter();
-	statechart->raise_event1();
-	statechart->runCycle();
-	statechart->raise_event3();
-	statechart->runCycle();
-	statechart->raise_event5();
-	statechart->runCycle();
-	statechart->raise_event7();
-	statechart->runCycle();
-	EXPECT_TRUE(!statechart->isActive(DeepHistory::State1));
-	EXPECT_TRUE(statechart->isActive(DeepHistory::State9));
-	statechart->raise_event2();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(DeepHistory::State1));
-	EXPECT_TRUE(!statechart->isActive(DeepHistory::State9));
-	statechart->raise_event1();
-	statechart->runCycle();
-	EXPECT_TRUE(!statechart->isActive(DeepHistory::State1));
-	EXPECT_TRUE(statechart->isActive(DeepHistory::State9));
-	delete statechart;
-}
+/**
+* Copyright (c) 2014 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 "DeepHistory.h"
+
+TEST(StatemachineTest, deepHistoryTest) {
+	DeepHistory* statechart = new DeepHistory();
+	statechart->init();
+	statechart->enter();
+	statechart->raise_event1();
+	statechart->runCycle();
+	statechart->raise_event3();
+	statechart->runCycle();
+	statechart->raise_event5();
+	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));
+	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));
+	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));
+	delete statechart;
+}

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

@@ -1,8 +1,8 @@
-GeneratorModel for yakindu::cpp {
-	statechart DynamicChoice {
-		feature Outlet {
-			targetProject = "gtests"
-			targetFolder = "DynamicChoiceTest"
-		}
-	}
-}
+GeneratorModel for yakindu::cpp {
+	statechart DynamicChoice {
+		feature Outlet {
+			targetProject = "gtests"
+			targetFolder = "DynamicChoiceTest"
+		}
+	}
+}

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

@@ -1,23 +1,23 @@
-/**
-* Copyright (c) 2014 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 "DynamicChoice.h"
-
-TEST(StatemachineTest, DynamicChoiceTest) {
-	DynamicChoice* statechart = new DynamicChoice();
-	statechart->init();
-	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(DynamicChoice::Start));
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(DynamicChoice::A));
-	delete statechart;
-}
+/**
+* Copyright (c) 2014 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 "DynamicChoice.h"
+
+TEST(StatemachineTest, DynamicChoiceTest) {
+	DynamicChoice* statechart = new DynamicChoice();
+	statechart->init();
+	statechart->enter();
+	EXPECT_TRUE(statechart->isActive(DynamicChoice::main_region_Start));
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(DynamicChoice::main_region_A));
+	delete statechart;
+}

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

@@ -1,8 +1,8 @@
-GeneratorModel for yakindu::cpp {
-	statechart EnterState {
-		feature Outlet {
-			targetProject = "gtests"
-			targetFolder = "EnterStateTest"
-		}
-	}
-}
+GeneratorModel for yakindu::cpp {
+	statechart EnterState {
+		feature Outlet {
+			targetProject = "gtests"
+			targetFolder = "EnterStateTest"
+		}
+	}
+}

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

@@ -1,44 +1,44 @@
-/**
-* Copyright (c) 2014 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 "EnterState.h"
-
-TEST(StatemachineTest, defaultEntry) {
-	EnterState* statechart = new EnterState();
-	statechart->init();
-	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(EnterState::A));
-	statechart->raise_e();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(EnterState::E));
-	delete statechart;
-}
-TEST(StatemachineTest, namedEntryThroughNamedTransition) {
-	EnterState* statechart = new EnterState();
-	statechart->init();
-	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(EnterState::A));
-	statechart->raise_f();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(EnterState::F));
-	delete statechart;
-}
-TEST(StatemachineTest, namedEntryThroughDefaultTransition) {
-	EnterState* statechart = new EnterState();
-	statechart->init();
-	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(EnterState::A));
-	statechart->raise_g();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(EnterState::E));
-	delete statechart;
-}
+/**
+* Copyright (c) 2014 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 "EnterState.h"
+
+TEST(StatemachineTest, defaultEntry) {
+	EnterState* statechart = new EnterState();
+	statechart->init();
+	statechart->enter();
+	EXPECT_TRUE(statechart->isActive(EnterState::r_A));
+	statechart->raise_e();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(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));
+	statechart->raise_f();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(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));
+	statechart->raise_g();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(EnterState::r_B_r_E));
+	delete statechart;
+}

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

@@ -1,8 +1,8 @@
-GeneratorModel for yakindu::cpp {
-	statechart EntryChoice {
-		feature Outlet {
-			targetProject = "gtests"
-			targetFolder = "EntryChoiceTest"
-		}
-	}
-}
+GeneratorModel for yakindu::cpp {
+	statechart EntryChoice {
+		feature Outlet {
+			targetProject = "gtests"
+			targetFolder = "EntryChoiceTest"
+		}
+	}
+}

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

@@ -1,23 +1,23 @@
-/**
-* Copyright (c) 2014 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 "EntryChoice.h"
-
-TEST(StatemachineTest, EntryChoiceTest) {
-	EntryChoice* statechart = new EntryChoice();
-	statechart->init();
-	statechart->enter();
-	statechart->runCycle();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(EntryChoice::A));
-	delete statechart;
-}
+/**
+* Copyright (c) 2014 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 "EntryChoice.h"
+
+TEST(StatemachineTest, EntryChoiceTest) {
+	EntryChoice* statechart = new EntryChoice();
+	statechart->init();
+	statechart->enter();
+	statechart->runCycle();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(EntryChoice::main_region_A));
+	delete statechart;
+}

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

@@ -1,8 +1,8 @@
-GeneratorModel for yakindu::cpp {
-	statechart EntryExitSelfTransition {
-		feature Outlet {
-			targetProject = "gtests"
-			targetFolder = "EntryExitSelfTransitionTest"
-		}
-	}
-}
+GeneratorModel for yakindu::cpp {
+	statechart EntryExitSelfTransition {
+		feature Outlet {
+			targetProject = "gtests"
+			targetFolder = "EntryExitSelfTransitionTest"
+		}
+	}
+}

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

@@ -1,48 +1,48 @@
-/**
-* Copyright (c) 2014 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 "EntryExitSelfTransition.h"
-
-TEST(StatemachineTest, SelfTransitionToChildState) {
-	EntryExitSelfTransition* statechart = new EntryExitSelfTransition();
-	statechart->init();
-	statechart->enter();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_entries()== 1);
-	EXPECT_TRUE(statechart->isActive(EntryExitSelfTransition::B));
-	statechart->getDefaultSCI()->set_entries(0);
-	statechart->raise_e();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_entries()== 1);
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_exits()== 1);
-	EXPECT_TRUE(statechart->isActive(EntryExitSelfTransition::C));
-	delete statechart;
-}
-TEST(StatemachineTest, SelfTransitionFromChildState) {
-	EntryExitSelfTransition* statechart = new EntryExitSelfTransition();
-	statechart->init();
-	statechart->enter();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_entries()== 1);
-	statechart->getDefaultSCI()->set_entries(0);
-	statechart->raise_e1();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_entries()== 0);
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_exits()== 0);
-	EXPECT_TRUE(statechart->isActive(EntryExitSelfTransition::C));
-	statechart->raise_e1();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(EntryExitSelfTransition::B));
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_entries()== 1);
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_exits()== 1);
-	delete statechart;
-}
+/**
+* Copyright (c) 2014 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 "EntryExitSelfTransition.h"
+
+TEST(StatemachineTest, SelfTransitionToChildState) {
+	EntryExitSelfTransition* statechart = new EntryExitSelfTransition();
+	statechart->init();
+	statechart->enter();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_entries()== 1);
+	EXPECT_TRUE(statechart->isActive(EntryExitSelfTransition::main_region_A__region0_B));
+	statechart->getDefaultSCI()->set_entries(0);
+	statechart->raise_e();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_entries()== 1);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_exits()== 1);
+	EXPECT_TRUE(statechart->isActive(EntryExitSelfTransition::main_region_A__region0_C));
+	delete statechart;
+}
+TEST(StatemachineTest, SelfTransitionFromChildState) {
+	EntryExitSelfTransition* statechart = new EntryExitSelfTransition();
+	statechart->init();
+	statechart->enter();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_entries()== 1);
+	statechart->getDefaultSCI()->set_entries(0);
+	statechart->raise_e1();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_entries()== 0);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_exits()== 0);
+	EXPECT_TRUE(statechart->isActive(EntryExitSelfTransition::main_region_A__region0_C));
+	statechart->raise_e1();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(EntryExitSelfTransition::main_region_A__region0_B));
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_entries()== 1);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_exits()== 1);
+	delete statechart;
+}

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

@@ -1,8 +1,8 @@
-GeneratorModel for yakindu::cpp {
-	statechart ExitOnSelfTransition {
-		feature Outlet {
-			targetProject = "gtests"
-			targetFolder = "ExitOnSelfTransitionTest"
-		}
-	}
-}
+GeneratorModel for yakindu::cpp {
+	statechart ExitOnSelfTransition {
+		feature Outlet {
+			targetProject = "gtests"
+			targetFolder = "ExitOnSelfTransitionTest"
+		}
+	}
+}

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

@@ -1,31 +1,31 @@
-/**
-* Copyright (c) 2014 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 "ExitOnSelfTransition.h"
-
-TEST(StatemachineTest, ExitOnSelfTransitionTest) {
-	ExitOnSelfTransition* statechart = new ExitOnSelfTransition();
-	statechart->init();
-	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(ExitOnSelfTransition::A));
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_entryCount()== 1);
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_exitCount()== 0);
-	statechart->raise_e();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_entryCount()== 2);
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_exitCount()== 1);
-	statechart->raise_f();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_entryCount()== 2);
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_exitCount()== 2);
-	delete statechart;
-}
+/**
+* Copyright (c) 2014 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 "ExitOnSelfTransition.h"
+
+TEST(StatemachineTest, ExitOnSelfTransitionTest) {
+	ExitOnSelfTransition* statechart = new ExitOnSelfTransition();
+	statechart->init();
+	statechart->enter();
+	EXPECT_TRUE(statechart->isActive(ExitOnSelfTransition::main_region_A));
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_entryCount()== 1);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_exitCount()== 0);
+	statechart->raise_e();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_entryCount()== 2);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_exitCount()== 1);
+	statechart->raise_f();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_entryCount()== 2);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_exitCount()== 2);
+	delete statechart;
+}

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

@@ -1,8 +1,8 @@
-GeneratorModel for yakindu::cpp {
-	statechart ExitState {
-		feature Outlet {
-			targetProject = "gtests"
-			targetFolder = "ExitStateTest"
-		}
-	}
-}
+GeneratorModel for yakindu::cpp {
+	statechart ExitState {
+		feature Outlet {
+			targetProject = "gtests"
+			targetFolder = "ExitStateTest"
+		}
+	}
+}

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

@@ -1,53 +1,53 @@
-/**
-* Copyright (c) 2014 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 "ExitState.h"
-
-TEST(StatemachineTest, defaultExit) {
-	ExitState* statechart = new ExitState();
-	statechart->init();
-	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(ExitState::A));
-	statechart->raise_e();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(ExitState::E));
-	delete statechart;
-}
-TEST(StatemachineTest, namedExitThroughNamedTransition) {
-	ExitState* statechart = new ExitState();
-	statechart->init();
-	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(ExitState::A));
-	statechart->raise_f();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(ExitState::F));
-	delete statechart;
-}
-TEST(StatemachineTest, namedExitThroughDefaultTransition) {
-	ExitState* statechart = new ExitState();
-	statechart->init();
-	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(ExitState::A));
-	statechart->raise_g();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(ExitState::E));
-	delete statechart;
-}
-TEST(StatemachineTest, remainInA) {
-	ExitState* statechart = new ExitState();
-	statechart->init();
-	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(ExitState::A));
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(ExitState::A));
-	delete statechart;
-}
+/**
+* Copyright (c) 2014 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 "ExitState.h"
+
+TEST(StatemachineTest, defaultExit) {
+	ExitState* statechart = new ExitState();
+	statechart->init();
+	statechart->enter();
+	EXPECT_TRUE(statechart->isActive(ExitState::r_A));
+	statechart->raise_e();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(ExitState::r_E));
+	delete statechart;
+}
+TEST(StatemachineTest, namedExitThroughNamedTransition) {
+	ExitState* statechart = new ExitState();
+	statechart->init();
+	statechart->enter();
+	EXPECT_TRUE(statechart->isActive(ExitState::r_A));
+	statechart->raise_f();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(ExitState::r_F));
+	delete statechart;
+}
+TEST(StatemachineTest, namedExitThroughDefaultTransition) {
+	ExitState* statechart = new ExitState();
+	statechart->init();
+	statechart->enter();
+	EXPECT_TRUE(statechart->isActive(ExitState::r_A));
+	statechart->raise_g();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(ExitState::r_E));
+	delete statechart;
+}
+TEST(StatemachineTest, remainInA) {
+	ExitState* statechart = new ExitState();
+	statechart->init();
+	statechart->enter();
+	EXPECT_TRUE(statechart->isActive(ExitState::r_A));
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(ExitState::r_A));
+	delete statechart;
+}

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

@@ -1,8 +1,8 @@
-GeneratorModel for yakindu::cpp {
-	statechart FeatureCalls {
-		feature Outlet {
-			targetProject = "gtests"
-			targetFolder = "FeatureCallsTest"
-		}
-	}
-}
+GeneratorModel for yakindu::cpp {
+	statechart FeatureCalls {
+		feature Outlet {
+			targetProject = "gtests"
+			targetFolder = "FeatureCallsTest"
+		}
+	}
+}

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

@@ -1,23 +1,23 @@
-/**
-* Copyright (c) 2014 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 "FeatureCalls.h"
-
-TEST(StatemachineTest, FeatureCalls) {
-	FeatureCalls* statechart = new FeatureCalls();
-	statechart->init();
-	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(FeatureCalls::A));
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(FeatureCalls::A));
-	delete statechart;
-}
+/**
+* Copyright (c) 2014 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 "FeatureCalls.h"
+
+TEST(StatemachineTest, FeatureCalls) {
+	FeatureCalls* statechart = new FeatureCalls();
+	statechart->init();
+	statechart->enter();
+	EXPECT_TRUE(statechart->isActive(FeatureCalls::main_region_A));
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(FeatureCalls::main_region_A));
+	delete statechart;
+}

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

@@ -1,8 +1,8 @@
-GeneratorModel for yakindu::cpp {
-	statechart Guard {
-		feature Outlet {
-			targetProject = "gtests"
-			targetFolder = "GuardTest"
-		}
-	}
-}
+GeneratorModel for yakindu::cpp {
+	statechart Guard {
+		feature Outlet {
+			targetProject = "gtests"
+			targetFolder = "GuardTest"
+		}
+	}
+}

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

@@ -1,36 +1,36 @@
-/**
-* Copyright (c) 2014 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 "Guard.h"
-
-TEST(StatemachineTest, guardTest) {
-	Guard* statechart = new Guard();
-	statechart->init();
-	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(Guard::A));
-	statechart->raise_event1();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(Guard::A));
-	statechart->raise_event2();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(Guard::B));
-	statechart->raise_return();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(Guard::A));
-	statechart->raise_event1();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(Guard::B));
-	statechart->raise_return();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(Guard::A));
-	delete statechart;
-}
+/**
+* Copyright (c) 2014 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 "Guard.h"
+
+TEST(StatemachineTest, guardTest) {
+	Guard* statechart = new Guard();
+	statechart->init();
+	statechart->enter();
+	EXPECT_TRUE(statechart->isActive(Guard::main_region_A));
+	statechart->raise_event1();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(Guard::main_region_A));
+	statechart->raise_event2();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(Guard::main_region_B));
+	statechart->raise_return();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(Guard::main_region_A));
+	statechart->raise_event1();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(Guard::main_region_B));
+	statechart->raise_return();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(Guard::main_region_A));
+	delete statechart;
+}

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

@@ -1,8 +1,8 @@
-GeneratorModel for yakindu::cpp {
-	statechart GuardedEntry {
-		feature Outlet {
-			targetProject = "gtests"
-			targetFolder = "GuardedEntryTest"
-		}
-	}
-}
+GeneratorModel for yakindu::cpp {
+	statechart GuardedEntry {
+		feature Outlet {
+			targetProject = "gtests"
+			targetFolder = "GuardedEntryTest"
+		}
+	}
+}

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

@@ -1,64 +1,64 @@
-/**
-* Copyright (c) 2014 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 "GuardedEntry.h"
-
-TEST(StatemachineTest, EntryNotTakenOnStatechartEnter) {
-	GuardedEntry* statechart = new GuardedEntry();
-	statechart->init();
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_guard()== false);
-	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(GuardedEntry::A));
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_done()== false);
-	delete statechart;
-}
-TEST(StatemachineTest, EntryTakenOnStatechartEnter) {
-	GuardedEntry* statechart = new GuardedEntry();
-	statechart->init();
-	statechart->getDefaultSCI()->set_guard(true);
-	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(GuardedEntry::A));
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_done()== true);
-	delete statechart;
-}
-TEST(StatemachineTest, EntryTakenInTransition) {
-	GuardedEntry* statechart = new GuardedEntry();
-	statechart->init();
-	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(GuardedEntry::A));
-	statechart->raise_e();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(GuardedEntry::B));
-	statechart->getDefaultSCI()->set_guard(true);
-	statechart->getDefaultSCI()->set_done(false);
-	statechart->raise_e();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(GuardedEntry::A));
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_done());
-	delete statechart;
-}
-TEST(StatemachineTest, EntryNotTakenInTransition) {
-	GuardedEntry* statechart = new GuardedEntry();
-	statechart->init();
-	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(GuardedEntry::A));
-	statechart->raise_e();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(GuardedEntry::B));
-	statechart->getDefaultSCI()->set_guard(false);
-	statechart->getDefaultSCI()->set_done(false);
-	statechart->raise_e();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(GuardedEntry::A));
-	EXPECT_TRUE(!statechart->getDefaultSCI()->get_done());
-	delete statechart;
-}
+/**
+* Copyright (c) 2014 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 "GuardedEntry.h"
+
+TEST(StatemachineTest, EntryNotTakenOnStatechartEnter) {
+	GuardedEntry* statechart = new GuardedEntry();
+	statechart->init();
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_guard()== false);
+	statechart->enter();
+	EXPECT_TRUE(statechart->isActive(GuardedEntry::main_region_A));
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_done()== false);
+	delete statechart;
+}
+TEST(StatemachineTest, EntryTakenOnStatechartEnter) {
+	GuardedEntry* statechart = new GuardedEntry();
+	statechart->init();
+	statechart->getDefaultSCI()->set_guard(true);
+	statechart->enter();
+	EXPECT_TRUE(statechart->isActive(GuardedEntry::main_region_A));
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_done()== true);
+	delete statechart;
+}
+TEST(StatemachineTest, EntryTakenInTransition) {
+	GuardedEntry* statechart = new GuardedEntry();
+	statechart->init();
+	statechart->enter();
+	EXPECT_TRUE(statechart->isActive(GuardedEntry::main_region_A));
+	statechart->raise_e();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(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->getDefaultSCI()->get_done());
+	delete statechart;
+}
+TEST(StatemachineTest, EntryNotTakenInTransition) {
+	GuardedEntry* statechart = new GuardedEntry();
+	statechart->init();
+	statechart->enter();
+	EXPECT_TRUE(statechart->isActive(GuardedEntry::main_region_A));
+	statechart->raise_e();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(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->getDefaultSCI()->get_done());
+	delete statechart;
+}

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

@@ -1,8 +1,8 @@
-GeneratorModel for yakindu::cpp {
-	statechart GuardedExit {
-		feature Outlet {
-			targetProject = "gtests"
-			targetFolder = "GuardedExitTest"
-		}
-	}
-}
+GeneratorModel for yakindu::cpp {
+	statechart GuardedExit {
+		feature Outlet {
+			targetProject = "gtests"
+			targetFolder = "GuardedExitTest"
+		}
+	}
+}

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

@@ -1,38 +1,38 @@
-/**
-* Copyright (c) 2014 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 "GuardedExit.h"
-
-TEST(StatemachineTest, ExitTaken) {
-	GuardedExit* statechart = new GuardedExit();
-	statechart->init();
-	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(GuardedExit::A));
-	EXPECT_TRUE(!statechart->getDefaultSCI()->get_guard());
-	statechart->raise_e();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(GuardedExit::B));
-	EXPECT_TRUE(!statechart->getDefaultSCI()->get_done());
-	delete statechart;
-}
-TEST(StatemachineTest, ExitNotTaken) {
-	GuardedExit* statechart = new GuardedExit();
-	statechart->init();
-	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(GuardedExit::A));
-	statechart->getDefaultSCI()->set_guard(true);
-	statechart->raise_e();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(GuardedExit::B));
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_done());
-	delete statechart;
-}
+/**
+* Copyright (c) 2014 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 "GuardedExit.h"
+
+TEST(StatemachineTest, ExitTaken) {
+	GuardedExit* statechart = new GuardedExit();
+	statechart->init();
+	statechart->enter();
+	EXPECT_TRUE(statechart->isActive(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->getDefaultSCI()->get_done());
+	delete statechart;
+}
+TEST(StatemachineTest, ExitNotTaken) {
+	GuardedExit* statechart = new GuardedExit();
+	statechart->init();
+	statechart->enter();
+	EXPECT_TRUE(statechart->isActive(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->getDefaultSCI()->get_done());
+	delete statechart;
+}

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

@@ -1,8 +1,8 @@
-GeneratorModel for yakindu::cpp {
-	statechart HistoryWithExitPoint {
-		feature Outlet {
-			targetProject = "gtests"
-			targetFolder = "HistoryWithExitPointTest"
-		}
-	}
-}
+GeneratorModel for yakindu::cpp {
+	statechart HistoryWithExitPoint {
+		feature Outlet {
+			targetProject = "gtests"
+			targetFolder = "HistoryWithExitPointTest"
+		}
+	}
+}

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

@@ -1,36 +1,36 @@
-/**
-* Copyright (c) 2014 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 "HistoryWithExitPoint.h"
-
-TEST(StatemachineTest, historyEntryAfterExit) {
-	HistoryWithExitPoint* statechart = new HistoryWithExitPoint();
-	statechart->init();
-	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(HistoryWithExitPoint::X1));
-	statechart->raise_push();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(HistoryWithExitPoint::B));
-	statechart->raise_back();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(HistoryWithExitPoint::X1));
-	statechart->raise_next();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(HistoryWithExitPoint::X2));
-	statechart->raise_push();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(HistoryWithExitPoint::B));
-	statechart->raise_back();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(HistoryWithExitPoint::X2));
-	delete statechart;
-}
+/**
+* Copyright (c) 2014 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 "HistoryWithExitPoint.h"
+
+TEST(StatemachineTest, historyEntryAfterExit) {
+	HistoryWithExitPoint* statechart = new HistoryWithExitPoint();
+	statechart->init();
+	statechart->enter();
+	EXPECT_TRUE(statechart->isActive(HistoryWithExitPoint::mr_A_r_X1));
+	statechart->raise_push();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(HistoryWithExitPoint::mr_B));
+	statechart->raise_back();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(HistoryWithExitPoint::mr_A_r_X1));
+	statechart->raise_next();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(HistoryWithExitPoint::mr_A_r_X2));
+	statechart->raise_push();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(HistoryWithExitPoint::mr_B));
+	statechart->raise_back();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(HistoryWithExitPoint::mr_A_r_X2));
+	delete statechart;
+}

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

@@ -1,8 +1,8 @@
-GeneratorModel for yakindu::cpp {
-	statechart HistoryWithoutInitialStep {
-		feature Outlet {
-			targetProject = "gtests"
-			targetFolder = "HistoryWithoutInitialStepTest"
-		}
-	}
-}
+GeneratorModel for yakindu::cpp {
+	statechart HistoryWithoutInitialStep {
+		feature Outlet {
+			targetProject = "gtests"
+			targetFolder = "HistoryWithoutInitialStepTest"
+		}
+	}
+}

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

@@ -1,61 +1,61 @@
-/**
-* Copyright (c) 2014 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 "HistoryWithoutInitialStep.h"
-
-TEST(StatemachineTest, enterThroughInitialEntry) {
-	HistoryWithoutInitialStep* statechart = new HistoryWithoutInitialStep();
-	statechart->init();
-	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(HistoryWithoutInitialStep::A));
-	statechart->raise_e1();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(HistoryWithoutInitialStep::C));
-	statechart->raise_e2();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(HistoryWithoutInitialStep::D));
-	delete statechart;
-}
-TEST(StatemachineTest, enterCThroughHistory) {
-	HistoryWithoutInitialStep* statechart = new HistoryWithoutInitialStep();
-	statechart->init();
-	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(HistoryWithoutInitialStep::A));
-	statechart->raise_e1();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(HistoryWithoutInitialStep::C));
-	statechart->raise_e1();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(HistoryWithoutInitialStep::A));
-	statechart->raise_e2();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(HistoryWithoutInitialStep::C));
-	delete statechart;
-}
-TEST(StatemachineTest, enterDThroughHistory) {
-	HistoryWithoutInitialStep* statechart = new HistoryWithoutInitialStep();
-	statechart->init();
-	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(HistoryWithoutInitialStep::A));
-	statechart->raise_e1();
-	statechart->runCycle();
-	statechart->raise_e2();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(HistoryWithoutInitialStep::D));
-	statechart->raise_e1();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(HistoryWithoutInitialStep::A));
-	statechart->raise_e2();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(HistoryWithoutInitialStep::D));
-	delete statechart;
-}
+/**
+* Copyright (c) 2014 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 "HistoryWithoutInitialStep.h"
+
+TEST(StatemachineTest, enterThroughInitialEntry) {
+	HistoryWithoutInitialStep* statechart = new HistoryWithoutInitialStep();
+	statechart->init();
+	statechart->enter();
+	EXPECT_TRUE(statechart->isActive(HistoryWithoutInitialStep::main_region_A));
+	statechart->raise_e1();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(HistoryWithoutInitialStep::main_region_B_r1_C));
+	statechart->raise_e2();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(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));
+	statechart->raise_e1();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(HistoryWithoutInitialStep::main_region_B_r1_C));
+	statechart->raise_e1();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(HistoryWithoutInitialStep::main_region_A));
+	statechart->raise_e2();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(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));
+	statechart->raise_e1();
+	statechart->runCycle();
+	statechart->raise_e2();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(HistoryWithoutInitialStep::main_region_B_r1_D));
+	statechart->raise_e1();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(HistoryWithoutInitialStep::main_region_A));
+	statechart->raise_e2();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(HistoryWithoutInitialStep::main_region_B_r1_D));
+	delete statechart;
+}

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

@@ -1,8 +1,8 @@
-GeneratorModel for yakindu::cpp {
-	statechart InEventLifeCycle {
-		feature Outlet {
-			targetProject = "gtests"
-			targetFolder = "InEventLifeCycleTest"
-		}
-	}
-}
+GeneratorModel for yakindu::cpp {
+	statechart InEventLifeCycle {
+		feature Outlet {
+			targetProject = "gtests"
+			targetFolder = "InEventLifeCycleTest"
+		}
+	}
+}

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

@@ -1,24 +1,24 @@
-/**
-* Copyright (c) 2014 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 "InEventLifeCycle.h"
-
-TEST(StatemachineTest, eventLifeCycle) {
-	InEventLifeCycle* statechart = new InEventLifeCycle();
-	statechart->init();
-	statechart->enter();
-	statechart->raise_e();
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_i()== 0);
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_i()== 1);
-	delete statechart;
-}
+/**
+* Copyright (c) 2014 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 "InEventLifeCycle.h"
+
+TEST(StatemachineTest, eventLifeCycle) {
+	InEventLifeCycle* statechart = new InEventLifeCycle();
+	statechart->init();
+	statechart->enter();
+	statechart->raise_e();
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_i()== 0);
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_i()== 1);
+	delete statechart;
+}

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

@@ -1,8 +1,8 @@
-GeneratorModel for yakindu::cpp {
-	statechart IntegerExpressions {
-		feature Outlet {
-			targetProject = "gtests"
-			targetFolder = "IntegerExpressionsTest"
-		}
-	}
-}
+GeneratorModel for yakindu::cpp {
+	statechart IntegerExpressions {
+		feature Outlet {
+			targetProject = "gtests"
+			targetFolder = "IntegerExpressionsTest"
+		}
+	}
+}

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

@@ -1,42 +1,42 @@
-/**
-* Copyright (c) 2014 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 "IntegerExpressions.h"
-
-TEST(StatemachineTest, integerExpressions) {
-	IntegerExpressions* statechart = new IntegerExpressions();
-	statechart->init();
-	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(IntegerExpressions::StateA));
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_myInt1()== 10);
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_myInt2()== 5);
-	statechart->raise_e1();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_less()== false);
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_greater()== true);
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_equalOrLess()== false);
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_equalOrGreater()== true);
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_equal()== false);
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_notEqual()== true);
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_plus()== 15);
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_minus()== 5);
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_multiply()== 50);
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_division()== 2);
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_modulo()== 0);
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_negat()== - 10 );
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_multiAssign()== 20);
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_divAssign()== 2);
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_plusAssign()== 12);
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_minusAssign()== - 8 );
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_moduloAssign()== 0);
-	delete statechart;
-}
+/**
+* Copyright (c) 2014 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 "IntegerExpressions.h"
+
+TEST(StatemachineTest, integerExpressions) {
+	IntegerExpressions* statechart = new IntegerExpressions();
+	statechart->init();
+	statechart->enter();
+	EXPECT_TRUE(statechart->isActive(IntegerExpressions::main_region_StateA));
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_myInt1()== 10);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_myInt2()== 5);
+	statechart->raise_e1();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_less()== false);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_greater()== true);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_equalOrLess()== false);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_equalOrGreater()== true);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_equal()== false);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_notEqual()== true);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_plus()== 15);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_minus()== 5);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_multiply()== 50);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_division()== 2);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_modulo()== 0);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_negat()== - 10 );
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_multiAssign()== 20);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_divAssign()== 2);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_plusAssign()== 12);
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_minusAssign()== - 8 );
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_moduloAssign()== 0);
+	delete statechart;
+}

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

@@ -1,8 +1,8 @@
-GeneratorModel for yakindu::cpp {
-	statechart InternalEventLifeCycle {
-		feature Outlet {
-			targetProject = "gtests"
-			targetFolder = "InternalEventLifeCycleTest"
-		}
-	}
-}
+GeneratorModel for yakindu::cpp {
+	statechart InternalEventLifeCycle {
+		feature Outlet {
+			targetProject = "gtests"
+			targetFolder = "InternalEventLifeCycleTest"
+		}
+	}
+}

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

@@ -1,36 +1,36 @@
-/**
-* Copyright (c) 2014 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 "InternalEventLifeCycle.h"
-
-TEST(StatemachineTest, InternalEventLifeCycleTest) {
-	InternalEventLifeCycle* statechart = new InternalEventLifeCycle();
-	statechart->init();
-	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(InternalEventLifeCycle::A));
-	EXPECT_TRUE(statechart->isActive(InternalEventLifeCycle::C));
-	statechart->raise_e();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(InternalEventLifeCycle::A));
-	EXPECT_TRUE(statechart->isActive(InternalEventLifeCycle::D));
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(InternalEventLifeCycle::A));
-	EXPECT_TRUE(statechart->isActive(InternalEventLifeCycle::D));
-	statechart->raise_f();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(InternalEventLifeCycle::A));
-	EXPECT_TRUE(statechart->isActive(InternalEventLifeCycle::C));
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(InternalEventLifeCycle::A));
-	EXPECT_TRUE(statechart->isActive(InternalEventLifeCycle::C));
-	delete statechart;
-}
+/**
+* Copyright (c) 2014 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 "InternalEventLifeCycle.h"
+
+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));
+	statechart->raise_e();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(InternalEventLifeCycle::r1_A));
+	EXPECT_TRUE(statechart->isActive(InternalEventLifeCycle::r2_D));
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(InternalEventLifeCycle::r1_A));
+	EXPECT_TRUE(statechart->isActive(InternalEventLifeCycle::r2_D));
+	statechart->raise_f();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(InternalEventLifeCycle::r1_A));
+	EXPECT_TRUE(statechart->isActive(InternalEventLifeCycle::r2_C));
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(InternalEventLifeCycle::r1_A));
+	EXPECT_TRUE(statechart->isActive(InternalEventLifeCycle::r2_C));
+	delete statechart;
+}

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

@@ -1,8 +1,8 @@
-GeneratorModel for yakindu::cpp {
-	statechart LocalReactions {
-		feature Outlet {
-			targetProject = "gtests"
-			targetFolder = "LocalReactionsTest"
-		}
-	}
-}
+GeneratorModel for yakindu::cpp {
+	statechart LocalReactions {
+		feature Outlet {
+			targetProject = "gtests"
+			targetFolder = "LocalReactionsTest"
+		}
+	}
+}

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

@@ -1,23 +1,23 @@
-/**
-* Copyright (c) 2014 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 "LocalReactions.h"
-
-TEST(StatemachineTest, LocalReactionsTest) {
-	LocalReactions* statechart = new LocalReactions();
-	statechart->init();
-	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(LocalReactions::A));
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_x()== 1);
-	delete statechart;
-}
+/**
+* Copyright (c) 2014 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 "LocalReactions.h"
+
+TEST(StatemachineTest, LocalReactionsTest) {
+	LocalReactions* statechart = new LocalReactions();
+	statechart->init();
+	statechart->enter();
+	EXPECT_TRUE(statechart->isActive(LocalReactions::main_region_A));
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_x()== 1);
+	delete statechart;
+}

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

@@ -1,8 +1,8 @@
-GeneratorModel for yakindu::cpp {
-	statechart LogicalAnd {
-		feature Outlet {
-			targetProject = "gtests"
-			targetFolder = "LogicalAndTestsTest"
-		}
-	}
-}
+GeneratorModel for yakindu::cpp {
+	statechart LogicalAnd {
+		feature Outlet {
+			targetProject = "gtests"
+			targetFolder = "LogicalAndTestsTest"
+		}
+	}
+}

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

@@ -1,22 +1,22 @@
-/**
-* Copyright (c) 2014 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 "LogicalAnd.h"
-
-TEST(StatemachineTest, operandEvaluationOrder) {
-	LogicalAnd* statechart = new LogicalAnd();
-	statechart->init();
-	statechart->enter();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->getDefaultSCI()->get_x()== 4 && statechart->getDefaultSCI()->get_b()) << "logical and expression was executed in wrong order..." ;
-	delete statechart;
-}
+/**
+* Copyright (c) 2014 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 "LogicalAnd.h"
+
+TEST(StatemachineTest, operandEvaluationOrder) {
+	LogicalAnd* statechart = new LogicalAnd();
+	statechart->init();
+	statechart->enter();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->getDefaultSCI()->get_x()== 4 && statechart->getDefaultSCI()->get_b()) << "logical and expression was executed in wrong order..." ;
+	delete statechart;
+}