Procházet zdrojové kódy

Regeneration of cc tests.

markus.muehlbrandt@googlemail.com před 12 roky
rodič
revize
0fbe61070d

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

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

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

@@ -59,6 +59,6 @@ TEST(StatemachineTest, EntryNotTakenInTransition) {
 	statechart->raise_e();
 	statechart->runCycle();
 	EXPECT_TRUE(statechart->isActive(GuardedEntry::GuardedEntry_main_region_A));
-	EXPECT_TRUE(statechart->!getSCInterface()->get_done());
+	EXPECT_TRUE(!statechart->getSCInterface()->get_done());
 	delete statechart;
 }

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

@@ -17,11 +17,11 @@ TEST(StatemachineTest, ExitTaken) {
 	statechart->init();
 	statechart->enter();
 	EXPECT_TRUE(statechart->isActive(GuardedExit::GuardedExit_main_region_A));
-	EXPECT_TRUE(statechart->!getSCInterface()->get_guard());
+	EXPECT_TRUE(!statechart->getSCInterface()->get_guard());
 	statechart->raise_e();
 	statechart->runCycle();
 	EXPECT_TRUE(statechart->isActive(GuardedExit::GuardedExit_main_region_B));
-	EXPECT_TRUE(statechart->!getSCInterface()->get_done());
+	EXPECT_TRUE(!statechart->getSCInterface()->get_done());
 	delete statechart;
 }
 TEST(StatemachineTest, ExitNotTaken) {

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

@@ -23,6 +23,6 @@ TEST(StatemachineTest, SafeOpenSuccess) {
 	statechart->runCycle();
 	statechart->getSCIUser()->raise_numberPressed(5);
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->getSCTSafe()->isRaised_open());
+	EXPECT_TRUE(getSCTSafe()->isRaised_open());
 	delete statechart;
 }

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

@@ -37,7 +37,7 @@ TEST(StatemachineTest, unvailableWithin2ndCycle) {
 	statechart->raise_e();
 	statechart->runCycle();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->!getSCInterface()->get_f_available_in_next_cycle());
+	EXPECT_TRUE(!statechart->getSCInterface()->get_f_available_in_next_cycle());
 	delete statechart;
 }
 TEST(StatemachineTest, unvailableAfter2ndCycle) {
@@ -47,6 +47,6 @@ TEST(StatemachineTest, unvailableAfter2ndCycle) {
 	statechart->raise_e();
 	statechart->runCycle();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->!getSCInterface()->);
+	EXPECT_TRUE(!statechart->getSCInterface()->);
 	delete statechart;
 }

+ 6 - 6
test-plugins/org.yakindu.sct.generator.cpp.test/gtests/PerformanceTestsTest/PerformanceTestsTest.cc

@@ -18,11 +18,11 @@ TEST(StatemachineTest, test_100_000) {
 	statechart->enter();
 	EXPECT_TRUE(statechart->isActive(PerformanceTest::PerformanceTest_mr_A));
 	while (statechart->getSCInterface()->get_c()< 100000) {
-		if (isActive(PerformanceTest::PerformanceTest_mr_A)) {
+		if (statechart->isActive(PerformanceTest::PerformanceTest_mr_A)) {
 					statechart->raise_e1();
 				  }
 				else {
-					if (getSCInterface()->get_c()%2== 0) {
+					if (statechart->getSCInterface()->get_c()%2== 0) {
 								statechart->raise_e2();
 							  }
 							else {
@@ -41,11 +41,11 @@ TEST(StatemachineTest, test_1_000_000) {
 	statechart->enter();
 	EXPECT_TRUE(statechart->isActive(PerformanceTest::PerformanceTest_mr_A));
 	while (statechart->getSCInterface()->get_c()< 1000000) {
-		if (isActive(PerformanceTest::PerformanceTest_mr_A)) {
+		if (statechart->isActive(PerformanceTest::PerformanceTest_mr_A)) {
 					statechart->raise_e1();
 				  }
 				else {
-					if (getSCInterface()->get_c()%2== 0) {
+					if (statechart->getSCInterface()->get_c()%2== 0) {
 								statechart->raise_e2();
 							  }
 							else {
@@ -64,11 +64,11 @@ TEST(StatemachineTest, test_10_000_000) {
 	statechart->enter();
 	EXPECT_TRUE(statechart->isActive(PerformanceTest::PerformanceTest_mr_A));
 	while (statechart->getSCInterface()->get_c()< 10000000) {
-		if (isActive(PerformanceTest::PerformanceTest_mr_A)) {
+		if (statechart->isActive(PerformanceTest::PerformanceTest_mr_A)) {
 					statechart->raise_e1();
 				  }
 				else {
-					if (getSCInterface()->get_c()%2== 0) {
+					if (statechart->getSCInterface()->get_c()%2== 0) {
 								statechart->raise_e2();
 							  }
 							else {

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

@@ -30,6 +30,6 @@ TEST(StatemachineTest, regionPriority) {
 	statechart->raise_event2();
 	statechart->runCycle();
 	EXPECT_TRUE(statechart->isActive(PriorityValues::PriorityValues_someRegion_B));
-	EXPECT_TRUE(statechart->!isActive(PriorityValues::PriorityValues_main_region_E));
+	EXPECT_TRUE(!statechart->isActive(PriorityValues::PriorityValues_main_region_E));
 	delete statechart;
 }

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

@@ -24,27 +24,27 @@ TEST(StatemachineTest, shallowHistoryTest) {
 	statechart->runCycle();
 	statechart->raise_event7();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->!isActive(ShallowHistory::ShallowHistory_mainRegion_State1));
+	EXPECT_TRUE(!statechart->isActive(ShallowHistory::ShallowHistory_mainRegion_State1));
 	EXPECT_TRUE(statechart->isActive(ShallowHistory::ShallowHistory_mainRegion_State2__region0_State4__region0_State7__region0_State9));
 	statechart->raise_event6();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->!isActive(ShallowHistory::ShallowHistory_mainRegion_State2__region0_State4__region0_State7__region0_State9));
+	EXPECT_TRUE(!statechart->isActive(ShallowHistory::ShallowHistory_mainRegion_State2__region0_State4__region0_State7__region0_State9));
 	EXPECT_TRUE(statechart->isActive(ShallowHistory::ShallowHistory_mainRegion_State2__region0_State4__region0_State6));
 	statechart->raise_event5();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->!isActive(ShallowHistory::ShallowHistory_mainRegion_State2__region0_State4__region0_State7__region0_State8));
+	EXPECT_TRUE(!statechart->isActive(ShallowHistory::ShallowHistory_mainRegion_State2__region0_State4__region0_State7__region0_State8));
 	EXPECT_TRUE(statechart->isActive(ShallowHistory::ShallowHistory_mainRegion_State2__region0_State4__region0_State7__region0_State9));
 	statechart->raise_event2();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->!isActive(ShallowHistory::ShallowHistory_mainRegion_State2__region0_State4__region0_State7__region0_State9));
+	EXPECT_TRUE(!statechart->isActive(ShallowHistory::ShallowHistory_mainRegion_State2__region0_State4__region0_State7__region0_State9));
 	EXPECT_TRUE(statechart->isActive(ShallowHistory::ShallowHistory_mainRegion_State1));
 	statechart->raise_event1();
 	statechart->runCycle();
 	EXPECT_TRUE(statechart->isActive(ShallowHistory::ShallowHistory_mainRegion_State2__region0_State4__region0_State6));
-	EXPECT_TRUE(statechart->!isActive(ShallowHistory::ShallowHistory_mainRegion_State1));
+	EXPECT_TRUE(!statechart->isActive(ShallowHistory::ShallowHistory_mainRegion_State1));
 	statechart->raise_event5();
 	statechart->runCycle();
-	EXPECT_TRUE(statechart->!isActive(ShallowHistory::ShallowHistory_mainRegion_State2__region0_State4__region0_State6));
+	EXPECT_TRUE(!statechart->isActive(ShallowHistory::ShallowHistory_mainRegion_State2__region0_State4__region0_State6));
 	EXPECT_TRUE(statechart->isActive(ShallowHistory::ShallowHistory_mainRegion_State2__region0_State4__region0_State7__region0_State9));
 	delete statechart;
 }

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

@@ -17,7 +17,7 @@ TEST(StatemachineTest, simpleEventTest) {
 	statechart->init();
 	statechart->enter();
 	EXPECT_TRUE(statechart->isActive(SimpleEvent::SimpleEvent_main_region_A));
-	EXPECT_TRUE(statechart->5== 5);
+	EXPECT_TRUE(5== 5);
 	statechart->raise_event1();
 	statechart->runCycle();
 	EXPECT_TRUE(statechart->isActive(SimpleEvent::SimpleEvent_main_region_B));

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

@@ -20,7 +20,7 @@ TEST(StatemachineTest, statechartLocalReactionsTest) {
 	EXPECT_TRUE(statechart->isActive(StatechartLocalReactions::StatechartLocalReactions_region2_a));
 	while (statechart->getSCInterface()->get_myInt()< 10) {
 		EXPECT_TRUE(statechart->isActive(StatechartLocalReactions::StatechartLocalReactions_region2_a));
-		if (getSCInterface()->get_myInt()%2== 0) {
+		if (statechart->getSCInterface()->get_myInt()%2== 0) {
 					EXPECT_TRUE(statechart->isActive(StatechartLocalReactions::StatechartLocalReactions_main_region_S1));
 				  }
 				else {

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

@@ -15,17 +15,17 @@
 TEST(StatemachineTest, StringExpressionsTest) {
 	StringExpressions* statechart = new StringExpressions();
 	statechart->init();
-	EXPECT_TRUE(statechart->strcmp(getSCInterface()->get_quotedString(), "\"x\"") == 0);
+	EXPECT_TRUE(strcmp(statechart->getSCInterface()->get_quotedString(), "\"x\"") == 0);
 	statechart->enter();
 	EXPECT_TRUE(statechart->isActive(StringExpressions::StringExpressions_main_region_StateA));
-	EXPECT_TRUE(statechart->strcmp(getSCInterface()->get_myString(), "hello") == 0);
-	EXPECT_TRUE(statechart->strcmp(getSCInterface()->get_myString2(), "world") == 0);
-	EXPECT_TRUE(statechart->strcmp(getSCInterface()->get_quotedString(), "'y'") == 0);
+	EXPECT_TRUE(strcmp(statechart->getSCInterface()->get_myString(), "hello") == 0);
+	EXPECT_TRUE(strcmp(statechart->getSCInterface()->get_myString2(), "world") == 0);
+	EXPECT_TRUE(strcmp(statechart->getSCInterface()->get_quotedString(), "'y'") == 0);
 	statechart->raise_e1();
 	statechart->runCycle();
 	EXPECT_TRUE(statechart->isActive(StringExpressions::StringExpressions_main_region_StateB));
 	EXPECT_TRUE(statechart->getSCInterface()->get_equals()== false);
 	EXPECT_TRUE(statechart->getSCInterface()->get_notEqual()== true);
-	EXPECT_TRUE(statechart->strcmp(getSCInterface()->get_quotedString(), "\"z\"") == 0);
+	EXPECT_TRUE(strcmp(statechart->getSCInterface()->get_quotedString(), "\"z\"") == 0);
 	delete statechart;
 }