Merge pull request #197 from Sundsvallskommun/uf-6182-add-support-for-multipartbody

UF-6182: Add support for multipartbody.

Author: foobar-1337

dept44-starter-test/src/main/java/se/sundsvall/dept44/test/AbstractAppTest.java

@@ -89,6 +89,7 @@ public abstract class AbstractAppTest {
 	private HttpHeaders expectedResponseHeaders;
 	private Map<String, String> headerValues;
 	private String testDirectoryPath;
+	private String testCaseName;
 
 	@Autowired
 	protected TestRestTemplate restTemplate;
@@ -114,32 +115,39 @@ public AbstractAppTest reset() {
 		this.expectedResponseHeaders = null;
 		this.headerValues = null;
 		this.testDirectoryPath = null;
+		this.testCaseName = null;
 
 		return this;
 	}
 
-	public AbstractAppTest setupCall() {
-
-		reset();
-		initializeJsonAssert();
+	public AbstractAppTest setupPaths() {
 
 		// Fetch test case name.
-		final var testCaseName = getTestMethodName();
+		this.testCaseName = getTestMethodName();
 
 		this.mappingPath = wiremock.getOptions().filesRoot().getPath();
 		if (!this.mappingPath.endsWith("/")) {
 			this.mappingPath += "/";
 		}
 
+		this.testDirectoryPath = "classpath:" + this.mappingPath + FILES_DIR + getTestMethodName() + System.getProperty("file.separator");
+
+		return this;
+	}
+
+	public AbstractAppTest setupCall() {
+
+		reset();
+		initializeJsonAssert();
+		setupPaths();
+
 		this.wiremock.loadMappingsUsing(new JsonFileMappingsSource(
 			new ClasspathFileSource(this.mappingPath + FILES_DIR + COMMON_MAPPING_DIR + MAPPING_DIRECTORY)));
-		if (nonNull(testCaseName)) {
+		if (nonNull(this.testCaseName)) {
 			this.wiremock.loadMappingsUsing(new JsonFileMappingsSource(
-				new ClasspathFileSource(this.mappingPath + FILES_DIR + testCaseName + MAPPING_DIRECTORY)));
+				new ClasspathFileSource(this.mappingPath + FILES_DIR + this.testCaseName + MAPPING_DIRECTORY)));
 		}
 
-		this.testDirectoryPath = "classpath:" + this.mappingPath + FILES_DIR + getTestMethodName() + System.getProperty("file.separator");
-
 		return this;
 	}
 
@@ -274,6 +282,19 @@ public AbstractAppTest withRequest(final String request) {
 		return this;
 	}
 
+	/**
+	 * Method takes a file that will be added to the multipart body.
+	 *
+	 * @param  fileName              to be added to the request as a multipart, the method will look for the file in the
+	 *                               current
+	 *                               test-case directory.
+	 * @return
+	 * @throws FileNotFoundException
+	 */
+	public AbstractAppTest withRequestFile(final String parameterName, final String fileName) throws FileNotFoundException {
+		return withRequestFile(parameterName, getFile(this.testDirectoryPath + fileName));
+	}
+
 	/**
 	 * Method takes a file that will be added to the multipart body.
 	 *
@@ -285,23 +306,25 @@ public AbstractAppTest withRequestFile(final String parameterName, final File fi
 			this.multipartBody = new LinkedMultiValueMap<>();
 		}
 
-		multipartBody.add(parameterName, new FileSystemResource(file));
+		this.multipartBody.add(parameterName, new FileSystemResource(file));
 
 		return this;
 	}
 
 	/**
-	 * Method takes a file that will be added to the multipart body.
+	 * Method takes a MultiValueMap that will set the multipart body.
+	 * If you have added any parts to the multipartbody before a call to this method, these parts will be lost.
 	 *
-	 * @param  fileName              to be added to the request as a multipart, the method will look for the file in the
-	 *                               current
-	 *                               test-case directory.
+	 * @see                  org.springframework.http.client.MultipartBodyBuilder for instruction on how to create a
+	 *                       suitable MultiValueMap.
+	 *
+	 * @param  multiPartBody the multipartbody (as a MultiValueMap).
 	 * @return
-	 * @throws FileNotFoundException
 	 */
-	public AbstractAppTest withRequestFile(final String parameterName, final String fileName) throws FileNotFoundException {
-		final var file = getFile(this.testDirectoryPath + fileName);
-		return withRequestFile(parameterName, file);
+	@SuppressWarnings("unchecked")
+	public AbstractAppTest withRequest(final MultiValueMap<?, ?> multiPartBody) {
+		this.multipartBody = (MultiValueMap<String, Object>) multiPartBody;
+		return this;
 	}
 
 	/**
@@ -435,6 +458,10 @@ public AbstractAppTest andVerifyThat(final Callable<Boolean> conditionIsMet) {
 		return this;
 	}
 
+	public String getTestDirectoryPath() {
+		return this.testDirectoryPath;
+	}
+
 	private HttpEntity<Object> restTemplateRequest(final MediaType mediaType, Object body) {
 		final var httpHeaders = new HttpHeaders();
 		httpHeaders.setContentType(mediaType);