Jelajahi Sumber

modified customTests to new syntax

bohl 10 tahun lalu
induk
melakukan
d23a402c24

+ 3 - 3
test-plugins/org.yakindu.sct.generator.c.test/gtests/Operations/Operations.cc

@@ -19,13 +19,13 @@ TEST(StatemachineTest, OperationsTest) {
 	operations_init(&handle);
 	operations_enter(&handle);
 	operations_runCycle(&handle);
-	EXPECT_TRUE(operations_isActive(&handle, Operations_main_region_B));
+	EXPECT_TRUE(operations_isStateActive(&handle, Operations_main_region_B));
 	operationsIface_raise_ev(&handle);
 	operations_runCycle(&handle);
-	EXPECT_TRUE(operations_isActive(&handle, Operations_main_region_C));
+	EXPECT_TRUE(operations_isStateActive(&handle, Operations_main_region_C));
 	operationsIface_raise_ev(&handle);
 	operations_runCycle(&handle);
-	EXPECT_TRUE(operations_isActive(&handle, Operations_main_region_D));
+	EXPECT_TRUE(operations_isStateActive(&handle, Operations_main_region_D));
 }
 
 		

+ 3 - 3
test-plugins/org.yakindu.sct.generator.c.test/gtests/Operations/OperationsCustom.cc

@@ -47,7 +47,7 @@ TEST(StatemachineTest, OperationCallback) {
 	operations_init(&handle);
 	operations_enter(&handle);
 	operations_runCycle(&handle);
-	EXPECT_TRUE(operations_isActive(&handle, Operations_main_region_B));
+	EXPECT_TRUE(operations_isStateActive(&handle, Operations_main_region_B));
 	EXPECT_TRUE(internalOperation1Called);
 	EXPECT_TRUE(internalOperation2Called);
 	EXPECT_TRUE(internalOp2Param == 4);
@@ -58,7 +58,7 @@ TEST(StatemachineTest, OperationCallback) {
 	
 	operationsIface_raise_ev(&handle);
 	operations_runCycle(&handle);
-	EXPECT_TRUE(operations_isActive(&handle, Operations_main_region_C));
+	EXPECT_TRUE(operations_isStateActive(&handle, Operations_main_region_C));
 	EXPECT_TRUE(interfaceOperation1Called);
 	EXPECT_TRUE(interfaceOperation2Called);
 	EXPECT_TRUE(interfaceOp2Param == 4);
@@ -67,7 +67,7 @@ TEST(StatemachineTest, OperationCallback) {
 	
 	operationsIface_raise_ev(&handle);
 	operations_runCycle(&handle);
-	EXPECT_TRUE(operations_isActive(&handle, Operations_main_region_D));
+	EXPECT_TRUE(operations_isStateActive(&handle, Operations_main_region_D));
 	EXPECT_TRUE(unnamedInterfaceOperation1Called);
 	EXPECT_TRUE(unnamedInterfaceOperation2Called);
 	EXPECT_TRUE(unnamedInterfaceOp2Param == 4);

+ 8 - 8
test-plugins/org.yakindu.sct.generator.c.test/gtests/OperationsWithoutBraces/OperationsWithoutBraces.cc

@@ -18,17 +18,17 @@ OperationsWithoutBraces handle;
 TEST(StatemachineTest, OperationsWithoutBracesTest) {
 	operationsWithoutBraces_init(&handle);
 	operationsWithoutBraces_enter(&handle);
-	EXPECT_TRUE(operationsWithoutBraces_isActive(&handle, OperationsWithoutBraces_main_region_A));
-	EXPECT_TRUE(operationsWithoutBraces_isActive(&handle, OperationsWithoutBraces_another_region_A));
+	EXPECT_TRUE(operationsWithoutBraces_isStateActive(&handle, OperationsWithoutBraces_main_region_A));
+	EXPECT_TRUE(operationsWithoutBraces_isStateActive(&handle, OperationsWithoutBraces_another_region_A));
 	operationsWithoutBraces_runCycle(&handle);
-	EXPECT_TRUE(operationsWithoutBraces_isActive(&handle, OperationsWithoutBraces_main_region_B));
-	EXPECT_TRUE(operationsWithoutBraces_isActive(&handle, OperationsWithoutBraces_another_region_B));
+	EXPECT_TRUE(operationsWithoutBraces_isStateActive(&handle, OperationsWithoutBraces_main_region_B));
+	EXPECT_TRUE(operationsWithoutBraces_isStateActive(&handle, OperationsWithoutBraces_another_region_B));
 	operationsWithoutBraces_runCycle(&handle);
-	EXPECT_TRUE(operationsWithoutBraces_isActive(&handle, OperationsWithoutBraces_main_region_C));
-	EXPECT_TRUE(operationsWithoutBraces_isActive(&handle, OperationsWithoutBraces_another_region_C));
+	EXPECT_TRUE(operationsWithoutBraces_isStateActive(&handle, OperationsWithoutBraces_main_region_C));
+	EXPECT_TRUE(operationsWithoutBraces_isStateActive(&handle, OperationsWithoutBraces_another_region_C));
 	operationsWithoutBraces_runCycle(&handle);
-	EXPECT_TRUE(operationsWithoutBraces_isActive(&handle, OperationsWithoutBraces_main_region_D));
-	EXPECT_TRUE(operationsWithoutBraces_isActive(&handle, OperationsWithoutBraces_another_region_D));
+	EXPECT_TRUE(operationsWithoutBraces_isStateActive(&handle, OperationsWithoutBraces_main_region_D));
+	EXPECT_TRUE(operationsWithoutBraces_isStateActive(&handle, OperationsWithoutBraces_another_region_D));
 }
 
 		

+ 8 - 8
test-plugins/org.yakindu.sct.generator.c.test/gtests/OperationsWithoutBraces/OperationsWithoutBracesCustom.cc

@@ -18,17 +18,17 @@ OperationsWithoutBraces handle;
 TEST(StatemachineTest, OperationsWithoutBracesTest) {
 	operationsWithoutBraces_init(&handle);
 	operationsWithoutBraces_enter(&handle);
-	EXPECT_TRUE(operationsWithoutBraces_isActive(&handle, OperationsWithoutBraces_main_region_A));
-	EXPECT_TRUE(operationsWithoutBraces_isActive(&handle, OperationsWithoutBraces_another_region_A));
+	EXPECT_TRUE(operationsWithoutBraces_isStateActive(&handle, OperationsWithoutBraces_main_region_A));
+	EXPECT_TRUE(operationsWithoutBraces_isStateActive(&handle, OperationsWithoutBraces_another_region_A));
 	operationsWithoutBraces_runCycle(&handle);
-	EXPECT_TRUE(operationsWithoutBraces_isActive(&handle, OperationsWithoutBraces_main_region_B));
-	EXPECT_TRUE(operationsWithoutBraces_isActive(&handle, OperationsWithoutBraces_another_region_B));
+	EXPECT_TRUE(operationsWithoutBraces_isStateActive(&handle, OperationsWithoutBraces_main_region_B));
+	EXPECT_TRUE(operationsWithoutBraces_isStateActive(&handle, OperationsWithoutBraces_another_region_B));
 	operationsWithoutBraces_runCycle(&handle);
-	EXPECT_TRUE(operationsWithoutBraces_isActive(&handle, OperationsWithoutBraces_main_region_C));
-	EXPECT_TRUE(operationsWithoutBraces_isActive(&handle, OperationsWithoutBraces_another_region_C));
+	EXPECT_TRUE(operationsWithoutBraces_isStateActive(&handle, OperationsWithoutBraces_main_region_C));
+	EXPECT_TRUE(operationsWithoutBraces_isStateActive(&handle, OperationsWithoutBraces_another_region_C));
 	operationsWithoutBraces_runCycle(&handle);
-	EXPECT_TRUE(operationsWithoutBraces_isActive(&handle, OperationsWithoutBraces_main_region_D));
-	EXPECT_TRUE(operationsWithoutBraces_isActive(&handle, OperationsWithoutBraces_another_region_D));
+	EXPECT_TRUE(operationsWithoutBraces_isStateActive(&handle, OperationsWithoutBraces_main_region_D));
+	EXPECT_TRUE(operationsWithoutBraces_isStateActive(&handle, OperationsWithoutBraces_another_region_D));
 }
 		
 sc_boolean operationsWithoutBracesIface_myBoolOp(OperationsWithoutBraces* handle){