Fixed short name generation for pseudostates.

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

@@ -282,7 +282,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
@@ -322,7 +326,7 @@ class DefaultNamingService implements INamingService {
 	def protected dispatch String elementName(ExecutionScope it, NameShorteningStrategy nameShorteningType) {
 		switch nameShorteningType {
 			case NameShorteningStrategy::STANDARD: return name
-			case NameShorteningStrategy::REMOVE_VOWELS: return name.removeVowels
+			case NameShorteningStrategy::REMOVE_VOWELS: return name?.removeVowels
 			case NameShorteningStrategy::INDEX_POSITION: return asIndexPosition
 		}
 	}
@@ -338,7 +342,7 @@ class DefaultNamingService implements INamingService {
 	def protected dispatch String elementName(Vertex it, NameShorteningStrategy nameShorteningType) {
 		switch nameShorteningType {
 			case NameShorteningStrategy::STANDARD: return name
-			case NameShorteningStrategy::REMOVE_VOWELS: return name.removeVowels
+			case NameShorteningStrategy::REMOVE_VOWELS: return name?.removeVowels
 			case NameShorteningStrategy::INDEX_POSITION: return asSGraphIndexPosition
 		}
 	}
@@ -356,14 +360,10 @@ class DefaultNamingService implements INamingService {
 	}
 
 	def protected dispatch String elementName(NamedElement it, NameShorteningStrategy nameShorteningType) {
-		var ret = name
-		if (ret.nullOrEmpty) {
-			ret = it.class.simpleName
-		}
 		switch nameShorteningType {
-			case NameShorteningStrategy::STANDARD: return ret
-			case NameShorteningStrategy::REMOVE_VOWELS: return ret.removeVowels
-			case NameShorteningStrategy::INDEX_POSITION: return ret.removeVowels
+			case NameShorteningStrategy::STANDARD: return name
+			case NameShorteningStrategy::REMOVE_VOWELS: return name?.removeVowels
+			case NameShorteningStrategy::INDEX_POSITION: return name?.removeVowels
 		}
 	}
 

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->getSCInterface()->get_value()< 5) {
-		statechart->runCycle();
-		EXPECT_TRUE(statechart->isActive(AlwaysOncycle::StateA));
-	}
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(AlwaysOncycle::StateB));
-	while (statechart->getSCInterface()->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::StateA));
+	while (statechart->getSCInterface()->get_value()< 5) {
+		statechart->runCycle();
+		EXPECT_TRUE(statechart->isActive(AlwaysOncycle::StateA));
+	}
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(AlwaysOncycle::StateB));
+	while (statechart->getSCInterface()->get_value()< 5) {
+		statechart->runCycle();
+		EXPECT_TRUE(statechart->isActive(AlwaysOncycle::StateB));
+	}
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(AlwaysOncycle::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->getSCInterface()->get_b()== 5);
-	EXPECT_TRUE(statechart->getSCInterface()->get_a()== 9);
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(AssignmentAsExpression::Subtract));
-	EXPECT_TRUE(statechart->getSCInterface()->get_d()== 6);
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(AssignmentAsExpression::Multiply));
-	EXPECT_TRUE(statechart->getSCInterface()->get_e()== 15);
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(AssignmentAsExpression::Divide));
-	EXPECT_TRUE(statechart->getSCInterface()->get_g()== 1);
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(AssignmentAsExpression::Modulo));
-	EXPECT_TRUE(statechart->getSCInterface()->get_i()== 1);
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(AssignmentAsExpression::Shift));
-	EXPECT_TRUE(statechart->getSCInterface()->get_j()== 16);
-	EXPECT_TRUE(statechart->getSCInterface()->get_k()== 4);
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(AssignmentAsExpression::boolean_And));
-	EXPECT_TRUE(statechart->getSCInterface()->get_l()== 1);
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(AssignmentAsExpression::boolean_Or));
-	EXPECT_TRUE(statechart->getSCInterface()->get_p()== 15);
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(AssignmentAsExpression::boolean_Xor));
-	EXPECT_TRUE(statechart->getSCInterface()->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::Add));
+	EXPECT_TRUE(statechart->getSCInterface()->get_b()== 5);
+	EXPECT_TRUE(statechart->getSCInterface()->get_a()== 9);
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(AssignmentAsExpression::Subtract));
+	EXPECT_TRUE(statechart->getSCInterface()->get_d()== 6);
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(AssignmentAsExpression::Multiply));
+	EXPECT_TRUE(statechart->getSCInterface()->get_e()== 15);
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(AssignmentAsExpression::Divide));
+	EXPECT_TRUE(statechart->getSCInterface()->get_g()== 1);
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(AssignmentAsExpression::Modulo));
+	EXPECT_TRUE(statechart->getSCInterface()->get_i()== 1);
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(AssignmentAsExpression::Shift));
+	EXPECT_TRUE(statechart->getSCInterface()->get_j()== 16);
+	EXPECT_TRUE(statechart->getSCInterface()->get_k()== 4);
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(AssignmentAsExpression::boolean_And));
+	EXPECT_TRUE(statechart->getSCInterface()->get_l()== 1);
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(AssignmentAsExpression::boolean_Or));
+	EXPECT_TRUE(statechart->getSCInterface()->get_p()== 15);
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(AssignmentAsExpression::boolean_Xor));
+	EXPECT_TRUE(statechart->getSCInterface()->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->getSCInterface()->get_myBit1()== 5);
-	EXPECT_TRUE(statechart->getSCInterface()->get_myBit2()== 7);
-	statechart->raise_e1();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(BitExpressions::StateB));
-	EXPECT_TRUE(statechart->getSCInterface()->get_leftBitshift()== 10);
-	EXPECT_TRUE(statechart->getSCInterface()->get_rightBitshift()== 2);
-	EXPECT_TRUE(statechart->getSCInterface()->get_complementBitshift()== - 6 );
-	EXPECT_TRUE(statechart->getSCInterface()->get_bitwiseAnd()== 5);
-	EXPECT_TRUE(statechart->getSCInterface()->get_bitwiseOr()== 7);
-	EXPECT_TRUE(statechart->getSCInterface()->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::StateA));
+	EXPECT_TRUE(statechart->getSCInterface()->get_myBit1()== 5);
+	EXPECT_TRUE(statechart->getSCInterface()->get_myBit2()== 7);
+	statechart->raise_e1();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(BitExpressions::StateB));
+	EXPECT_TRUE(statechart->getSCInterface()->get_leftBitshift()== 10);
+	EXPECT_TRUE(statechart->getSCInterface()->get_rightBitshift()== 2);
+	EXPECT_TRUE(statechart->getSCInterface()->get_complementBitshift()== - 6 );
+	EXPECT_TRUE(statechart->getSCInterface()->get_bitwiseAnd()== 5);
+	EXPECT_TRUE(statechart->getSCInterface()->get_bitwiseOr()== 7);
+	EXPECT_TRUE(statechart->getSCInterface()->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->getSCInterface()->get_myBool1()== true);
-	EXPECT_TRUE(statechart->getSCInterface()->get_myBool2()== false);
-	statechart->raise_e1();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(BooleanExpressions::StateB));
-	EXPECT_TRUE(statechart->getSCInterface()->get_and()== false);
-	EXPECT_TRUE(statechart->getSCInterface()->get_or()== true);
-	EXPECT_TRUE(statechart->getSCInterface()->get_not()== false);
-	EXPECT_TRUE(statechart->getSCInterface()->get_equal()== false);
-	EXPECT_TRUE(statechart->getSCInterface()->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::StateA));
+	EXPECT_TRUE(statechart->getSCInterface()->get_myBool1()== true);
+	EXPECT_TRUE(statechart->getSCInterface()->get_myBool2()== false);
+	statechart->raise_e1();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(BooleanExpressions::StateB));
+	EXPECT_TRUE(statechart->getSCInterface()->get_and()== false);
+	EXPECT_TRUE(statechart->getSCInterface()->get_or()== true);
+	EXPECT_TRUE(statechart->getSCInterface()->get_not()== false);
+	EXPECT_TRUE(statechart->getSCInterface()->get_equal()== false);
+	EXPECT_TRUE(statechart->getSCInterface()->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::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;
+}

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->getSCInterface()->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->getSCInterface()->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->getSCInterface()->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->getSCInterface()->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->getSCInterface()->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->getSCInterface()->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->getSCInterface()->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::A));
+	statechart->getSCInterface()->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->getSCInterface()->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->getSCInterface()->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->getSCInterface()->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->getSCInterface()->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->getSCInterface()->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->getSCInterface()->set_c(true);
+	statechart->raise_h();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(Choice::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->getSCInterface()->get_condition()== 1);
-	statechart->raise_e();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(ConditionalExpressions::B));
-	EXPECT_TRUE(statechart->getSCInterface()->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::A));
+	EXPECT_TRUE(statechart->getSCInterface()->get_condition()== 1);
+	statechart->raise_e();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(ConditionalExpressions::B));
+	EXPECT_TRUE(statechart->getSCInterface()->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->getSCInterface()->get_x()== 0);
-	EXPECT_TRUE(statechart->getSCInterface()->get_y()== 0);
-	EXPECT_TRUE(statechart->getSCInterface()->get_z()== 0);
-	statechart->enter();
-	EXPECT_TRUE(statechart->getSCInterface()->get_x()== 1);
-	EXPECT_TRUE(statechart->getSCInterface()->get_y()== 1);
-	EXPECT_TRUE(statechart->getSCInterface()->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->getSCInterface()->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->getSCInterface()->get_x()== 0);
+	EXPECT_TRUE(statechart->getSCInterface()->get_y()== 0);
+	EXPECT_TRUE(statechart->getSCInterface()->get_z()== 0);
+	statechart->enter();
+	EXPECT_TRUE(statechart->getSCInterface()->get_x()== 1);
+	EXPECT_TRUE(statechart->getSCInterface()->get_y()== 1);
+	EXPECT_TRUE(statechart->getSCInterface()->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->getSCInterface()->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::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;
+}

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::Start));
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(DynamicChoice::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::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;
+}

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::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->getSCInterface()->get_entries()== 1);
-	EXPECT_TRUE(statechart->isActive(EntryExitSelfTransition::B));
-	statechart->getSCInterface()->set_entries(0);
-	statechart->raise_e();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->getSCInterface()->get_entries()== 1);
-	EXPECT_TRUE(statechart->getSCInterface()->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->getSCInterface()->get_entries()== 1);
-	statechart->getSCInterface()->set_entries(0);
-	statechart->raise_e1();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->getSCInterface()->get_entries()== 0);
-	EXPECT_TRUE(statechart->getSCInterface()->get_exits()== 0);
-	EXPECT_TRUE(statechart->isActive(EntryExitSelfTransition::C));
-	statechart->raise_e1();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(EntryExitSelfTransition::B));
-	EXPECT_TRUE(statechart->getSCInterface()->get_entries()== 1);
-	EXPECT_TRUE(statechart->getSCInterface()->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->getSCInterface()->get_entries()== 1);
+	EXPECT_TRUE(statechart->isActive(EntryExitSelfTransition::B));
+	statechart->getSCInterface()->set_entries(0);
+	statechart->raise_e();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->getSCInterface()->get_entries()== 1);
+	EXPECT_TRUE(statechart->getSCInterface()->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->getSCInterface()->get_entries()== 1);
+	statechart->getSCInterface()->set_entries(0);
+	statechart->raise_e1();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->getSCInterface()->get_entries()== 0);
+	EXPECT_TRUE(statechart->getSCInterface()->get_exits()== 0);
+	EXPECT_TRUE(statechart->isActive(EntryExitSelfTransition::C));
+	statechart->raise_e1();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(EntryExitSelfTransition::B));
+	EXPECT_TRUE(statechart->getSCInterface()->get_entries()== 1);
+	EXPECT_TRUE(statechart->getSCInterface()->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->getSCInterface()->get_entryCount()== 1);
-	EXPECT_TRUE(statechart->getSCInterface()->get_exitCount()== 0);
-	statechart->raise_e();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->getSCInterface()->get_entryCount()== 2);
-	EXPECT_TRUE(statechart->getSCInterface()->get_exitCount()== 1);
-	statechart->raise_f();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->getSCInterface()->get_entryCount()== 2);
-	EXPECT_TRUE(statechart->getSCInterface()->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::A));
+	EXPECT_TRUE(statechart->getSCInterface()->get_entryCount()== 1);
+	EXPECT_TRUE(statechart->getSCInterface()->get_exitCount()== 0);
+	statechart->raise_e();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->getSCInterface()->get_entryCount()== 2);
+	EXPECT_TRUE(statechart->getSCInterface()->get_exitCount()== 1);
+	statechart->raise_f();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->getSCInterface()->get_entryCount()== 2);
+	EXPECT_TRUE(statechart->getSCInterface()->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::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;
+}

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::A));
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(FeatureCalls::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::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;
+}

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->getSCInterface()->get_guard()== false);
-	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(GuardedEntry::A));
-	EXPECT_TRUE(statechart->getSCInterface()->get_done()== false);
-	delete statechart;
-}
-TEST(StatemachineTest, EntryTakenOnStatechartEnter) {
-	GuardedEntry* statechart = new GuardedEntry();
-	statechart->init();
-	statechart->getSCInterface()->set_guard(true);
-	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(GuardedEntry::A));
-	EXPECT_TRUE(statechart->getSCInterface()->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->getSCInterface()->set_guard(true);
-	statechart->getSCInterface()->set_done(false);
-	statechart->raise_e();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(GuardedEntry::A));
-	EXPECT_TRUE(statechart->getSCInterface()->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->getSCInterface()->set_guard(false);
-	statechart->getSCInterface()->set_done(false);
-	statechart->raise_e();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(GuardedEntry::A));
-	EXPECT_TRUE(!statechart->getSCInterface()->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->getSCInterface()->get_guard()== false);
+	statechart->enter();
+	EXPECT_TRUE(statechart->isActive(GuardedEntry::A));
+	EXPECT_TRUE(statechart->getSCInterface()->get_done()== false);
+	delete statechart;
+}
+TEST(StatemachineTest, EntryTakenOnStatechartEnter) {
+	GuardedEntry* statechart = new GuardedEntry();
+	statechart->init();
+	statechart->getSCInterface()->set_guard(true);
+	statechart->enter();
+	EXPECT_TRUE(statechart->isActive(GuardedEntry::A));
+	EXPECT_TRUE(statechart->getSCInterface()->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->getSCInterface()->set_guard(true);
+	statechart->getSCInterface()->set_done(false);
+	statechart->raise_e();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(GuardedEntry::A));
+	EXPECT_TRUE(statechart->getSCInterface()->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->getSCInterface()->set_guard(false);
+	statechart->getSCInterface()->set_done(false);
+	statechart->raise_e();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(GuardedEntry::A));
+	EXPECT_TRUE(!statechart->getSCInterface()->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->getSCInterface()->get_guard());
-	statechart->raise_e();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(GuardedExit::B));
-	EXPECT_TRUE(!statechart->getSCInterface()->get_done());
-	delete statechart;
-}
-TEST(StatemachineTest, ExitNotTaken) {
-	GuardedExit* statechart = new GuardedExit();
-	statechart->init();
-	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(GuardedExit::A));
-	statechart->getSCInterface()->set_guard(true);
-	statechart->raise_e();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(GuardedExit::B));
-	EXPECT_TRUE(statechart->getSCInterface()->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::A));
+	EXPECT_TRUE(!statechart->getSCInterface()->get_guard());
+	statechart->raise_e();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(GuardedExit::B));
+	EXPECT_TRUE(!statechart->getSCInterface()->get_done());
+	delete statechart;
+}
+TEST(StatemachineTest, ExitNotTaken) {
+	GuardedExit* statechart = new GuardedExit();
+	statechart->init();
+	statechart->enter();
+	EXPECT_TRUE(statechart->isActive(GuardedExit::A));
+	statechart->getSCInterface()->set_guard(true);
+	statechart->raise_e();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(GuardedExit::B));
+	EXPECT_TRUE(statechart->getSCInterface()->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::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;
+}

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::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;
+}

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->getSCInterface()->get_i()== 0);
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->getSCInterface()->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->getSCInterface()->get_i()== 0);
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->getSCInterface()->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->getSCInterface()->get_myInt1()== 10);
-	EXPECT_TRUE(statechart->getSCInterface()->get_myInt2()== 5);
-	statechart->raise_e1();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->getSCInterface()->get_less()== false);
-	EXPECT_TRUE(statechart->getSCInterface()->get_greater()== true);
-	EXPECT_TRUE(statechart->getSCInterface()->get_equalOrLess()== false);
-	EXPECT_TRUE(statechart->getSCInterface()->get_equalOrGreater()== true);
-	EXPECT_TRUE(statechart->getSCInterface()->get_equal()== false);
-	EXPECT_TRUE(statechart->getSCInterface()->get_notEqual()== true);
-	EXPECT_TRUE(statechart->getSCInterface()->get_plus()== 15);
-	EXPECT_TRUE(statechart->getSCInterface()->get_minus()== 5);
-	EXPECT_TRUE(statechart->getSCInterface()->get_multiply()== 50);
-	EXPECT_TRUE(statechart->getSCInterface()->get_division()== 2);
-	EXPECT_TRUE(statechart->getSCInterface()->get_modulo()== 0);
-	EXPECT_TRUE(statechart->getSCInterface()->get_negat()== - 10 );
-	EXPECT_TRUE(statechart->getSCInterface()->get_multiAssign()== 20);
-	EXPECT_TRUE(statechart->getSCInterface()->get_divAssign()== 2);
-	EXPECT_TRUE(statechart->getSCInterface()->get_plusAssign()== 12);
-	EXPECT_TRUE(statechart->getSCInterface()->get_minusAssign()== - 8 );
-	EXPECT_TRUE(statechart->getSCInterface()->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::StateA));
+	EXPECT_TRUE(statechart->getSCInterface()->get_myInt1()== 10);
+	EXPECT_TRUE(statechart->getSCInterface()->get_myInt2()== 5);
+	statechart->raise_e1();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->getSCInterface()->get_less()== false);
+	EXPECT_TRUE(statechart->getSCInterface()->get_greater()== true);
+	EXPECT_TRUE(statechart->getSCInterface()->get_equalOrLess()== false);
+	EXPECT_TRUE(statechart->getSCInterface()->get_equalOrGreater()== true);
+	EXPECT_TRUE(statechart->getSCInterface()->get_equal()== false);
+	EXPECT_TRUE(statechart->getSCInterface()->get_notEqual()== true);
+	EXPECT_TRUE(statechart->getSCInterface()->get_plus()== 15);
+	EXPECT_TRUE(statechart->getSCInterface()->get_minus()== 5);
+	EXPECT_TRUE(statechart->getSCInterface()->get_multiply()== 50);
+	EXPECT_TRUE(statechart->getSCInterface()->get_division()== 2);
+	EXPECT_TRUE(statechart->getSCInterface()->get_modulo()== 0);
+	EXPECT_TRUE(statechart->getSCInterface()->get_negat()== - 10 );
+	EXPECT_TRUE(statechart->getSCInterface()->get_multiAssign()== 20);
+	EXPECT_TRUE(statechart->getSCInterface()->get_divAssign()== 2);
+	EXPECT_TRUE(statechart->getSCInterface()->get_plusAssign()== 12);
+	EXPECT_TRUE(statechart->getSCInterface()->get_minusAssign()== - 8 );
+	EXPECT_TRUE(statechart->getSCInterface()->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::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;
+}

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->getSCInterface()->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::A));
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->getSCInterface()->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->getSCInterface()->get_x()== 4 && statechart->getSCInterface()->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->getSCInterface()->get_x()== 4 && statechart->getSCInterface()->get_b()) << "logical and expression was executed in wrong order..." ;
+	delete statechart;
+}

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

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

test-plugins/org.yakindu.sct.generator.cpp.test/gtests/LogicalOrTestsTest/LogicalOrTestsTest.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 "LogicalOr.h"
-
-TEST(StatemachineTest, operandEvaluationOrder) {
-	LogicalOr* statechart = new LogicalOr();
-	statechart->init();
-	statechart->enter();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->getSCInterface()->get_x()== 4 && statechart->getSCInterface()->get_b()) << "logical or 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 "LogicalOr.h"
+
+TEST(StatemachineTest, operandEvaluationOrder) {
+	LogicalOr* statechart = new LogicalOr();
+	statechart->init();
+	statechart->enter();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->getSCInterface()->get_x()== 4 && statechart->getSCInterface()->get_b()) << "logical or expression was executed in wrong order..." ;
+	delete statechart;
+}

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

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

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

@@ -1,28 +1,28 @@
-/**
-* 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 "NamedInterfaceAccess.h"
-
-TEST(StatemachineTest, SafeOpenSuccess) {
-	NamedInterfaceAccess* statechart = new NamedInterfaceAccess();
-	statechart->init();
-	statechart->enter();
-	statechart->runCycle();
-	statechart->getSCIUser()->raise_numberPressed(3);
-	statechart->runCycle();
-	statechart->getSCIUser()->raise_numberPressed(7);
-	statechart->runCycle();
-	statechart->getSCIUser()->raise_numberPressed(5);
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->getSCISafe()->isRaised_open());
-	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 "NamedInterfaceAccess.h"
+
+TEST(StatemachineTest, SafeOpenSuccess) {
+	NamedInterfaceAccess* statechart = new NamedInterfaceAccess();
+	statechart->init();
+	statechart->enter();
+	statechart->runCycle();
+	statechart->getSCIUser()->raise_numberPressed(3);
+	statechart->runCycle();
+	statechart->getSCIUser()->raise_numberPressed(7);
+	statechart->runCycle();
+	statechart->getSCIUser()->raise_numberPressed(5);
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->getSCISafe()->isRaised_open());
+	delete statechart;
+}

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

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

test-plugins/org.yakindu.sct.generator.cpp.test/gtests/NullCheckTest/NullCheckTest.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 "NullCheck.h"
-
-TEST(StatemachineTest, SimpleNullCheckTest) {
-	NullCheck* statechart = new NullCheck();
-	statechart->init();
-	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(NullCheck::A));
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(NullCheck::B));
-	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 "NullCheck.h"
+
+TEST(StatemachineTest, SimpleNullCheckTest) {
+	NullCheck* statechart = new NullCheck();
+	statechart->init();
+	statechart->enter();
+	EXPECT_TRUE(statechart->isActive(NullCheck::A));
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(NullCheck::B));
+	delete statechart;
+}

test-plugins/org.yakindu.sct.generator.cpp.test/gtests/OutEventLifeCycleTest/OutEventLifeCycle.sgen

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

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

@@ -1,52 +1,52 @@
-/**
-* 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 "OutEventLifeCycle.h"
-
-TEST(StatemachineTest, availableAfterCycle) {
-	OutEventLifeCycle* statechart = new OutEventLifeCycle();
-	statechart->init();
-	statechart->enter();
-	statechart->raise_e();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->getSCInterface()->isRaised_f());
-	delete statechart;
-}
-TEST(StatemachineTest, availableWithinCycle) {
-	OutEventLifeCycle* statechart = new OutEventLifeCycle();
-	statechart->init();
-	statechart->enter();
-	statechart->raise_e();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->getSCInterface()->get_f_available_in_cycle());
-	delete statechart;
-}
-TEST(StatemachineTest, unvailableWithin2ndCycle) {
-	OutEventLifeCycle* statechart = new OutEventLifeCycle();
-	statechart->init();
-	statechart->enter();
-	statechart->raise_e();
-	statechart->runCycle();
-	statechart->runCycle();
-	EXPECT_TRUE(!statechart->getSCInterface()->get_f_available_in_next_cycle());
-	delete statechart;
-}
-TEST(StatemachineTest, unvailableAfter2ndCycle) {
-	OutEventLifeCycle* statechart = new OutEventLifeCycle();
-	statechart->init();
-	statechart->enter();
-	statechart->raise_e();
-	statechart->runCycle();
-	statechart->runCycle();
-	EXPECT_TRUE(!statechart->getSCInterface()->isRaised_f());
-	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 "OutEventLifeCycle.h"
+
+TEST(StatemachineTest, availableAfterCycle) {
+	OutEventLifeCycle* statechart = new OutEventLifeCycle();
+	statechart->init();
+	statechart->enter();
+	statechart->raise_e();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->getSCInterface()->isRaised_f());
+	delete statechart;
+}
+TEST(StatemachineTest, availableWithinCycle) {
+	OutEventLifeCycle* statechart = new OutEventLifeCycle();
+	statechart->init();
+	statechart->enter();
+	statechart->raise_e();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->getSCInterface()->get_f_available_in_cycle());
+	delete statechart;
+}
+TEST(StatemachineTest, unvailableWithin2ndCycle) {
+	OutEventLifeCycle* statechart = new OutEventLifeCycle();
+	statechart->init();
+	statechart->enter();
+	statechart->raise_e();
+	statechart->runCycle();
+	statechart->runCycle();
+	EXPECT_TRUE(!statechart->getSCInterface()->get_f_available_in_next_cycle());
+	delete statechart;
+}
+TEST(StatemachineTest, unvailableAfter2ndCycle) {
+	OutEventLifeCycle* statechart = new OutEventLifeCycle();
+	statechart->init();
+	statechart->enter();
+	statechart->raise_e();
+	statechart->runCycle();
+	statechart->runCycle();
+	EXPECT_TRUE(!statechart->getSCInterface()->isRaised_f());
+	delete statechart;
+}

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

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

test-plugins/org.yakindu.sct.generator.cpp.test/gtests/ParenthesisTest/ParenthesisTest.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 "Parenthesis.h"
-
-TEST(StatemachineTest, simple) {
-	Parenthesis* statechart = new Parenthesis();
-	statechart->init();
-	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(Parenthesis::A));
-	EXPECT_TRUE(statechart->getSCInterface()->get_erg()== 8);
-	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 "Parenthesis.h"
+
+TEST(StatemachineTest, simple) {
+	Parenthesis* statechart = new Parenthesis();
+	statechart->init();
+	statechart->enter();
+	EXPECT_TRUE(statechart->isActive(Parenthesis::A));
+	EXPECT_TRUE(statechart->getSCInterface()->get_erg()== 8);
+	delete statechart;
+}

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

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

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

@@ -1,35 +1,35 @@
-/**
-* 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 "PriorityValues.h"
-
-TEST(StatemachineTest, transitionPriority) {
-	PriorityValues* statechart = new PriorityValues();
-	statechart->init();
-	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(PriorityValues::main_region_A));
-	statechart->raise_event1();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(PriorityValues::C));
-	delete statechart;
-}
-TEST(StatemachineTest, regionPriority) {
-	PriorityValues* statechart = new PriorityValues();
-	statechart->init();
-	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(PriorityValues::A));
-	statechart->raise_event2();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(PriorityValues::B));
-	EXPECT_TRUE(!statechart->isActive(PriorityValues::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 "PriorityValues.h"
+
+TEST(StatemachineTest, transitionPriority) {
+	PriorityValues* statechart = new PriorityValues();
+	statechart->init();
+	statechart->enter();
+	EXPECT_TRUE(statechart->isActive(PriorityValues::main_region_A));
+	statechart->raise_event1();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(PriorityValues::C));
+	delete statechart;
+}
+TEST(StatemachineTest, regionPriority) {
+	PriorityValues* statechart = new PriorityValues();
+	statechart->init();
+	statechart->enter();
+	EXPECT_TRUE(statechart->isActive(PriorityValues::A));
+	statechart->raise_event2();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(PriorityValues::B));
+	EXPECT_TRUE(!statechart->isActive(PriorityValues::E));
+	delete statechart;
+}

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

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

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

@@ -1,27 +1,27 @@
-/**
-* 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 "RaiseEvent.h"
-
-TEST(StatemachineTest, raiseEvent) {
-	RaiseEvent* statechart = new RaiseEvent();
-	statechart->init();
-	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(RaiseEvent::SateA));
-	EXPECT_TRUE(statechart->isActive(RaiseEvent::StateA));
-	statechart->raise_e2();
-	statechart->runCycle();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(RaiseEvent::second_region_StateB));
-	EXPECT_TRUE(statechart->isActive(RaiseEvent::StateB));
-	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 "RaiseEvent.h"
+
+TEST(StatemachineTest, raiseEvent) {
+	RaiseEvent* statechart = new RaiseEvent();
+	statechart->init();
+	statechart->enter();
+	EXPECT_TRUE(statechart->isActive(RaiseEvent::SateA));
+	EXPECT_TRUE(statechart->isActive(RaiseEvent::StateA));
+	statechart->raise_e2();
+	statechart->runCycle();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(RaiseEvent::second_region_StateB));
+	EXPECT_TRUE(statechart->isActive(RaiseEvent::StateB));
+	delete statechart;
+}

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

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

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

@@ -1,480 +1,480 @@
-/**
-* 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 "STextKeywordsInStatesAndRegions.h"
-
-TEST(StatemachineTest, activeCheckWithSTextNamedStates) {
-	STextKeywordsInStatesAndRegions* statechart = new STextKeywordsInStatesAndRegions();
-	statechart->init();
-	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::namespace_ID));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::interface));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::event));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::in));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::var));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::external));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::default_ID));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::entry));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::always));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::raise));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::active));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::external_interface));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_event));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::entry_in));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_var));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::always_external));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle_default));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::raise_entry));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::valueof_always));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::active_raise));
-	statechart->raise_e1();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::namespace_ID));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::internal));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::event));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::in));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::var));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::external));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::default_ID));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::entry));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::always));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::raise));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::active));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::external_interface));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_event));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::entry_in));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_var));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::always_external));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle_default));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::raise_entry));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::valueof_always));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::active_raise));
-	statechart->raise_e2();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::namespace_ID));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::internal));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::local));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::in));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::var));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::external));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::default_ID));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::entry));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::always));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::raise));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::active));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::external_interface));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_event));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::entry_in));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_var));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::always_external));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle_default));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::raise_entry));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::valueof_always));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::active_raise));
-	statechart->raise_e1();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::namespace_ID));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::internal));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::local));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::out));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::var));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::external));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::default_ID));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::entry));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::always));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::raise));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::active));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::external_interface));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_event));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::entry_in));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_var));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::always_external));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle_default));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::raise_entry));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::valueof_always));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::active_raise));
-	statechart->raise_e2();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::namespace_ID));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::internal));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::local));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::out));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::readonly));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::external));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::default_ID));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::entry));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::always));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::raise));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::active));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::external_interface));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_event));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::entry_in));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_var));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::always_external));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle_default));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::raise_entry));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::valueof_always));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::active_raise));
-	statechart->raise_e1();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::namespace_ID));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::internal));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::local));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::out));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::readonly));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::internal_operation));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::default_ID));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::entry));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::always));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::raise));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::active));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::external_interface));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_event));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::entry_in));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_var));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::always_external));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle_default));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::raise_entry));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::valueof_always));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::active_raise));
-	statechart->raise_e2();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::namespace_ID));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::internal));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::local));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::out));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::readonly));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::internal_operation));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_ID));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::entry));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::always));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::raise));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::active));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::external_interface));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_event));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::entry_in));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_var));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::always_external));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle_default));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::raise_entry));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::valueof_always));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::active_raise));
-	statechart->raise_e1();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::namespace_ID));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::internal));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::local));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::out));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::readonly));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::internal_operation));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_ID));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_ID));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::always));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::raise));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::active));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::external_interface));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_event));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::entry_in));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_var));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::always_external));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle_default));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::raise_entry));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::valueof_always));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::active_raise));
-	statechart->raise_e2();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::namespace_ID));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::internal));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::local));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::out));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::readonly));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::internal_operation));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_ID));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_ID));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::raise));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::active));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::external_interface));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_event));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::entry_in));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_var));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::always_external));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle_default));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::raise_entry));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::valueof_always));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::active_raise));
-	statechart->raise_e1();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::namespace_ID));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::internal));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::local));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::out));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::readonly));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::internal_operation));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_ID));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_ID));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::valueof));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::active));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::external_interface));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_event));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::entry_in));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_var));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::always_external));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle_default));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::raise_entry));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::valueof_always));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::active_raise));
-	statechart->raise_e2();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::namespace_ID));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::internal));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::local));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::out));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::readonly));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::internal_operation));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_ID));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_ID));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::valueof));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::readonly_namespace));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::external_interface));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_event));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::entry_in));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_var));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::always_external));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle_default));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::raise_entry));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::valueof_always));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::active_raise));
-	statechart->raise_e1();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::namespace_ID));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::internal));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::local));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::out));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::readonly));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::internal_operation));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_ID));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_ID));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::valueof));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::readonly_namespace));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::external_internal));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_event));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::entry_in));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_var));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::always_external));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle_default));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::raise_entry));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::valueof_always));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::active_raise));
-	statechart->raise_e2();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::namespace_ID));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::internal));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::local));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::out));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::readonly));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::internal_operation));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_ID));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_ID));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::valueof));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::readonly_namespace));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::external_internal));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_local));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::entry_in));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_var));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::always_external));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle_default));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::raise_entry));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::valueof_always));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::active_raise));
-	statechart->raise_e1();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::namespace_ID));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::internal));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::local));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::out));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::readonly));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::internal_operation));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_ID));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_ID));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::valueof));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::readonly_namespace));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::external_internal));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_local));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::entry_out));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_var));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::always_external));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle_default));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::raise_entry));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::valueof_always));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::active_raise));
-	statechart->raise_e2();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::namespace_ID));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::internal));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::local));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::out));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::readonly));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::internal_operation));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_ID));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_ID));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::valueof));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::readonly_namespace));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::external_internal));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_local));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::entry_out));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_readonly));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::always_external));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle_default));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::raise_entry));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::valueof_always));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::active_raise));
-	statechart->raise_e1();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::namespace_ID));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::internal));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::local));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::out));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::readonly));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::internal_operation));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_ID));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_ID));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::valueof));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::readonly_namespace));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::external_internal));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_local));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::entry_out));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_readonly));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::always_operation));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle_default));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::raise_entry));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::valueof_always));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::active_raise));
-	statechart->raise_e2();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::namespace_ID));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::internal));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::local));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::out));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::readonly));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::internal_operation));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_ID));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_ID));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::valueof));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::readonly_namespace));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::external_internal));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_local));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::entry_out));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_readonly));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::always_operation));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle_else));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::raise_entry));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::valueof_always));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::active_raise));
-	statechart->raise_e1();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::namespace_ID));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::internal));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::local));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::out));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::readonly));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::internal_operation));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_ID));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_ID));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::valueof));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::readonly_namespace));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::external_internal));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_local));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::entry_out));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_readonly));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::always_operation));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle_else));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::raise_exit));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::valueof_always));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::active_raise));
-	statechart->raise_e2();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::namespace_ID));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::internal));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::local));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::out));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::readonly));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::internal_operation));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_ID));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_ID));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::valueof));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::readonly_namespace));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::external_internal));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_local));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::entry_out));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_readonly));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::always_operation));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle_else));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::raise_exit));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::valueof_oncycle));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::active_raise));
-	statechart->raise_e1();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::namespace_ID));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::internal));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::local));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::out));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::readonly));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::internal_operation));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_ID));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_ID));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::valueof));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::readonly_namespace));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::external_internal));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_local));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::entry_out));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_readonly));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::always_operation));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle_else));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::raise_exit));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::valueof_oncycle));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::active_valueof));
-	statechart->raise_e2();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::namespace_ID));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::internal));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::local));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::out));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::readonly));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::internal_operation));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_ID));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_ID));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::valueof));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::readonly_namespace));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::external_internal));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_local));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::entry_out));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_readonly));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::always_operation));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle_else));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::raise_exit));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::valueof_oncycle));
-	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::active_valueof));
-	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 "STextKeywordsInStatesAndRegions.h"
+
+TEST(StatemachineTest, activeCheckWithSTextNamedStates) {
+	STextKeywordsInStatesAndRegions* statechart = new STextKeywordsInStatesAndRegions();
+	statechart->init();
+	statechart->enter();
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::namespace_ID));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::interface));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::event));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::in));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::var));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::external));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::default_ID));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::entry));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::always));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::raise));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::active));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::external_interface));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_event));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::entry_in));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_var));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::always_external));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle_default));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::raise_entry));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::valueof_always));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::active_raise));
+	statechart->raise_e1();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::namespace_ID));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::internal));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::event));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::in));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::var));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::external));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::default_ID));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::entry));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::always));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::raise));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::active));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::external_interface));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_event));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::entry_in));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_var));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::always_external));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle_default));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::raise_entry));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::valueof_always));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::active_raise));
+	statechart->raise_e2();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::namespace_ID));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::internal));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::local));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::in));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::var));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::external));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::default_ID));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::entry));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::always));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::raise));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::active));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::external_interface));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_event));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::entry_in));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_var));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::always_external));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle_default));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::raise_entry));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::valueof_always));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::active_raise));
+	statechart->raise_e1();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::namespace_ID));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::internal));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::local));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::out));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::var));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::external));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::default_ID));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::entry));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::always));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::raise));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::active));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::external_interface));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_event));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::entry_in));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_var));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::always_external));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle_default));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::raise_entry));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::valueof_always));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::active_raise));
+	statechart->raise_e2();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::namespace_ID));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::internal));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::local));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::out));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::readonly));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::external));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::default_ID));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::entry));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::always));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::raise));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::active));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::external_interface));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_event));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::entry_in));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_var));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::always_external));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle_default));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::raise_entry));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::valueof_always));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::active_raise));
+	statechart->raise_e1();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::namespace_ID));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::internal));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::local));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::out));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::readonly));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::operation));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::default_ID));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::entry));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::always));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::raise));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::active));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::external_interface));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_event));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::entry_in));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_var));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::always_external));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle_default));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::raise_entry));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::valueof_always));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::active_raise));
+	statechart->raise_e2();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::namespace_ID));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::internal));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::local));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::out));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::readonly));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::operation));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_ID));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::entry));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::always));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::raise));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::active));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::external_interface));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_event));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::entry_in));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_var));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::always_external));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle_default));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::raise_entry));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::valueof_always));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::active_raise));
+	statechart->raise_e1();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::namespace_ID));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::internal));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::local));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::out));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::readonly));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::operation));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_ID));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_ID));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::always));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::raise));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::active));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::external_interface));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_event));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::entry_in));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_var));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::always_external));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle_default));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::raise_entry));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::valueof_always));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::active_raise));
+	statechart->raise_e2();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::namespace_ID));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::internal));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::local));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::out));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::readonly));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::operation));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_ID));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_ID));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::raise));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::active));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::external_interface));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_event));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::entry_in));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_var));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::always_external));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle_default));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::raise_entry));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::valueof_always));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::active_raise));
+	statechart->raise_e1();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::namespace_ID));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::internal));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::local));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::out));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::readonly));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::operation));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_ID));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_ID));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::valueof));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::active));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::external_interface));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_event));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::entry_in));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_var));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::always_external));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle_default));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::raise_entry));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::valueof_always));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::active_raise));
+	statechart->raise_e2();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::namespace_ID));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::internal));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::local));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::out));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::readonly));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::operation));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_ID));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_ID));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::valueof));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::readonly_namespace));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::external_interface));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_event));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::entry_in));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_var));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::always_external));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle_default));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::raise_entry));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::valueof_always));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::active_raise));
+	statechart->raise_e1();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::namespace_ID));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::internal));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::local));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::out));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::readonly));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::operation));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_ID));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_ID));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::valueof));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::readonly_namespace));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::external_internal));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_event));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::entry_in));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_var));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::always_external));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle_default));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::raise_entry));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::valueof_always));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::active_raise));
+	statechart->raise_e2();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::namespace_ID));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::internal));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::local));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::out));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::readonly));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::operation));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_ID));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_ID));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::valueof));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::readonly_namespace));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::external_internal));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_local));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::entry_in));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_var));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::always_external));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle_default));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::raise_entry));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::valueof_always));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::active_raise));
+	statechart->raise_e1();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::namespace_ID));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::internal));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::local));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::out));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::readonly));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::operation));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_ID));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_ID));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::valueof));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::readonly_namespace));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::external_internal));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_local));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::entry_out));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_var));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::always_external));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle_default));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::raise_entry));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::valueof_always));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::active_raise));
+	statechart->raise_e2();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::namespace_ID));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::internal));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::local));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::out));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::readonly));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::operation));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_ID));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_ID));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::valueof));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::readonly_namespace));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::external_internal));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_local));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::entry_out));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_readonly));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::always_external));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle_default));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::raise_entry));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::valueof_always));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::active_raise));
+	statechart->raise_e1();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::namespace_ID));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::internal));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::local));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::out));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::readonly));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::operation));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_ID));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_ID));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::valueof));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::readonly_namespace));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::external_internal));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_local));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::entry_out));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_readonly));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::always_operation));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle_default));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::raise_entry));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::valueof_always));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::active_raise));
+	statechart->raise_e2();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::namespace_ID));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::internal));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::local));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::out));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::readonly));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::operation));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_ID));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_ID));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::valueof));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::readonly_namespace));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::external_internal));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_local));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::entry_out));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_readonly));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::always_operation));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle_else));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::raise_entry));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::valueof_always));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::active_raise));
+	statechart->raise_e1();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::namespace_ID));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::internal));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::local));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::out));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::readonly));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::operation));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_ID));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_ID));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::valueof));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::readonly_namespace));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::external_internal));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_local));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::entry_out));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_readonly));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::always_operation));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle_else));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::raise_exit));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::valueof_always));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::active_raise));
+	statechart->raise_e2();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::namespace_ID));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::internal));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::local));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::out));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::readonly));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::operation));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_ID));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_ID));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::valueof));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::readonly_namespace));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::external_internal));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_local));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::entry_out));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_readonly));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::always_operation));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle_else));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::raise_exit));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::valueof_oncycle));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::active_raise));
+	statechart->raise_e1();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::namespace_ID));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::internal));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::local));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::out));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::readonly));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::operation));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_ID));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_ID));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::valueof));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::readonly_namespace));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::external_internal));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_local));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::entry_out));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_readonly));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::always_operation));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle_else));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::raise_exit));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::valueof_oncycle));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::active_valueof));
+	statechart->raise_e2();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::namespace_ID));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::internal));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::local));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::out));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::readonly));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::operation));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_ID));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_ID));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::valueof));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::readonly_namespace));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::external_internal));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::else_local));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::entry_out));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::exit_readonly));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::always_operation));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::oncycle_else));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::raise_exit));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::valueof_oncycle));
+	EXPECT_TRUE(statechart->isActive(STextKeywordsInStatesAndRegions::active_valueof));
+	delete statechart;
+}

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

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

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

@@ -1,29 +1,29 @@
-/**
-* 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 "SameNameDifferentRegion.h"
-
-TEST(StatemachineTest, sameNameDifferenRegionTest) {
-	SameNameDifferentRegion* statechart = new SameNameDifferentRegion();
-	statechart->init();
-	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(SameNameDifferentRegion::StateA));
-	statechart->raise_e1();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(SameNameDifferentRegion::StateB));
-	EXPECT_TRUE(statechart->isActive(SameNameDifferentRegion::r1_StateA));
-	statechart->raise_e1();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(SameNameDifferentRegion::StateB));
-	EXPECT_TRUE(statechart->isActive(SameNameDifferentRegion::r1_StateB));
-	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 "SameNameDifferentRegion.h"
+
+TEST(StatemachineTest, sameNameDifferenRegionTest) {
+	SameNameDifferentRegion* statechart = new SameNameDifferentRegion();
+	statechart->init();
+	statechart->enter();
+	EXPECT_TRUE(statechart->isActive(SameNameDifferentRegion::StateA));
+	statechart->raise_e1();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(SameNameDifferentRegion::StateB));
+	EXPECT_TRUE(statechart->isActive(SameNameDifferentRegion::r1_StateA));
+	statechart->raise_e1();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(SameNameDifferentRegion::StateB));
+	EXPECT_TRUE(statechart->isActive(SameNameDifferentRegion::r1_StateB));
+	delete statechart;
+}

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

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

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

@@ -1,50 +1,50 @@
-/**
-* 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 "ShallowHistory.h"
-
-TEST(StatemachineTest, shallowHistoryTest) {
-	ShallowHistory* statechart = new ShallowHistory();
-	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(ShallowHistory::State1));
-	EXPECT_TRUE(statechart->isActive(ShallowHistory::State9));
-	statechart->raise_event6();
-	statechart->runCycle();
-	EXPECT_TRUE(!statechart->isActive(ShallowHistory::State9));
-	EXPECT_TRUE(statechart->isActive(ShallowHistory::State6));
-	statechart->raise_event5();
-	statechart->runCycle();
-	EXPECT_TRUE(!statechart->isActive(ShallowHistory::State8));
-	EXPECT_TRUE(statechart->isActive(ShallowHistory::State9));
-	statechart->raise_event2();
-	statechart->runCycle();
-	EXPECT_TRUE(!statechart->isActive(ShallowHistory::State9));
-	EXPECT_TRUE(statechart->isActive(ShallowHistory::State1));
-	statechart->raise_event1();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(ShallowHistory::State6));
-	EXPECT_TRUE(!statechart->isActive(ShallowHistory::State1));
-	statechart->raise_event5();
-	statechart->runCycle();
-	EXPECT_TRUE(!statechart->isActive(ShallowHistory::State6));
-	EXPECT_TRUE(statechart->isActive(ShallowHistory::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 "ShallowHistory.h"
+
+TEST(StatemachineTest, shallowHistoryTest) {
+	ShallowHistory* statechart = new ShallowHistory();
+	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(ShallowHistory::State1));
+	EXPECT_TRUE(statechart->isActive(ShallowHistory::State9));
+	statechart->raise_event6();
+	statechart->runCycle();
+	EXPECT_TRUE(!statechart->isActive(ShallowHistory::State9));
+	EXPECT_TRUE(statechart->isActive(ShallowHistory::State6));
+	statechart->raise_event5();
+	statechart->runCycle();
+	EXPECT_TRUE(!statechart->isActive(ShallowHistory::State8));
+	EXPECT_TRUE(statechart->isActive(ShallowHistory::State9));
+	statechart->raise_event2();
+	statechart->runCycle();
+	EXPECT_TRUE(!statechart->isActive(ShallowHistory::State9));
+	EXPECT_TRUE(statechart->isActive(ShallowHistory::State1));
+	statechart->raise_event1();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(ShallowHistory::State6));
+	EXPECT_TRUE(!statechart->isActive(ShallowHistory::State1));
+	statechart->raise_event5();
+	statechart->runCycle();
+	EXPECT_TRUE(!statechart->isActive(ShallowHistory::State6));
+	EXPECT_TRUE(statechart->isActive(ShallowHistory::State9));
+	delete statechart;
+}

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

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

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

@@ -1,27 +1,27 @@
-/**
-* 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 "SimpleEvent.h"
-
-TEST(StatemachineTest, simpleEventTest) {
-	SimpleEvent* statechart = new SimpleEvent();
-	statechart->init();
-	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(SimpleEvent::A)) << "Expected A to be active" ;
-	EXPECT_TRUE(5== 5);
-	statechart->raise_event1();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(SimpleEvent::B)) << "Expected B to be active" ;
-	statechart->runCycle();
-	EXPECT_TRUE(!statechart->isActive(SimpleEvent::B));
-	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 "SimpleEvent.h"
+
+TEST(StatemachineTest, simpleEventTest) {
+	SimpleEvent* statechart = new SimpleEvent();
+	statechart->init();
+	statechart->enter();
+	EXPECT_TRUE(statechart->isActive(SimpleEvent::A)) << "Expected A to be active" ;
+	EXPECT_TRUE(5== 5);
+	statechart->raise_event1();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(SimpleEvent::B)) << "Expected B to be active" ;
+	statechart->runCycle();
+	EXPECT_TRUE(!statechart->isActive(SimpleEvent::B));
+	delete statechart;
+}

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

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

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

@@ -1,27 +1,27 @@
-/**
-* 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 "SimpleHierachy.h"
-
-TEST(StatemachineTest, simpleHierachyTest) {
-	SimpleHierachy* statechart = new SimpleHierachy();
-	statechart->init();
-	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(SimpleHierachy::A));
-	statechart->raise_event1();
-	statechart->raise_event1();
-	statechart->raise_event1();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(SimpleHierachy::B));
-	EXPECT_TRUE(statechart->isActive(SimpleHierachy::B1));
-	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 "SimpleHierachy.h"
+
+TEST(StatemachineTest, simpleHierachyTest) {
+	SimpleHierachy* statechart = new SimpleHierachy();
+	statechart->init();
+	statechart->enter();
+	EXPECT_TRUE(statechart->isActive(SimpleHierachy::A));
+	statechart->raise_event1();
+	statechart->raise_event1();
+	statechart->raise_event1();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(SimpleHierachy::B));
+	EXPECT_TRUE(statechart->isActive(SimpleHierachy::B1));
+	delete statechart;
+}

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

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

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

@@ -1,27 +1,27 @@
-/**
-* 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 "StateIsActive.h"
-
-TEST(StatemachineTest, stateIsActive) {
-	StateIsActive* statechart = new StateIsActive();
-	statechart->init();
-	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(StateIsActive::R1A));
-	EXPECT_TRUE(statechart->isActive(StateIsActive::R2A));
-	statechart->raise_event1();
-	statechart->runCycle();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(StateIsActive::R1B));
-	EXPECT_TRUE(statechart->isActive(StateIsActive::R2B));
-	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 "StateIsActive.h"
+
+TEST(StatemachineTest, stateIsActive) {
+	StateIsActive* statechart = new StateIsActive();
+	statechart->init();
+	statechart->enter();
+	EXPECT_TRUE(statechart->isActive(StateIsActive::R1A));
+	EXPECT_TRUE(statechart->isActive(StateIsActive::R2A));
+	statechart->raise_event1();
+	statechart->runCycle();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(StateIsActive::R1B));
+	EXPECT_TRUE(statechart->isActive(StateIsActive::R2B));
+	delete statechart;
+}

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

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

test-plugins/org.yakindu.sct.generator.cpp.test/gtests/StatechartLocalReactionsTest/StatechartLocalReactionsTest.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 "StatechartLocalReactions.h"
-
-TEST(StatemachineTest, statechartLocalReactionsTest) {
-	StatechartLocalReactions* statechart = new StatechartLocalReactions();
-	statechart->init();
-	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(StatechartLocalReactions::S1));
-	EXPECT_TRUE(statechart->isActive(StatechartLocalReactions::a));
-	while (statechart->getSCInterface()->get_myInt()< 10) {
-		EXPECT_TRUE(statechart->isActive(StatechartLocalReactions::a));
-		if (statechart->getSCInterface()->get_myInt()%2== 0) {
-					EXPECT_TRUE(statechart->isActive(StatechartLocalReactions::S1));
-				  }
-				else {
-					EXPECT_TRUE(statechart->isActive(StatechartLocalReactions::S2));;
-				}
-		statechart->runCycle();
-	}
-	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 "StatechartLocalReactions.h"
+
+TEST(StatemachineTest, statechartLocalReactionsTest) {
+	StatechartLocalReactions* statechart = new StatechartLocalReactions();
+	statechart->init();
+	statechart->enter();
+	EXPECT_TRUE(statechart->isActive(StatechartLocalReactions::S1));
+	EXPECT_TRUE(statechart->isActive(StatechartLocalReactions::a));
+	while (statechart->getSCInterface()->get_myInt()< 10) {
+		EXPECT_TRUE(statechart->isActive(StatechartLocalReactions::a));
+		if (statechart->getSCInterface()->get_myInt()%2== 0) {
+					EXPECT_TRUE(statechart->isActive(StatechartLocalReactions::S1));
+				  }
+				else {
+					EXPECT_TRUE(statechart->isActive(StatechartLocalReactions::S2));;
+				}
+		statechart->runCycle();
+	}
+	delete statechart;
+}

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

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

test-plugins/org.yakindu.sct.generator.cpp.test/gtests/StaticChoiceTest/StaticChoiceTest.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 "StaticChoice.h"
-
-TEST(StatemachineTest, StaticChoiceTest) {
-	StaticChoice* statechart = new StaticChoice();
-	statechart->init();
-	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(StaticChoice::Start));
-	statechart->runCycle();
-	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 "StaticChoice.h"
+
+TEST(StatemachineTest, StaticChoiceTest) {
+	StaticChoice* statechart = new StaticChoice();
+	statechart->init();
+	statechart->enter();
+	EXPECT_TRUE(statechart->isActive(StaticChoice::Start));
+	statechart->runCycle();
+	delete statechart;
+}

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

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

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

@@ -1,51 +1,51 @@
-/**
-* 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 "StringExpressions.h"
-
-TEST(StatemachineTest, StringExpressionsTest) {
-	StringExpressions* statechart = new StringExpressions();
-	statechart->init();
-	EXPECT_TRUE(strcmp(statechart->getSCInterface()->get_quotedStringX(), "\"X\"") == 0);
-	EXPECT_TRUE(strcmp(statechart->getSCInterface()->get_quotedStringY(), "\"Y\"") == 0);
-	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(StringExpressions::AssignmentChecked));
-	statechart->raise_e();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(StringExpressions::VarToVarCompareSucceeded));
-	EXPECT_TRUE(statechart->getSCInterface()->get_guardStringEqual());
-	EXPECT_TRUE(statechart->getSCInterface()->get_guardStringNotEqual());
-	EXPECT_TRUE(statechart->getSCInterface()->get_stringVarEqual());
-	EXPECT_TRUE(statechart->getSCInterface()->get_stringVarNotEqual());
-	statechart->raise_e();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(StringExpressions::VarToConstCompareSucceeded));
-	EXPECT_TRUE(statechart->getSCInterface()->get_guardStringEqual());
-	EXPECT_TRUE(statechart->getSCInterface()->get_guardStringNotEqual());
-	EXPECT_TRUE(statechart->getSCInterface()->get_stringVarEqual());
-	EXPECT_TRUE(statechart->getSCInterface()->get_stringVarNotEqual());
-	statechart->raise_e();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(StringExpressions::ConstToVarCompareSucceeded));
-	EXPECT_TRUE(statechart->getSCInterface()->get_guardStringEqual());
-	EXPECT_TRUE(statechart->getSCInterface()->get_guardStringNotEqual());
-	EXPECT_TRUE(statechart->getSCInterface()->get_stringVarEqual());
-	EXPECT_TRUE(statechart->getSCInterface()->get_stringVarNotEqual());
-	statechart->raise_e();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(StringExpressions::ConstToConstCompareSucceeded));
-	EXPECT_TRUE(statechart->getSCInterface()->get_guardStringEqual());
-	EXPECT_TRUE(statechart->getSCInterface()->get_guardStringNotEqual());
-	EXPECT_TRUE(statechart->getSCInterface()->get_stringVarEqual());
-	EXPECT_TRUE(statechart->getSCInterface()->get_stringVarNotEqual());
-	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 "StringExpressions.h"
+
+TEST(StatemachineTest, StringExpressionsTest) {
+	StringExpressions* statechart = new StringExpressions();
+	statechart->init();
+	EXPECT_TRUE(strcmp(statechart->getSCInterface()->get_quotedStringX(), "\"X\"") == 0);
+	EXPECT_TRUE(strcmp(statechart->getSCInterface()->get_quotedStringY(), "\"Y\"") == 0);
+	statechart->enter();
+	EXPECT_TRUE(statechart->isActive(StringExpressions::AssignmentChecked));
+	statechart->raise_e();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(StringExpressions::VarToVarCompareSucceeded));
+	EXPECT_TRUE(statechart->getSCInterface()->get_guardStringEqual());
+	EXPECT_TRUE(statechart->getSCInterface()->get_guardStringNotEqual());
+	EXPECT_TRUE(statechart->getSCInterface()->get_stringVarEqual());
+	EXPECT_TRUE(statechart->getSCInterface()->get_stringVarNotEqual());
+	statechart->raise_e();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(StringExpressions::VarToConstCompareSucceeded));
+	EXPECT_TRUE(statechart->getSCInterface()->get_guardStringEqual());
+	EXPECT_TRUE(statechart->getSCInterface()->get_guardStringNotEqual());
+	EXPECT_TRUE(statechart->getSCInterface()->get_stringVarEqual());
+	EXPECT_TRUE(statechart->getSCInterface()->get_stringVarNotEqual());
+	statechart->raise_e();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(StringExpressions::ConstToVarCompareSucceeded));
+	EXPECT_TRUE(statechart->getSCInterface()->get_guardStringEqual());
+	EXPECT_TRUE(statechart->getSCInterface()->get_guardStringNotEqual());
+	EXPECT_TRUE(statechart->getSCInterface()->get_stringVarEqual());
+	EXPECT_TRUE(statechart->getSCInterface()->get_stringVarNotEqual());
+	statechart->raise_e();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(StringExpressions::ConstToConstCompareSucceeded));
+	EXPECT_TRUE(statechart->getSCInterface()->get_guardStringEqual());
+	EXPECT_TRUE(statechart->getSCInterface()->get_guardStringNotEqual());
+	EXPECT_TRUE(statechart->getSCInterface()->get_stringVarEqual());
+	EXPECT_TRUE(statechart->getSCInterface()->get_stringVarNotEqual());
+	delete statechart;
+}

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

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

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

@@ -1,39 +1,39 @@
-/**
-* 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 "SyncFork.h"
-
-TEST(StatemachineTest, syncForkTest) {
-	SyncFork* statechart = new SyncFork();
-	statechart->init();
-	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(SyncFork::A));
-	statechart->raise_f();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(SyncFork::B));
-	EXPECT_TRUE(statechart->isActive(SyncFork::C1));
-	EXPECT_TRUE(statechart->isActive(SyncFork::D1));
-	statechart->raise_f();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(SyncFork::B));
-	EXPECT_TRUE(statechart->isActive(SyncFork::C2));
-	EXPECT_TRUE(statechart->isActive(SyncFork::D2));
-	statechart->raise_e();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(SyncFork::A));
-	statechart->raise_f();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(SyncFork::B));
-	EXPECT_TRUE(statechart->isActive(SyncFork::C1));
-	EXPECT_TRUE(statechart->isActive(SyncFork::D1));
-	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 "SyncFork.h"
+
+TEST(StatemachineTest, syncForkTest) {
+	SyncFork* statechart = new SyncFork();
+	statechart->init();
+	statechart->enter();
+	EXPECT_TRUE(statechart->isActive(SyncFork::A));
+	statechart->raise_f();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(SyncFork::B));
+	EXPECT_TRUE(statechart->isActive(SyncFork::C1));
+	EXPECT_TRUE(statechart->isActive(SyncFork::D1));
+	statechart->raise_f();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(SyncFork::B));
+	EXPECT_TRUE(statechart->isActive(SyncFork::C2));
+	EXPECT_TRUE(statechart->isActive(SyncFork::D2));
+	statechart->raise_e();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(SyncFork::A));
+	statechart->raise_f();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(SyncFork::B));
+	EXPECT_TRUE(statechart->isActive(SyncFork::C1));
+	EXPECT_TRUE(statechart->isActive(SyncFork::D1));
+	delete statechart;
+}

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

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

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

@@ -1,100 +1,100 @@
-/**
-* 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 "SyncJoin.h"
-
-TEST(StatemachineTest, syncJoin_C2_Waits) {
-	SyncJoin* statechart = new SyncJoin();
-	statechart->init();
-	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(SyncJoin::B));
-	EXPECT_TRUE(statechart->isActive(SyncJoin::C1));
-	EXPECT_TRUE(statechart->isActive(SyncJoin::D1));
-	statechart->raise_e();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(SyncJoin::C2));
-	EXPECT_TRUE(statechart->isActive(SyncJoin::D1));
-	statechart->raise_jc();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(SyncJoin::C2));
-	EXPECT_TRUE(statechart->isActive(SyncJoin::D1));
-	statechart->raise_jd();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(SyncJoin::C2));
-	EXPECT_TRUE(statechart->isActive(SyncJoin::D1));
-	statechart->raise_jc();
-	statechart->raise_jd();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(SyncJoin::C2));
-	EXPECT_TRUE(statechart->isActive(SyncJoin::D1));
-	statechart->raise_f();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(SyncJoin::C2));
-	EXPECT_TRUE(statechart->isActive(SyncJoin::D2));
-	statechart->raise_jc();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(SyncJoin::C2));
-	EXPECT_TRUE(statechart->isActive(SyncJoin::D2));
-	statechart->raise_jd();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(SyncJoin::C2));
-	EXPECT_TRUE(statechart->isActive(SyncJoin::D2));
-	statechart->raise_jc();
-	statechart->raise_jd();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(SyncJoin::A));
-	delete statechart;
-}
-TEST(StatemachineTest, syncJoin_D2_Waits) {
-	SyncJoin* statechart = new SyncJoin();
-	statechart->init();
-	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(SyncJoin::B));
-	EXPECT_TRUE(statechart->isActive(SyncJoin::C1));
-	EXPECT_TRUE(statechart->isActive(SyncJoin::D1));
-	statechart->raise_f();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(SyncJoin::C1));
-	EXPECT_TRUE(statechart->isActive(SyncJoin::D2));
-	statechart->raise_jc();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(SyncJoin::C1));
-	EXPECT_TRUE(statechart->isActive(SyncJoin::D2));
-	statechart->raise_jd();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(SyncJoin::C1));
-	EXPECT_TRUE(statechart->isActive(SyncJoin::D2));
-	statechart->raise_jc();
-	statechart->raise_jd();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(SyncJoin::C1));
-	EXPECT_TRUE(statechart->isActive(SyncJoin::D2));
-	statechart->raise_e();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(SyncJoin::C2));
-	EXPECT_TRUE(statechart->isActive(SyncJoin::D2));
-	delete statechart;
-}
-TEST(StatemachineTest, doubleEntryActionBug) {
-	SyncJoin* statechart = new SyncJoin();
-	statechart->init();
-	statechart->enter();
-	statechart->raise_e();
-	statechart->raise_f();
-	statechart->runCycle();
-	statechart->raise_jc();
-	statechart->raise_jd();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(SyncJoin::A));
-	EXPECT_TRUE(statechart->getSCInterface()->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 "SyncJoin.h"
+
+TEST(StatemachineTest, syncJoin_C2_Waits) {
+	SyncJoin* statechart = new SyncJoin();
+	statechart->init();
+	statechart->enter();
+	EXPECT_TRUE(statechart->isActive(SyncJoin::B));
+	EXPECT_TRUE(statechart->isActive(SyncJoin::C1));
+	EXPECT_TRUE(statechart->isActive(SyncJoin::D1));
+	statechart->raise_e();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(SyncJoin::C2));
+	EXPECT_TRUE(statechart->isActive(SyncJoin::D1));
+	statechart->raise_jc();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(SyncJoin::C2));
+	EXPECT_TRUE(statechart->isActive(SyncJoin::D1));
+	statechart->raise_jd();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(SyncJoin::C2));
+	EXPECT_TRUE(statechart->isActive(SyncJoin::D1));
+	statechart->raise_jc();
+	statechart->raise_jd();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(SyncJoin::C2));
+	EXPECT_TRUE(statechart->isActive(SyncJoin::D1));
+	statechart->raise_f();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(SyncJoin::C2));
+	EXPECT_TRUE(statechart->isActive(SyncJoin::D2));
+	statechart->raise_jc();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(SyncJoin::C2));
+	EXPECT_TRUE(statechart->isActive(SyncJoin::D2));
+	statechart->raise_jd();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(SyncJoin::C2));
+	EXPECT_TRUE(statechart->isActive(SyncJoin::D2));
+	statechart->raise_jc();
+	statechart->raise_jd();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(SyncJoin::A));
+	delete statechart;
+}
+TEST(StatemachineTest, syncJoin_D2_Waits) {
+	SyncJoin* statechart = new SyncJoin();
+	statechart->init();
+	statechart->enter();
+	EXPECT_TRUE(statechart->isActive(SyncJoin::B));
+	EXPECT_TRUE(statechart->isActive(SyncJoin::C1));
+	EXPECT_TRUE(statechart->isActive(SyncJoin::D1));
+	statechart->raise_f();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(SyncJoin::C1));
+	EXPECT_TRUE(statechart->isActive(SyncJoin::D2));
+	statechart->raise_jc();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(SyncJoin::C1));
+	EXPECT_TRUE(statechart->isActive(SyncJoin::D2));
+	statechart->raise_jd();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(SyncJoin::C1));
+	EXPECT_TRUE(statechart->isActive(SyncJoin::D2));
+	statechart->raise_jc();
+	statechart->raise_jd();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(SyncJoin::C1));
+	EXPECT_TRUE(statechart->isActive(SyncJoin::D2));
+	statechart->raise_e();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(SyncJoin::C2));
+	EXPECT_TRUE(statechart->isActive(SyncJoin::D2));
+	delete statechart;
+}
+TEST(StatemachineTest, doubleEntryActionBug) {
+	SyncJoin* statechart = new SyncJoin();
+	statechart->init();
+	statechart->enter();
+	statechart->raise_e();
+	statechart->raise_f();
+	statechart->runCycle();
+	statechart->raise_jc();
+	statechart->raise_jd();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(SyncJoin::A));
+	EXPECT_TRUE(statechart->getSCInterface()->get_x()== 1);
+	delete statechart;
+}

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

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

test-plugins/org.yakindu.sct.generator.cpp.test/gtests/TimedTransitionsTest/TimedTransitionsTest.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 "TimedTransitions.h"
-
-TEST(StatemachineTest, Timer01) {
-	TimedTransitions* statechart = new TimedTransitions();
-	statechart->init();
-	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(TimedTransitions::Start));
-	/*not implemented: WaitStatement*/
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(TimedTransitions::End));
-	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 "TimedTransitions.h"
+
+TEST(StatemachineTest, Timer01) {
+	TimedTransitions* statechart = new TimedTransitions();
+	statechart->init();
+	statechart->enter();
+	EXPECT_TRUE(statechart->isActive(TimedTransitions::Start));
+	/*not implemented: WaitStatement*/
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(TimedTransitions::End));
+	delete statechart;
+}

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

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

test-plugins/org.yakindu.sct.generator.cpp.test/gtests/TransitionWithoutConditionTest/TransitionWithoutConditionTest.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 "TransitionWithoutCondition.h"
-
-TEST(StatemachineTest, TransitionWithoutConditionTest) {
-	TransitionWithoutCondition* statechart = new TransitionWithoutCondition();
-	statechart->init();
-	statechart->enter();
-	EXPECT_TRUE(statechart->isActive(TransitionWithoutCondition::A));
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(TransitionWithoutCondition::B));
-	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 "TransitionWithoutCondition.h"
+
+TEST(StatemachineTest, TransitionWithoutConditionTest) {
+	TransitionWithoutCondition* statechart = new TransitionWithoutCondition();
+	statechart->init();
+	statechart->enter();
+	EXPECT_TRUE(statechart->isActive(TransitionWithoutCondition::A));
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(TransitionWithoutCondition::B));
+	delete statechart;
+}

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

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

test-plugins/org.yakindu.sct.generator.cpp.test/gtests/ValuedEventsTest/ValuedEventsTest.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 "ValuedEvents.h"
-
-TEST(StatemachineTest, valuedEventsTest) {
-	ValuedEvents* statechart = new ValuedEvents();
-	statechart->init();
-	statechart->enter();
-	statechart->runCycle();
-	EXPECT_TRUE(statechart->isActive(ValuedEvents::A));
-	EXPECT_TRUE(statechart->isActive(ValuedEvents::C));
-	EXPECT_TRUE(statechart->getSCInterface()->get_myVar()== 42);
-	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 "ValuedEvents.h"
+
+TEST(StatemachineTest, valuedEventsTest) {
+	ValuedEvents* statechart = new ValuedEvents();
+	statechart->init();
+	statechart->enter();
+	statechart->runCycle();
+	EXPECT_TRUE(statechart->isActive(ValuedEvents::A));
+	EXPECT_TRUE(statechart->isActive(ValuedEvents::C));
+	EXPECT_TRUE(statechart->getSCInterface()->get_myVar()== 42);
+	delete statechart;
+}

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

@@ -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
- */
-package org.yakindu.sct.generator.cpp.test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-import org.junit.runners.Suite.SuiteClasses;
-
-@RunWith(Suite.class)
-@SuiteClasses({AlwaysOncycleTest.class, AssignmentAsExpressionTest.class,
-		BitExpressionsTest.class, BooleanExpressionsTest.class,
-		ChoiceTest.class, CKeywordsTest.class, ConditionalExpressionTest.class,
-		DeclarationsTest.class, DeepEntryTest.class, DeepHistoryTest.class,
-		DynamicChoiceTest.class, EnterStateTest.class, EntryChoiceTest.class,
-		EntryExitSelfTransitionTest.class, ExitOnSelfTransitionTest.class,
-		ExitStateTest.class, FeatureCallsTest.class, GuardTest.class,
-		GuardedEntryTest.class, GuardedExitTest.class,
-		HistoryWithExitPointTest.class, HistoryWithoutInitialStepTest.class,
-		InEventLifeCycleTest.class, IntegerExpressionsTest.class,
-		InternalEventLifeCycleTest.class, LocalReactionsTest.class,
-		LogicalAndTestsTest.class, LogicalOrTestsTest.class,
-		NamedInterfaceAccessTest.class, OutEventLifeCycleTest.class,
-		ParenthesisTest.class, PriorityValuesTest.class, RaiseEventTest.class,
-		SameNameDifferentRegionTest.class, ShallowHistoryTest.class,
-		SimpleEventTest.class, StatechartLocalReactionsTest.class,
-		SimpleHierachyTest.class, StateIsActiveTest.class,
-		StaticChoiceTest.class, STextKeywordsInStatesAndRegionsTest.class,
-		StringExpressionsTest.class, SyncForkTest.class, SyncJoinTest.class,
-		TransitionWithoutConditionTest.class, ValuedEventsTest.class})
-public class AllTestsTest {
-}
+/**
+ * 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
+ */
+package org.yakindu.sct.generator.cpp.test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
+
+@RunWith(Suite.class)
+@SuiteClasses({AlwaysOncycleTest.class, AssignmentAsExpressionTest.class,
+		BitExpressionsTest.class, BooleanExpressionsTest.class,
+		ChoiceTest.class, CKeywordsTest.class, ConditionalExpressionTest.class,
+		DeclarationsTest.class, DeepEntryTest.class, DeepHistoryTest.class,
+		DynamicChoiceTest.class, EnterStateTest.class, EntryChoiceTest.class,
+		EntryExitSelfTransitionTest.class, ExitOnSelfTransitionTest.class,
+		ExitStateTest.class, FeatureCallsTest.class, GuardTest.class,
+		GuardedEntryTest.class, GuardedExitTest.class,
+		HistoryWithExitPointTest.class, HistoryWithoutInitialStepTest.class,
+		InEventLifeCycleTest.class, IntegerExpressionsTest.class,
+		InternalEventLifeCycleTest.class, LocalReactionsTest.class,
+		LogicalAndTestsTest.class, LogicalOrTestsTest.class,
+		NamedInterfaceAccessTest.class, OutEventLifeCycleTest.class,
+		ParenthesisTest.class, PriorityValuesTest.class, RaiseEventTest.class,
+		SameNameDifferentRegionTest.class, ShallowHistoryTest.class,
+		SimpleEventTest.class, StatechartLocalReactionsTest.class,
+		SimpleHierachyTest.class, StateIsActiveTest.class,
+		StaticChoiceTest.class, STextKeywordsInStatesAndRegionsTest.class,
+		StringExpressionsTest.class, SyncForkTest.class, SyncJoinTest.class,
+		TransitionWithoutConditionTest.class, ValuedEventsTest.class})
+public class AllTestsTest {
+}

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

@@ -1,39 +1,39 @@
-/**
- * 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
- */
-package org.yakindu.sct.generator.cpp.test;
-
-import java.util.Collection;
-
-import org.junit.Before;
-import org.junit.runner.RunWith;
-import org.yakindu.sct.generator.c.gtest.GTest;
-import org.yakindu.sct.generator.c.gtest.GTestRunner;
-import org.yakindu.sct.generator.c.gtest.GTestHelper;
-
-@GTest(sourceFile = "gtests/AlwaysOncycleTest/AlwaysOncycleTest.cc", program = "gtests/AlwaysOncycleTest/AlwaysOncycle", model = "testmodels/SCTUnit/AlwaysOncycle.sct")
-@RunWith(GTestRunner.class)
-public class AlwaysOncycleTest {
-
-	protected final GTestHelper helper = new GTestHelper(this) {
-
-		@Override
-		protected void getSourceFiles(Collection<String> files) {
-			super.getSourceFiles(files);
-			files.add(getFileName(getTestProgram()) + ".cpp");
-		}
-	};
-
-	@Before
-	public void setUp() {
-		helper.generate();
-		helper.compile();
-	}
-}
+/**
+ * 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
+ */
+package org.yakindu.sct.generator.cpp.test;
+
+import java.util.Collection;
+
+import org.junit.Before;
+import org.junit.runner.RunWith;
+import org.yakindu.sct.generator.c.gtest.GTest;
+import org.yakindu.sct.generator.c.gtest.GTestRunner;
+import org.yakindu.sct.generator.c.gtest.GTestHelper;
+
+@GTest(sourceFile = "gtests/AlwaysOncycleTest/AlwaysOncycleTest.cc", program = "gtests/AlwaysOncycleTest/AlwaysOncycle", model = "testmodels/SCTUnit/AlwaysOncycle.sct")
+@RunWith(GTestRunner.class)
+public class AlwaysOncycleTest {
+
+	protected final GTestHelper helper = new GTestHelper(this) {
+
+		@Override
+		protected void getSourceFiles(Collection<String> files) {
+			super.getSourceFiles(files);
+			files.add(getFileName(getTestProgram()) + ".cpp");
+		}
+	};
+
+	@Before
+	public void setUp() {
+		helper.generate();
+		helper.compile();
+	}
+}