Browse Source

Regenerated test code

markus.muehlbrandt@googlemail.com 12 years ago
parent
commit
73cc5ccec2

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

@@ -17,7 +17,7 @@ TEST(StatemachineTest, elseChoiceUsingNonDefaultTransition) {
 	statechart->init();
 	statechart->enter();
 	EXPECT_TRUE(statechart->isActive(Choice::Choice_main_region_A));
-	statechart->getSCInterface().set_c(true);
+	statechart->getSCInterface()->set_c(true);
 	statechart->raise_e();
 	statechart->runCycle();
 	EXPECT_TRUE(statechart->isActive(Choice::Choice_main_region_C));
@@ -28,7 +28,7 @@ TEST(StatemachineTest, elseChoiceUsingDefaultTransition) {
 	statechart->init();
 	statechart->enter();
 	EXPECT_TRUE(statechart->isActive(Choice::Choice_main_region_A));
-	statechart->getSCInterface().set_c(false);
+	statechart->getSCInterface()->set_c(false);
 	statechart->raise_e();
 	statechart->runCycle();
 	EXPECT_TRUE(statechart->isActive(Choice::Choice_main_region_B));
@@ -39,7 +39,7 @@ TEST(StatemachineTest, defaultChoiceUsingNonDefaultTransition) {
 	statechart->init();
 	statechart->enter();
 	EXPECT_TRUE(statechart->isActive(Choice::Choice_main_region_A));
-	statechart->getSCInterface().set_c(true);
+	statechart->getSCInterface()->set_c(true);
 	statechart->raise_g();
 	statechart->runCycle();
 	EXPECT_TRUE(statechart->isActive(Choice::Choice_main_region_C));
@@ -50,7 +50,7 @@ TEST(StatemachineTest, defaultChoiceUsingDefaultTransition) {
 	statechart->init();
 	statechart->enter();
 	EXPECT_TRUE(statechart->isActive(Choice::Choice_main_region_A));
-	statechart->getSCInterface().set_c(false);
+	statechart->getSCInterface()->set_c(false);
 	statechart->raise_g();
 	statechart->runCycle();
 	EXPECT_TRUE(statechart->isActive(Choice::Choice_main_region_B));
@@ -61,7 +61,7 @@ TEST(StatemachineTest, uncheckedChoiceUsingNonDefaultTransition) {
 	statechart->init();
 	statechart->enter();
 	EXPECT_TRUE(statechart->isActive(Choice::Choice_main_region_A));
-	statechart->getSCInterface().set_c(true);
+	statechart->getSCInterface()->set_c(true);
 	statechart->raise_f();
 	statechart->runCycle();
 	EXPECT_TRUE(statechart->isActive(Choice::Choice_main_region_C));
@@ -72,7 +72,7 @@ TEST(StatemachineTest, uncheckedChoiceUsingDefaultTransition) {
 	statechart->init();
 	statechart->enter();
 	EXPECT_TRUE(statechart->isActive(Choice::Choice_main_region_A));
-	statechart->getSCInterface().set_c(false);
+	statechart->getSCInterface()->set_c(false);
 	statechart->raise_f();
 	statechart->runCycle();
 	EXPECT_TRUE(statechart->isActive(Choice::Choice_main_region_B));
@@ -83,7 +83,7 @@ TEST(StatemachineTest, alwaysTrueTransitionInChoice) {
 	statechart->init();
 	statechart->enter();
 	EXPECT_TRUE(statechart->isActive(Choice::Choice_main_region_A));
-	statechart->getSCInterface().set_c(true);
+	statechart->getSCInterface()->set_c(true);
 	statechart->raise_h();
 	statechart->runCycle();
 	EXPECT_TRUE(statechart->isActive(Choice::Choice_main_region_B));

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

@@ -24,7 +24,7 @@ TEST(StatemachineTest, EntryNotTakenOnStatechartEnter) {
 TEST(StatemachineTest, EntryTakenOnStatechartEnter) {
 	GuardedEntry* statechart = new GuardedEntry();
 	statechart->init();
-	statechart->getSCInterface().set_guard(true);
+	statechart->getSCInterface()->set_guard(true);
 	statechart->enter();
 	EXPECT_TRUE(statechart->isActive(GuardedEntry::GuardedEntry_main_region_A));
 	EXPECT_TRUE(statechart->getSCInterface()->get_done()== true);
@@ -38,8 +38,8 @@ TEST(StatemachineTest, EntryTakenInTransition) {
 	statechart->raise_e();
 	statechart->runCycle();
 	EXPECT_TRUE(statechart->isActive(GuardedEntry::GuardedEntry_main_region_B));
-	statechart->getSCInterface().set_guard(true);
-	statechart->getSCInterface().set_done(false);
+	statechart->getSCInterface()->set_guard(true);
+	statechart->getSCInterface()->set_done(false);
 	statechart->raise_e();
 	statechart->runCycle();
 	EXPECT_TRUE(statechart->isActive(GuardedEntry::GuardedEntry_main_region_A));
@@ -54,8 +54,8 @@ TEST(StatemachineTest, EntryNotTakenInTransition) {
 	statechart->raise_e();
 	statechart->runCycle();
 	EXPECT_TRUE(statechart->isActive(GuardedEntry::GuardedEntry_main_region_B));
-	statechart->getSCInterface().set_guard(false);
-	statechart->getSCInterface().set_done(false);
+	statechart->getSCInterface()->set_guard(false);
+	statechart->getSCInterface()->set_done(false);
 	statechart->raise_e();
 	statechart->runCycle();
 	EXPECT_TRUE(statechart->isActive(GuardedEntry::GuardedEntry_main_region_A));

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

@@ -29,7 +29,7 @@ TEST(StatemachineTest, ExitNotTaken) {
 	statechart->init();
 	statechart->enter();
 	EXPECT_TRUE(statechart->isActive(GuardedExit::GuardedExit_main_region_A));
-	statechart->getSCInterface().set_guard(true);
+	statechart->getSCInterface()->set_guard(true);
 	statechart->raise_e();
 	statechart->runCycle();
 	EXPECT_TRUE(statechart->isActive(GuardedExit::GuardedExit_main_region_B));