From 97b041ce3a68ffb5d3064fd8042d84eb66e63401 Mon Sep 17 00:00:00 2001 From: maillard Date: Tue, 10 Oct 2023 16:50:14 -0700 Subject: [PATCH] Add e2e test reproducing the bug --- .../nasa/jpl/aerie/e2e/SchedulingTests.java | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) 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 index 8fedc03de9..a351ea8277 100644 --- 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 @@ -66,6 +66,18 @@ export default () => Goal.CoexistenceGoal({ startsAt: TimingConstraint.singleton(WindowProperty.START) })"""; + private final String bakeBananaGoalDefinition = + """ + export default (): Goal => + Goal.ActivityRecurrenceGoal({ + activityTemplate: ActivityTemplates.BakeBananaBread({ + temperature: 325.0, + tbSugar: 2, + glutenFree: false, + }), + interval: Temporal.Duration.from({ hours: 12 }), + });"""; + @BeforeAll void beforeAll() { // Setup Requests @@ -125,6 +137,30 @@ private void insertActivities() throws IOException { hasura.updatePlanRevisionSchedulingSpec(planId); } + //reproduces issue #1165 + @Test + void twoInARow() throws IOException { + // Setup: Add Goal + final int bakeBananaBreadGoalId = hasura.insertSchedulingGoal( + "BakeBanana Scheduling Test Goal", + modelId, + bakeBananaGoalDefinition); + hasura.createSchedulingSpecGoal(bakeBananaBreadGoalId, schedulingSpecId, 0); + try { + // Schedule and get Plan + hasura.awaitScheduling(schedulingSpecId); + hasura.updatePlanRevisionSchedulingSpec(planId); + hasura.awaitScheduling(schedulingSpecId); + final var plan = hasura.getPlan(planId); + final var activities = plan.activityDirectives(); + assertEquals(2, activities.size()); + activities.forEach(a->assertEquals("BakeBananaBread", a.type())); + } finally { + // Teardown: Delete Goal + hasura.deleteSchedulingGoal(bakeBananaBreadGoalId); + } + } + @Test void getSchedulingDSLTypeScript() throws IOException { final var schedulingDslTypes = hasura.getSchedulingDslTypeScript(modelId);