another fix for rest tests

Evolveum · Apr 16, 2018 · 1067456 · 1067456
1 parent af25e85
commit 1067456
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/RestServiceInitializer.java b/testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/RestServiceInitializer.java
@@ -20,6 +20,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 import javax.ws.rs.core.Response;
@@ -197,11 +198,8 @@ protected <O extends ObjectType> PrismObject<O> addObject(File file, OperationRe
 
 	protected WebClient prepareClient(String username, String password) {
 
-		List providers = new ArrayList<>();
-		providers.add(getProvider());
-		WebClient client = WebClient.create(ENDPOINT_ADDRESS, providers);// ,
+		WebClient client = WebClient.create(ENDPOINT_ADDRESS, Arrays.asList(getProvider()));// ,
 																			// provider);
-
 		ClientConfiguration clientConfig = WebClient.getConfig(client);
 
 		clientConfig.getRequestContext().put(LocalConduit.DIRECT_DISPATCH, Boolean.TRUE);

diff --git a/...c/test/java/com/evolveum/midpoint/testing/rest/TestSecurityQuestionChallengeResponse.java b/...c/test/java/com/evolveum/midpoint/testing/rest/TestSecurityQuestionChallengeResponse.java
@@ -20,14 +20,19 @@
 import static org.testng.AssertJUnit.assertEquals;
 import static org.testng.AssertJUnit.fail;
 
+import java.io.InputStream;
+import java.util.Arrays;
 import java.util.List;
 
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
+import org.apache.commons.io.IOUtils;
 import org.apache.cxf.common.util.Base64Exception;
 import org.apache.cxf.common.util.Base64Utility;
+import org.apache.cxf.jaxrs.client.ClientConfiguration;
 import org.apache.cxf.jaxrs.client.WebClient;
+import org.apache.cxf.transport.local.LocalConduit;
 import org.testng.annotations.Test;
 
 import com.evolveum.midpoint.model.impl.rest.MidpointAbstractProvider;
@@ -41,7 +46,7 @@ public class TestSecurityQuestionChallengeResponse extends RestServiceInitialize
 	private static final Trace LOGGER = TraceManager.getTrace(TestSecurityQuestionChallengeResponse.class);
 
 	@Test
-	public void testChallengeResponse(){
+	public void testChallengeResponse() throws Exception {
 		Response response = getUserAdministrator("SecQ");
 
 		String challengeBase64 = assertAndGetChallenge(response);
@@ -109,7 +114,13 @@ private String assertAndGetChallenge(Response response){
 	}
 
 	private Response getUserAdministrator(String authorizationHeader){
-		WebClient client = WebClient.create(ENDPOINT_ADDRESS);
+		WebClient client = WebClient.create(ENDPOINT_ADDRESS, Arrays.asList(getProvider()));
+		ClientConfiguration clientConfig = WebClient.getConfig(client);
+
+		clientConfig.getRequestContext().put(LocalConduit.DIRECT_DISPATCH, Boolean.TRUE);
+		client.accept(getAcceptHeader());
+		client.type(getContentType());
+
 		client.authorization(authorizationHeader);
 
 		client.path("/users/" + SystemObjectsType.USER_ADMINISTRATOR.value());