Inline variable and fix formatting

1 files changed, 284 insertions, 284 deletions

diff --git a/src/test/java/com/stileeducation/markr/controller/TestResultsControllerTest.java b/src/test/java/com/stileeducation/markr/controller/TestResultsControllerTest.java
index c0358c9..3b491cc 100644
--- a/src/test/java/com/stileeducation/markr/controller/TestResultsControllerTest.java
+++ b/src/test/java/com/stileeducation/markr/controller/TestResultsControllerTest.java
@@ -27,288 +27,288 @@ import static org.assertj.core.api.Assertions.assertThat;
 @ActiveProfiles("test")
 public class TestResultsControllerTest {
 
-    private static String validPayload;
-    private static String invalidPayload;
-
-    @Autowired
-    private TestRestTemplate restTemplate;
-
-    @BeforeAll
-    static void setup() throws IOException {
-        validPayload = new String(new ClassPathResource("sample-results.xml").getInputStream().readAllBytes(), UTF_8);
-        invalidPayload = new String(new ClassPathResource("invalid-payload.xml").getInputStream().readAllBytes(), UTF_8);
-    }
-
-    private static String toXmlString(MCQTestResultsDTO mcqTestResultsDTO) throws JAXBException {
-        JAXBContext jaxbContext = JAXBContext.newInstance(MCQTestResultsDTO.class);
-        Marshaller marshaller = jaxbContext.createMarshaller();
-        StringWriter stringWriter = new StringWriter();
-        marshaller.marshal(mcqTestResultsDTO, stringWriter);
-        return stringWriter.toString();
-    }
-
-    @Test
-    void testSupportedMediaType() throws Exception {
-        // Given
-        HttpHeaders headers = new HttpHeaders();
-        headers.setContentType(XmlMarkrMessageConverter.MEDIA_TYPE);
-        HttpEntity<String> entity = new HttpEntity<>(validPayload, headers);
-
-        // When
-        ResponseEntity<String> response = restTemplate.postForEntity(IMPORT_ENDPOINT, entity, String.class);
-
-        // Then
-        assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
-    }
-
-    @Test
-    void testUnsupportedMediaType() throws Exception {
-        // Given
-        HttpHeaders headers = new HttpHeaders();
-        headers.setContentType(MediaType.APPLICATION_XML);
-        HttpEntity<String> entity = new HttpEntity<>(validPayload, headers);
-
-        // When
-        ResponseEntity<String> response = restTemplate.postForEntity(IMPORT_ENDPOINT, entity, String.class);
-
-        // Then
-        assertThat(response.getStatusCode()).isEqualTo(HttpStatus.UNSUPPORTED_MEDIA_TYPE);
-    }
-
-    @Test
-    void testInvalidImport() throws Exception {
-        // Given
-        HttpHeaders headers = new HttpHeaders();
-        headers.setContentType(XmlMarkrMessageConverter.MEDIA_TYPE);
-        HttpEntity<String> entity = new HttpEntity<>(invalidPayload, headers);
-
-        // When
-        ResponseEntity<String> response = restTemplate.postForEntity(IMPORT_ENDPOINT, entity, String.class);
-
-        // Then
-        assertThat(response.getStatusCode()).isEqualTo(HttpStatus.BAD_REQUEST);
-    }
-
-    @Test
-    void testInvalidImport_MissingFirstName() throws Exception {
-        // Given
-        String invalidPayload = """
-                    <mcq-test-results>
-                        <mcq-test-result scanned-on="2017-12-04T12:12:10+11:00">
-                            <first-name></first-name>
-                            <last-name>Alysander</last-name>
-                            <student-number>002299</student-number>
-                            <test-id>9863</test-id>
-                            <summary-marks available="20" obtained="13"/>
-                        </mcq-test-result>
-                    </mcq-test-results>
-                """;
-
-        HttpHeaders headers = new HttpHeaders();
-        headers.setContentType(XmlMarkrMessageConverter.MEDIA_TYPE);
-        HttpEntity<String> entity = new HttpEntity<>(invalidPayload, headers);
-
-        // When
-        ResponseEntity<ImportResponseDTO> response = restTemplate.postForEntity(IMPORT_ENDPOINT, entity, ImportResponseDTO.class);
-
-        // Then
-        assertThat(response.getStatusCode()).isEqualTo(HttpStatus.BAD_REQUEST);
-        assertThat(response.getBody()).isNotNull();
-        assertThat(response.getBody().getMessage()).isEqualTo("Invalid payload");
-    }
-
-    @Test
-    void testInvalidImport_MissingLastName() throws Exception {
-        // Given
-        String invalidPayload = """
-                    <mcq-test-results>
-                        <mcq-test-result scanned-on="2017-12-04T12:12:10+11:00">
-                            <first-name>KJ</first-name>
-                            <last-name></last-name>
-                            <student-number>002299</student-number>
-                            <test-id>9863</test-id>
-                            <summary-marks available="20" obtained="13"/>
-                        </mcq-test-result>
-                    </mcq-test-results>
-                """;
-
-        HttpHeaders headers = new HttpHeaders();
-        headers.setContentType(XmlMarkrMessageConverter.MEDIA_TYPE);
-        HttpEntity<String> entity = new HttpEntity<>(invalidPayload, headers);
-
-        // When
-        ResponseEntity<ImportResponseDTO> response = restTemplate.postForEntity(IMPORT_ENDPOINT, entity, ImportResponseDTO.class);
-
-        // Then
-        assertThat(response.getStatusCode()).isEqualTo(HttpStatus.BAD_REQUEST);
-        assertThat(response.getBody()).isNotNull();
-        assertThat(response.getBody().getMessage()).isEqualTo("Invalid payload");
-    }
-
-    @Test
-    void testInvalidImport_MissingStudentNumber() throws Exception {
-        // Given
-        String invalidPayload = """
-                    <mcq-test-results>
-                        <mcq-test-result scanned-on="2017-12-04T12:12:10+11:00">
-                            <first-name>KJ</first-name>
-                            <last-name>Alysander</last-name>
-                            <student-number></student-number>
-                            <test-id>9863</test-id>
-                            <summary-marks available="20" obtained="13"/>
-                        </mcq-test-result>
-                    </mcq-test-results>
-                """;
-
-        HttpHeaders headers = new HttpHeaders();
-        headers.setContentType(XmlMarkrMessageConverter.MEDIA_TYPE);
-        HttpEntity<String> entity = new HttpEntity<>(invalidPayload, headers);
-
-        // When
-        ResponseEntity<ImportResponseDTO> response = restTemplate.postForEntity(IMPORT_ENDPOINT, entity, ImportResponseDTO.class);
-
-        // Then
-        assertThat(response.getStatusCode()).isEqualTo(HttpStatus.BAD_REQUEST);
-        assertThat(response.getBody()).isNotNull();
-        assertThat(response.getBody().getMessage()).isEqualTo("Invalid payload");
-    }
-
-    @Test
-    void testInvalidImport_MissingTestId() throws Exception {
-        // Given
-        String invalidPayload = """
-                    <mcq-test-results>
-                        <mcq-test-result scanned-on="2017-12-04T12:12:10+11:00">
-                            <first-name>KJ</first-name>
-                            <last-name>Alysander</last-name>
-                            <student-number>002299</student-number>
-                            <test-id></test-id>
-                            <summary-marks available="20" obtained="13"/>
-                        </mcq-test-result>
-                    </mcq-test-results>
-                """;
-
-        HttpHeaders headers = new HttpHeaders();
-        headers.setContentType(XmlMarkrMessageConverter.MEDIA_TYPE);
-        HttpEntity<String> entity = new HttpEntity<>(invalidPayload, headers);
-
-        // When
-        ResponseEntity<ImportResponseDTO> response = restTemplate.postForEntity(IMPORT_ENDPOINT, entity, ImportResponseDTO.class);
-
-        // Then
-        assertThat(response.getStatusCode()).isEqualTo(HttpStatus.BAD_REQUEST);
-        assertThat(response.getBody()).isNotNull();
-        assertThat(response.getBody().getMessage()).isEqualTo("Invalid payload");
-    }
-
-    @Test
-    void testInvalidImport_MissingSummaryMarks() throws Exception {
-        // Given
-        String invalidPayload = """
-                    <mcq-test-results>
-                        <mcq-test-result scanned-on="2017-12-04T12:12:10+11:00">
-                            <first-name>KJ</first-name>
-                            <last-name>Alysander</last-name>
-                            <student-number>002299</student-number>
-                            <test-id>9863</test-id>
-                        </mcq-test-result>
-                    </mcq-test-results>
-                """;
-
-        HttpHeaders headers = new HttpHeaders();
-        headers.setContentType(XmlMarkrMessageConverter.MEDIA_TYPE);
-        HttpEntity<String> entity = new HttpEntity<>(invalidPayload, headers);
-
-        // When
-        ResponseEntity<ImportResponseDTO> response = restTemplate.postForEntity(IMPORT_ENDPOINT, entity, ImportResponseDTO.class);
-
-        // Then
-        assertThat(response.getStatusCode()).isEqualTo(HttpStatus.BAD_REQUEST);
-        assertThat(response.getBody()).isNotNull();
-        assertThat(response.getBody().getMessage()).isEqualTo("Invalid payload");
-    }
-
-    @Test
-    void testInvalidImport_MissingSummaryMarksAvailable() throws Exception {
-        // Given
-        String invalidPayload = """
-                    <mcq-test-results>
-                        <mcq-test-result scanned-on="2017-12-04T12:12:10+11:00">
-                            <first-name>KJ</first-name>
-                            <last-name>Alysander</last-name>
-                            <student-number>002299</student-number>
-                            <test-id>9863</test-id>
-                            <summary-marks obtained="13"/>
-                        </mcq-test-result>
-                    </mcq-test-results>
-                """;
-
-        HttpHeaders headers = new HttpHeaders();
-        headers.setContentType(XmlMarkrMessageConverter.MEDIA_TYPE);
-        HttpEntity<String> entity = new HttpEntity<>(invalidPayload, headers);
-
-        // When
-        ResponseEntity<ImportResponseDTO> response = restTemplate.postForEntity(IMPORT_ENDPOINT, entity, ImportResponseDTO.class);
-
-        // Then
-        assertThat(response.getStatusCode()).isEqualTo(HttpStatus.BAD_REQUEST);
-        assertThat(response.getBody()).isNotNull();
-        assertThat(response.getBody().getMessage()).isEqualTo("Invalid payload");
-    }
-
-    @Test
-    void testInvalidImport_MissingSummaryMarksObtained() throws Exception {
-        // Given
-        String invalidPayload = """
-                    <mcq-test-results>
-                        <mcq-test-result scanned-on="2017-12-04T12:12:10+11:00">
-                            <first-name>KJ</first-name>
-                            <last-name>Alysander</last-name>
-                            <student-number>002299</student-number>
-                            <test-id>9863</test-id>
-                            <summary-marks available="20"/>
-                        </mcq-test-result>
-                    </mcq-test-results>
-                """;
-
-        HttpHeaders headers = new HttpHeaders();
-        headers.setContentType(XmlMarkrMessageConverter.MEDIA_TYPE);
-        HttpEntity<String> entity = new HttpEntity<>(invalidPayload, headers);
-
-        // When
-        ResponseEntity<ImportResponseDTO> response = restTemplate.postForEntity(IMPORT_ENDPOINT, entity, ImportResponseDTO.class);
-
-        // Then
-        assertThat(response.getStatusCode()).isEqualTo(HttpStatus.BAD_REQUEST);
-        assertThat(response.getBody()).isNotNull();
-        assertThat(response.getBody().getMessage()).isEqualTo("Invalid payload");
-    }
-
-    @Test
-    void testInvalidImport_InvalidXmlFormat() throws Exception {
-        // Given
-        String invalidPayload = """
-                    <mcq-test-results>
-                        <mcq-test-result scanned-on="2017-12-04T12:12:10+11:00">
-                            <first-name>KJ</first-name>
-                            <last-name>Alysander</last-name>
-                            <student-number>002299</student-number>
-                            <test-id>9863</test-id>
-                            <summary-marks available="20" obtained="1
-                        </mcq-test-result>
-                    </mcq-test-results>
-                """;
-
-        HttpHeaders headers = new HttpHeaders();
-        headers.setContentType(XmlMarkrMessageConverter.MEDIA_TYPE);
-        HttpEntity<String> entity = new HttpEntity<>(invalidPayload, headers);
-
-        // When
-        ResponseEntity<ImportResponseDTO> response = restTemplate.postForEntity(IMPORT_ENDPOINT, entity, ImportResponseDTO.class);
-
-        // Then
-        assertThat(response.getStatusCode()).isEqualTo(HttpStatus.BAD_REQUEST);
-        assertThat(response.getBody()).isNotNull();
-        assertThat(response.getBody().getMessage()).isEqualTo("Invalid XML payload");
-    }
+  private static String validPayload;
+  private static String invalidPayload;
+
+  @Autowired
+  private TestRestTemplate restTemplate;
+
+  @BeforeAll
+  static void setup() throws IOException {
+    validPayload = new String(new ClassPathResource("sample-results.xml").getInputStream().readAllBytes(), UTF_8);
+    invalidPayload = new String(new ClassPathResource("invalid-payload.xml").getInputStream().readAllBytes(), UTF_8);
+  }
+
+  private static String toXmlString(MCQTestResultsDTO mcqTestResultsDTO) throws JAXBException {
+    JAXBContext jaxbContext = JAXBContext.newInstance(MCQTestResultsDTO.class);
+    Marshaller marshaller = jaxbContext.createMarshaller();
+    StringWriter stringWriter = new StringWriter();
+    marshaller.marshal(mcqTestResultsDTO, stringWriter);
+    return stringWriter.toString();
+  }
+
+  @Test
+  void testSupportedMediaType() throws Exception {
+    // Given
+    HttpHeaders headers = new HttpHeaders();
+    headers.setContentType(XmlMarkrMessageConverter.MEDIA_TYPE);
+    HttpEntity<String> entity = new HttpEntity<>(validPayload, headers);
+
+    // When
+    ResponseEntity<String> response = restTemplate.postForEntity(IMPORT_ENDPOINT, entity, String.class);
+
+    // Then
+    assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
+  }
+
+  @Test
+  void testUnsupportedMediaType() throws Exception {
+    // Given
+    HttpHeaders headers = new HttpHeaders();
+    headers.setContentType(MediaType.APPLICATION_XML);
+    HttpEntity<String> entity = new HttpEntity<>(validPayload, headers);
+
+    // When
+    ResponseEntity<String> response = restTemplate.postForEntity(IMPORT_ENDPOINT, entity, String.class);
+
+    // Then
+    assertThat(response.getStatusCode()).isEqualTo(HttpStatus.UNSUPPORTED_MEDIA_TYPE);
+  }
+
+  @Test
+  void testInvalidImport() throws Exception {
+    // Given
+    HttpHeaders headers = new HttpHeaders();
+    headers.setContentType(XmlMarkrMessageConverter.MEDIA_TYPE);
+    HttpEntity<String> entity = new HttpEntity<>(invalidPayload, headers);
+
+    // When
+    ResponseEntity<String> response = restTemplate.postForEntity(IMPORT_ENDPOINT, entity, String.class);
+
+    // Then
+    assertThat(response.getStatusCode()).isEqualTo(HttpStatus.BAD_REQUEST);
+  }
+
+  @Test
+  void testInvalidImport_MissingFirstName() throws Exception {
+    // Given
+    String invalidPayload = """
+            <mcq-test-results>
+                <mcq-test-result scanned-on="2017-12-04T12:12:10+11:00">
+                    <first-name></first-name>
+                    <last-name>Alysander</last-name>
+                    <student-number>002299</student-number>
+                    <test-id>9863</test-id>
+                    <summary-marks available="20" obtained="13"/>
+                </mcq-test-result>
+            </mcq-test-results>
+        """;
+
+    HttpHeaders headers = new HttpHeaders();
+    headers.setContentType(XmlMarkrMessageConverter.MEDIA_TYPE);
+    HttpEntity<String> entity = new HttpEntity<>(invalidPayload, headers);
+
+    // When
+    ResponseEntity<ImportResponseDTO> response = restTemplate.postForEntity(IMPORT_ENDPOINT, entity, ImportResponseDTO.class);
+
+    // Then
+    assertThat(response.getStatusCode()).isEqualTo(HttpStatus.BAD_REQUEST);
+    assertThat(response.getBody()).isNotNull();
+    assertThat(response.getBody().getMessage()).isEqualTo("Invalid payload");
+  }
+
+  @Test
+  void testInvalidImport_MissingLastName() throws Exception {
+    // Given
+    String invalidPayload = """
+            <mcq-test-results>
+                <mcq-test-result scanned-on="2017-12-04T12:12:10+11:00">
+                    <first-name>KJ</first-name>
+                    <last-name></last-name>
+                    <student-number>002299</student-number>
+                    <test-id>9863</test-id>
+                    <summary-marks available="20" obtained="13"/>
+                </mcq-test-result>
+            </mcq-test-results>
+        """;
+
+    HttpHeaders headers = new HttpHeaders();
+    headers.setContentType(XmlMarkrMessageConverter.MEDIA_TYPE);
+    HttpEntity<String> entity = new HttpEntity<>(invalidPayload, headers);
+
+    // When
+    ResponseEntity<ImportResponseDTO> response = restTemplate.postForEntity(IMPORT_ENDPOINT, entity, ImportResponseDTO.class);
+
+    // Then
+    assertThat(response.getStatusCode()).isEqualTo(HttpStatus.BAD_REQUEST);
+    assertThat(response.getBody()).isNotNull();
+    assertThat(response.getBody().getMessage()).isEqualTo("Invalid payload");
+  }
+
+  @Test
+  void testInvalidImport_MissingStudentNumber() throws Exception {
+    // Given
+    String invalidPayload = """
+            <mcq-test-results>
+                <mcq-test-result scanned-on="2017-12-04T12:12:10+11:00">
+                    <first-name>KJ</first-name>
+                    <last-name>Alysander</last-name>
+                    <student-number></student-number>
+                    <test-id>9863</test-id>
+                    <summary-marks available="20" obtained="13"/>
+                </mcq-test-result>
+            </mcq-test-results>
+        """;
+
+    HttpHeaders headers = new HttpHeaders();
+    headers.setContentType(XmlMarkrMessageConverter.MEDIA_TYPE);
+    HttpEntity<String> entity = new HttpEntity<>(invalidPayload, headers);
+
+    // When
+    ResponseEntity<ImportResponseDTO> response = restTemplate.postForEntity(IMPORT_ENDPOINT, entity, ImportResponseDTO.class);
+
+    // Then
+    assertThat(response.getStatusCode()).isEqualTo(HttpStatus.BAD_REQUEST);
+    assertThat(response.getBody()).isNotNull();
+    assertThat(response.getBody().getMessage()).isEqualTo("Invalid payload");
+  }
+
+  @Test
+  void testInvalidImport_MissingTestId() throws Exception {
+    // Given
+    String invalidPayload = """
+            <mcq-test-results>
+                <mcq-test-result scanned-on="2017-12-04T12:12:10+11:00">
+                    <first-name>KJ</first-name>
+                    <last-name>Alysander</last-name>
+                    <student-number>002299</student-number>
+                    <test-id></test-id>
+                    <summary-marks available="20" obtained="13"/>
+                </mcq-test-result>
+            </mcq-test-results>
+        """;
+
+    HttpHeaders headers = new HttpHeaders();
+    headers.setContentType(XmlMarkrMessageConverter.MEDIA_TYPE);
+    HttpEntity<String> entity = new HttpEntity<>(invalidPayload, headers);
+
+    // When
+    ResponseEntity<ImportResponseDTO> response = restTemplate.postForEntity(IMPORT_ENDPOINT, entity, ImportResponseDTO.class);
+
+    // Then
+    assertThat(response.getStatusCode()).isEqualTo(HttpStatus.BAD_REQUEST);
+    assertThat(response.getBody()).isNotNull();
+    assertThat(response.getBody().getMessage()).isEqualTo("Invalid payload");
+  }
+
+  @Test
+  void testInvalidImport_MissingSummaryMarks() throws Exception {
+    // Given
+    String invalidPayload = """
+            <mcq-test-results>
+                <mcq-test-result scanned-on="2017-12-04T12:12:10+11:00">
+                    <first-name>KJ</first-name>
+                    <last-name>Alysander</last-name>
+                    <student-number>002299</student-number>
+                    <test-id>9863</test-id>
+                </mcq-test-result>
+            </mcq-test-results>
+        """;
+
+    HttpHeaders headers = new HttpHeaders();
+    headers.setContentType(XmlMarkrMessageConverter.MEDIA_TYPE);
+    HttpEntity<String> entity = new HttpEntity<>(invalidPayload, headers);
+
+    // When
+    ResponseEntity<ImportResponseDTO> response = restTemplate.postForEntity(IMPORT_ENDPOINT, entity, ImportResponseDTO.class);
+
+    // Then
+    assertThat(response.getStatusCode()).isEqualTo(HttpStatus.BAD_REQUEST);
+    assertThat(response.getBody()).isNotNull();
+    assertThat(response.getBody().getMessage()).isEqualTo("Invalid payload");
+  }
+
+  @Test
+  void testInvalidImport_MissingSummaryMarksAvailable() throws Exception {
+    // Given
+    String invalidPayload = """
+            <mcq-test-results>
+                <mcq-test-result scanned-on="2017-12-04T12:12:10+11:00">
+                    <first-name>KJ</first-name>
+                    <last-name>Alysander</last-name>
+                    <student-number>002299</student-number>
+                    <test-id>9863</test-id>
+                    <summary-marks obtained="13"/>
+                </mcq-test-result>
+            </mcq-test-results>
+        """;
+
+    HttpHeaders headers = new HttpHeaders();
+    headers.setContentType(XmlMarkrMessageConverter.MEDIA_TYPE);
+    HttpEntity<String> entity = new HttpEntity<>(invalidPayload, headers);
+
+    // When
+    ResponseEntity<ImportResponseDTO> response = restTemplate.postForEntity(IMPORT_ENDPOINT, entity, ImportResponseDTO.class);
+
+    // Then
+    assertThat(response.getStatusCode()).isEqualTo(HttpStatus.BAD_REQUEST);
+    assertThat(response.getBody()).isNotNull();
+    assertThat(response.getBody().getMessage()).isEqualTo("Invalid payload");
+  }
+
+  @Test
+  void testInvalidImport_MissingSummaryMarksObtained() throws Exception {
+    // Given
+    String invalidPayload = """
+            <mcq-test-results>
+                <mcq-test-result scanned-on="2017-12-04T12:12:10+11:00">
+                    <first-name>KJ</first-name>
+                    <last-name>Alysander</last-name>
+                    <student-number>002299</student-number>
+                    <test-id>9863</test-id>
+                    <summary-marks available="20"/>
+                </mcq-test-result>
+            </mcq-test-results>
+        """;
+
+    HttpHeaders headers = new HttpHeaders();
+    headers.setContentType(XmlMarkrMessageConverter.MEDIA_TYPE);
+    HttpEntity<String> entity = new HttpEntity<>(invalidPayload, headers);
+
+    // When
+    ResponseEntity<ImportResponseDTO> response = restTemplate.postForEntity(IMPORT_ENDPOINT, entity, ImportResponseDTO.class);
+
+    // Then
+    assertThat(response.getStatusCode()).isEqualTo(HttpStatus.BAD_REQUEST);
+    assertThat(response.getBody()).isNotNull();
+    assertThat(response.getBody().getMessage()).isEqualTo("Invalid payload");
+  }
+
+  @Test
+  void testInvalidImport_InvalidXmlFormat() throws Exception {
+    // Given
+    String invalidPayload = """
+            <mcq-test-results>
+                <mcq-test-result scanned-on="2017-12-04T12:12:10+11:00">
+                    <first-name>KJ</first-name>
+                    <last-name>Alysander</last-name>
+                    <student-number>002299</student-number>
+                    <test-id>9863</test-id>
+                    <summary-marks available="20" obtained="1
+                </mcq-test-result>
+            </mcq-test-results>
+        """;
+
+    HttpHeaders headers = new HttpHeaders();
+    headers.setContentType(XmlMarkrMessageConverter.MEDIA_TYPE);
+    HttpEntity<String> entity = new HttpEntity<>(invalidPayload, headers);
+
+    // When
+    ResponseEntity<ImportResponseDTO> response = restTemplate.postForEntity(IMPORT_ENDPOINT, entity, ImportResponseDTO.class);
+
+    // Then
+    assertThat(response.getStatusCode()).isEqualTo(HttpStatus.BAD_REQUEST);
+    assertThat(response.getBody()).isNotNull();
+    assertThat(response.getBody().getMessage()).isEqualTo("Invalid XML payload");
+  }
 }
\ No newline at end of file