UNOMI-128 : Fix import config IT
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/629284e4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/629284e4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/629284e4 Branch: refs/heads/scores-filters Commit: 629284e4c7224ef8af8948c33579f868757416a8 Parents: 2490bdc Author: Abdelkader Midani <[email protected]> Authored: Tue Oct 31 16:26:22 2017 +0100 Committer: Abdelkader Midani <[email protected]> Committed: Tue Oct 31 16:26:22 2017 +0100 ---------------------------------------------------------------------- .../itests/ProfileImportSurfersDeleteIT.java | 25 +------------------- .../unomi/itests/ProfileImportSurfersIT.java | 15 +----------- 2 files changed, 2 insertions(+), 38 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/629284e4/itests/src/test/java/org/apache/unomi/itests/ProfileImportSurfersDeleteIT.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/unomi/itests/ProfileImportSurfersDeleteIT.java b/itests/src/test/java/org/apache/unomi/itests/ProfileImportSurfersDeleteIT.java index 4991e20..39a9fc6 100644 --- a/itests/src/test/java/org/apache/unomi/itests/ProfileImportSurfersDeleteIT.java +++ b/itests/src/test/java/org/apache/unomi/itests/ProfileImportSurfersDeleteIT.java @@ -16,12 +16,6 @@ */ package org.apache.unomi.itests; -import com.fasterxml.jackson.databind.ObjectMapper; -import org.apache.http.HttpResponse; -import org.apache.http.client.methods.HttpPut; -import org.apache.http.entity.StringEntity; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClients; import org.apache.unomi.api.PartialList; import org.apache.unomi.api.Profile; import org.apache.unomi.api.services.ProfileService; @@ -40,16 +34,12 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import javax.inject.Inject; -import javax.ws.rs.core.MediaType; import java.io.File; import java.io.IOException; import java.util.HashMap; import java.util.List; import java.util.Map; -import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.MatcherAssert.assertThat; - /** * Created by amidani on 11/08/2017. */ @@ -93,20 +83,7 @@ public class ProfileImportSurfersDeleteIT extends BaseIT { importConfigSurfersDelete.getProperties().put("source", "file://" + importSurfersFile.getAbsolutePath() + "?fileName=4-surfers-delete-test.csv&consumer.delay=10m&move=.done"); importConfigSurfersDelete.setActive(true); - ImportConfiguration savedImportConfigDelete = importConfigurationService.save(importConfigSurfersDelete, true); - - CloseableHttpClient httpclient = HttpClients.createDefault(); - HttpPut httpPut = new HttpPut(URL + "/configUpdate/importConfigAdmin"); - - String jsonDelete = new ObjectMapper().writeValueAsString(savedImportConfigDelete); - StringEntity entityDelete = new StringEntity(jsonDelete); - entityDelete.setContentType(MediaType.APPLICATION_JSON); - httpPut.setEntity(entityDelete); - - HttpResponse responseDelete = httpclient.execute(httpPut); - assertThat(responseDelete.getStatusLine().getStatusCode(), equalTo(200)); - - httpclient.close(); + importConfigurationService.save(importConfigSurfersDelete, true); } http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/629284e4/itests/src/test/java/org/apache/unomi/itests/ProfileImportSurfersIT.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/unomi/itests/ProfileImportSurfersIT.java b/itests/src/test/java/org/apache/unomi/itests/ProfileImportSurfersIT.java index df5ee49..f9589c5 100644 --- a/itests/src/test/java/org/apache/unomi/itests/ProfileImportSurfersIT.java +++ b/itests/src/test/java/org/apache/unomi/itests/ProfileImportSurfersIT.java @@ -103,24 +103,11 @@ public class ProfileImportSurfersIT extends BaseIT { importConfigSurfers.getProperties().put("source", "file://" + importSurfersFile.getAbsolutePath() + "?fileName=2-surfers-test.csv&consumer.delay=10m&move=.done"); importConfigSurfers.setActive(true); - ImportConfiguration savedImportConfig = importConfigurationService.save(importConfigSurfers, true); + importConfigurationService.save(importConfigSurfers, true); //Wait for data to be processed Thread.sleep(10000); - CloseableHttpClient httpclient = HttpClients.createDefault(); - HttpPut httpPut = new HttpPut(URL + "/configUpdate/importConfigAdmin"); - - String json = new ObjectMapper().writeValueAsString(savedImportConfig); - StringEntity entity = new StringEntity(json); - entity.setContentType(MediaType.APPLICATION_JSON); - httpPut.setEntity(entity); - - HttpResponse response = httpclient.execute(httpPut); - assertThat(response.getStatusLine().getStatusCode(), equalTo(200)); - - httpclient.close(); - } @Test
