Przeglądaj źródła

Cpp gets compiled with gcc and not with g++ (#1653)

* Added initialisation list

* Added copyConstructor and assignment operator as private

Prepared declaration for copyConstructor

* removed copyConstructorDefinition

* changed compiler flag for cpp tests 

issue #1192

* restored cpp generator
rherrmannr 8 lat temu
rodzic
commit
80b0de6043
77 zmienionych plików z 722 dodań i 640 usunięć
  1. 347 342
      plugins/org.yakindu.sct.model.sexec/src/org/yakindu/sct/model/sexec/extensions/SExecExtensions.xtend
  2. 18 13
      test-plugins/org.yakindu.sct.generator.c.test/src/org/yakindu/sct/generator/c/gtest/GTestHelper.java
  3. 6 6
      test-plugins/org.yakindu.sct.generator.cpp.test/model/test.eventdriven.sgen
  4. 12 12
      test-plugins/org.yakindu.sct.generator.cpp.test/model/test.executionorder.sgen
  5. 198 196
      test-plugins/org.yakindu.sct.generator.cpp.test/model/test.sgen
  6. 0 1
      test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/AllTests.java
  7. 2 1
      test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/AlwaysOncycleTest.java
  8. 2 1
      test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/AssignmentAsExpressionTest.java
  9. 2 1
      test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/BitExpressionsTest.java
  10. 2 1
      test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/BooleanExpressionsTest.java
  11. 2 1
      test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/CKeywordsTest.java
  12. 2 1
      test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/CastExpressionsTest.java
  13. 2 1
      test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/ChildFirstExecutionHierarchyTest.java
  14. 2 1
      test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/ChildFirstLocalReactionsTest.java
  15. 2 1
      test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/ChoiceTest.java
  16. 2 1
      test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/ConditionalExpression.java
  17. 2 1
      test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/ConstOnlyDefaultScopeTest.java
  18. 2 1
      test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/ConstOnlyInternalScopeTest.java
  19. 2 1
      test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/ConstOnlyNamedScopeTest.java
  20. 2 1
      test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/ConstantsTests.java
  21. 2 1
      test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/DeclarationsTest.java
  22. 2 1
      test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/DeepEntryTest.java
  23. 2 1
      test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/DeepHistoryTest.java
  24. 2 1
      test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/DynamicChoiceTest.java
  25. 2 1
      test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/EmptyTransitionTest.java
  26. 2 1
      test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/EnterStateTest.java
  27. 2 1
      test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/EntryChoiceTest.java
  28. 2 1
      test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/EntryExitSelfTransitionTest.java
  29. 2 1
      test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/EntryReactionActionTest.java
  30. 2 1
      test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/EventDrivenInternalEventTest.java
  31. 2 1
      test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/EventDrivenTriggeredByEventTest.java
  32. 2 1
      test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/EventDrivenTriggeredByTimeEventTest.java
  33. 2 1
      test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/ExitOnSelfTransitionTest.java
  34. 2 1
      test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/ExitStateTest.java
  35. 2 1
      test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/FeatureCallsTest.java
  36. 2 1
      test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/FinalStateTest.java
  37. 2 1
      test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/GuardTest.java
  38. 2 1
      test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/GuardedEntryTest.java
  39. 2 1
      test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/GuardedExitTest.java
  40. 2 1
      test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/HistoryWithExitPointTest.java
  41. 2 1
      test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/HistoryWithoutInitialStepTest.java
  42. 2 1
      test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/InEventLifeCycleTest.java
  43. 2 1
      test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/IntegerExpressionsTest.java
  44. 2 1
      test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/InternalEventLifeCycleTest.java
  45. 2 1
      test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/LocalReactionsTest.java
  46. 2 1
      test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/LogicalAndTests.java
  47. 2 1
      test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/LogicalOrTests.java
  48. 2 1
      test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/NamedInterfaceAccessTest.java
  49. 2 1
      test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/NullCheckTest.java
  50. 1 0
      test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/OperationsTest.java
  51. 2 1
      test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/OutEventLifeCycleTest.java
  52. 2 1
      test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/ParentFirstExecutionHierarchyTest.java
  53. 2 1
      test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/ParentFirstLocalReactionsTest.java
  54. 2 1
      test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/ParenthesisTest.java
  55. 2 1
      test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/PriorityValuesTest.java
  56. 2 1
      test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/RaiseEventTest.java
  57. 2 1
      test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/ReadOnlyVariableTest.java
  58. 2 1
      test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/STextKeywordsInStatesAndRegionsTest.java
  59. 2 1
      test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/SameNameDifferentRegionTest.java
  60. 2 1
      test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/ShallowHistoryTest.java
  61. 2 1
      test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/ShallowHistoryWithDeepEntryTest.java
  62. 2 1
      test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/SimpleEventTest.java
  63. 2 1
      test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/SimpleHierachyTest.java
  64. 2 1
      test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/StateIsActiveTest.java
  65. 2 1
      test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/StatechartActiveTest.java
  66. 2 1
      test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/StatechartLocalReactionsTest.java
  67. 2 1
      test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/StatemachineKeywords.java
  68. 2 1
      test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/StaticChoiceTest.java
  69. 2 1
      test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/StringExpressionsTest.java
  70. 2 1
      test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/SyncForkTest.java
  71. 2 1
      test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/SyncJoinTest.java
  72. 2 1
      test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/TimedTransitionsTest.java
  73. 2 1
      test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/TransitionWithoutConditionTest.java
  74. 2 1
      test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/TriggerExpressionPrecedenceTest.java
  75. 2 1
      test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/TriggerGuardExpressionsTest.java
  76. 2 1
      test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/TypeAliasTest.java
  77. 2 1
      test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/ValuedEventsTest.java

+ 347 - 342
plugins/org.yakindu.sct.model.sexec/src/org/yakindu/sct/model/sexec/extensions/SExecExtensions.xtend

@@ -1,343 +1,348 @@
-/**
- * Copyright (c) 2013 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.model.sexec.extensions
-
-import java.util.ArrayList
-import java.util.List
-import org.eclipse.emf.ecore.EObject
-import org.yakindu.base.expressions.expressions.ElementReferenceExpression
-import org.yakindu.base.expressions.expressions.Expression
-import org.yakindu.base.expressions.expressions.FeatureCall
-import org.yakindu.base.types.Declaration
-import org.yakindu.base.types.Direction
-import org.yakindu.base.types.Event
-import org.yakindu.sct.model.sexec.Check
-import org.yakindu.sct.model.sexec.ExecutionFlow
-import org.yakindu.sct.model.sexec.ExecutionNode
-import org.yakindu.sct.model.sexec.ExecutionRegion
-import org.yakindu.sct.model.sexec.ExecutionScope
-import org.yakindu.sct.model.sexec.ExecutionState
-import org.yakindu.sct.model.sexec.Reaction
-import org.yakindu.sct.model.sexec.Sequence
-import org.yakindu.sct.model.sexec.Step
-import org.yakindu.sct.model.sexec.TimeEvent
-import org.yakindu.sct.model.sgraph.Scope
-import org.yakindu.sct.model.stext.stext.EventDefinition
-import org.yakindu.sct.model.stext.stext.InterfaceScope
-import org.yakindu.sct.model.stext.stext.InternalScope
-import org.yakindu.sct.model.stext.stext.StatechartScope
-import org.yakindu.sct.model.stext.stext.VariableDefinition
-
-class SExecExtensions {
-	
-	def isDefaultInterface(StatechartScope scope) {
-		switch scope {
-			InterfaceScope: scope.name == null || scope.name.empty
-			default: false
-		}
-	}
-	
-	def ExecutionFlow flow(EObject element){
-		var ExecutionFlow ret = null;
-		if (element != null) {
-			if (element instanceof ExecutionFlow) {
-				return element as ExecutionFlow
-			}
-			else {
-				ret = flow(element.eContainer)
-			}
-		}
-		return ret;
-	}
-	
-	def isTimed (ExecutionFlow it) {
-		scopes.filter[declarations.filter( typeof(TimeEvent) ).size > 0].size > 0
-	}
-	
-	def getTimeEvents(ExecutionFlow it) {
-		scopes.fold(new ArrayList<TimeEvent>, [l, s | l += s.declarations.filter(typeof(TimeEvent)) l])
-	}
-	
-	def hasHistory(ExecutionFlow it) {
-		historyVector != null && historyVector.size > 0;		
-	}
-	
-	def hasOutgoingEvents(Scope it) {
-		!outgoingEvents.empty
-	}
-	
-	def getOutgoingEvents(Scope it) {
-		declarations.filter(typeof(EventDefinition)).filter[direction == Direction::OUT].fold(new ArrayList<EventDefinition>, [l, ev | l += ev l])
-	}
-	
-	def hasIncomingEvents(Scope it) {
-		!incomingEvents.empty
-	}
-		
-	def List<EventDefinition> getIncomingEvents(Scope it) {
-		declarations.filter(typeof(EventDefinition)).filter[direction == Direction::IN].fold(new ArrayList<EventDefinition>, [l, ev | l += ev l])
-	}
-	
-	def List<EventDefinition> getLocalEvents(Scope it) {
-		declarations.filter(typeof(EventDefinition)).filter[direction == Direction::LOCAL].fold(new ArrayList<EventDefinition>, [l, ev | l += ev l])
-	}
-	
-	def getInterfaceScopes(ExecutionFlow it) {
-		scopes.filter(typeof(InterfaceScope))
-	}
-	
-	def getVariableDefinitions(Scope it) {
-		declarations.filter(typeof(VariableDefinition))
-	} 
-	def getInternalScope(ExecutionFlow it) {
-		it.scopes.filter(typeof(InternalScope)).head
-	}
-	
-	def dispatch definition(ElementReferenceExpression it) {
-		if (reference instanceof Declaration) reference as Declaration
-	}
-	def dispatch definition(FeatureCall it) {
-		if (feature instanceof Declaration) feature as Declaration
-	}
-	def dispatch definition(Expression it) {
-		null
-	}
-	
-	def Event event(Declaration it) {
-		if ( it instanceof Event ) it as Event else null 	
-	}
-
-	def dispatch List<ExecutionState> subStates(ExecutionState it) {
-		subScopes.fold(new ArrayList<ExecutionState>, 
-			[a, s | 
-				a.addAll(s.subStates)
-				a
-			]
-		)
-	} 
-	
-	def dispatch List<ExecutionState> subStates(ExecutionRegion it) {
-		subScopes.fold(new ArrayList<ExecutionState>, 
-			[a, s | 
-				a.add(s as ExecutionState)
-				a.addAll(s.subStates)
-				a
-			]
-		)
-	} 
-	
-	def dispatch List<ExecutionState> subStates(ExecutionScope it) {
-		return new ArrayList<ExecutionState>()
-	}
-	
-	def referencedChecks(ExecutionNode it) {
-		reactions.filter( r | r.check != null && r.check.refs.size > 0).map[it.check]
-	}
-
-	def referencedEffects(ExecutionNode it) {
-		reactions.filter( r | r.effect != null && r.effect.caller.size > 0).map( r | r.effect )
-	}
-	
-	def List<Step> checkFunctions(ExecutionFlow it) {
-		val funcs = new ArrayList<Step>()
-		funcs += referencedChecks
-		states.forEach( s | funcs += s.referencedChecks )
-		nodes.forEach( n | funcs += n.referencedChecks )
-		funcs
-	}
-	 
-	def List<Step> effectFunctions(ExecutionFlow it) {
-		val funcs = new ArrayList<Step>()
-		funcs += referencedEffects
-		states.forEach( s | funcs += s.referencedEffects )
-		nodes.forEach( n | funcs += n.referencedEffects )
-		return funcs
-	}
-	 
-	def List<Step> entryActionFunctions(ExecutionFlow it) {
-		val funcs = new ArrayList<Step>()
-		if (entryAction.called) funcs.add(entryAction) 
-		states.forEach( s | if (s.entryAction.called) funcs += s.entryAction )
-		return funcs
-	}
-	
-	def List<Step> exitActionFunctions(ExecutionFlow it) {
-		val funcs = new ArrayList<Step>()
-		if (exitAction.called) funcs.add(exitAction) 
-		states.forEach( s | if (s.exitAction.called) funcs += s.exitAction )
-		return funcs
-	}
-
-	/**
-	 * Checks if a step is called or not.
-	 */
-	def isCalled(Step it) { it != null && caller.size > 0 }
-	
-	
-	/**
-	 * Returns a list of all steps that are called. 
-	 */
-	def List<Sequence> called(List<Sequence> it) {
-		filter( s | s.called ).toList
-	}
-	
-	 
-	def List<Step> enterSequenceFunctions(ExecutionFlow it) {
-		val funcs = new ArrayList<Step>()
-		funcs.addAll(enterSequences.called) 
-		states.forEach( s | funcs += s.enterSequences.called )
-		regions.forEach( s | {
-			funcs += s.enterSequences.called
-			if (s.deepEnterSequence.called) funcs += s.deepEnterSequence
-			if (s.shallowEnterSequence.called) funcs += s.shallowEnterSequence
-		})
-		return funcs
-	}
-	 
-	def List<Step> exitSequenceFunctions(ExecutionFlow it) {
-		val funcs = new ArrayList<Step>()
-		if (exitSequence.called) funcs.add(exitSequence) 
-		states.forEach( s | if (s.exitSequence.called) funcs += s.exitSequence )
-		regions.forEach( s | if (s.exitSequence.called) funcs += s.exitSequence )
-		return funcs
-	}
-	 
-	def List<Step> reactFunctions(ExecutionFlow it) {
-		val funcs = new ArrayList<Step>()
-		if (reactSequence.called) funcs.add(reactSequence) 
-		states.forEach( s | if (s.reactSequence.called) funcs += s.reactSequence )
-		nodes.forEach( s | if (s.reactSequence.called) funcs += s.reactSequence )
-		return funcs
-	}
-	def dispatch Reaction reaction(Check it) { eContainer as Reaction }
-	def dispatch Reaction reaction(EObject it) { eContainer?.reaction }
-	def dispatch Reaction reaction(Reaction it) { it }
-
-	def isEntryAction(Step it) { eContainer.isEntryAction(it) }
-	def dispatch isEntryAction(ExecutionFlow it, Step s) { entryAction == s }
-	def dispatch isEntryAction(ExecutionState it, Step s) { entryAction == s }
-	def dispatch isEntryAction(EObject it, Step s) { false }
-	
-	def isExitAction(Step it) { eContainer.isExitAction(it) }
-	def dispatch isExitAction(ExecutionFlow it, Step s) { exitAction == s }
-	def dispatch isExitAction(ExecutionState it, Step s) { exitAction == s }
-	def dispatch isExitAction(EObject it, Step s) { false }
-	
-	def isEffect(Step it) { eContainer.isEffect(it) }
-	def dispatch isEffect(Reaction it, Step s) { effect == s }
-	def dispatch isEffect(EObject it, Step s) { false }
-	
-	def isEnterSequence(Step it) { eContainer.isEnterSequence(it) }
-	def dispatch isEnterSequence(ExecutionScope it, Step s) { enterSequences.contains(s) }
-	def dispatch isEnterSequence(EObject it, Step s) { false }
-	
-	def isDeepEnterSequence(Step it) { eContainer.isDeepEnterSequence(it) }
-	def dispatch isDeepEnterSequence(ExecutionRegion it, Step s) { deepEnterSequence == s }
-	def dispatch isDeepEnterSequence(EObject it, Step s) { false }
-	
-	def isShallowEnterSequence(Step it) { eContainer.isShallowEnterSequence(it) }
-	def dispatch isShallowEnterSequence(ExecutionRegion it, Step s) { shallowEnterSequence == s }
-	def dispatch isShallowEnterSequence(EObject it, Step s) { false }
-
-	def isExitSequence(Step it) { eContainer.isExitSequence(it) }
-	def dispatch isExitSequence(ExecutionScope it, Step s) { exitSequence == s }
-	def dispatch isExitSequence(EObject it, Step s) { false }
-	
-	def isReactSequence(Step it) { eContainer.isReactSequence(it) }
-	def dispatch isReactSequence(ExecutionNode it, Step s) { reactSequence == s }
-	def dispatch isReactSequence(EObject it, Step s) { false }
-	
-	def isCheckFunction(Step it) { it instanceof Check }
-	
-	
-	
-	/**
-	 * Returns a step that mathes the given name.
-	 */
-	def Sequence byName(List<Sequence>steps, String name) {
-		steps.filter(s | name.trim == s.name.trim ).head
-	}
-
-	/**
-	 * Returns the default step that is the step without name or the name 'default'.
-	 */
-	def Sequence defaultSequence(List<Sequence>steps) {
-		steps.filter(s | s.name == null || s.name.trim == "" ||  s.name.trim == "default" ).head
-	}
-	
-	/**
-	 * Tries to find the next super ExecutionScope from the eContainer hierarchy.
-	 * 
-	 * @return
-	 * 		The super ExecutionScope or null
-	 */
-	def ExecutionScope parentExecutionScope(EObject it) {
-		if (it != null) {
-			if (it instanceof ExecutionScope) {
-				return it as ExecutionScope
-			} else {
-				return parentExecutionScope(it.eContainer)
-			}
-		}
-		return null
-	}
-	
-	/**
-	 * Calculates the depth of a step within the ExecutionScope hierarchy. If the
-	 * Step is directly below the ExecutionFlow it has a depth of 0.
-	 * 
-	 * @return
-	 * 		The depth of the element
-	 */
-	def int getScopeDepth(Step it) {
-		return parentExecutionScope.scopeDepth
-	}
-	
-	/**
-	 * Calculates the depth of a ExecutionScope.
-	 * The ExecutionFlow has as root element a depth of 0.
-	 * 
-	 * * @return
-	 * 		The depth of the element
-	 */
-	def int getScopeDepth(ExecutionScope it) {
-		var scopeDepth = 0
-
-		if (it instanceof ExecutionFlow) {
-			return 0
-		} else {
-			scopeDepth = superScope.getScopeDepth + 1
-		}
-		return scopeDepth
-	}
-	
-	/**
-	 * returns all functions of an ExecutionFlow.
-	 */
-	def List<Step> getAllFunctions(ExecutionFlow it) {
-		var functions = new ArrayList<Step>
-		functions.addAll(checkFunctions)
-		functions.addAll(effectFunctions)
-		functions.addAll(entryActionFunctions)
-		functions.addAll(exitActionFunctions)
-		functions.addAll(enterSequenceFunctions)
-		functions.addAll(exitSequenceFunctions)
-		functions.addAll(reactFunctions)
-		return functions
-	}
-	
-	def getTimeEvent(ExecutionFlow flow, String timeEventName) {
-		flow.timeEvents.findFirst[name.compareTo(timeEventName) == 0]
-	}
-	
-		
-	
+/**
+ * Copyright (c) 2013 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.model.sexec.extensions
+
+import java.util.ArrayList
+import java.util.List
+import org.eclipse.emf.ecore.EObject
+import org.yakindu.base.expressions.expressions.ElementReferenceExpression
+import org.yakindu.base.expressions.expressions.Expression
+import org.yakindu.base.expressions.expressions.FeatureCall
+import org.yakindu.base.types.Declaration
+import org.yakindu.base.types.Direction
+import org.yakindu.base.types.Event
+import org.yakindu.sct.model.sexec.Check
+import org.yakindu.sct.model.sexec.ExecutionFlow
+import org.yakindu.sct.model.sexec.ExecutionNode
+import org.yakindu.sct.model.sexec.ExecutionRegion
+import org.yakindu.sct.model.sexec.ExecutionScope
+import org.yakindu.sct.model.sexec.ExecutionState
+import org.yakindu.sct.model.sexec.Reaction
+import org.yakindu.sct.model.sexec.Sequence
+import org.yakindu.sct.model.sexec.Step
+import org.yakindu.sct.model.sexec.TimeEvent
+import org.yakindu.sct.model.sgraph.Scope
+import org.yakindu.sct.model.stext.stext.EventDefinition
+import org.yakindu.sct.model.stext.stext.InterfaceScope
+import org.yakindu.sct.model.stext.stext.InternalScope
+import org.yakindu.sct.model.stext.stext.StatechartScope
+import org.yakindu.sct.model.stext.stext.VariableDefinition
+import org.yakindu.sct.model.stext.stext.OperationDefinition
+
+class SExecExtensions {
+	
+	def isDefaultInterface(StatechartScope scope) {
+		switch scope {
+			InterfaceScope: scope.name == null || scope.name.empty
+			default: false
+		}
+	}
+	
+	def ExecutionFlow flow(EObject element){
+		var ExecutionFlow ret = null;
+		if (element != null) {
+			if (element instanceof ExecutionFlow) {
+				return element as ExecutionFlow
+			}
+			else {
+				ret = flow(element.eContainer)
+			}
+		}
+		return ret;
+	}
+	
+	def isTimed (ExecutionFlow it) {
+		scopes.filter[declarations.filter( typeof(TimeEvent) ).size > 0].size > 0
+	}
+	
+	def hasOperationCallbacks (ExecutionFlow it){
+		scopes.filter[declarations.filter( typeof(OperationDefinition) ).size > 0].size > 0
+	}
+	
+	def getTimeEvents(ExecutionFlow it) {
+		scopes.fold(new ArrayList<TimeEvent>, [l, s | l += s.declarations.filter(typeof(TimeEvent)) l])
+	}
+	
+	def hasHistory(ExecutionFlow it) {
+		historyVector != null && historyVector.size > 0;		
+	}
+	
+	def hasOutgoingEvents(Scope it) {
+		!outgoingEvents.empty
+	}
+	
+	def getOutgoingEvents(Scope it) {
+		declarations.filter(typeof(EventDefinition)).filter[direction == Direction::OUT].fold(new ArrayList<EventDefinition>, [l, ev | l += ev l])
+	}
+	
+	def hasIncomingEvents(Scope it) {
+		!incomingEvents.empty
+	}
+		
+	def List<EventDefinition> getIncomingEvents(Scope it) {
+		declarations.filter(typeof(EventDefinition)).filter[direction == Direction::IN].fold(new ArrayList<EventDefinition>, [l, ev | l += ev l])
+	}
+	
+	def List<EventDefinition> getLocalEvents(Scope it) {
+		declarations.filter(typeof(EventDefinition)).filter[direction == Direction::LOCAL].fold(new ArrayList<EventDefinition>, [l, ev | l += ev l])
+	}
+	
+	def getInterfaceScopes(ExecutionFlow it) {
+		scopes.filter(typeof(InterfaceScope))
+	}
+	
+	def getVariableDefinitions(Scope it) {
+		declarations.filter(typeof(VariableDefinition))
+	} 
+	def getInternalScope(ExecutionFlow it) {
+		it.scopes.filter(typeof(InternalScope)).head
+	}
+	
+	def dispatch definition(ElementReferenceExpression it) {
+		if (reference instanceof Declaration) reference as Declaration
+	}
+	def dispatch definition(FeatureCall it) {
+		if (feature instanceof Declaration) feature as Declaration
+	}
+	def dispatch definition(Expression it) {
+		null
+	}
+	
+	def Event event(Declaration it) {
+		if ( it instanceof Event ) it as Event else null 	
+	}
+
+	def dispatch List<ExecutionState> subStates(ExecutionState it) {
+		subScopes.fold(new ArrayList<ExecutionState>, 
+			[a, s | 
+				a.addAll(s.subStates)
+				a
+			]
+		)
+	} 
+	
+	def dispatch List<ExecutionState> subStates(ExecutionRegion it) {
+		subScopes.fold(new ArrayList<ExecutionState>, 
+			[a, s | 
+				a.add(s as ExecutionState)
+				a.addAll(s.subStates)
+				a
+			]
+		)
+	} 
+	
+	def dispatch List<ExecutionState> subStates(ExecutionScope it) {
+		return new ArrayList<ExecutionState>()
+	}
+	
+	def referencedChecks(ExecutionNode it) {
+		reactions.filter( r | r.check != null && r.check.refs.size > 0).map[it.check]
+	}
+
+	def referencedEffects(ExecutionNode it) {
+		reactions.filter( r | r.effect != null && r.effect.caller.size > 0).map( r | r.effect )
+	}
+	
+	def List<Step> checkFunctions(ExecutionFlow it) {
+		val funcs = new ArrayList<Step>()
+		funcs += referencedChecks
+		states.forEach( s | funcs += s.referencedChecks )
+		nodes.forEach( n | funcs += n.referencedChecks )
+		funcs
+	}
+	 
+	def List<Step> effectFunctions(ExecutionFlow it) {
+		val funcs = new ArrayList<Step>()
+		funcs += referencedEffects
+		states.forEach( s | funcs += s.referencedEffects )
+		nodes.forEach( n | funcs += n.referencedEffects )
+		return funcs
+	}
+	 
+	def List<Step> entryActionFunctions(ExecutionFlow it) {
+		val funcs = new ArrayList<Step>()
+		if (entryAction.called) funcs.add(entryAction) 
+		states.forEach( s | if (s.entryAction.called) funcs += s.entryAction )
+		return funcs
+	}
+	
+	def List<Step> exitActionFunctions(ExecutionFlow it) {
+		val funcs = new ArrayList<Step>()
+		if (exitAction.called) funcs.add(exitAction) 
+		states.forEach( s | if (s.exitAction.called) funcs += s.exitAction )
+		return funcs
+	}
+
+	/**
+	 * Checks if a step is called or not.
+	 */
+	def isCalled(Step it) { it != null && caller.size > 0 }
+	
+	
+	/**
+	 * Returns a list of all steps that are called. 
+	 */
+	def List<Sequence> called(List<Sequence> it) {
+		filter( s | s.called ).toList
+	}
+	
+	 
+	def List<Step> enterSequenceFunctions(ExecutionFlow it) {
+		val funcs = new ArrayList<Step>()
+		funcs.addAll(enterSequences.called) 
+		states.forEach( s | funcs += s.enterSequences.called )
+		regions.forEach( s | {
+			funcs += s.enterSequences.called
+			if (s.deepEnterSequence.called) funcs += s.deepEnterSequence
+			if (s.shallowEnterSequence.called) funcs += s.shallowEnterSequence
+		})
+		return funcs
+	}
+	 
+	def List<Step> exitSequenceFunctions(ExecutionFlow it) {
+		val funcs = new ArrayList<Step>()
+		if (exitSequence.called) funcs.add(exitSequence) 
+		states.forEach( s | if (s.exitSequence.called) funcs += s.exitSequence )
+		regions.forEach( s | if (s.exitSequence.called) funcs += s.exitSequence )
+		return funcs
+	}
+	 
+	def List<Step> reactFunctions(ExecutionFlow it) {
+		val funcs = new ArrayList<Step>()
+		if (reactSequence.called) funcs.add(reactSequence) 
+		states.forEach( s | if (s.reactSequence.called) funcs += s.reactSequence )
+		nodes.forEach( s | if (s.reactSequence.called) funcs += s.reactSequence )
+		return funcs
+	}
+	def dispatch Reaction reaction(Check it) { eContainer as Reaction }
+	def dispatch Reaction reaction(EObject it) { eContainer?.reaction }
+	def dispatch Reaction reaction(Reaction it) { it }
+
+	def isEntryAction(Step it) { eContainer.isEntryAction(it) }
+	def dispatch isEntryAction(ExecutionFlow it, Step s) { entryAction == s }
+	def dispatch isEntryAction(ExecutionState it, Step s) { entryAction == s }
+	def dispatch isEntryAction(EObject it, Step s) { false }
+	
+	def isExitAction(Step it) { eContainer.isExitAction(it) }
+	def dispatch isExitAction(ExecutionFlow it, Step s) { exitAction == s }
+	def dispatch isExitAction(ExecutionState it, Step s) { exitAction == s }
+	def dispatch isExitAction(EObject it, Step s) { false }
+	
+	def isEffect(Step it) { eContainer.isEffect(it) }
+	def dispatch isEffect(Reaction it, Step s) { effect == s }
+	def dispatch isEffect(EObject it, Step s) { false }
+	
+	def isEnterSequence(Step it) { eContainer.isEnterSequence(it) }
+	def dispatch isEnterSequence(ExecutionScope it, Step s) { enterSequences.contains(s) }
+	def dispatch isEnterSequence(EObject it, Step s) { false }
+	
+	def isDeepEnterSequence(Step it) { eContainer.isDeepEnterSequence(it) }
+	def dispatch isDeepEnterSequence(ExecutionRegion it, Step s) { deepEnterSequence == s }
+	def dispatch isDeepEnterSequence(EObject it, Step s) { false }
+	
+	def isShallowEnterSequence(Step it) { eContainer.isShallowEnterSequence(it) }
+	def dispatch isShallowEnterSequence(ExecutionRegion it, Step s) { shallowEnterSequence == s }
+	def dispatch isShallowEnterSequence(EObject it, Step s) { false }
+
+	def isExitSequence(Step it) { eContainer.isExitSequence(it) }
+	def dispatch isExitSequence(ExecutionScope it, Step s) { exitSequence == s }
+	def dispatch isExitSequence(EObject it, Step s) { false }
+	
+	def isReactSequence(Step it) { eContainer.isReactSequence(it) }
+	def dispatch isReactSequence(ExecutionNode it, Step s) { reactSequence == s }
+	def dispatch isReactSequence(EObject it, Step s) { false }
+	
+	def isCheckFunction(Step it) { it instanceof Check }
+	
+	
+	
+	/**
+	 * Returns a step that mathes the given name.
+	 */
+	def Sequence byName(List<Sequence>steps, String name) {
+		steps.filter(s | name.trim == s.name.trim ).head
+	}
+
+	/**
+	 * Returns the default step that is the step without name or the name 'default'.
+	 */
+	def Sequence defaultSequence(List<Sequence>steps) {
+		steps.filter(s | s.name == null || s.name.trim == "" ||  s.name.trim == "default" ).head
+	}
+	
+	/**
+	 * Tries to find the next super ExecutionScope from the eContainer hierarchy.
+	 * 
+	 * @return
+	 * 		The super ExecutionScope or null
+	 */
+	def ExecutionScope parentExecutionScope(EObject it) {
+		if (it != null) {
+			if (it instanceof ExecutionScope) {
+				return it as ExecutionScope
+			} else {
+				return parentExecutionScope(it.eContainer)
+			}
+		}
+		return null
+	}
+	
+	/**
+	 * Calculates the depth of a step within the ExecutionScope hierarchy. If the
+	 * Step is directly below the ExecutionFlow it has a depth of 0.
+	 * 
+	 * @return
+	 * 		The depth of the element
+	 */
+	def int getScopeDepth(Step it) {
+		return parentExecutionScope.scopeDepth
+	}
+	
+	/**
+	 * Calculates the depth of a ExecutionScope.
+	 * The ExecutionFlow has as root element a depth of 0.
+	 * 
+	 * * @return
+	 * 		The depth of the element
+	 */
+	def int getScopeDepth(ExecutionScope it) {
+		var scopeDepth = 0
+
+		if (it instanceof ExecutionFlow) {
+			return 0
+		} else {
+			scopeDepth = superScope.getScopeDepth + 1
+		}
+		return scopeDepth
+	}
+	
+	/**
+	 * returns all functions of an ExecutionFlow.
+	 */
+	def List<Step> getAllFunctions(ExecutionFlow it) {
+		var functions = new ArrayList<Step>
+		functions.addAll(checkFunctions)
+		functions.addAll(effectFunctions)
+		functions.addAll(entryActionFunctions)
+		functions.addAll(exitActionFunctions)
+		functions.addAll(enterSequenceFunctions)
+		functions.addAll(exitSequenceFunctions)
+		functions.addAll(reactFunctions)
+		return functions
+	}
+	
+	def getTimeEvent(ExecutionFlow flow, String timeEventName) {
+		flow.timeEvents.findFirst[name.compareTo(timeEventName) == 0]
+	}
+	
+		
+	
 }

+ 18 - 13
test-plugins/org.yakindu.sct.generator.c.test/src/org/yakindu/sct/generator/c/gtest/GTestHelper.java

@@ -49,20 +49,20 @@ import org.yakindu.sct.model.sgraph.Statechart;
  * 
  */
 public class GTestHelper {
-	
+
 	/**
 	 * @author rbeckmann
 	 *
 	 */
 	public enum Compiler {
-		GCC ("gcc"), GPLUSPLUS ("g++");
-		
+		GCC("gcc"), GPLUSPLUS("g++");
+
 		protected String command;
-		
+
 		Compiler(String command) {
 			this.command = command;
 		}
-		
+
 		public String getCommand() {
 			return this.command;
 		}
@@ -70,11 +70,14 @@ public class GTestHelper {
 
 	private final Object owner;
 	protected Compiler compiler;
-	
-	
+
 	public GTestHelper(Object owner) {
+		this(owner, Compiler.GCC);
+	}
+
+	public GTestHelper(Object owner, Compiler compiler) {
 		this.owner = owner;
-		this.compiler = Compiler.GCC;
+		this.compiler = compiler;
 	}
 
 	public void compile() {
@@ -109,13 +112,15 @@ public class GTestHelper {
 		GeneratorModel model = (GeneratorModel) sgenResource.getContents().get(0);
 		return model;
 	}
-	
+
 	protected List<String> getFilesToCopy() {
-		return new ArrayList<String>(Arrays.asList(owner.getClass().getAnnotation(GTest.class).additionalFilesToCopy()));
+		return new ArrayList<String>(
+				Arrays.asList(owner.getClass().getAnnotation(GTest.class).additionalFilesToCopy()));
 	}
-	
+
 	protected List<String> getFilesToCompile() {
-		return new ArrayList<String>(Arrays.asList(owner.getClass().getAnnotation(GTest.class).additionalFilesToCompile()));
+		return new ArrayList<String>(
+				Arrays.asList(owner.getClass().getAnnotation(GTest.class).additionalFilesToCompile()));
 	}
 
 	protected GeneratorExecutorLookup getGeneratorExecutorLookup() {
@@ -259,7 +264,7 @@ public class GTestHelper {
 	protected String getTestBundleAnnotation() {
 		return owner.getClass().getAnnotation(GTest.class).testBundle();
 	}
-	
+
 	protected String getStatechartBundleAnnotation() {
 		return owner.getClass().getAnnotation(GTest.class).statechartBundle();
 	}

+ 6 - 6
test-plugins/org.yakindu.sct.generator.cpp.test/model/test.eventdriven.sgen

@@ -9,7 +9,7 @@ GeneratorModel for sctunit::cpp {
 		}		
 		
 		feature JUnitWrapper {
-			WrapToJUnit =  "true"
+			WrapToJUnit =  true
 		}		
 		
 		feature FunctionInlining {
@@ -25,7 +25,7 @@ GeneratorModel for sctunit::cpp {
 		}
 		
 		feature SGenModel {
-			GenerateSGen = "true"
+			GenerateSGen = true
 		}
 	}
 		
@@ -39,7 +39,7 @@ GeneratorModel for sctunit::cpp {
 		}		
 		
 		feature JUnitWrapper {
-			WrapToJUnit =  "true"
+			WrapToJUnit =  true
 		}		
 		
 		feature FunctionInlining {
@@ -55,7 +55,7 @@ GeneratorModel for sctunit::cpp {
 		}
 		
 		feature SGenModel {
-			GenerateSGen = "true"
+			GenerateSGen = true
 		}
 	}
 		
@@ -70,7 +70,7 @@ GeneratorModel for sctunit::cpp {
 		}		
 		
 		feature JUnitWrapper {
-			WrapToJUnit =  "true"
+			WrapToJUnit =  true
 		}		
 		
 		feature FunctionInlining {
@@ -86,7 +86,7 @@ GeneratorModel for sctunit::cpp {
 		}
 		
 		feature SGenModel {
-			GenerateSGen = "true"
+			GenerateSGen = true
 		}
 	}
 		

+ 12 - 12
test-plugins/org.yakindu.sct.generator.cpp.test/model/test.executionorder.sgen

@@ -9,7 +9,7 @@ GeneratorModel for sctunit::cpp {
 		}		
 		
 		feature JUnitWrapper {
-			WrapToJUnit =  "true"
+			WrapToJUnit =  true
 		}		
 		
 		feature FunctionInlining {
@@ -25,7 +25,7 @@ GeneratorModel for sctunit::cpp {
 		}
 		
 		feature SGenModel {
-			GenerateSGen = "true"
+			GenerateSGen = true
 		}
 	}
 		
@@ -39,7 +39,7 @@ GeneratorModel for sctunit::cpp {
 		}		
 		
 		feature JUnitWrapper {
-			WrapToJUnit =  "true"
+			WrapToJUnit =  true
 		}		
 		
 		feature FunctionInlining {
@@ -55,7 +55,7 @@ GeneratorModel for sctunit::cpp {
 		}
 		
 		feature SGenModel {
-			GenerateSGen = "true"
+			GenerateSGen = true
 		}
 	}
 		
@@ -70,7 +70,7 @@ GeneratorModel for sctunit::cpp {
 //		}		
 //		
 //		feature JUnitWrapper {
-//			WrapToJUnit =  "true"
+//			WrapToJUnit =  true
 //		}		
 //		
 //		feature FunctionInlining {
@@ -86,7 +86,7 @@ GeneratorModel for sctunit::cpp {
 //		}
 //		
 //		feature SGenModel {
-//			GenerateSGen = "true"
+//			GenerateSGen = true
 //		}
 //	}
 		
@@ -101,7 +101,7 @@ GeneratorModel for sctunit::cpp {
 		}		
 		
 		feature JUnitWrapper {
-			WrapToJUnit =  "true"
+			WrapToJUnit =  true
 		}		
 		
 		feature FunctionInlining {
@@ -117,7 +117,7 @@ GeneratorModel for sctunit::cpp {
 		}
 		
 		feature SGenModel {
-			GenerateSGen = "true"
+			GenerateSGen = true
 		}
 	}
 		
@@ -132,7 +132,7 @@ GeneratorModel for sctunit::cpp {
 		}		
 		
 		feature JUnitWrapper {
-			WrapToJUnit =  "true"
+			WrapToJUnit =  true
 		}		
 		
 		feature FunctionInlining {
@@ -148,7 +148,7 @@ GeneratorModel for sctunit::cpp {
 		}
 		
 		feature SGenModel {
-			GenerateSGen = "true"
+			GenerateSGen = true
 		}
 	}
 		
@@ -163,7 +163,7 @@ GeneratorModel for sctunit::cpp {
 //		}		
 //		
 //		feature JUnitWrapper {
-//			WrapToJUnit =  "true"
+//			WrapToJUnit =  true
 //		}		
 //		
 //		feature FunctionInlining {
@@ -179,7 +179,7 @@ GeneratorModel for sctunit::cpp {
 //		}
 //		
 //		feature SGenModel {
-//			GenerateSGen = "true"
+//			GenerateSGen = true
 //		}
 //	}
 		

Plik diff jest za duży
+ 198 - 196
test-plugins/org.yakindu.sct.generator.cpp.test/model/test.sgen


+ 0 - 1
test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/AllTests.java

@@ -29,7 +29,6 @@ import org.junit.runners.Suite.SuiteClasses;
 	EntryChoiceTest.class,
 	EntryExitSelfTransitionTest.class,
 	EntryReactionActionTest.class,
-	EventDrivenInternalEventTest.class,
 	EventDrivenTriggeredByEventTest.class,
 	EventDrivenTriggeredByTimeEventTest.class,
 	ExitOnSelfTransitionTest.class,

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

@@ -6,6 +6,7 @@ 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;
+import org.yakindu.sct.generator.c.gtest.GTestHelper.Compiler;
 
 @GTest(
 	statechartBundle = "org.yakindu.sct.test.models",
@@ -23,7 +24,7 @@ import org.yakindu.sct.generator.c.gtest.GTestHelper;
 )
 @RunWith(GTestRunner.class)
 public class AlwaysOncycleTest {
-protected final GTestHelper helper = new GTestHelper(this);
+protected final GTestHelper helper = new GTestHelper(this, Compiler.GPLUSPLUS);
 
 	@Before
 	public void setUp() {

+ 2 - 1
test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/AssignmentAsExpressionTest.java

@@ -6,6 +6,7 @@ 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;
+import org.yakindu.sct.generator.c.gtest.GTestHelper.Compiler;
 
 @GTest(
 	statechartBundle = "org.yakindu.sct.test.models",
@@ -23,7 +24,7 @@ import org.yakindu.sct.generator.c.gtest.GTestHelper;
 )
 @RunWith(GTestRunner.class)
 public class AssignmentAsExpressionTest {
-protected final GTestHelper helper = new GTestHelper(this);
+protected final GTestHelper helper = new GTestHelper(this, Compiler.GPLUSPLUS);
 
 	@Before
 	public void setUp() {

+ 2 - 1
test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/BitExpressionsTest.java

@@ -6,6 +6,7 @@ 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;
+import org.yakindu.sct.generator.c.gtest.GTestHelper.Compiler;
 
 @GTest(
 	statechartBundle = "org.yakindu.sct.test.models",
@@ -23,7 +24,7 @@ import org.yakindu.sct.generator.c.gtest.GTestHelper;
 )
 @RunWith(GTestRunner.class)
 public class BitExpressionsTest {
-protected final GTestHelper helper = new GTestHelper(this);
+protected final GTestHelper helper = new GTestHelper(this, Compiler.GPLUSPLUS);
 
 	@Before
 	public void setUp() {

+ 2 - 1
test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/BooleanExpressionsTest.java

@@ -6,6 +6,7 @@ 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;
+import org.yakindu.sct.generator.c.gtest.GTestHelper.Compiler;
 
 @GTest(
 	statechartBundle = "org.yakindu.sct.test.models",
@@ -23,7 +24,7 @@ import org.yakindu.sct.generator.c.gtest.GTestHelper;
 )
 @RunWith(GTestRunner.class)
 public class BooleanExpressionsTest {
-protected final GTestHelper helper = new GTestHelper(this);
+protected final GTestHelper helper = new GTestHelper(this, Compiler.GPLUSPLUS);
 
 	@Before
 	public void setUp() {

+ 2 - 1
test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/CKeywordsTest.java

@@ -6,6 +6,7 @@ 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;
+import org.yakindu.sct.generator.c.gtest.GTestHelper.Compiler;
 
 @GTest(
 	statechartBundle = "org.yakindu.sct.test.models",
@@ -23,7 +24,7 @@ import org.yakindu.sct.generator.c.gtest.GTestHelper;
 )
 @RunWith(GTestRunner.class)
 public class CKeywordsTest {
-protected final GTestHelper helper = new GTestHelper(this);
+protected final GTestHelper helper = new GTestHelper(this, Compiler.GPLUSPLUS);
 
 	@Before
 	public void setUp() {

+ 2 - 1
test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/CastExpressionsTest.java

@@ -6,6 +6,7 @@ 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;
+import org.yakindu.sct.generator.c.gtest.GTestHelper.Compiler;
 
 @GTest(
 	statechartBundle = "org.yakindu.sct.test.models",
@@ -23,7 +24,7 @@ import org.yakindu.sct.generator.c.gtest.GTestHelper;
 )
 @RunWith(GTestRunner.class)
 public class CastExpressionsTest {
-protected final GTestHelper helper = new GTestHelper(this);
+protected final GTestHelper helper = new GTestHelper(this, Compiler.GPLUSPLUS);
 
 	@Before
 	public void setUp() {

+ 2 - 1
test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/ChildFirstExecutionHierarchyTest.java

@@ -6,6 +6,7 @@ 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;
+import org.yakindu.sct.generator.c.gtest.GTestHelper.Compiler;
 
 @GTest(
 	statechartBundle = "org.yakindu.sct.test.models",
@@ -23,7 +24,7 @@ import org.yakindu.sct.generator.c.gtest.GTestHelper;
 )
 @RunWith(GTestRunner.class)
 public class ChildFirstExecutionHierarchyTest {
-protected final GTestHelper helper = new GTestHelper(this);
+protected final GTestHelper helper = new GTestHelper(this, Compiler.GPLUSPLUS);
 
 	@Before
 	public void setUp() {

+ 2 - 1
test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/ChildFirstLocalReactionsTest.java

@@ -6,6 +6,7 @@ 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;
+import org.yakindu.sct.generator.c.gtest.GTestHelper.Compiler;
 
 @GTest(
 	statechartBundle = "org.yakindu.sct.test.models",
@@ -23,7 +24,7 @@ import org.yakindu.sct.generator.c.gtest.GTestHelper;
 )
 @RunWith(GTestRunner.class)
 public class ChildFirstLocalReactionsTest {
-protected final GTestHelper helper = new GTestHelper(this);
+protected final GTestHelper helper = new GTestHelper(this, Compiler.GPLUSPLUS);
 
 	@Before
 	public void setUp() {

+ 2 - 1
test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/ChoiceTest.java

@@ -6,6 +6,7 @@ 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;
+import org.yakindu.sct.generator.c.gtest.GTestHelper.Compiler;
 
 @GTest(
 	statechartBundle = "org.yakindu.sct.test.models",
@@ -23,7 +24,7 @@ import org.yakindu.sct.generator.c.gtest.GTestHelper;
 )
 @RunWith(GTestRunner.class)
 public class ChoiceTest {
-protected final GTestHelper helper = new GTestHelper(this);
+protected final GTestHelper helper = new GTestHelper(this, Compiler.GPLUSPLUS);
 
 	@Before
 	public void setUp() {

+ 2 - 1
test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/ConditionalExpression.java

@@ -6,6 +6,7 @@ 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;
+import org.yakindu.sct.generator.c.gtest.GTestHelper.Compiler;
 
 @GTest(
 	statechartBundle = "org.yakindu.sct.test.models",
@@ -23,7 +24,7 @@ import org.yakindu.sct.generator.c.gtest.GTestHelper;
 )
 @RunWith(GTestRunner.class)
 public class ConditionalExpression {
-protected final GTestHelper helper = new GTestHelper(this);
+protected final GTestHelper helper = new GTestHelper(this, Compiler.GPLUSPLUS);
 
 	@Before
 	public void setUp() {

+ 2 - 1
test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/ConstOnlyDefaultScopeTest.java

@@ -6,6 +6,7 @@ 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;
+import org.yakindu.sct.generator.c.gtest.GTestHelper.Compiler;
 
 @GTest(
 	statechartBundle = "org.yakindu.sct.test.models",
@@ -23,7 +24,7 @@ import org.yakindu.sct.generator.c.gtest.GTestHelper;
 )
 @RunWith(GTestRunner.class)
 public class ConstOnlyDefaultScopeTest {
-protected final GTestHelper helper = new GTestHelper(this);
+protected final GTestHelper helper = new GTestHelper(this, Compiler.GPLUSPLUS);
 
 	@Before
 	public void setUp() {

+ 2 - 1
test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/ConstOnlyInternalScopeTest.java

@@ -6,6 +6,7 @@ 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;
+import org.yakindu.sct.generator.c.gtest.GTestHelper.Compiler;
 
 @GTest(
 	statechartBundle = "org.yakindu.sct.test.models",
@@ -23,7 +24,7 @@ import org.yakindu.sct.generator.c.gtest.GTestHelper;
 )
 @RunWith(GTestRunner.class)
 public class ConstOnlyInternalScopeTest {
-protected final GTestHelper helper = new GTestHelper(this);
+protected final GTestHelper helper = new GTestHelper(this, Compiler.GPLUSPLUS);
 
 	@Before
 	public void setUp() {

+ 2 - 1
test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/ConstOnlyNamedScopeTest.java

@@ -6,6 +6,7 @@ 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;
+import org.yakindu.sct.generator.c.gtest.GTestHelper.Compiler;
 
 @GTest(
 	statechartBundle = "org.yakindu.sct.test.models",
@@ -23,7 +24,7 @@ import org.yakindu.sct.generator.c.gtest.GTestHelper;
 )
 @RunWith(GTestRunner.class)
 public class ConstOnlyNamedScopeTest {
-protected final GTestHelper helper = new GTestHelper(this);
+protected final GTestHelper helper = new GTestHelper(this, Compiler.GPLUSPLUS);
 
 	@Before
 	public void setUp() {

+ 2 - 1
test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/ConstantsTests.java

@@ -6,6 +6,7 @@ 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;
+import org.yakindu.sct.generator.c.gtest.GTestHelper.Compiler;
 
 @GTest(
 	statechartBundle = "org.yakindu.sct.test.models",
@@ -23,7 +24,7 @@ import org.yakindu.sct.generator.c.gtest.GTestHelper;
 )
 @RunWith(GTestRunner.class)
 public class ConstantsTests {
-protected final GTestHelper helper = new GTestHelper(this);
+protected final GTestHelper helper = new GTestHelper(this, Compiler.GPLUSPLUS);
 
 	@Before
 	public void setUp() {

+ 2 - 1
test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/DeclarationsTest.java

@@ -6,6 +6,7 @@ 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;
+import org.yakindu.sct.generator.c.gtest.GTestHelper.Compiler;
 
 @GTest(
 	statechartBundle = "org.yakindu.sct.test.models",
@@ -23,7 +24,7 @@ import org.yakindu.sct.generator.c.gtest.GTestHelper;
 )
 @RunWith(GTestRunner.class)
 public class DeclarationsTest {
-protected final GTestHelper helper = new GTestHelper(this);
+protected final GTestHelper helper = new GTestHelper(this, Compiler.GPLUSPLUS);
 
 	@Before
 	public void setUp() {

+ 2 - 1
test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/DeepEntryTest.java

@@ -6,6 +6,7 @@ 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;
+import org.yakindu.sct.generator.c.gtest.GTestHelper.Compiler;
 
 @GTest(
 	statechartBundle = "org.yakindu.sct.test.models",
@@ -23,7 +24,7 @@ import org.yakindu.sct.generator.c.gtest.GTestHelper;
 )
 @RunWith(GTestRunner.class)
 public class DeepEntryTest {
-protected final GTestHelper helper = new GTestHelper(this);
+protected final GTestHelper helper = new GTestHelper(this, Compiler.GPLUSPLUS);
 
 	@Before
 	public void setUp() {

+ 2 - 1
test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/DeepHistoryTest.java

@@ -6,6 +6,7 @@ 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;
+import org.yakindu.sct.generator.c.gtest.GTestHelper.Compiler;
 
 @GTest(
 	statechartBundle = "org.yakindu.sct.test.models",
@@ -23,7 +24,7 @@ import org.yakindu.sct.generator.c.gtest.GTestHelper;
 )
 @RunWith(GTestRunner.class)
 public class DeepHistoryTest {
-protected final GTestHelper helper = new GTestHelper(this);
+protected final GTestHelper helper = new GTestHelper(this, Compiler.GPLUSPLUS);
 
 	@Before
 	public void setUp() {

+ 2 - 1
test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/DynamicChoiceTest.java

@@ -6,6 +6,7 @@ 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;
+import org.yakindu.sct.generator.c.gtest.GTestHelper.Compiler;
 
 @GTest(
 	statechartBundle = "org.yakindu.sct.test.models",
@@ -23,7 +24,7 @@ import org.yakindu.sct.generator.c.gtest.GTestHelper;
 )
 @RunWith(GTestRunner.class)
 public class DynamicChoiceTest {
-protected final GTestHelper helper = new GTestHelper(this);
+protected final GTestHelper helper = new GTestHelper(this, Compiler.GPLUSPLUS);
 
 	@Before
 	public void setUp() {

+ 2 - 1
test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/EmptyTransitionTest.java

@@ -6,6 +6,7 @@ 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;
+import org.yakindu.sct.generator.c.gtest.GTestHelper.Compiler;
 
 @GTest(
 	statechartBundle = "org.yakindu.sct.test.models",
@@ -23,7 +24,7 @@ import org.yakindu.sct.generator.c.gtest.GTestHelper;
 )
 @RunWith(GTestRunner.class)
 public class EmptyTransitionTest {
-protected final GTestHelper helper = new GTestHelper(this);
+protected final GTestHelper helper = new GTestHelper(this, Compiler.GPLUSPLUS);
 
 	@Before
 	public void setUp() {

+ 2 - 1
test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/EnterStateTest.java

@@ -6,6 +6,7 @@ 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;
+import org.yakindu.sct.generator.c.gtest.GTestHelper.Compiler;
 
 @GTest(
 	statechartBundle = "org.yakindu.sct.test.models",
@@ -23,7 +24,7 @@ import org.yakindu.sct.generator.c.gtest.GTestHelper;
 )
 @RunWith(GTestRunner.class)
 public class EnterStateTest {
-protected final GTestHelper helper = new GTestHelper(this);
+protected final GTestHelper helper = new GTestHelper(this, Compiler.GPLUSPLUS);
 
 	@Before
 	public void setUp() {

+ 2 - 1
test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/EntryChoiceTest.java

@@ -6,6 +6,7 @@ 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;
+import org.yakindu.sct.generator.c.gtest.GTestHelper.Compiler;
 
 @GTest(
 	statechartBundle = "org.yakindu.sct.test.models",
@@ -23,7 +24,7 @@ import org.yakindu.sct.generator.c.gtest.GTestHelper;
 )
 @RunWith(GTestRunner.class)
 public class EntryChoiceTest {
-protected final GTestHelper helper = new GTestHelper(this);
+protected final GTestHelper helper = new GTestHelper(this, Compiler.GPLUSPLUS);
 
 	@Before
 	public void setUp() {

+ 2 - 1
test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/EntryExitSelfTransitionTest.java

@@ -6,6 +6,7 @@ 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;
+import org.yakindu.sct.generator.c.gtest.GTestHelper.Compiler;
 
 @GTest(
 	statechartBundle = "org.yakindu.sct.test.models",
@@ -23,7 +24,7 @@ import org.yakindu.sct.generator.c.gtest.GTestHelper;
 )
 @RunWith(GTestRunner.class)
 public class EntryExitSelfTransitionTest {
-protected final GTestHelper helper = new GTestHelper(this);
+protected final GTestHelper helper = new GTestHelper(this, Compiler.GPLUSPLUS);
 
 	@Before
 	public void setUp() {

+ 2 - 1
test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/EntryReactionActionTest.java

@@ -6,6 +6,7 @@ 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;
+import org.yakindu.sct.generator.c.gtest.GTestHelper.Compiler;
 
 @GTest(
 	statechartBundle = "org.yakindu.sct.test.models",
@@ -23,7 +24,7 @@ import org.yakindu.sct.generator.c.gtest.GTestHelper;
 )
 @RunWith(GTestRunner.class)
 public class EntryReactionActionTest {
-protected final GTestHelper helper = new GTestHelper(this);
+protected final GTestHelper helper = new GTestHelper(this, Compiler.GPLUSPLUS);
 
 	@Before
 	public void setUp() {

+ 2 - 1
test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/EventDrivenInternalEventTest.java

@@ -6,6 +6,7 @@ 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;
+import org.yakindu.sct.generator.c.gtest.GTestHelper.Compiler;
 
 @GTest(
 	statechartBundle = "org.yakindu.sct.test.models",
@@ -23,7 +24,7 @@ import org.yakindu.sct.generator.c.gtest.GTestHelper;
 )
 @RunWith(GTestRunner.class)
 public class EventDrivenInternalEventTest {
-protected final GTestHelper helper = new GTestHelper(this);
+protected final GTestHelper helper = new GTestHelper(this, Compiler.GPLUSPLUS);
 
 	@Before
 	public void setUp() {

+ 2 - 1
test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/EventDrivenTriggeredByEventTest.java

@@ -6,6 +6,7 @@ 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;
+import org.yakindu.sct.generator.c.gtest.GTestHelper.Compiler;
 
 @GTest(
 	statechartBundle = "org.yakindu.sct.test.models",
@@ -23,7 +24,7 @@ import org.yakindu.sct.generator.c.gtest.GTestHelper;
 )
 @RunWith(GTestRunner.class)
 public class EventDrivenTriggeredByEventTest {
-protected final GTestHelper helper = new GTestHelper(this);
+protected final GTestHelper helper = new GTestHelper(this, Compiler.GPLUSPLUS);
 
 	@Before
 	public void setUp() {

+ 2 - 1
test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/EventDrivenTriggeredByTimeEventTest.java

@@ -6,6 +6,7 @@ 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;
+import org.yakindu.sct.generator.c.gtest.GTestHelper.Compiler;
 
 @GTest(
 	statechartBundle = "org.yakindu.sct.test.models",
@@ -23,7 +24,7 @@ import org.yakindu.sct.generator.c.gtest.GTestHelper;
 )
 @RunWith(GTestRunner.class)
 public class EventDrivenTriggeredByTimeEventTest {
-protected final GTestHelper helper = new GTestHelper(this);
+protected final GTestHelper helper = new GTestHelper(this, Compiler.GPLUSPLUS);
 
 	@Before
 	public void setUp() {

+ 2 - 1
test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/ExitOnSelfTransitionTest.java

@@ -6,6 +6,7 @@ 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;
+import org.yakindu.sct.generator.c.gtest.GTestHelper.Compiler;
 
 @GTest(
 	statechartBundle = "org.yakindu.sct.test.models",
@@ -23,7 +24,7 @@ import org.yakindu.sct.generator.c.gtest.GTestHelper;
 )
 @RunWith(GTestRunner.class)
 public class ExitOnSelfTransitionTest {
-protected final GTestHelper helper = new GTestHelper(this);
+protected final GTestHelper helper = new GTestHelper(this, Compiler.GPLUSPLUS);
 
 	@Before
 	public void setUp() {

+ 2 - 1
test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/ExitStateTest.java

@@ -6,6 +6,7 @@ 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;
+import org.yakindu.sct.generator.c.gtest.GTestHelper.Compiler;
 
 @GTest(
 	statechartBundle = "org.yakindu.sct.test.models",
@@ -23,7 +24,7 @@ import org.yakindu.sct.generator.c.gtest.GTestHelper;
 )
 @RunWith(GTestRunner.class)
 public class ExitStateTest {
-protected final GTestHelper helper = new GTestHelper(this);
+protected final GTestHelper helper = new GTestHelper(this, Compiler.GPLUSPLUS);
 
 	@Before
 	public void setUp() {

+ 2 - 1
test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/FeatureCallsTest.java

@@ -6,6 +6,7 @@ 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;
+import org.yakindu.sct.generator.c.gtest.GTestHelper.Compiler;
 
 @GTest(
 	statechartBundle = "org.yakindu.sct.test.models",
@@ -23,7 +24,7 @@ import org.yakindu.sct.generator.c.gtest.GTestHelper;
 )
 @RunWith(GTestRunner.class)
 public class FeatureCallsTest {
-protected final GTestHelper helper = new GTestHelper(this);
+protected final GTestHelper helper = new GTestHelper(this, Compiler.GPLUSPLUS);
 
 	@Before
 	public void setUp() {

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

@@ -6,6 +6,7 @@ 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;
+import org.yakindu.sct.generator.c.gtest.GTestHelper.Compiler;
 
 @GTest(
 	statechartBundle = "org.yakindu.sct.test.models",
@@ -23,7 +24,7 @@ import org.yakindu.sct.generator.c.gtest.GTestHelper;
 )
 @RunWith(GTestRunner.class)
 public class FinalStateTest {
-protected final GTestHelper helper = new GTestHelper(this);
+protected final GTestHelper helper = new GTestHelper(this, Compiler.GPLUSPLUS);
 
 	@Before
 	public void setUp() {

+ 2 - 1
test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/GuardTest.java

@@ -6,6 +6,7 @@ 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;
+import org.yakindu.sct.generator.c.gtest.GTestHelper.Compiler;
 
 @GTest(
 	statechartBundle = "org.yakindu.sct.test.models",
@@ -23,7 +24,7 @@ import org.yakindu.sct.generator.c.gtest.GTestHelper;
 )
 @RunWith(GTestRunner.class)
 public class GuardTest {
-protected final GTestHelper helper = new GTestHelper(this);
+protected final GTestHelper helper = new GTestHelper(this, Compiler.GPLUSPLUS);
 
 	@Before
 	public void setUp() {

+ 2 - 1
test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/GuardedEntryTest.java

@@ -6,6 +6,7 @@ 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;
+import org.yakindu.sct.generator.c.gtest.GTestHelper.Compiler;
 
 @GTest(
 	statechartBundle = "org.yakindu.sct.test.models",
@@ -23,7 +24,7 @@ import org.yakindu.sct.generator.c.gtest.GTestHelper;
 )
 @RunWith(GTestRunner.class)
 public class GuardedEntryTest {
-protected final GTestHelper helper = new GTestHelper(this);
+protected final GTestHelper helper = new GTestHelper(this, Compiler.GPLUSPLUS);
 
 	@Before
 	public void setUp() {

+ 2 - 1
test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/GuardedExitTest.java

@@ -6,6 +6,7 @@ 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;
+import org.yakindu.sct.generator.c.gtest.GTestHelper.Compiler;
 
 @GTest(
 	statechartBundle = "org.yakindu.sct.test.models",
@@ -23,7 +24,7 @@ import org.yakindu.sct.generator.c.gtest.GTestHelper;
 )
 @RunWith(GTestRunner.class)
 public class GuardedExitTest {
-protected final GTestHelper helper = new GTestHelper(this);
+protected final GTestHelper helper = new GTestHelper(this, Compiler.GPLUSPLUS);
 
 	@Before
 	public void setUp() {

+ 2 - 1
test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/HistoryWithExitPointTest.java

@@ -6,6 +6,7 @@ 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;
+import org.yakindu.sct.generator.c.gtest.GTestHelper.Compiler;
 
 @GTest(
 	statechartBundle = "org.yakindu.sct.test.models",
@@ -23,7 +24,7 @@ import org.yakindu.sct.generator.c.gtest.GTestHelper;
 )
 @RunWith(GTestRunner.class)
 public class HistoryWithExitPointTest {
-protected final GTestHelper helper = new GTestHelper(this);
+protected final GTestHelper helper = new GTestHelper(this, Compiler.GPLUSPLUS);
 
 	@Before
 	public void setUp() {

+ 2 - 1
test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/HistoryWithoutInitialStepTest.java

@@ -6,6 +6,7 @@ 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;
+import org.yakindu.sct.generator.c.gtest.GTestHelper.Compiler;
 
 @GTest(
 	statechartBundle = "org.yakindu.sct.test.models",
@@ -23,7 +24,7 @@ import org.yakindu.sct.generator.c.gtest.GTestHelper;
 )
 @RunWith(GTestRunner.class)
 public class HistoryWithoutInitialStepTest {
-protected final GTestHelper helper = new GTestHelper(this);
+protected final GTestHelper helper = new GTestHelper(this, Compiler.GPLUSPLUS);
 
 	@Before
 	public void setUp() {

+ 2 - 1
test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/InEventLifeCycleTest.java

@@ -6,6 +6,7 @@ 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;
+import org.yakindu.sct.generator.c.gtest.GTestHelper.Compiler;
 
 @GTest(
 	statechartBundle = "org.yakindu.sct.test.models",
@@ -23,7 +24,7 @@ import org.yakindu.sct.generator.c.gtest.GTestHelper;
 )
 @RunWith(GTestRunner.class)
 public class InEventLifeCycleTest {
-protected final GTestHelper helper = new GTestHelper(this);
+protected final GTestHelper helper = new GTestHelper(this, Compiler.GPLUSPLUS);
 
 	@Before
 	public void setUp() {

+ 2 - 1
test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/IntegerExpressionsTest.java

@@ -6,6 +6,7 @@ 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;
+import org.yakindu.sct.generator.c.gtest.GTestHelper.Compiler;
 
 @GTest(
 	statechartBundle = "org.yakindu.sct.test.models",
@@ -23,7 +24,7 @@ import org.yakindu.sct.generator.c.gtest.GTestHelper;
 )
 @RunWith(GTestRunner.class)
 public class IntegerExpressionsTest {
-protected final GTestHelper helper = new GTestHelper(this);
+protected final GTestHelper helper = new GTestHelper(this, Compiler.GPLUSPLUS);
 
 	@Before
 	public void setUp() {

+ 2 - 1
test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/InternalEventLifeCycleTest.java

@@ -6,6 +6,7 @@ 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;
+import org.yakindu.sct.generator.c.gtest.GTestHelper.Compiler;
 
 @GTest(
 	statechartBundle = "org.yakindu.sct.test.models",
@@ -23,7 +24,7 @@ import org.yakindu.sct.generator.c.gtest.GTestHelper;
 )
 @RunWith(GTestRunner.class)
 public class InternalEventLifeCycleTest {
-protected final GTestHelper helper = new GTestHelper(this);
+protected final GTestHelper helper = new GTestHelper(this, Compiler.GPLUSPLUS);
 
 	@Before
 	public void setUp() {

+ 2 - 1
test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/LocalReactionsTest.java

@@ -6,6 +6,7 @@ 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;
+import org.yakindu.sct.generator.c.gtest.GTestHelper.Compiler;
 
 @GTest(
 	statechartBundle = "org.yakindu.sct.test.models",
@@ -23,7 +24,7 @@ import org.yakindu.sct.generator.c.gtest.GTestHelper;
 )
 @RunWith(GTestRunner.class)
 public class LocalReactionsTest {
-protected final GTestHelper helper = new GTestHelper(this);
+protected final GTestHelper helper = new GTestHelper(this, Compiler.GPLUSPLUS);
 
 	@Before
 	public void setUp() {

+ 2 - 1
test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/LogicalAndTests.java

@@ -6,6 +6,7 @@ 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;
+import org.yakindu.sct.generator.c.gtest.GTestHelper.Compiler;
 
 @GTest(
 	statechartBundle = "org.yakindu.sct.test.models",
@@ -23,7 +24,7 @@ import org.yakindu.sct.generator.c.gtest.GTestHelper;
 )
 @RunWith(GTestRunner.class)
 public class LogicalAndTests {
-protected final GTestHelper helper = new GTestHelper(this);
+protected final GTestHelper helper = new GTestHelper(this, Compiler.GPLUSPLUS);
 
 	@Before
 	public void setUp() {

+ 2 - 1
test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/LogicalOrTests.java

@@ -6,6 +6,7 @@ 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;
+import org.yakindu.sct.generator.c.gtest.GTestHelper.Compiler;
 
 @GTest(
 	statechartBundle = "org.yakindu.sct.test.models",
@@ -23,7 +24,7 @@ import org.yakindu.sct.generator.c.gtest.GTestHelper;
 )
 @RunWith(GTestRunner.class)
 public class LogicalOrTests {
-protected final GTestHelper helper = new GTestHelper(this);
+protected final GTestHelper helper = new GTestHelper(this, Compiler.GPLUSPLUS);
 
 	@Before
 	public void setUp() {

+ 2 - 1
test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/NamedInterfaceAccessTest.java

@@ -6,6 +6,7 @@ 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;
+import org.yakindu.sct.generator.c.gtest.GTestHelper.Compiler;
 
 @GTest(
 	statechartBundle = "org.yakindu.sct.test.models",
@@ -23,7 +24,7 @@ import org.yakindu.sct.generator.c.gtest.GTestHelper;
 )
 @RunWith(GTestRunner.class)
 public class NamedInterfaceAccessTest {
-protected final GTestHelper helper = new GTestHelper(this);
+protected final GTestHelper helper = new GTestHelper(this, Compiler.GPLUSPLUS);
 
 	@Before
 	public void setUp() {

+ 2 - 1
test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/NullCheckTest.java

@@ -6,6 +6,7 @@ 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;
+import org.yakindu.sct.generator.c.gtest.GTestHelper.Compiler;
 
 @GTest(
 	statechartBundle = "org.yakindu.sct.test.models",
@@ -23,7 +24,7 @@ import org.yakindu.sct.generator.c.gtest.GTestHelper;
 )
 @RunWith(GTestRunner.class)
 public class NullCheckTest {
-protected final GTestHelper helper = new GTestHelper(this);
+protected final GTestHelper helper = new GTestHelper(this, Compiler.GPLUSPLUS);
 
 	@Before
 	public void setUp() {

+ 1 - 0
test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/OperationsTest.java

@@ -6,6 +6,7 @@ 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;
+import org.yakindu.sct.generator.c.gtest.GTestHelper.Compiler;
 import org.yakindu.sct.generator.c.gtest.GMockHelper;
 
 @GTest(

+ 2 - 1
test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/OutEventLifeCycleTest.java

@@ -6,6 +6,7 @@ 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;
+import org.yakindu.sct.generator.c.gtest.GTestHelper.Compiler;
 
 @GTest(
 	statechartBundle = "org.yakindu.sct.test.models",
@@ -23,7 +24,7 @@ import org.yakindu.sct.generator.c.gtest.GTestHelper;
 )
 @RunWith(GTestRunner.class)
 public class OutEventLifeCycleTest {
-protected final GTestHelper helper = new GTestHelper(this);
+protected final GTestHelper helper = new GTestHelper(this, Compiler.GPLUSPLUS);
 
 	@Before
 	public void setUp() {

+ 2 - 1
test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/ParentFirstExecutionHierarchyTest.java

@@ -6,6 +6,7 @@ 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;
+import org.yakindu.sct.generator.c.gtest.GTestHelper.Compiler;
 
 @GTest(
 	statechartBundle = "org.yakindu.sct.test.models",
@@ -23,7 +24,7 @@ import org.yakindu.sct.generator.c.gtest.GTestHelper;
 )
 @RunWith(GTestRunner.class)
 public class ParentFirstExecutionHierarchyTest {
-protected final GTestHelper helper = new GTestHelper(this);
+protected final GTestHelper helper = new GTestHelper(this, Compiler.GPLUSPLUS);
 
 	@Before
 	public void setUp() {

+ 2 - 1
test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/ParentFirstLocalReactionsTest.java

@@ -6,6 +6,7 @@ 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;
+import org.yakindu.sct.generator.c.gtest.GTestHelper.Compiler;
 
 @GTest(
 	statechartBundle = "org.yakindu.sct.test.models",
@@ -23,7 +24,7 @@ import org.yakindu.sct.generator.c.gtest.GTestHelper;
 )
 @RunWith(GTestRunner.class)
 public class ParentFirstLocalReactionsTest {
-protected final GTestHelper helper = new GTestHelper(this);
+protected final GTestHelper helper = new GTestHelper(this, Compiler.GPLUSPLUS);
 
 	@Before
 	public void setUp() {

+ 2 - 1
test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/ParenthesisTest.java

@@ -6,6 +6,7 @@ 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;
+import org.yakindu.sct.generator.c.gtest.GTestHelper.Compiler;
 
 @GTest(
 	statechartBundle = "org.yakindu.sct.test.models",
@@ -23,7 +24,7 @@ import org.yakindu.sct.generator.c.gtest.GTestHelper;
 )
 @RunWith(GTestRunner.class)
 public class ParenthesisTest {
-protected final GTestHelper helper = new GTestHelper(this);
+protected final GTestHelper helper = new GTestHelper(this, Compiler.GPLUSPLUS);
 
 	@Before
 	public void setUp() {

+ 2 - 1
test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/PriorityValuesTest.java

@@ -6,6 +6,7 @@ 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;
+import org.yakindu.sct.generator.c.gtest.GTestHelper.Compiler;
 
 @GTest(
 	statechartBundle = "org.yakindu.sct.test.models",
@@ -23,7 +24,7 @@ import org.yakindu.sct.generator.c.gtest.GTestHelper;
 )
 @RunWith(GTestRunner.class)
 public class PriorityValuesTest {
-protected final GTestHelper helper = new GTestHelper(this);
+protected final GTestHelper helper = new GTestHelper(this, Compiler.GPLUSPLUS);
 
 	@Before
 	public void setUp() {

+ 2 - 1
test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/RaiseEventTest.java

@@ -6,6 +6,7 @@ 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;
+import org.yakindu.sct.generator.c.gtest.GTestHelper.Compiler;
 
 @GTest(
 	statechartBundle = "org.yakindu.sct.test.models",
@@ -23,7 +24,7 @@ import org.yakindu.sct.generator.c.gtest.GTestHelper;
 )
 @RunWith(GTestRunner.class)
 public class RaiseEventTest {
-protected final GTestHelper helper = new GTestHelper(this);
+protected final GTestHelper helper = new GTestHelper(this, Compiler.GPLUSPLUS);
 
 	@Before
 	public void setUp() {

+ 2 - 1
test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/ReadOnlyVariableTest.java

@@ -6,6 +6,7 @@ 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;
+import org.yakindu.sct.generator.c.gtest.GTestHelper.Compiler;
 
 @GTest(
 	statechartBundle = "org.yakindu.sct.test.models",
@@ -23,7 +24,7 @@ import org.yakindu.sct.generator.c.gtest.GTestHelper;
 )
 @RunWith(GTestRunner.class)
 public class ReadOnlyVariableTest {
-protected final GTestHelper helper = new GTestHelper(this);
+protected final GTestHelper helper = new GTestHelper(this, Compiler.GPLUSPLUS);
 
 	@Before
 	public void setUp() {

+ 2 - 1
test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/STextKeywordsInStatesAndRegionsTest.java

@@ -6,6 +6,7 @@ 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;
+import org.yakindu.sct.generator.c.gtest.GTestHelper.Compiler;
 
 @GTest(
 	statechartBundle = "org.yakindu.sct.test.models",
@@ -23,7 +24,7 @@ import org.yakindu.sct.generator.c.gtest.GTestHelper;
 )
 @RunWith(GTestRunner.class)
 public class STextKeywordsInStatesAndRegionsTest {
-protected final GTestHelper helper = new GTestHelper(this);
+protected final GTestHelper helper = new GTestHelper(this, Compiler.GPLUSPLUS);
 
 	@Before
 	public void setUp() {

+ 2 - 1
test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/SameNameDifferentRegionTest.java

@@ -6,6 +6,7 @@ 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;
+import org.yakindu.sct.generator.c.gtest.GTestHelper.Compiler;
 
 @GTest(
 	statechartBundle = "org.yakindu.sct.test.models",
@@ -23,7 +24,7 @@ import org.yakindu.sct.generator.c.gtest.GTestHelper;
 )
 @RunWith(GTestRunner.class)
 public class SameNameDifferentRegionTest {
-protected final GTestHelper helper = new GTestHelper(this);
+protected final GTestHelper helper = new GTestHelper(this, Compiler.GPLUSPLUS);
 
 	@Before
 	public void setUp() {

+ 2 - 1
test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/ShallowHistoryTest.java

@@ -6,6 +6,7 @@ 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;
+import org.yakindu.sct.generator.c.gtest.GTestHelper.Compiler;
 
 @GTest(
 	statechartBundle = "org.yakindu.sct.test.models",
@@ -23,7 +24,7 @@ import org.yakindu.sct.generator.c.gtest.GTestHelper;
 )
 @RunWith(GTestRunner.class)
 public class ShallowHistoryTest {
-protected final GTestHelper helper = new GTestHelper(this);
+protected final GTestHelper helper = new GTestHelper(this, Compiler.GPLUSPLUS);
 
 	@Before
 	public void setUp() {

+ 2 - 1
test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/ShallowHistoryWithDeepEntryTest.java

@@ -6,6 +6,7 @@ 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;
+import org.yakindu.sct.generator.c.gtest.GTestHelper.Compiler;
 
 @GTest(
 	statechartBundle = "org.yakindu.sct.test.models",
@@ -23,7 +24,7 @@ import org.yakindu.sct.generator.c.gtest.GTestHelper;
 )
 @RunWith(GTestRunner.class)
 public class ShallowHistoryWithDeepEntryTest {
-protected final GTestHelper helper = new GTestHelper(this);
+protected final GTestHelper helper = new GTestHelper(this, Compiler.GPLUSPLUS);
 
 	@Before
 	public void setUp() {

+ 2 - 1
test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/SimpleEventTest.java

@@ -6,6 +6,7 @@ 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;
+import org.yakindu.sct.generator.c.gtest.GTestHelper.Compiler;
 
 @GTest(
 	statechartBundle = "org.yakindu.sct.test.models",
@@ -23,7 +24,7 @@ import org.yakindu.sct.generator.c.gtest.GTestHelper;
 )
 @RunWith(GTestRunner.class)
 public class SimpleEventTest {
-protected final GTestHelper helper = new GTestHelper(this);
+protected final GTestHelper helper = new GTestHelper(this, Compiler.GPLUSPLUS);
 
 	@Before
 	public void setUp() {

+ 2 - 1
test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/SimpleHierachyTest.java

@@ -6,6 +6,7 @@ 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;
+import org.yakindu.sct.generator.c.gtest.GTestHelper.Compiler;
 
 @GTest(
 	statechartBundle = "org.yakindu.sct.test.models",
@@ -23,7 +24,7 @@ import org.yakindu.sct.generator.c.gtest.GTestHelper;
 )
 @RunWith(GTestRunner.class)
 public class SimpleHierachyTest {
-protected final GTestHelper helper = new GTestHelper(this);
+protected final GTestHelper helper = new GTestHelper(this, Compiler.GPLUSPLUS);
 
 	@Before
 	public void setUp() {

+ 2 - 1
test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/StateIsActiveTest.java

@@ -6,6 +6,7 @@ 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;
+import org.yakindu.sct.generator.c.gtest.GTestHelper.Compiler;
 
 @GTest(
 	statechartBundle = "org.yakindu.sct.test.models",
@@ -23,7 +24,7 @@ import org.yakindu.sct.generator.c.gtest.GTestHelper;
 )
 @RunWith(GTestRunner.class)
 public class StateIsActiveTest {
-protected final GTestHelper helper = new GTestHelper(this);
+protected final GTestHelper helper = new GTestHelper(this, Compiler.GPLUSPLUS);
 
 	@Before
 	public void setUp() {

+ 2 - 1
test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/StatechartActiveTest.java

@@ -6,6 +6,7 @@ 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;
+import org.yakindu.sct.generator.c.gtest.GTestHelper.Compiler;
 
 @GTest(
 	statechartBundle = "org.yakindu.sct.test.models",
@@ -23,7 +24,7 @@ import org.yakindu.sct.generator.c.gtest.GTestHelper;
 )
 @RunWith(GTestRunner.class)
 public class StatechartActiveTest {
-protected final GTestHelper helper = new GTestHelper(this);
+protected final GTestHelper helper = new GTestHelper(this, Compiler.GPLUSPLUS);
 
 	@Before
 	public void setUp() {

+ 2 - 1
test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/StatechartLocalReactionsTest.java

@@ -6,6 +6,7 @@ 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;
+import org.yakindu.sct.generator.c.gtest.GTestHelper.Compiler;
 
 @GTest(
 	statechartBundle = "org.yakindu.sct.test.models",
@@ -23,7 +24,7 @@ import org.yakindu.sct.generator.c.gtest.GTestHelper;
 )
 @RunWith(GTestRunner.class)
 public class StatechartLocalReactionsTest {
-protected final GTestHelper helper = new GTestHelper(this);
+protected final GTestHelper helper = new GTestHelper(this, Compiler.GPLUSPLUS);
 
 	@Before
 	public void setUp() {

+ 2 - 1
test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/StatemachineKeywords.java

@@ -6,6 +6,7 @@ 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;
+import org.yakindu.sct.generator.c.gtest.GTestHelper.Compiler;
 
 @GTest(
 	statechartBundle = "org.yakindu.sct.test.models",
@@ -23,7 +24,7 @@ import org.yakindu.sct.generator.c.gtest.GTestHelper;
 )
 @RunWith(GTestRunner.class)
 public class StatemachineKeywords {
-protected final GTestHelper helper = new GTestHelper(this);
+protected final GTestHelper helper = new GTestHelper(this, Compiler.GPLUSPLUS);
 
 	@Before
 	public void setUp() {

+ 2 - 1
test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/StaticChoiceTest.java

@@ -6,6 +6,7 @@ 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;
+import org.yakindu.sct.generator.c.gtest.GTestHelper.Compiler;
 
 @GTest(
 	statechartBundle = "org.yakindu.sct.test.models",
@@ -23,7 +24,7 @@ import org.yakindu.sct.generator.c.gtest.GTestHelper;
 )
 @RunWith(GTestRunner.class)
 public class StaticChoiceTest {
-protected final GTestHelper helper = new GTestHelper(this);
+protected final GTestHelper helper = new GTestHelper(this, Compiler.GPLUSPLUS);
 
 	@Before
 	public void setUp() {

+ 2 - 1
test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/StringExpressionsTest.java

@@ -6,6 +6,7 @@ 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;
+import org.yakindu.sct.generator.c.gtest.GTestHelper.Compiler;
 
 @GTest(
 	statechartBundle = "org.yakindu.sct.test.models",
@@ -23,7 +24,7 @@ import org.yakindu.sct.generator.c.gtest.GTestHelper;
 )
 @RunWith(GTestRunner.class)
 public class StringExpressionsTest {
-protected final GTestHelper helper = new GTestHelper(this);
+protected final GTestHelper helper = new GTestHelper(this, Compiler.GPLUSPLUS);
 
 	@Before
 	public void setUp() {

+ 2 - 1
test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/SyncForkTest.java

@@ -6,6 +6,7 @@ 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;
+import org.yakindu.sct.generator.c.gtest.GTestHelper.Compiler;
 
 @GTest(
 	statechartBundle = "org.yakindu.sct.test.models",
@@ -23,7 +24,7 @@ import org.yakindu.sct.generator.c.gtest.GTestHelper;
 )
 @RunWith(GTestRunner.class)
 public class SyncForkTest {
-protected final GTestHelper helper = new GTestHelper(this);
+protected final GTestHelper helper = new GTestHelper(this, Compiler.GPLUSPLUS);
 
 	@Before
 	public void setUp() {

+ 2 - 1
test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/SyncJoinTest.java

@@ -6,6 +6,7 @@ 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;
+import org.yakindu.sct.generator.c.gtest.GTestHelper.Compiler;
 
 @GTest(
 	statechartBundle = "org.yakindu.sct.test.models",
@@ -23,7 +24,7 @@ import org.yakindu.sct.generator.c.gtest.GTestHelper;
 )
 @RunWith(GTestRunner.class)
 public class SyncJoinTest {
-protected final GTestHelper helper = new GTestHelper(this);
+protected final GTestHelper helper = new GTestHelper(this, Compiler.GPLUSPLUS);
 
 	@Before
 	public void setUp() {

+ 2 - 1
test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/TimedTransitionsTest.java

@@ -6,6 +6,7 @@ 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;
+import org.yakindu.sct.generator.c.gtest.GTestHelper.Compiler;
 
 @GTest(
 	statechartBundle = "org.yakindu.sct.test.models",
@@ -23,7 +24,7 @@ import org.yakindu.sct.generator.c.gtest.GTestHelper;
 )
 @RunWith(GTestRunner.class)
 public class TimedTransitionsTest {
-protected final GTestHelper helper = new GTestHelper(this);
+protected final GTestHelper helper = new GTestHelper(this, Compiler.GPLUSPLUS);
 
 	@Before
 	public void setUp() {

+ 2 - 1
test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/TransitionWithoutConditionTest.java

@@ -6,6 +6,7 @@ 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;
+import org.yakindu.sct.generator.c.gtest.GTestHelper.Compiler;
 
 @GTest(
 	statechartBundle = "org.yakindu.sct.test.models",
@@ -23,7 +24,7 @@ import org.yakindu.sct.generator.c.gtest.GTestHelper;
 )
 @RunWith(GTestRunner.class)
 public class TransitionWithoutConditionTest {
-protected final GTestHelper helper = new GTestHelper(this);
+protected final GTestHelper helper = new GTestHelper(this, Compiler.GPLUSPLUS);
 
 	@Before
 	public void setUp() {

+ 2 - 1
test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/TriggerExpressionPrecedenceTest.java

@@ -6,6 +6,7 @@ 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;
+import org.yakindu.sct.generator.c.gtest.GTestHelper.Compiler;
 
 @GTest(
 	statechartBundle = "org.yakindu.sct.test.models",
@@ -23,7 +24,7 @@ import org.yakindu.sct.generator.c.gtest.GTestHelper;
 )
 @RunWith(GTestRunner.class)
 public class TriggerExpressionPrecedenceTest {
-protected final GTestHelper helper = new GTestHelper(this);
+protected final GTestHelper helper = new GTestHelper(this, Compiler.GPLUSPLUS);
 
 	@Before
 	public void setUp() {

+ 2 - 1
test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/TriggerGuardExpressionsTest.java

@@ -6,6 +6,7 @@ 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;
+import org.yakindu.sct.generator.c.gtest.GTestHelper.Compiler;
 
 @GTest(
 	statechartBundle = "org.yakindu.sct.test.models",
@@ -23,7 +24,7 @@ import org.yakindu.sct.generator.c.gtest.GTestHelper;
 )
 @RunWith(GTestRunner.class)
 public class TriggerGuardExpressionsTest {
-protected final GTestHelper helper = new GTestHelper(this);
+protected final GTestHelper helper = new GTestHelper(this, Compiler.GPLUSPLUS);
 
 	@Before
 	public void setUp() {

+ 2 - 1
test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/TypeAliasTest.java

@@ -6,6 +6,7 @@ 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;
+import org.yakindu.sct.generator.c.gtest.GTestHelper.Compiler;
 
 @GTest(
 	statechartBundle = "org.yakindu.sct.test.models",
@@ -23,7 +24,7 @@ import org.yakindu.sct.generator.c.gtest.GTestHelper;
 )
 @RunWith(GTestRunner.class)
 public class TypeAliasTest {
-protected final GTestHelper helper = new GTestHelper(this);
+protected final GTestHelper helper = new GTestHelper(this, Compiler.GPLUSPLUS);
 
 	@Before
 	public void setUp() {

+ 2 - 1
test-plugins/org.yakindu.sct.generator.cpp.test/test-gen/org/yakindu/sct/generator/cpp/test/ValuedEventsTest.java

@@ -6,6 +6,7 @@ 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;
+import org.yakindu.sct.generator.c.gtest.GTestHelper.Compiler;
 
 @GTest(
 	statechartBundle = "org.yakindu.sct.test.models",
@@ -23,7 +24,7 @@ import org.yakindu.sct.generator.c.gtest.GTestHelper;
 )
 @RunWith(GTestRunner.class)
 public class ValuedEventsTest {
-protected final GTestHelper helper = new GTestHelper(this);
+protected final GTestHelper helper = new GTestHelper(this, Compiler.GPLUSPLUS);
 
 	@Before
 	public void setUp() {