UNOMI-128 : Fix import/export 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/f4087719 Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/f4087719 Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/f4087719 Branch: refs/heads/scores-filters Commit: f40877191a4b848128d005a52b3687c502caa82b Parents: de5dea6 Author: Abdelkader Midani <[email protected]> Authored: Tue Oct 31 17:56:10 2017 +0100 Committer: Abdelkader Midani <[email protected]> Committed: Tue Oct 31 18:23:45 2017 +0100 ---------------------------------------------------------------------- .../org/apache/unomi/itests/ProfileExportIT.java | 15 +-------------- .../apache/unomi/itests/ProfileImportActorsIT.java | 15 +-------------- .../apache/unomi/itests/ProfileImportRankingIT.java | 15 +-------------- .../itests/ProfileImportSurfersOverwriteIT.java | 15 +-------------- 4 files changed, 4 insertions(+), 56 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/f4087719/itests/src/test/java/org/apache/unomi/itests/ProfileExportIT.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/unomi/itests/ProfileExportIT.java b/itests/src/test/java/org/apache/unomi/itests/ProfileExportIT.java index 1391497..1f43b08 100644 --- a/itests/src/test/java/org/apache/unomi/itests/ProfileExportIT.java +++ b/itests/src/test/java/org/apache/unomi/itests/ProfileExportIT.java @@ -112,20 +112,7 @@ public class ProfileExportIT extends BaseIT { exportConfiguration.getProperties().put("destination", "file://" + exportDir.getAbsolutePath() + "?fileName=profiles-actors-export.csv"); exportConfiguration.setActive(true); - ExportConfiguration savedExportConfig = exportConfigurationService.save(exportConfiguration, true); - - CloseableHttpClient httpclient = HttpClients.createDefault(); - HttpPut httpPut = new HttpPut(URL + "/configUpdate/exportConfigAdmin"); - - String json = new ObjectMapper().writeValueAsString(savedExportConfig); - 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(); + exportConfigurationService.save(exportConfiguration, true); } http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/f4087719/itests/src/test/java/org/apache/unomi/itests/ProfileImportActorsIT.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/unomi/itests/ProfileImportActorsIT.java b/itests/src/test/java/org/apache/unomi/itests/ProfileImportActorsIT.java index c8de826..e145ac3 100644 --- a/itests/src/test/java/org/apache/unomi/itests/ProfileImportActorsIT.java +++ b/itests/src/test/java/org/apache/unomi/itests/ProfileImportActorsIT.java @@ -106,20 +106,7 @@ public class ProfileImportActorsIT extends BaseIT { importConfigActors.getProperties().put("source", "file://" + importSurfersFile.getAbsolutePath() + "?fileName=6-actors-test.csv&consumer.delay=10m&move=.done"); importConfigActors.setActive(true); - ImportConfiguration savedImportConfig = importConfigurationService.save(importConfigActors, true); - - 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(); + importConfigurationService.save(importConfigActors, true); } http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/f4087719/itests/src/test/java/org/apache/unomi/itests/ProfileImportRankingIT.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/unomi/itests/ProfileImportRankingIT.java b/itests/src/test/java/org/apache/unomi/itests/ProfileImportRankingIT.java index 447b422..afbb172 100644 --- a/itests/src/test/java/org/apache/unomi/itests/ProfileImportRankingIT.java +++ b/itests/src/test/java/org/apache/unomi/itests/ProfileImportRankingIT.java @@ -109,20 +109,7 @@ public class ProfileImportRankingIT extends BaseIT { importConfigRanking.getProperties().put("source", "file://" + importSurfersFile.getAbsolutePath() + "?fileName=5-ranking-test.csv&consumer.delay=10m&move=.done"); importConfigRanking.setActive(true); - ImportConfiguration savedImportConfig = importConfigurationService.save(importConfigRanking, true); - - 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(); + importConfigurationService.save(importConfigRanking, true); } http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/f4087719/itests/src/test/java/org/apache/unomi/itests/ProfileImportSurfersOverwriteIT.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/unomi/itests/ProfileImportSurfersOverwriteIT.java b/itests/src/test/java/org/apache/unomi/itests/ProfileImportSurfersOverwriteIT.java index 8f97c3f..d837f4c 100644 --- a/itests/src/test/java/org/apache/unomi/itests/ProfileImportSurfersOverwriteIT.java +++ b/itests/src/test/java/org/apache/unomi/itests/ProfileImportSurfersOverwriteIT.java @@ -93,20 +93,7 @@ public class ProfileImportSurfersOverwriteIT extends BaseIT { importConfigSurfers.getProperties().put("source", "file://" + importSurfersFile.getAbsolutePath() + "?fileName=3-surfers-overwrite-test.csv&consumer.delay=10m&move=.done"); importConfigSurfers.setActive(true); - ImportConfiguration savedImportConfig = importConfigurationService.save(importConfigSurfers, true); - - 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(); + importConfigurationService.save(importConfigSurfers, true); }
