Refactor predicates test

DATP4G6 · May 15, 2024 · 31472b1 · 31472b1
1 parent 7bf9469
commit 31472b1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 23 deletions.
diff --git a/SocietalConstructionToolTests/Snapshots/BehaviourTests/TestPredicates.verified.txt b/SocietalConstructionToolTests/Snapshots/BehaviourTests/TestPredicates.verified.txt
@@ -15,10 +15,10 @@
     }
   },
   {
-    "Species": "Counter",
+    "Species": "stdCounter",
     "State": "Counting",
     "Fields": {
-      "generation": 0
+      "x": 2
     }
   }
 ][
@@ -45,10 +45,10 @@
     }
   },
   {
-    "Species": "Counter",
+    "Species": "stdCounter",
     "State": "Counting",
     "Fields": {
-      "generation": 1
+      "x": 1
     }
   }
 ][
@@ -82,10 +82,10 @@
     }
   },
   {
-    "Species": "Counter",
+    "Species": "stdCounter",
     "State": "Counting",
     "Fields": {
-      "generation": 2
+      "x": 0
     }
   }
 ][

diff --git a/SocietalConstructionToolTests/TestFiles/BehaviourTests/TestPredicates.sct b/SocietalConstructionToolTests/TestFiles/BehaviourTests/TestPredicates.sct
@@ -1,12 +1,10 @@
 species Citizen(int townId) {
-
     state Alive {
         enter Alive;
     }
 }
 
 species Town(int id, int citizenCount) {
-
     decorator updateCitizenCount {
         citizenCount = count(Citizen::?(townId: id));
     }
@@ -18,22 +16,8 @@ species Town(int id, int citizenCount) {
     }
 }
 
-species Counter(int generation) {
-    state Counting {
-        generation = generation + 1;
-        if (generation > 2) {
-            exit;
-        }
-        enter Counting;
-    }
-}
-
 function setup() -> void {
     create Town::Stable(id: 1, citizenCount: 0);
     create Citizen::Alive(townId: 1);
-    create Counter::Counting(generation: 0);
+    ExitAfterTicks(2);
 }
-
-
-
-