Cleanup tests

exasol · Sep 11, 2023 · 9866323 · 9866323
1 parent 6c5ac60
commit 9866323
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/...tegration-test-java/src/test/java/com/exasol/extensionmanager/itest/ExasolMetadataIT.java b/...tegration-test-java/src/test/java/com/exasol/extensionmanager/itest/ExasolMetadataIT.java
@@ -1,5 +1,6 @@
 package com.exasol.extensionmanager.itest;
 
+import static com.exasol.extensionmanager.itest.IntegrationTestCommon.BUILT_EXTENSION_JS;
 import static com.exasol.extensionmanager.itest.IntegrationTestCommon.TESTING_EXTENSION_SOURCE_DIR;
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 
@@ -18,8 +19,7 @@ class ExasolMetadataIT {
     static void setupExasol() {
         exasolTestSetup = IntegrationTestCommon.createExasolTestSetup();
         extensionManager = ExtensionManagerSetup.create(exasolTestSetup,
-                ExtensionBuilder.createDefaultNpmBuilder(TESTING_EXTENSION_SOURCE_DIR,
-                        TESTING_EXTENSION_SOURCE_DIR.resolve("dist").resolve(IntegrationTestCommon.EXTENSION_ID)));
+                ExtensionBuilder.createDefaultNpmBuilder(TESTING_EXTENSION_SOURCE_DIR, BUILT_EXTENSION_JS));
         metadata = extensionManager.exasolMetadata();
     }
 

diff --git a/...n-test-java/src/test/java/com/exasol/extensionmanager/itest/ExtensionManagerClientIT.java b/...n-test-java/src/test/java/com/exasol/extensionmanager/itest/ExtensionManagerClientIT.java
@@ -1,7 +1,6 @@
 package com.exasol.extensionmanager.itest;
 
-import static com.exasol.extensionmanager.itest.IntegrationTestCommon.EXTENSION_ID;
-import static com.exasol.extensionmanager.itest.IntegrationTestCommon.TESTING_EXTENSION_SOURCE_DIR;
+import static com.exasol.extensionmanager.itest.IntegrationTestCommon.*;
 import static java.util.Collections.emptyList;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.*;
@@ -37,8 +36,8 @@ static void setup() throws SQLException, IOException {
         exasolTestSetup = IntegrationTestCommon.createExasolTestSetup();
         connection = exasolTestSetup.createConnection();
         createTestConfigFile();
-        extensionManager = ExtensionManagerSetup.create(exasolTestSetup, ExtensionBuilder.createDefaultNpmBuilder(
-                TESTING_EXTENSION_SOURCE_DIR, TESTING_EXTENSION_SOURCE_DIR.resolve("dist").resolve(EXTENSION_ID)));
+        extensionManager = ExtensionManagerSetup.create(exasolTestSetup,
+                ExtensionBuilder.createDefaultNpmBuilder(TESTING_EXTENSION_SOURCE_DIR, BUILT_EXTENSION_JS));
         client = extensionManager.client();
     }
 

diff --git a/...on-test-java/src/test/java/com/exasol/extensionmanager/itest/ExtensionManagerSetupIT.java b/...on-test-java/src/test/java/com/exasol/extensionmanager/itest/ExtensionManagerSetupIT.java
@@ -1,5 +1,6 @@
 package com.exasol.extensionmanager.itest;
 
+import static com.exasol.extensionmanager.itest.IntegrationTestCommon.BUILT_EXTENSION_JS;
 import static com.exasol.extensionmanager.itest.IntegrationTestCommon.TESTING_EXTENSION_SOURCE_DIR;
 import static com.exasol.matcher.ResultSetStructureMatcher.table;
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -35,8 +36,7 @@ static void teardownExasol() throws Exception {
     @BeforeEach
     void setup() throws SQLException {
         extensionManager = ExtensionManagerSetup.create(exasolTestSetup,
-                ExtensionBuilder.createDefaultNpmBuilder(TESTING_EXTENSION_SOURCE_DIR,
-                        TESTING_EXTENSION_SOURCE_DIR.resolve("dist").resolve(IntegrationTestCommon.EXTENSION_ID)));
+                ExtensionBuilder.createDefaultNpmBuilder(TESTING_EXTENSION_SOURCE_DIR, BUILT_EXTENSION_JS));
     }
 
     @AfterEach

diff --git a/...tion-test-java/src/test/java/com/exasol/extensionmanager/itest/IntegrationTestCommon.java b/...tion-test-java/src/test/java/com/exasol/extensionmanager/itest/IntegrationTestCommon.java
@@ -10,6 +10,7 @@ class IntegrationTestCommon {
     static final Path TESTING_EXTENSION_SOURCE_DIR = Paths.get("testing-extension").toAbsolutePath();
     static final Path CONFIG_FILE = Paths.get("extension-test.properties").toAbsolutePath();
     static final String EXTENSION_ID = "testing-extension.js";
+    static final Path BUILT_EXTENSION_JS = TESTING_EXTENSION_SOURCE_DIR.resolve("dist").resolve(EXTENSION_ID);
 
     private IntegrationTestCommon() {
         // Not instantiable