Fixed tests after rebasing with latest develop

NASA-AMMOS · Apr 5, 2024 · 6ef16e5 · 6ef16e5
1 parent 87a1df5
commit 6ef16e5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/e2e-tests/src/test/java/gov/nasa/jpl/aerie/e2e/SchedulingTests.java b/e2e-tests/src/test/java/gov/nasa/jpl/aerie/e2e/SchedulingTests.java
@@ -274,11 +274,12 @@ void schedulingCoexistenceGoal() throws IOException {
   void schedulingCoexistenceGoalWithAnchor() throws IOException {
     // Setup: Add Goal and Activities
     ArrayList<Integer> anchors = insertAnchorActivities();
-    final int coexistenceGoalId = hasura.insertSchedulingGoal(
+    /*final int coexistenceGoalId = hasura.insertSchedulingGoal(
         "Coexistence Scheduling Test Goal",
         modelId,
-        coexistenceGoalWithAnchorsDefinition);
-    hasura.createSchedulingSpecGoal(coexistenceGoalId, schedulingSpecId, 0);
+        coexistenceGoalWithAnchorsDefinition);*/
+    hasura.createSchedulingSpecGoal("Coexistence Scheduling Test Goal", coexistenceGoalWithAnchorsDefinition, schedulingSpecId, 0);
+
 
     try {
       // Schedule and get Plan
@@ -303,7 +304,7 @@ void schedulingCoexistenceGoalWithAnchor() throws IOException {
 
     } finally {
       // Teardown: Delete Goal
-      hasura.deleteSchedulingGoal(coexistenceGoalId);
+      hasura.deleteSchedulingGoal(schedulingSpecId);
     }
   }
 

diff --git a/...rc/test/java/gov/nasa/jpl/aerie/scheduler/worker/services/SchedulingIntegrationTests.java b/...rc/test/java/gov/nasa/jpl/aerie/scheduler/worker/services/SchedulingIntegrationTests.java
@@ -464,7 +464,7 @@ void testCoexistenceGoalWithAnchors() {
                 true
             )
         ),
-        List.of(new SchedulingGoal(new GoalId(0L), """
+        List.of(new SchedulingGoal(new GoalId(0L, 0L), """
           export default () => Goal.CoexistenceGoal({
           persistentAnchor: PersistentTimeAnchor.START,
             forEach: ActivityExpression.ofType(ActivityTypes.BiteBanana),
@@ -476,7 +476,7 @@ export default () => Goal.CoexistenceGoal({
         PLANNING_HORIZON);
 
     assertEquals(1, results.scheduleResults.goalResults().size());
-    final var goalResult = results.scheduleResults.goalResults().get(new GoalId(0L));
+    final var goalResult = results.scheduleResults.goalResults().get(new GoalId(0L, 0L));
 
     assertTrue(goalResult.satisfied());
     assertEquals(0, goalResult.createdActivities().size());