From 90ed4a82e480188e82d710572ffcb41f180d7a26 Mon Sep 17 00:00:00 2001 From: Paul Brodner Date: Thu, 21 Feb 2019 11:14:26 +0200 Subject: [PATCH] wip: backup test --- .../service/search/backup/AbstractBackupTest.java | 4 ++++ .../search/backup/SearchServiceBackupTests.java | 11 ++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/e2e-test/src/test/java/org/alfresco/service/search/backup/AbstractBackupTest.java b/e2e-test/src/test/java/org/alfresco/service/search/backup/AbstractBackupTest.java index 7c665f311..02d401acd 100644 --- a/e2e-test/src/test/java/org/alfresco/service/search/backup/AbstractBackupTest.java +++ b/e2e-test/src/test/java/org/alfresco/service/search/backup/AbstractBackupTest.java @@ -7,6 +7,7 @@ import org.alfresco.rest.core.RestRequest; import org.alfresco.rest.core.RestWrapper; import org.alfresco.rest.model.RestHtmlResponse; import org.alfresco.utility.Utility; +import org.alfresco.utility.data.DataSite; import org.alfresco.utility.network.ServerHealth; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -26,6 +27,9 @@ public abstract class AbstractBackupTest extends AbstractTestNGSpringContextTest @Autowired protected ServerHealth serverHealth; + + @Autowired + protected DataSite dataSite; @Autowired RestWrapper restWrapper; diff --git a/e2e-test/src/test/java/org/alfresco/service/search/backup/SearchServiceBackupTests.java b/e2e-test/src/test/java/org/alfresco/service/search/backup/SearchServiceBackupTests.java index 1f3d9bbf2..09bac2fe4 100644 --- a/e2e-test/src/test/java/org/alfresco/service/search/backup/SearchServiceBackupTests.java +++ b/e2e-test/src/test/java/org/alfresco/service/search/backup/SearchServiceBackupTests.java @@ -4,6 +4,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.StringContains.containsString; import org.alfresco.rest.model.RestHtmlResponse; +import org.alfresco.utility.model.SiteModel; import org.testng.Assert; import org.testng.annotations.Test; @@ -16,6 +17,7 @@ import org.testng.annotations.Test; */ public class SearchServiceBackupTests extends AbstractBackupTest { + private SiteModel testSite = new SiteModel("siteForBackupTesting"); /** * {"responseHeader":{"status":0,"QTime":1},"exception":"org.apache.solr.common.SolrException:org.apache.solr.common.SolrException: * Directory does not exist: @@ -32,10 +34,17 @@ public class SearchServiceBackupTests extends AbstractBackupTest { } + @Test(priority=1) + public void createTestSiteForBackup() { + if(dataSite.isSiteCreated(testSite)) + testSite = dataSite.usingAdmin().createSite(testSite); + + } + /** * In case of success: {"responseHeader":{"status":0,"QTime":3},"status":"OK"} */ - @Test(priority=1) + @Test(priority=2) public void save1AlfrescoSnaphotToExistingBackupFolder() throws Exception { RestHtmlResponse htmlResponse = executeSolrBackupRequest("alfresco", "/backup/alfresco", 1);