Przeglądaj źródła

modified*. sctunit - files according to dsl-grammar-changes

Andreas Mülder 13 lat temu
rodzic
commit
9f4219a351
20 zmienionych plików z 62 dodań i 59 usunięć
  1. 7 0
      test-plugins/org.yakindu.sct.test.models/tests/AllTests.sctunit
  2. 2 1
      test-plugins/org.yakindu.sct.test.models/tests/AlwaysOncycle.sctunit
  3. 1 1
      test-plugins/org.yakindu.sct.test.models/tests/BitExpression.sctunit
  4. 1 2
      test-plugins/org.yakindu.sct.test.models/tests/BooleanExpressions.sctunit
  5. 31 31
      test-plugins/org.yakindu.sct.test.models/tests/Choice.sctunit
  6. 2 2
      test-plugins/org.yakindu.sct.test.models/tests/DeepHistory.sctunit
  7. 4 5
      test-plugins/org.yakindu.sct.test.models/tests/FeatureCalls.sctunit
  8. 1 1
      test-plugins/org.yakindu.sct.test.models/tests/Guard.sctunit
  9. 1 2
      test-plugins/org.yakindu.sct.test.models/tests/IntegerExpressions.sctunit
  10. 1 1
      test-plugins/org.yakindu.sct.test.models/tests/PriorityValues.sctunit
  11. 1 1
      test-plugins/org.yakindu.sct.test.models/tests/RaiseEvent.sctunit
  12. 1 1
      test-plugins/org.yakindu.sct.test.models/tests/SameNameDifferentRegion.sctunit
  13. 1 1
      test-plugins/org.yakindu.sct.test.models/tests/ShallowHistory.sctunit
  14. 1 1
      test-plugins/org.yakindu.sct.test.models/tests/SimpleEvent.sctunit
  15. 1 1
      test-plugins/org.yakindu.sct.test.models/tests/SimpleHierachy.sctunit
  16. 1 1
      test-plugins/org.yakindu.sct.test.models/tests/StateIsActiveTest.sctunit
  17. 1 1
      test-plugins/org.yakindu.sct.test.models/tests/StatechartLocalReactions.sctunit
  18. 2 2
      test-plugins/org.yakindu.sct.test.models/tests/SyncFork.sctunit
  19. 1 3
      test-plugins/org.yakindu.sct.test.models/tests/SyncJoin.sctunit
  20. 1 1
      test-plugins/org.yakindu.sct.test.models/tests/ValuedEvent.sctunit

+ 7 - 0
test-plugins/org.yakindu.sct.test.models/tests/AllTests.sctunit

@@ -0,0 +1,7 @@
+testsuite AllTests { 
+	AlwaysOncycle , BitExpressions , BooleanExpressions ,
+	Choice , DeepHistory , FeatureCalls , Guard , IntegerExpressions ,
+	PriorityValues , RaiseEvent , SameNameDifferentRegion , ShallowHistory ,
+	SimpleHietachy , StateIsActive , StatechartLocalReactions , SyncFork ,
+	SyncJoin , ValuedEvent , simpleEvent 
+}

+ 2 - 1
test-plugins/org.yakindu.sct.test.models/tests/AlwaysOncycle.sctunit

@@ -1,4 +1,4 @@
-testcase for AlwaysOncycle {
+testgroup AlwaysOncycle for statechart AlwaysOncycle {
 	 test alwaysOncycleTest {
 		assert active (AlwaysOncycle.main_region.StateA)
 		while [value < 5] {
@@ -14,4 +14,5 @@ testcase for AlwaysOncycle {
 		cycle
 		assert active (AlwaysOncycle.main_region.StateA)
 	}
+		
 }

+ 1 - 1
test-plugins/org.yakindu.sct.test.models/tests/BitExpression.sctunit

@@ -1,4 +1,4 @@
-testcase for BitExpressions{
+testgroup BitExpressions for statechart BitExpressions {
 	
 	test BitExpressions {
 		assert active ( BitExpressions.main_region.StateA)

+ 1 - 2
test-plugins/org.yakindu.sct.test.models/tests/BooleanExpressions.sctunit

@@ -1,5 +1,4 @@
-testcase for BooleanExpressions {
-	
+testgroup BooleanExpressions for statechart BooleanExpressions {
 	test booleanExpressions {
 		assert active (BooleanExpressions.main_region.StateA)
 		assert myBool1 == true

+ 31 - 31
test-plugins/org.yakindu.sct.test.models/tests/Choice.sctunit

@@ -1,32 +1,32 @@
-testcase for Choice {
-	test choiceTest {
-		assert active (Choice.main_region.A)
-		assert value == 4
-		raise pressKey
-		cycle
-		assert active (Choice.main_region.B)
-		assert value == 3
-		raise pressKey
-		cycle
-		assert active (Choice.main_region.A)
-		raise pressKey
-		cycle
-		assert active (Choice.main_region.C)
-		assert value == 2
-		raise pressKey
-		cycle
-		assert active (Choice.main_region.B)
-		assert value == 1
-		raise pressKey
-		cycle
-		assert active (Choice.main_region.A)
-		assert value == 1
-		raise pressKey
-		cycle
-		assert active (Choice.main_region.C)
-		assert value == 0
-		raise pressKey
-		cycle
-		assert active (Choice.main_region.A)
-	}
+testgroup Choice for statechart Choice { 
+	test choiceTest { 
+		assert active (Choice.main_region.A ) 
+		assert value == 4 
+		raise pressKey 
+		cycle 
+		assert active (Choice.main_region.B ) 
+		assert value == 3 
+		raise pressKey 
+		cycle 
+		assert active (Choice.main_region.A ) 
+		raise pressKey 
+		cycle 
+		assert active (Choice.main_region.C ) 
+		assert value == 2 
+		raise pressKey 
+		cycle 
+		assert active (Choice.main_region.B ) 
+		assert value == 1 
+		raise pressKey 
+		cycle 
+		assert active (Choice.main_region.A ) 
+		assert value == 1 
+		raise pressKey 
+		cycle 
+		assert active (Choice.main_region.C ) 
+		assert value == 0 
+		raise pressKey 
+		cycle 
+		assert active (Choice.main_region.A ) 
+	} 
 }

+ 2 - 2
test-plugins/org.yakindu.sct.test.models/tests/DeepHistory.sctunit

@@ -1,4 +1,4 @@
-testcase for DeepHistory  {
+testgroup DeepHistory for statechart DeepHistory {
 	test deepHistoryTest {
 		// Change active states to State9;
 		raise event1
@@ -27,7 +27,7 @@ testcase for DeepHistory  {
 		assert !active (DeepHistory.mainRegion.State1)
 		assert active (DeepHistory.mainRegion.State2._region0.State4._region0.State7._region0.State9)
 	
-	
 	}
 }
 
+ 

+ 4 - 5
test-plugins/org.yakindu.sct.test.models/tests/FeatureCalls.sctunit

@@ -1,11 +1,10 @@
-testcase for FeatureCalls {
+testgroup FeatureCalls for statechart FeatureCalls {
 	test FeatureCalls {
 		assert active ( FeatureCalls.main_region.A)
 		assert MyInterface.myInt == 0
 		raise MyInterface.Event1
 		cycle
-		assert MyInterface.myInt == 42 
-		assert active (FeatureCalls.main_region.A)
-				
+		assert MyInterface.myInt == 42
+		assert active (FeatureCalls.main_region.A) 		
 	}
-}
+}   

+ 1 - 1
test-plugins/org.yakindu.sct.test.models/tests/Guard.sctunit

@@ -1,4 +1,4 @@
-testcase for Guard {
+testgroup Guard for statechart Guard {
 	test guardTest {
 		assert active (Guard.main_region.A)
 		raise Event1

+ 1 - 2
test-plugins/org.yakindu.sct.test.models/tests/IntegerExpressions.sctunit

@@ -1,5 +1,4 @@
-testcase for IntegerExpressions {
-	
+testgroup IntegerExpressions for statechart IntegerExpressions {
 	test integerExpressions {
 		assert active (IntegerExpressions.main_region.StateA)
 		assert myInt1 == 10

+ 1 - 1
test-plugins/org.yakindu.sct.test.models/tests/PriorityValues.sctunit

@@ -1,4 +1,4 @@
-testcase for PriorityValues {
+testgroup PriorityValues for statechart PriorityValues {
 	test transitionPriority {
 		assert active (PriorityValues.main_region.A)
 		raise event1

+ 1 - 1
test-plugins/org.yakindu.sct.test.models/tests/RaiseEvent.sctunit

@@ -1,4 +1,4 @@
-testcase for RaiseEvent {
+testgroup RaiseEvent for statechart RaiseEvent {
 	test raiseEvent {
 		assert active ( RaiseEvent.second_region.SateA)
 		assert active (RaiseEvent.main_region.StateA)

+ 1 - 1
test-plugins/org.yakindu.sct.test.models/tests/SameNameDifferentRegion.sctunit

@@ -1,4 +1,4 @@
-testcase for SameNameDifferentRegion {
+testgroup SameNameDifferentRegion for statechart SameNameDifferentRegion {
 	test sameNameDifferenRegionTest {
 		assert active ( SameNameDifferentRegion.main_region.StateA)
 		raise e1

+ 1 - 1
test-plugins/org.yakindu.sct.test.models/tests/ShallowHistory.sctunit

@@ -1,4 +1,4 @@
-testcase for ShallowHistory { 
+testgroup ShallowHistory for statechart ShallowHistory {
 	test shallowHistoryTest {
 		// Change active states to State9;
 		raise event1

+ 1 - 1
test-plugins/org.yakindu.sct.test.models/tests/SimpleEvent.sctunit

@@ -1,4 +1,4 @@
-testcase for SimpleEvent {
+testgroup simpleEvent for statechart SimpleEvent {
 	test simpleEventTest {
 		assert active (SimpleEvent.main_region.A) "Expected A to be active"
 		assert 5 == 5

+ 1 - 1
test-plugins/org.yakindu.sct.test.models/tests/SimpleHierachy.sctunit

@@ -1,4 +1,4 @@
-testcase for SimpleHierachy {
+testgroup SimpleHietachy for statechart SimpleHierachy {
 	test simpleHierachyTest {
 		assert active (SimpleHierachy.main_region.A)
 		raise Event1

+ 1 - 1
test-plugins/org.yakindu.sct.test.models/tests/StateIsActiveTest.sctunit

@@ -1,4 +1,4 @@
-testcase for StateIsActive{
+testgroup StateIsActive for statechart StateIsActive {
 	test stateIsActive{
 		assert active (StateIsActive.R1.R1A )
 		assert active (StateIsActive.R2.R2A)

+ 1 - 1
test-plugins/org.yakindu.sct.test.models/tests/StatechartLocalReactions.sctunit

@@ -1,4 +1,4 @@
-testcase for StatechartLocalReactions {
+testgroup StatechartLocalReactions for statechart StatechartLocalReactions {
 	test statechartLocalReactionsTest {
 		assert active (StatechartLocalReactions.main_region.S1)
 		assert active (StatechartLocalReactions.region2.a)

+ 2 - 2
test-plugins/org.yakindu.sct.test.models/tests/SyncFork.sctunit

@@ -1,4 +1,4 @@
-testcase for SyncFork{
+testgroup SyncFork for statechart SyncFork {
 	test syncForkTest{
 		assert active (SyncFork.main_region.A)
 		raise f
@@ -23,6 +23,6 @@ testcase for SyncFork{
 		assert active (SyncFork.main_region.B)
 		assert active (SyncFork.main_region.B.r1.C1)
 		assert active (SyncFork.main_region.B.r2.D1)
-				
+		
 	} 
 }

+ 1 - 3
test-plugins/org.yakindu.sct.test.models/tests/SyncJoin.sctunit

@@ -1,6 +1,4 @@
-testcase for SyncJoin {
-	
-	
+testgroup SyncJoin for statechart SyncJoin {
 //	test syncJoin_C2_Waits 'test intention' { 
   
 	test syncJoin_C2_Waits {   

+ 1 - 1
test-plugins/org.yakindu.sct.test.models/tests/ValuedEvent.sctunit

@@ -1,4 +1,4 @@
-testcase for ValuedEvents {
+testgroup ValuedEvent for statechart ValuedEvents {
 	test valuedEventTest {
 		cycle
 		assert active(ValuedEvents.main_region.A)