Fixes for tests working directory

Aquerr · Nov 23, 2024 · 1d9ab43 · 1d9ab43
1 parent 79e2c58
commit 1d9ab43
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -346,6 +346,13 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <workingDirectory>./target/test-run</workingDirectory>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 

diff --git a/src/main/java/pl/bartlomiejstepien/armaserverwebgui/application/config/ASWGConfig.java b/src/main/java/pl/bartlomiejstepien/armaserverwebgui/application/config/ASWGConfig.java
@@ -88,7 +88,7 @@ public void onEnvironmentPreparedEvent() throws IOException
         createConfigFileIfNotExists();
     }
 
-    public void saveProperties()
+    public void saveToFile()
     {
         try(FileWriter fileWriter = new FileWriter(ASWG_CONFIGURATION_FILE_PATH.toFile(), StandardCharsets.UTF_8);
             BufferedWriter bufferedWriter = new BufferedWriter(fileWriter))
@@ -107,7 +107,7 @@ private void createConfigFileIfNotExists() throws IOException
         if (Files.notExists(ASWG_CONFIGURATION_FILE_PATH))
         {
             Files.createFile(ASWG_CONFIGURATION_FILE_PATH);
-            saveProperties();
+            saveToFile();
         }
     }
 

diff --git a/src/main/java/pl/bartlomiejstepien/armaserverwebgui/web/GeneralController.java b/src/main/java/pl/bartlomiejstepien/armaserverwebgui/web/GeneralController.java
@@ -66,7 +66,7 @@ public Mono<ResponseEntity<Void>> saveGeneralProperties(@RequestBody SaveGeneral
                             .build());
                     return Mono.empty();
                 })
-                .then(Mono.fromRunnable(this.aswgConfig::saveProperties))
+                .then(Mono.fromRunnable(this.aswgConfig::saveToFile))
                 .then(Mono.just(ResponseEntity.ok().build()));
     }
 

diff --git a/src/test/java/pl/bartlomiejstepien/armaserverwebgui/web/GeneralControllerTest.java b/src/test/java/pl/bartlomiejstepien/armaserverwebgui/web/GeneralControllerTest.java
@@ -58,6 +58,9 @@ void getGeneralPropertiesShouldTriggerUnauthorizedErrorWhenUserNotAuthorized()
     @Test
     void saveGeneralPropertiesShouldUpdateServerAndModsDirectoryInASWGConfig()
     {
+        String initialServerDirectory = aswgConfig.getServerDirectoryPath();
+        String initialModsDirectory = aswgConfig.getModsDirectoryPath();
+
         webTestClient.post()
                 .uri(API_GENERAL_PROPERTIES_URL)
                 .header(HttpHeaders.AUTHORIZATION, "Bearer " + jwtService.createJwt("test_user"))
@@ -72,6 +75,10 @@ void saveGeneralPropertiesShouldUpdateServerAndModsDirectoryInASWGConfig()
         verify(generalService).saveGeneralProperties(GeneralProperties.builder()
                 .maxPlayers(MAX_PLAYERS)
                 .build());
+
+        aswgConfig.setServerDirectoryPath(initialServerDirectory);
+        aswgConfig.setModsDirectoryPath(initialModsDirectory);
+        aswgConfig.saveToFile();
     }
 
     @Test

diff --git a/src/test/resources/application-test.properties b/src/test/resources/application-test.properties
@@ -10,7 +10,7 @@ spring.sql.init.mode=always
 spring.liquibase.url=jdbc:h2:mem:aswg;DB_CLOSE_DELAY=-1
 
 wiremock.server.port=${server.port}
-aswg.server-directory-path=./target
+aswg.server-directory-path=.
 aswg.mods-directory-path=mods
 aswg.job.file-scanner.installation.enabled=false
 aswg.steam.web-api-token=ABC123MYTOKEN
diff --git a/src/test/resources/integration/mocks/__files/general/get-general-properties-response.json b/src/test/resources/integration/mocks/__files/general/get-general-properties-response.json
@@ -1,5 +1,5 @@
 {
-  "serverDirectory": "./target",
+  "serverDirectory": ".",
   "modsDirectory": "mods",
   "maxPlayers": 10
 }