Merge pull request #1943 from Yakindu/updated_generator_tests

Updated generator tests

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

@@ -31,7 +31,7 @@ void checkDone(bool shouldBeDone){
 	guardedExitIface_raise_e(&statechart);
 	sc_timer_service_proceed_cycles(&timer_service, 1);
 	EXPECT_TRUE(guardedExit_isStateActive(&statechart, GuardedExit_main_region_B));
-	EXPECT_TRUE(shouldBeDone ? guardedExitIface_get_done(&statechart)  : !guardedExitIface_get_done(&statechart));
+	EXPECT_TRUE(shouldBeDone ? guardedExitIface_get_done(&statechart) : !guardedExitIface_get_done(&statechart));
 }
 
 TEST_F(GuardedExitTest, ExitTaken) {

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

@@ -4,7 +4,10 @@ GeneratorModel for yakindu::c {
 			targetProject = "gtests"
 			targetFolder = "StringExpressions"
 		}
-
+		feature IdentifierSettings {
+			maxIdentifierLength = 254
+			separator =  "_" 
+		}
 		feature FunctionInlining {
 			inlineReactions = false
 			inlineEntryActions = false

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

@@ -4,7 +4,9 @@
 #include "AlwaysOncycle.h"
 #include "sc_runner.h"
 #include "sc_types.h"
-			
+
+namespace  {
+
 
 
 //! The timers are managed by a timer service. */
@@ -58,3 +60,5 @@ class AlwaysOncycleTest : public ::testing::Test{
 		
 		
 }
+
+}

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

@@ -4,7 +4,9 @@
 #include "AssignmentAsExpression.h"
 #include "sc_runner.h"
 #include "sc_types.h"
-			
+
+namespace  {
+
 
 
 //! The timers are managed by a timer service. */
@@ -96,3 +98,5 @@ class AssignmentAsExpressionTest : public ::testing::Test{
 		
 		
 }
+
+}

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

@@ -4,7 +4,9 @@
 #include "BitExpressions.h"
 #include "sc_runner.h"
 #include "sc_types.h"
-			
+
+namespace  {
+
 
 
 //! The timers are managed by a timer service. */
@@ -62,3 +64,5 @@ class BitExpressionsTest : public ::testing::Test{
 		
 		
 }
+
+}

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

@@ -4,7 +4,9 @@
 #include "BooleanExpressions.h"
 #include "sc_runner.h"
 #include "sc_types.h"
-			
+
+namespace  {
+
 
 
 //! The timers are managed by a timer service. */
@@ -60,3 +62,5 @@ class BooleanExpressionsTest : public ::testing::Test{
 		
 		
 }
+
+}

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

@@ -4,7 +4,9 @@
 #include "CKeywords.h"
 #include "sc_runner.h"
 #include "sc_types.h"
-			
+
+namespace  {
+
 
 
 //! The timers are managed by a timer service. */
@@ -50,3 +52,5 @@ class CKeywordsTest : public ::testing::Test{
 		
 		
 }
+
+}

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

@@ -4,7 +4,9 @@
 #include "CastExpressions.h"
 #include "sc_runner.h"
 #include "sc_types.h"
-			
+
+namespace  {
+
 
 
 //! The timers are managed by a timer service. */
@@ -52,3 +54,5 @@ class CastExpressionsTest : public ::testing::Test{
 		
 		
 }
+
+}

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

@@ -4,7 +4,9 @@
 #include "ChildFirstExecutionHierarchy.h"
 #include "sc_runner.h"
 #include "sc_types.h"
-			
+
+namespace  {
+
 
 
 //! The timers are managed by a timer service. */
@@ -140,3 +142,5 @@ class ChildFirstExecutionHierarchyTest : public ::testing::Test{
 		
 		
 }
+
+}

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

@@ -4,7 +4,9 @@
 #include "ChildFirstLocalReactions.h"
 #include "sc_runner.h"
 #include "sc_types.h"
-			
+
+namespace  {
+
 
 long counter = 0l;
 
@@ -125,3 +127,5 @@ class ChildFirstLocalReactionsTest : public ::testing::Test{
 		
 		
 }
+
+}

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

@@ -4,7 +4,9 @@
 #include "Choice.h"
 #include "sc_runner.h"
 #include "sc_types.h"
-			
+
+namespace  {
+
 
 
 //! The timers are managed by a timer service. */
@@ -144,3 +146,5 @@ class ChoiceTest : public ::testing::Test{
 		
 		
 }
+
+}

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

@@ -4,7 +4,9 @@
 #include "ConditionalExpressions.h"
 #include "sc_runner.h"
 #include "sc_types.h"
-			
+
+namespace  {
+
 
 
 //! The timers are managed by a timer service. */
@@ -50,3 +52,5 @@ class ConditionalExpression : public ::testing::Test{
 		
 		
 }
+
+}

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

@@ -4,7 +4,9 @@
 #include "ConstOnlyInternalScope.h"
 #include "sc_runner.h"
 #include "sc_types.h"
-			
+
+namespace  {
+
 
 
 //! The timers are managed by a timer service. */
@@ -52,3 +54,5 @@ class ConstOnlyInternalScopeTest : public ::testing::Test{
 		
 		
 }
+
+}

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

@@ -4,7 +4,9 @@
 #include "ConstOnlyNamedScope.h"
 #include "sc_runner.h"
 #include "sc_types.h"
-			
+
+namespace  {
+
 
 
 //! The timers are managed by a timer service. */
@@ -52,3 +54,5 @@ class ConstOnlyNamedScopeTest : public ::testing::Test{
 		
 		
 }
+
+}

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

@@ -4,7 +4,9 @@
 #include "Constants.h"
 #include "sc_runner.h"
 #include "sc_types.h"
-			
+
+namespace  {
+
 
 
 //! The timers are managed by a timer service. */
@@ -68,3 +70,5 @@ class ConstantsTests : public ::testing::Test{
 		
 		
 }
+
+}

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

@@ -4,7 +4,9 @@
 #include "Declarations.h"
 #include "sc_runner.h"
 #include "sc_types.h"
-			
+
+namespace  {
+
 
 
 //! The timers are managed by a timer service. */
@@ -38,3 +40,5 @@ class DeclarationsTest : public ::testing::Test{
 		
 		
 }
+
+}

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

@@ -4,7 +4,9 @@
 #include "DeepEntry.h"
 #include "sc_runner.h"
 #include "sc_types.h"
-			
+
+namespace  {
+
 
 
 //! The timers are managed by a timer service. */
@@ -44,3 +46,5 @@ class DeepEntryTest : public ::testing::Test{
 		
 		
 }
+
+}

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

@@ -4,7 +4,9 @@
 #include "DeepHistory.h"
 #include "sc_runner.h"
 #include "sc_types.h"
-			
+
+namespace  {
+
 
 
 //! The timers are managed by a timer service. */
@@ -74,3 +76,5 @@ class DeepHistoryTest : public ::testing::Test{
 		
 		
 }
+
+}

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

@@ -4,7 +4,9 @@
 #include "DynamicChoice.h"
 #include "sc_runner.h"
 #include "sc_types.h"
-			
+
+namespace  {
+
 
 
 //! The timers are managed by a timer service. */
@@ -44,3 +46,5 @@ class DynamicChoiceTest : public ::testing::Test{
 		
 		
 }
+
+}

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

@@ -4,7 +4,9 @@
 #include "EmptyTransition.h"
 #include "sc_runner.h"
 #include "sc_types.h"
-			
+
+namespace  {
+
 
 
 //! The timers are managed by a timer service. */
@@ -44,3 +46,5 @@ class EmptyTransitionTest : public ::testing::Test{
 		
 		
 }
+
+}

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

@@ -4,7 +4,9 @@
 #include "EnterState.h"
 #include "sc_runner.h"
 #include "sc_types.h"
-			
+
+namespace  {
+
 
 
 //! The timers are managed by a timer service. */
@@ -74,3 +76,5 @@ class EnterStateTest : public ::testing::Test{
 		
 		
 }
+
+}

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

@@ -4,7 +4,9 @@
 #include "EntryChoice.h"
 #include "sc_runner.h"
 #include "sc_types.h"
-			
+
+namespace  {
+
 
 
 //! The timers are managed by a timer service. */
@@ -44,3 +46,5 @@ class EntryChoiceTest : public ::testing::Test{
 		
 		
 }
+
+}

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

@@ -4,7 +4,9 @@
 #include "EntryExitSelfTransition.h"
 #include "sc_runner.h"
 #include "sc_types.h"
-			
+
+namespace  {
+
 
 
 //! The timers are managed by a timer service. */
@@ -92,3 +94,5 @@ class EntryExitSelfTransitionTest : public ::testing::Test{
 		
 		
 }
+
+}

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

@@ -4,7 +4,9 @@
 #include "EntryReactionAction.h"
 #include "sc_runner.h"
 #include "sc_types.h"
-			
+
+namespace  {
+
 
 
 //! The timers are managed by a timer service. */
@@ -104,3 +106,5 @@ class EntryReactionActionTest : public ::testing::Test{
 		
 		
 }
+
+}

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

@@ -4,7 +4,9 @@
 #include "EventDrivenInternalEvent.h"
 #include "sc_runner.h"
 #include "sc_types.h"
-			
+
+namespace  {
+
 
 
 //! The timers are managed by a timer service. */
@@ -58,3 +60,5 @@ class EventDrivenInternalEventTest : public ::testing::Test{
 		
 		
 }
+
+}

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

@@ -4,7 +4,9 @@
 #include "EventDrivenTriggeredByEvent.h"
 #include "sc_runner_timed.h"
 #include "sc_types.h"
-			
+
+namespace  {
+
 
 
 //! The timers are managed by a timer service. */
@@ -69,3 +71,5 @@ class EventDrivenTriggeredByEventTest : public ::testing::Test{
 		
 		
 }
+
+}

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

@@ -4,7 +4,9 @@
 #include "EventDrivenTriggeredByTimeEvent.h"
 #include "sc_runner_timed.h"
 #include "sc_types.h"
-			
+
+namespace  {
+
 
 
 //! The timers are managed by a timer service. */
@@ -83,3 +85,5 @@ class EventDrivenTriggeredByTimeEventTest : public ::testing::Test{
 		
 		
 }
+
+}

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

@@ -4,7 +4,9 @@
 #include "ExitOnSelfTransition.h"
 #include "sc_runner.h"
 #include "sc_types.h"
-			
+
+namespace  {
+
 
 
 //! The timers are managed by a timer service. */
@@ -60,3 +62,5 @@ class ExitOnSelfTransitionTest : public ::testing::Test{
 		
 		
 }
+
+}

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

@@ -4,7 +4,9 @@
 #include "ExitState.h"
 #include "sc_runner.h"
 #include "sc_types.h"
-			
+
+namespace  {
+
 
 
 //! The timers are managed by a timer service. */
@@ -86,3 +88,5 @@ class ExitStateTest : public ::testing::Test{
 		
 		
 }
+
+}

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

@@ -4,7 +4,9 @@
 #include "FeatureCalls.h"
 #include "sc_runner.h"
 #include "sc_types.h"
-			
+
+namespace  {
+
 
 
 //! The timers are managed by a timer service. */
@@ -44,3 +46,5 @@ class FeatureCallsTest : public ::testing::Test{
 		
 		
 }
+
+}

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

@@ -4,7 +4,9 @@
 #include "FinalState.h"
 #include "sc_runner.h"
 #include "sc_types.h"
-			
+
+namespace  {
+
 
 
 //! The timers are managed by a timer service. */
@@ -42,3 +44,5 @@ class FinalStateTest : public ::testing::Test{
 		
 		
 }
+
+}

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

@@ -4,7 +4,9 @@
 #include "FloatModulo.h"
 #include "sc_runner.h"
 #include "sc_types.h"
-			
+
+namespace  {
+
 
 
 //! The timers are managed by a timer service. */
@@ -42,3 +44,5 @@ class FloatModuloTest : public ::testing::Test{
 		
 		
 }
+
+}

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

@@ -4,7 +4,9 @@
 #include "Guard.h"
 #include "sc_runner.h"
 #include "sc_types.h"
-			
+
+namespace  {
+
 
 
 //! The timers are managed by a timer service. */
@@ -70,3 +72,5 @@ class GuardTest : public ::testing::Test{
 		
 		
 }
+
+}

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

@@ -4,7 +4,9 @@
 #include "GuardedEntry.h"
 #include "sc_runner.h"
 #include "sc_types.h"
-			
+
+namespace  {
+
 
 
 //! The timers are managed by a timer service. */
@@ -96,3 +98,5 @@ class GuardedEntryTest : public ::testing::Test{
 		
 		
 }
+
+}

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

@@ -4,7 +4,9 @@
 #include "GuardedExit.h"
 #include "sc_runner.h"
 #include "sc_types.h"
-			
+
+namespace  {
+
 
 
 //! The timers are managed by a timer service. */
@@ -37,7 +39,7 @@ class GuardedExitTest : public ::testing::Test{
 		
 		EXPECT_TRUE(statechart->isStateActive(GuardedExit::main_region_B));
 		
-		EXPECT_TRUE(shouldBeDone ? statechart->getDefaultSCI()->get_done()  : !statechart->getDefaultSCI()->get_done());
+		EXPECT_TRUE(shouldBeDone ? statechart->getDefaultSCI()->get_done() : !statechart->getDefaultSCI()->get_done());
 		
 		
 	}
@@ -68,3 +70,5 @@ class GuardedExitTest : public ::testing::Test{
 		
 		
 }
+
+}

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

@@ -4,7 +4,9 @@
 #include "HistoryWithExitPoint.h"
 #include "sc_runner.h"
 #include "sc_types.h"
-			
+
+namespace  {
+
 
 
 //! The timers are managed by a timer service. */
@@ -70,3 +72,5 @@ class HistoryWithExitPointTest : public ::testing::Test{
 		
 		
 }
+
+}

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

@@ -4,7 +4,9 @@
 #include "HistoryWithoutInitialStep.h"
 #include "sc_runner.h"
 #include "sc_types.h"
-			
+
+namespace  {
+
 
 
 //! The timers are managed by a timer service. */
@@ -102,3 +104,5 @@ class HistoryWithoutInitialStepTest : public ::testing::Test{
 		
 		
 }
+
+}

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

@@ -4,7 +4,9 @@
 #include "InEventLifeCycle.h"
 #include "sc_runner.h"
 #include "sc_types.h"
-			
+
+namespace  {
+
 
 
 //! The timers are managed by a timer service. */
@@ -46,3 +48,5 @@ class InEventLifeCycleTest : public ::testing::Test{
 		
 		
 }
+
+}

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

@@ -4,7 +4,9 @@
 #include "IntegerExpressions.h"
 #include "sc_runner.h"
 #include "sc_types.h"
-			
+
+namespace  {
+
 
 
 //! The timers are managed by a timer service. */
@@ -82,3 +84,5 @@ class IntegerExpressionsTest : public ::testing::Test{
 		
 		
 }
+
+}

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

@@ -4,7 +4,9 @@
 #include "InternalEventLifeCycle.h"
 #include "sc_runner.h"
 #include "sc_types.h"
-			
+
+namespace  {
+
 
 
 //! The timers are managed by a timer service. */
@@ -70,3 +72,5 @@ class InternalEventLifeCycleTest : public ::testing::Test{
 		
 		
 }
+
+}

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

@@ -4,7 +4,9 @@
 #include "LocalReactions.h"
 #include "sc_runner.h"
 #include "sc_types.h"
-			
+
+namespace  {
+
 
 
 //! The timers are managed by a timer service. */
@@ -44,3 +46,5 @@ class LocalReactionsTest : public ::testing::Test{
 		
 		
 }
+
+}

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

@@ -4,7 +4,9 @@
 #include "LogicalAnd.h"
 #include "sc_runner.h"
 #include "sc_types.h"
-			
+
+namespace  {
+
 
 
 //! The timers are managed by a timer service. */
@@ -42,3 +44,5 @@ class LogicalAndTests : public ::testing::Test{
 		
 		
 }
+
+}

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

@@ -4,7 +4,9 @@
 #include "LogicalOr.h"
 #include "sc_runner.h"
 #include "sc_types.h"
-			
+
+namespace  {
+
 
 
 //! The timers are managed by a timer service. */
@@ -42,3 +44,5 @@ class LogicalOrTests : public ::testing::Test{
 		
 		
 }
+
+}

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

@@ -4,7 +4,9 @@
 #include "NamedInterfaceAccess.h"
 #include "sc_runner.h"
 #include "sc_types.h"
-			
+
+namespace  {
+
 
 
 //! The timers are managed by a timer service. */
@@ -54,3 +56,5 @@ class NamedInterfaceAccessTest : public ::testing::Test{
 		
 		
 }
+
+}

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

@@ -4,7 +4,9 @@
 #include "NullCheck.h"
 #include "sc_runner.h"
 #include "sc_types.h"
-			
+
+namespace  {
+
 
 
 //! The timers are managed by a timer service. */
@@ -44,3 +46,5 @@ class NullCheckTest : public ::testing::Test{
 		
 		
 }
+
+}

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

@@ -9,7 +9,9 @@
 using ::testing::AtLeast;
 using ::testing::Return;
 using ::testing::_;
-			
+
+namespace  {
+
 class InternalOperation1Mock{
 	public:
 	int callCount;
@@ -1493,3 +1495,5 @@ class OperationsTest : public ::testing::Test{
 		unnamedOperation5Mock->reset();
 		unnamedOperation5aMock->reset();
 }
+
+}

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

@@ -4,7 +4,9 @@
 #include "OutEventLifeCycle.h"
 #include "sc_runner.h"
 #include "sc_types.h"
-			
+
+namespace  {
+
 
 
 //! The timers are managed by a timer service. */
@@ -82,3 +84,5 @@ class OutEventLifeCycleTest : public ::testing::Test{
 		
 		
 }
+
+}

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

@@ -4,7 +4,9 @@
 #include "ParentFirstExecutionHierarchy.h"
 #include "sc_runner.h"
 #include "sc_types.h"
-			
+
+namespace  {
+
 
 
 //! The timers are managed by a timer service. */
@@ -140,3 +142,5 @@ class ParentFirstExecutionHierarchyTest : public ::testing::Test{
 		
 		
 }
+
+}

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

@@ -4,7 +4,9 @@
 #include "ParentFirstLocalReactions.h"
 #include "sc_runner.h"
 #include "sc_types.h"
-			
+
+namespace  {
+
 
 long counter = 0l;
 
@@ -129,3 +131,5 @@ class ParentFirstLocalReactionsTest : public ::testing::Test{
 		
 		
 }
+
+}

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

@@ -4,7 +4,9 @@
 #include "Parenthesis.h"
 #include "sc_runner.h"
 #include "sc_types.h"
-			
+
+namespace  {
+
 
 
 //! The timers are managed by a timer service. */
@@ -42,3 +44,5 @@ class ParenthesisTest : public ::testing::Test{
 		
 		
 }
+
+}

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

@@ -4,7 +4,9 @@
 #include "PriorityValues.h"
 #include "sc_runner.h"
 #include "sc_types.h"
-			
+
+namespace  {
+
 
 
 //! The timers are managed by a timer service. */
@@ -62,3 +64,5 @@ class PriorityValuesTest : public ::testing::Test{
 		
 		
 }
+
+}

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

@@ -4,7 +4,9 @@
 #include "RaiseEvent.h"
 #include "sc_runner.h"
 #include "sc_types.h"
-			
+
+namespace  {
+
 
 
 //! The timers are managed by a timer service. */
@@ -52,3 +54,5 @@ class RaiseEventTest : public ::testing::Test{
 		
 		
 }
+
+}

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

@@ -4,7 +4,9 @@
 #include "ReadOnlyVariable.h"
 #include "sc_runner.h"
 #include "sc_types.h"
-			
+
+namespace  {
+
 
 
 //! The timers are managed by a timer service. */
@@ -76,3 +78,5 @@ class ReadOnlyVariableTest : public ::testing::Test{
 		
 		
 }
+
+}

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

@@ -4,7 +4,9 @@
 #include "STextKeywordsInStatesAndRegions.h"
 #include "sc_runner.h"
 #include "sc_types.h"
-			
+
+namespace  {
+
 
 
 //! The timers are managed by a timer service. */
@@ -958,3 +960,5 @@ class STextKeywordsInStatesAndRegionsTest : public ::testing::Test{
 		
 		
 }
+
+}

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

@@ -4,7 +4,9 @@
 #include "SameNameDifferentRegion.h"
 #include "sc_runner.h"
 #include "sc_types.h"
-			
+
+namespace  {
+
 
 
 //! The timers are managed by a timer service. */
@@ -56,3 +58,5 @@ class SameNameDifferentRegionTest : public ::testing::Test{
 		
 		
 }
+
+}

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

@@ -4,7 +4,9 @@
 #include "ShallowHistory.h"
 #include "sc_runner.h"
 #include "sc_types.h"
-			
+
+namespace  {
+
 
 
 //! The timers are managed by a timer service. */
@@ -98,3 +100,5 @@ class ShallowHistoryTest : public ::testing::Test{
 		
 		
 }
+
+}

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

@@ -4,7 +4,9 @@
 #include "ShallowHistoryWithDeepEntry.h"
 #include "sc_runner.h"
 #include "sc_types.h"
-			
+
+namespace  {
+
 
 
 //! The timers are managed by a timer service. */
@@ -124,3 +126,5 @@ class ShallowHistoryWithDeepEntryTest : public ::testing::Test{
 		
 		
 }
+
+}

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

@@ -4,7 +4,9 @@
 #include "SimpleEvent.h"
 #include "sc_runner.h"
 #include "sc_types.h"
-			
+
+namespace  {
+
 
 
 //! The timers are managed by a timer service. */
@@ -52,3 +54,5 @@ class SimpleEventTest : public ::testing::Test{
 		
 		
 }
+
+}

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

@@ -4,7 +4,9 @@
 #include "SimpleHierachy.h"
 #include "sc_runner.h"
 #include "sc_types.h"
-			
+
+namespace  {
+
 
 
 //! The timers are managed by a timer service. */
@@ -52,3 +54,5 @@ class SimpleHierachyTest : public ::testing::Test{
 		
 		
 }
+
+}

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

@@ -4,7 +4,9 @@
 #include "StateIsActive.h"
 #include "sc_runner.h"
 #include "sc_types.h"
-			
+
+namespace  {
+
 
 
 //! The timers are managed by a timer service. */
@@ -52,3 +54,5 @@ class StateIsActiveTest : public ::testing::Test{
 		
 		
 }
+
+}

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

@@ -4,7 +4,9 @@
 #include "StatechartActive.h"
 #include "sc_runner.h"
 #include "sc_types.h"
-			
+
+namespace  {
+
 
 
 //! The timers are managed by a timer service. */
@@ -68,3 +70,5 @@ class StatechartActiveTest : public ::testing::Test{
 		
 		
 }
+
+}

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

@@ -4,7 +4,9 @@
 #include "StatechartLocalReactions.h"
 #include "sc_runner.h"
 #include "sc_types.h"
-			
+
+namespace  {
+
 
 
 //! The timers are managed by a timer service. */
@@ -53,3 +55,5 @@ class StatechartLocalReactionsTest : public ::testing::Test{
 		
 		
 }
+
+}

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

@@ -4,7 +4,9 @@
 #include "StatechartKeywords.h"
 #include "sc_runner_timed.h"
 #include "sc_types.h"
-			
+
+namespace  {
+
 
 
 //! The timers are managed by a timer service. */
@@ -41,3 +43,5 @@ class StatemachineKeywords : public ::testing::Test{
 		
 		
 }
+
+}

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

@@ -4,7 +4,9 @@
 #include "StaticChoice.h"
 #include "sc_runner.h"
 #include "sc_types.h"
-			
+
+namespace  {
+
 
 
 //! The timers are managed by a timer service. */
@@ -42,3 +44,5 @@ class StaticChoiceTest : public ::testing::Test{
 		
 		
 }
+
+}

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

@@ -4,7 +4,9 @@
 #include "StringExpressions.h"
 #include "sc_runner.h"
 #include "sc_types.h"
-			
+
+namespace  {
+
 
 
 //! The timers are managed by a timer service. */
@@ -100,3 +102,5 @@ class StringExpressionsTest : public ::testing::Test{
 		
 		
 }
+
+}

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

@@ -4,7 +4,9 @@
 #include "SyncFork.h"
 #include "sc_runner.h"
 #include "sc_types.h"
-			
+
+namespace  {
+
 
 
 //! The timers are managed by a timer service. */
@@ -76,3 +78,5 @@ class SyncForkTest : public ::testing::Test{
 		
 		
 }
+
+}

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

@@ -4,7 +4,9 @@
 #include "SyncJoin.h"
 #include "sc_runner.h"
 #include "sc_types.h"
-			
+
+namespace  {
+
 
 
 //! The timers are managed by a timer service. */
@@ -186,3 +188,5 @@ class SyncJoinTest : public ::testing::Test{
 		
 		
 }
+
+}

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

@@ -4,7 +4,9 @@
 #include "TimedTransitions.h"
 #include "sc_runner_timed.h"
 #include "sc_types.h"
-			
+
+namespace  {
+
 
 
 //! The timers are managed by a timer service. */
@@ -47,3 +49,5 @@ class TimedTransitionsTest : public ::testing::Test{
 		
 		
 }
+
+}

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

@@ -4,7 +4,9 @@
 #include "TransitionWithoutCondition.h"
 #include "sc_runner.h"
 #include "sc_types.h"
-			
+
+namespace  {
+
 
 
 //! The timers are managed by a timer service. */
@@ -44,3 +46,5 @@ class TransitionWithoutConditionTest : public ::testing::Test{
 		
 		
 }
+
+}

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

@@ -4,7 +4,9 @@
 #include "TriggerExpressionPrecedence.h"
 #include "sc_runner.h"
 #include "sc_types.h"
-			
+
+namespace  {
+
 
 
 //! The timers are managed by a timer service. */
@@ -88,3 +90,5 @@ class TriggerExpressionPrecedenceTest : public ::testing::Test{
 		
 		
 }
+
+}

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

@@ -4,7 +4,9 @@
 #include "TriggerGuardExpressions.h"
 #include "sc_runner.h"
 #include "sc_types.h"
-			
+
+namespace  {
+
 
 
 //! The timers are managed by a timer service. */
@@ -100,3 +102,5 @@ class TriggerGuardExpressionsTest : public ::testing::Test{
 		
 		
 }
+
+}

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

@@ -4,7 +4,9 @@
 #include "TypeAlias.h"
 #include "sc_runner.h"
 #include "sc_types.h"
-			
+
+namespace  {
+
 
 
 //! The timers are managed by a timer service. */
@@ -58,3 +60,5 @@ class TypeAliasTest : public ::testing::Test{
 		
 		
 }
+
+}

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

@@ -4,7 +4,9 @@
 #include "ValuedEvents.h"
 #include "sc_runner.h"
 #include "sc_types.h"
-			
+
+namespace  {
+
 
 
 //! The timers are managed by a timer service. */
@@ -68,3 +70,5 @@ class ValuedEventsTest : public ::testing::Test{
 		
 		
 }
+
+}

test-plugins/org.yakindu.sct.generator.java.test/test-gen/org/yakindu/sct/generator/java/test/AllTests.java

@@ -30,7 +30,6 @@ import org.junit.runners.Suite.SuiteClasses;
 	EntryChoice.class,
 	EntryExitSelfTransition.class,
 	EntryReactionAction.class,
-	EventDrivenInternalEvent.class,
 	EventDrivenTriggeredByEvent.class,
 	EventDrivenTriggeredByTimeEvent.class,
 	ExitOnSelfTransition.class,

test-plugins/org.yakindu.sct.generator.java.test/test-gen/org/yakindu/sct/generator/java/test/GuardedExit.java

@@ -53,6 +53,6 @@ public class GuardedExit {
 		statemachine.getSCInterface().raiseE();
 		timer.cycleLeap(1);
 		assertTrue(statemachine.isStateActive(State.main_region_B));
-		assertTrue(shouldBeDone ? statemachine.getDone()  : !statemachine.getDone());
+		assertTrue(shouldBeDone ? statemachine.getDone() : !statemachine.getDone());
 	}
 }