Move invalidFileInCaseDirectoryShouldBeIgnored to FsCaseControllerTest

Signed-off-by: Etienne Homer <etiennehomer@gmail.com>

Author: etiennehomer

src/test/java/com/powsybl/caseserver/service/AbstractCaseControllerTest.java

@@ -6,7 +6,6 @@
  */
 package com.powsybl.caseserver.service;
 
-import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.io.ByteStreams;
 import com.powsybl.caseserver.ContextConfigurationWithTestChannel;
@@ -57,7 +56,7 @@
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.MOCK)
 @ContextConfigurationWithTestChannel
 abstract class AbstractCaseControllerTest {
-    private static final String TEST_CASE = "testCase.xiidm";
+    public static final String TEST_CASE = "testCase.xiidm";
     private static final String TEST_TAR_CASE = "tarCase.tar";
     private static final String TEST_CASE_FORMAT = "XIIDM";
     private static final String NOT_A_NETWORK = "notANetwork.txt";
@@ -80,11 +79,11 @@ abstract class AbstractCaseControllerTest {
     OutputDestination outputDestination;
 
     @Autowired
-    private ObjectMapper mapper;
+    public ObjectMapper mapper;
 
     FileSystem fileSystem;
 
-    private final String caseImportDestination = "case.import.destination";
+    public final String caseImportDestination = "case.import.destination";
 
     @AfterEach
     public void tearDown() throws Exception {
@@ -93,7 +92,7 @@ public void tearDown() throws Exception {
         TestUtils.assertQueuesEmptyThenClear(destinations, outputDestination);
     }
 
-    private void createStorageDir() throws IOException {
+    void createStorageDir() throws IOException {
         Path path = fileSystem.getPath(caseService.getRootDirectory());
         if (!Files.exists(path)) {
             Files.createDirectories(path);
@@ -467,7 +466,7 @@ void testDuplicateNonIndexedCase() throws Exception {
         assertFalse(caseMetadataRepository.findById(duplicateCaseUuid).get().isIndexed());
     }
 
-    private UUID importCase(String testCase, Boolean withExpiration) throws Exception {
+    UUID importCase(String testCase, Boolean withExpiration) throws Exception {
         String importedCase;
         if (withExpiration) {
             importedCase = mvc.perform(multipart("/v1/cases")
@@ -721,35 +720,6 @@ private static String getDateSearchTerm(String entsoeFormatDate) {
         return "date:\"" + utcFormattedDate + "\"";
     }
 
-    @Test
-    void invalidFileInCaseDirectoryShouldBeIgnored() throws Exception {
-        createStorageDir();
-
-        // add a random file in the storage, not stored in a UUID named directory
-        Path filePath = fileSystem.getPath(caseService.getRootDirectory()).resolve("randomFile.txt");
-        Files.createFile(filePath);
-
-        // add a case file in a UUID named directory but no metadata in the database
-        Path casePath = fileSystem.getPath(caseService.getRootDirectory()).resolve(UUID.randomUUID().toString());
-        Files.createDirectory(casePath);
-        Files.createFile(casePath.resolve(TEST_CASE));
-
-        importCase(TEST_CASE, false);
-
-        MvcResult mvcResult = mvc.perform(get("/v1/cases"))
-                .andExpect(status().isOk())
-                .andReturn();
-        String resultAsString = mvcResult.getResponse().getContentAsString();
-        List<CaseInfos> caseInfos = mapper.readValue(resultAsString, new TypeReference<>() { });
-        assertEquals(1, caseInfos.size());
-        assertEquals(TEST_CASE, caseInfos.get(0).getName());
-
-        Files.delete(filePath);
-        mvc.perform(delete("/v1/cases"))
-                .andExpect(status().isOk());
-        assertNotNull(outputDestination.receive(1000, caseImportDestination));
-    }
-
     @Test
     void testGetCaseBaseName() throws Exception {
         MvcResult mvcResult = mvc.perform(get("/v1/cases/caseBaseName?caseName=case.xml"))

src/test/java/com/powsybl/caseserver/service/FsCaseControllerTest.java

@@ -6,18 +6,29 @@
  */
 package com.powsybl.caseserver.service;
 
+import com.fasterxml.jackson.core.type.TypeReference;
 import com.google.common.jimfs.Configuration;
 import com.google.common.jimfs.Jimfs;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
+import com.powsybl.caseserver.dto.CaseInfos;
 import com.powsybl.computation.ComputationManager;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.web.servlet.MvcResult;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.UUID;
 
 /**
  * @author Ghazwa Rehili <ghazwa.rehili at rte-france.com>
@@ -44,4 +55,34 @@ void testStorageNotCreated() throws Exception {
         mvc.perform(delete("/v1/cases")).andExpect(status().isUnprocessableEntity());
     }
 
+    @Test
+    void invalidFileInCaseDirectoryShouldBeIgnored() throws Exception {
+        createStorageDir();
+
+        // add a random file in the storage, not stored in a UUID named directory
+        Path filePath = fileSystem.getPath(caseService.getRootDirectory()).resolve("randomFile.txt");
+        Files.createFile(filePath);
+
+        // add a case file in a UUID named directory but no metadata in the database
+        Path casePath = fileSystem.getPath(caseService.getRootDirectory()).resolve(UUID.randomUUID().toString());
+        Files.createDirectory(casePath);
+        Files.write(casePath.resolve(TEST_CASE), AbstractCaseControllerTest.class.getResourceAsStream("/" + TEST_CASE).readAllBytes());
+
+        // import case properly
+        importCase(TEST_CASE, false);
+
+        MvcResult mvcResult = mvc.perform(get("/v1/cases"))
+                .andExpect(status().isOk())
+                .andReturn();
+        String resultAsString = mvcResult.getResponse().getContentAsString();
+        List<CaseInfos> caseInfos = mapper.readValue(resultAsString, new TypeReference<>() { });
+        assertEquals(1, caseInfos.size());
+        assertEquals(TEST_CASE, caseInfos.get(0).getName());
+
+        Files.delete(filePath);
+        mvc.perform(delete("/v1/cases"))
+                .andExpect(status().isOk());
+        assertNotNull(outputDestination.receive(1000, caseImportDestination));
+    }
+
 }