From 129627ecdade39008b56895aedd4147f467608a6 Mon Sep 17 00:00:00 2001 From: Theresa Kamerman Date: Wed, 18 Oct 2023 10:05:25 -0700 Subject: [PATCH] Remove Unneeded Dependencies (scheduler server) - replace assertJ assertThat with JUnit assertions - update Javalin to 5.6.3 --- scheduler-server/build.gradle | 10 ++-------- .../services/GenerateSchedulingLibActionTest.java | 7 ++++--- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/scheduler-server/build.gradle b/scheduler-server/build.gradle index f60a755a08..8c2381b95f 100644 --- a/scheduler-server/build.gradle +++ b/scheduler-server/build.gradle @@ -25,22 +25,16 @@ dependencies { implementation project(':constraints') implementation project(':scheduler-driver') - implementation 'org.apache.commons:commons-lang3:3.13.0' - implementation 'io.javalin:javalin:5.6.2' + implementation 'io.javalin:javalin:5.6.3' implementation 'org.eclipse:yasson:3.0.3' - implementation 'org.apache.bcel:bcel:6.7.0' implementation 'org.postgresql:postgresql:42.6.0' implementation 'com.zaxxer:HikariCP:5.0.1' testImplementation project(':examples:foo-missionmodel') testImplementation project(':merlin-framework') - testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.0' + testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.10.0' testImplementation 'org.junit.jupiter:junit-jupiter-params:5.10.0' - testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.0' - testImplementation 'org.assertj:assertj-core:3.24.2' - testImplementation 'javax.json.bind:javax.json.bind-api:1.0' - testImplementation 'org.glassfish:javax.json:1.1.4' testFixturesImplementation project(':merlin-driver') } diff --git a/scheduler-server/src/test/java/gov/nasa/jpl/aerie/scheduler/server/services/GenerateSchedulingLibActionTest.java b/scheduler-server/src/test/java/gov/nasa/jpl/aerie/scheduler/server/services/GenerateSchedulingLibActionTest.java index 010b900346..21aad6c5a8 100644 --- a/scheduler-server/src/test/java/gov/nasa/jpl/aerie/scheduler/server/services/GenerateSchedulingLibActionTest.java +++ b/scheduler-server/src/test/java/gov/nasa/jpl/aerie/scheduler/server/services/GenerateSchedulingLibActionTest.java @@ -1,7 +1,8 @@ package gov.nasa.jpl.aerie.scheduler.server.services; import org.junit.jupiter.api.Test; -import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; public final class GenerateSchedulingLibActionTest { @@ -16,7 +17,7 @@ void testTypescriptResourcesLoaded() { private static void assertTypescriptResourceLoaded(final String basename) { final var res = GenerateSchedulingLibAction.getTypescriptResource(basename); - assertThat(res.basename()).isEqualTo(basename); - assertThat(res.source()).isNotEmpty(); + assertEquals(basename, res.basename()); + assertFalse(res.source().isEmpty()); } }