Path Manipulation java test cases

Author: sahildari

Path Manipulation/while File Upload/java/fileupload.pathmanipulation/src/main/java/securecodingexamples/fileupload/pathmanipulation/UploadController.java

@@ -42,16 +42,16 @@ public ResponseEntity<?> uploadFile(@RequestParam("file") MultipartFile file) {
             }
 
             String filename = file.getOriginalFilename();
-            if (filename == null || !isValidExtension(filename)) {
-                logger.warning("Invalid File Extension");
-                return ResponseEntity.status(HttpStatus.BAD_REQUEST).body("Invalid Extension");
-            }
-            
             if (filename == null || !isValidName(filename)) {
                 logger.warning("Invalid Filename");
                 return ResponseEntity.status(HttpStatus.BAD_REQUEST).body("Invalid Filename");
             }
 
+            if (filename == null || !isValidExtension(filename)) {
+                logger.warning("Invalid File Extension");
+                return ResponseEntity.status(HttpStatus.BAD_REQUEST).body("Invalid Extension");
+            }
+
             if(isValidName(filename) && isValidExtension(filename)){
                 logger.info("Valid Filename and Extension");
                 String validFilename = validFilename(filename);

Path Manipulation/while File Upload/java/fileupload.pathmanipulation/src/test/java/securecodingexamples/fileupload/pathmanipulation/UploadControllerTest.java

@@ -47,7 +47,7 @@ void cleanup() {
     @Order(1)
     void testFileUploadSuccess() throws Exception {
         MockMultipartFile file = new MockMultipartFile(
-                "file", "valid.txt", "text/plain", "Sample file content".getBytes()
+                "file", "sample.txt", "text/plain", "Sample file content".getBytes()
         );
 
         mockMvc.perform(multipart("/uploadFile")
@@ -102,7 +102,7 @@ void testInvalidFilenameFormat() throws Exception {
                 .file(file)
                 .contentType(MediaType.MULTIPART_FORM_DATA))
                 .andExpect(status().isBadRequest())
-                .andExpect(content().string("Invalid Extension"));
+                .andExpect(content().string("Invalid Filename"));
     }
 
     // ✅ Test: Duplicate Filename Handling