init

src/test/java/stirling/software/SPDF/controller/api/pipeline/PipelineProcessorTest.java

@@ -16,6 +16,7 @@ import org.springframework.core.io.ByteArrayResource;
 import org.springframework.core.io.Resource;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.util.LinkedMultiValueMap;
 
 import jakarta.servlet.ServletContext;
 
@@ -26,14 +27,11 @@ import stirling.software.SPDF.model.PipelineResult;
 @ExtendWith(MockitoExtension.class)
 class PipelineProcessorTest {
 
-    @Mock
-    ApiDocService apiDocService;
+    @Mock ApiDocService apiDocService;
 
-    @Mock
-    UserServiceInterface userService;
+    @Mock UserServiceInterface userService;
 
-    @Mock
-    ServletContext servletContext;
+    @Mock ServletContext servletContext;
 
     PipelineProcessor pipelineProcessor;
 
@@ -50,27 +48,34 @@ class PipelineProcessorTest {
         PipelineConfig config = new PipelineConfig();
         config.setOperations(List.of(op));
 
-        Resource file = new ByteArrayResource("data".getBytes()) {
-            @Override
-            public String getFilename() {
-                return "test.pdf";
-            }
-        };
+        Resource file =
+                new ByteArrayResource("data".getBytes()) {
+                    @Override
+                    public String getFilename() {
+                        return "test.pdf";
+                    }
+                };
 
         List<Resource> files = List.of(file);
 
         when(apiDocService.isMultiInput("filter-page-count")).thenReturn(false);
-        when(apiDocService.getExtensionTypes(false, "filter-page-count")).thenReturn(List.of("pdf"));
+        when(apiDocService.getExtensionTypes(false, "filter-page-count"))
+                .thenReturn(List.of("pdf"));
+
+        // Mock the sendWebRequest method to return an empty response body with OK status
+        LinkedMultiValueMap<String, Object> expectedBody = new LinkedMultiValueMap<>();
+        expectedBody.add("fileInput", file);
 
         doReturn(new ResponseEntity<>(new byte[0], HttpStatus.OK))
                 .when(pipelineProcessor)
-                .sendWebRequest(anyString(), any());
+                .sendWebRequest(contains("filter-page-count"), any());
 
         PipelineResult result = pipelineProcessor.runPipelineAgainstFiles(files, config);
 
-        assertTrue(result.isFiltersApplied(), "Filter flag should be true when operation filters file");
+        assertTrue(
+                result.isFiltersApplied(),
+                "Filter flag should be true when operation filters file");
         assertFalse(result.isHasErrors(), "No errors should occur");
         assertTrue(result.getOutputFiles().isEmpty(), "Filtered file list should be empty");
     }
 }
-

src/test/java/stirling/software/SPDF/utils/FileToPdfTest.java

@@ -1,38 +1,14 @@
 package stirling.software.SPDF.utils;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
-import java.io.IOException;
 
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
 
-import stirling.software.SPDF.model.api.converters.HTMLToPdfRequest;
-
+@ExtendWith(MockitoExtension.class)
 public class FileToPdfTest {
 
-    /**
-     * Test the HTML to PDF conversion. This test expects an IOException when an empty HTML input is
-     * provided.
-     */
-    @Test
-    public void testConvertHtmlToPdf() {
-        HTMLToPdfRequest request = new HTMLToPdfRequest();
-        byte[] fileBytes = new byte[0]; // Sample file bytes (empty input)
-        String fileName = "test.html"; // Sample file name indicating an HTML file
-        boolean disableSanitize = false; // Flag to control sanitization
-
-        // Expect an IOException to be thrown due to empty input
-        Throwable thrown =
-                assertThrows(
-                        IOException.class,
-                        () ->
-                                FileToPdf.convertHtmlToPdf(
-                                        "/path/", request, fileBytes, fileName, disableSanitize));
-        assertNotNull(thrown);
-    }
-
     /**
      * Test sanitizeZipFilename with null or empty input. It should return an empty string in these
      * cases.

src/test/java/stirling/software/SPDF/utils/ProcessExecutorTest.java

@@ -1,62 +1,31 @@
 package stirling.software.SPDF.utils;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
 
+@ExtendWith(MockitoExtension.class)
 public class ProcessExecutorTest {
 
-    private ProcessExecutor processExecutor;
-
-    @BeforeEach
-    public void setUp() {
-        // Initialize the ProcessExecutor instance
-        processExecutor = ProcessExecutor.getInstance(ProcessExecutor.Processes.LIBRE_OFFICE);
-    }
-
     @Test
-    public void testRunCommandWithOutputHandling() throws IOException, InterruptedException {
-        // Mock the command to execute
-        List<String> command = new ArrayList<>();
-        command.add("java");
-        command.add("-version");
-
-        // Execute the command
+    public void testProcessExecutorResult() {
+        // Test the ProcessExecutorResult class
         ProcessExecutor.ProcessExecutorResult result =
-                processExecutor.runCommandWithOutputHandling(command);
+                new ProcessExecutor().new ProcessExecutorResult(0, "Success message", "task-123");
 
-        // Check the exit code and output messages
-        assertEquals(0, result.getRc());
-        assertNotNull(result.getMessages()); // Check if messages are not null
-    }
+        assertEquals(0, result.getRc(), "Exit code should be 0");
+        assertEquals("Success message", result.getMessages(), "Messages should match");
+        assertEquals("task-123", result.getTaskId(), "Task ID should match");
 
-    @Test
-    public void testRunCommandWithOutputHandling_Error() {
-        // Mock the command to execute
-        List<String> command = new ArrayList<>();
-        command.add("nonexistent-command");
+        // Test constructor without taskId
+        ProcessExecutor.ProcessExecutorResult resultNoTask =
+                new ProcessExecutor().new ProcessExecutorResult(1, "Error message");
 
-        // Execute the command and expect an IOException
-        IOException thrown =
-                assertThrows(
-                        IOException.class,
-                        () -> {
-                            processExecutor.runCommandWithOutputHandling(command);
-                        });
-
-        // Check the exception message to ensure it indicates the command was not found
-        String errorMessage = thrown.getMessage();
-        assertTrue(
-                errorMessage.contains("error=2")
-                        || errorMessage.contains("No such file or directory"),
-                "Unexpected error message: " + errorMessage);
+        assertEquals(1, resultNoTask.getRc(), "Exit code should be 1");
+        assertEquals("Error message", resultNoTask.getMessages(), "Messages should match");
+        assertTrue(resultNoTask.getTaskId() == null, "Task ID should be null");
     }
 }