Fixed some more testing code, missed this originally when simulationD…

…atasetId was added as an optional
NASA-AMMOS · Oct 18, 2023 · a2d7e04 · a2d7e04
1 parent 1d994cc
commit a2d7e04
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/merlin-server/src/test/java/gov/nasa/jpl/aerie/merlin/server/mocks/StubPlanService.java b/merlin-server/src/test/java/gov/nasa/jpl/aerie/merlin/server/mocks/StubPlanService.java
@@ -103,14 +103,14 @@ public void extendExternalDataset(final DatasetId datasetId, final ProfileSet pr
   @Override
   public List<Pair<Duration, ProfileSet>> getExternalDatasets(
       final PlanId planId,
-      final Optional<SimulationDatasetId> simulationDatasetId
+      final SimulationDatasetId simulationDatasetId
       ) throws NoSuchPlanException
   {
     return List.of();
   }
 
   @Override
-  public Map<String, ValueSchema> getExternalResourceSchemas(final PlanId planId) throws NoSuchPlanException {
+  public Map<String, ValueSchema> getExternalResourceSchemas(final PlanId planId, final Optional<SimulationDatasetId> simulationDatasetId) throws NoSuchPlanException {
     return Map.of("external resource", ValueSchema.BOOLEAN);
   }
 

diff --git a/...java/gov/nasa/jpl/aerie/merlin/server/services/ConstraintsDSLCompilationServiceTests.java b/...java/gov/nasa/jpl/aerie/merlin/server/services/ConstraintsDSLCompilationServiceTests.java
@@ -91,7 +91,7 @@ void tearDown() {
   private <T> void checkSuccessfulCompilation(String constraint, Expression<T> expected)
   {
     final ConstraintsDSLCompilationService.ConstraintsDSLCompilationResult result;
-    result = assertDoesNotThrow(() -> constraintsDSLCompilationService.compileConstraintsDSL(MISSION_MODEL_ID, Optional.of(PLAN_ID), constraint));
+    result = assertDoesNotThrow(() -> constraintsDSLCompilationService.compileConstraintsDSL(MISSION_MODEL_ID, Optional.of(PLAN_ID), Optional.empty(), constraint));
     if (result instanceof ConstraintsDSLCompilationService.ConstraintsDSLCompilationResult.Success r) {
       assertEquals(expected, r.constraintExpression());
     } else if (result instanceof ConstraintsDSLCompilationService.ConstraintsDSLCompilationResult.Error r) {
@@ -102,7 +102,7 @@ private <T> void checkSuccessfulCompilation(String constraint, Expression<T> exp
   private void checkFailedCompilation(String constraint, String error) {
     final ConstraintsDSLCompilationService.ConstraintsDSLCompilationResult.Error actualErrors;
     actualErrors = (ConstraintsDSLCompilationService.ConstraintsDSLCompilationResult.Error) assertDoesNotThrow(() -> constraintsDSLCompilationService.compileConstraintsDSL(
-        MISSION_MODEL_ID, Optional.of(PLAN_ID), constraint
+        MISSION_MODEL_ID, Optional.of(PLAN_ID), Optional.empty(), constraint
     ));
     if (actualErrors.errors()
                     .stream()

diff --git a/...t/java/gov/nasa/jpl/aerie/merlin/server/services/TypescriptCodeGenerationServiceTest.java b/...t/java/gov/nasa/jpl/aerie/merlin/server/services/TypescriptCodeGenerationServiceTest.java
@@ -15,7 +15,7 @@ class TypescriptCodeGenerationServiceTest {
   @Test
   void testCodeGen() throws MissionModelService.NoSuchMissionModelException, NoSuchPlanException {
     final var codeGenService = new TypescriptCodeGenerationServiceAdapter(new StubMissionModelService(), new StubPlanService());
-    final var expected = codeGenService.generateTypescriptTypes("abc", Optional.of(new PlanId(1L)));
+    final var expected = codeGenService.generateTypescriptTypes("abc", Optional.of(new PlanId(1L)), Optional.empty());
     assertEquals(expected,
         """
             /** Start Codegen */