From 22eeec2841119e650cf03f17bb42f63d8335c22e Mon Sep 17 00:00:00 2001 From: Keerat Date: Fri, 22 Mar 2019 12:09:48 +0000 Subject: [PATCH] Search-1485 --- .../alfresco/service/search/cmis/SolrSearchByAspectTests.java | 4 ++-- .../org/alfresco/service/search/cmis/SolrSearchByIdTests.java | 4 ++-- .../alfresco/service/search/cmis/SolrSearchByPathTests.java | 4 ++-- .../service/search/cmis/SolrSearchByPropertyTests.java | 4 ++-- .../alfresco/service/search/cmis/SolrSearchInFolderTests.java | 2 +- .../alfresco/service/search/cmis/SolrSearchInTreeTests.java | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/e2e-test/src/test/java/org/alfresco/service/search/cmis/SolrSearchByAspectTests.java b/e2e-test/src/test/java/org/alfresco/service/search/cmis/SolrSearchByAspectTests.java index c08fb6e90..045557cce 100644 --- a/e2e-test/src/test/java/org/alfresco/service/search/cmis/SolrSearchByAspectTests.java +++ b/e2e-test/src/test/java/org/alfresco/service/search/cmis/SolrSearchByAspectTests.java @@ -40,7 +40,7 @@ public class SolrSearchByAspectTests extends CmisTest } @Test(dataProviderClass = XMLTestDataProvider.class, dataProvider = "getAllData") - @XMLDataConfig(file = "src/main/resources/testdata/search-by-aspect.xml") + @XMLDataConfig(file = "src/test/resources/testdata/search-by-aspect.xml") public void prepareDataForAspectSearch(XMLTestData testData) throws Exception { this.testData = testData; @@ -52,7 +52,7 @@ public class SolrSearchByAspectTests extends CmisTest @Test(groups = { TestGroup.CMIS, TestGroup.QUERIES }, dataProviderClass = XMLTestDataProvider.class, dataProvider = "getQueriesData", dependsOnMethods = "prepareDataForAspectSearch") - @XMLDataConfig(file = "src/main/resources/testdata/search-by-aspect.xml") + @XMLDataConfig(file = "src/test/resources/testdata/search-by-aspect.xml") public void executeSearchByAspect(QueryModel query) throws Exception { cmisApi.withQuery(query.getValue()) diff --git a/e2e-test/src/test/java/org/alfresco/service/search/cmis/SolrSearchByIdTests.java b/e2e-test/src/test/java/org/alfresco/service/search/cmis/SolrSearchByIdTests.java index dc03ae4df..458eea9a8 100644 --- a/e2e-test/src/test/java/org/alfresco/service/search/cmis/SolrSearchByIdTests.java +++ b/e2e-test/src/test/java/org/alfresco/service/search/cmis/SolrSearchByIdTests.java @@ -40,7 +40,7 @@ public class SolrSearchByIdTests extends CmisTest } @Test(dataProviderClass = XMLTestDataProvider.class, dataProvider = "getAllData") - @XMLDataConfig(file = "src/main/resources/testdata/search-by-id.xml") + @XMLDataConfig(file = "src/test/resources/testdata/search-by-id.xml") public void prepareDataForSearchById(XMLTestData testData) throws Exception { this.testData = testData; @@ -52,7 +52,7 @@ public class SolrSearchByIdTests extends CmisTest @Test(groups = { TestGroup.CMIS, TestGroup.QUERIES }, dataProviderClass = XMLTestDataProvider.class, dataProvider = "getQueriesData", dependsOnMethods = "prepareDataForSearchById") - @XMLDataConfig(file = "src/main/resources/testdata/search-by-id.xml") + @XMLDataConfig(file = "src/test/resources/testdata/search-by-id.xml") public void executeSortedSearchByID(QueryModel query) throws Exception { cmisApi.withQuery(query.getValue()) diff --git a/e2e-test/src/test/java/org/alfresco/service/search/cmis/SolrSearchByPathTests.java b/e2e-test/src/test/java/org/alfresco/service/search/cmis/SolrSearchByPathTests.java index d72c43617..e0da6e600 100644 --- a/e2e-test/src/test/java/org/alfresco/service/search/cmis/SolrSearchByPathTests.java +++ b/e2e-test/src/test/java/org/alfresco/service/search/cmis/SolrSearchByPathTests.java @@ -38,7 +38,7 @@ public class SolrSearchByPathTests extends CmisTest } @Test(dataProviderClass = XMLTestDataProvider.class, dataProvider = "getAllData") - @XMLDataConfig(file = "src/main/resources/testdata/search-by-path.xml") + @XMLDataConfig(file = "src/test/resources/testdata/search-by-path.xml") public void prepareDataForSearchByPath(XMLTestData testData) throws Exception { this.testData = testData; @@ -50,7 +50,7 @@ public class SolrSearchByPathTests extends CmisTest @Test(groups = { TestGroup.CMIS, TestGroup.QUERIES }, dependsOnMethods = "prepareDataForSearchByPath", dataProviderClass = XMLTestDataProvider.class, dataProvider = "getQueriesData") - @XMLDataConfig(file = "src/main/resources/testdata/search-by-path.xml") + @XMLDataConfig(file = "src/test/resources/testdata/search-by-path.xml") public void executeSearchByPathQueries(QueryModel query) throws Exception { cmisApi.withQuery(query.getValue()).assertResultsCount().equals(query.getResults()); diff --git a/e2e-test/src/test/java/org/alfresco/service/search/cmis/SolrSearchByPropertyTests.java b/e2e-test/src/test/java/org/alfresco/service/search/cmis/SolrSearchByPropertyTests.java index 54715531f..e43e900a5 100644 --- a/e2e-test/src/test/java/org/alfresco/service/search/cmis/SolrSearchByPropertyTests.java +++ b/e2e-test/src/test/java/org/alfresco/service/search/cmis/SolrSearchByPropertyTests.java @@ -40,7 +40,7 @@ public class SolrSearchByPropertyTests extends CmisTest } @Test(dataProviderClass = XMLTestDataProvider.class, dataProvider = "getAllData") - @XMLDataConfig(file = "src/main/resources/testdata/search-by-property.xml") + @XMLDataConfig(file = "src/test/resources/testdata/search-by-property.xml") public void prepareDataForSearchWithProperty(XMLTestData testData) throws Exception { this.testData = testData; @@ -52,7 +52,7 @@ public class SolrSearchByPropertyTests extends CmisTest @Test(groups = { TestGroup.CMIS, TestGroup.QUERIES }, dataProviderClass = XMLTestDataProvider.class, dataProvider = "getQueriesData", dependsOnMethods = "prepareDataForSearchWithProperty") - @XMLDataConfig(file = "src/main/resources/testdata/search-by-property.xml") + @XMLDataConfig(file = "src/test/resources/testdata/search-by-property.xml") public void executeSortedSearchByID(QueryModel query) throws Exception { cmisApi.withQuery(query.getValue()) diff --git a/e2e-test/src/test/java/org/alfresco/service/search/cmis/SolrSearchInFolderTests.java b/e2e-test/src/test/java/org/alfresco/service/search/cmis/SolrSearchInFolderTests.java index f2d58b959..595be9f11 100644 --- a/e2e-test/src/test/java/org/alfresco/service/search/cmis/SolrSearchInFolderTests.java +++ b/e2e-test/src/test/java/org/alfresco/service/search/cmis/SolrSearchInFolderTests.java @@ -60,7 +60,7 @@ public class SolrSearchInFolderTests extends CmisTest @Test(groups = { TestGroup.CMIS, TestGroup.QUERIES }, dataProviderClass = XMLTestDataProvider.class, dataProvider = "getQueriesData") - @XMLDataConfig(file = "src/main/resources/testdata/search-in-folder.xml") + @XMLDataConfig(file = "src/test/resources/testdata/search-in-folder.xml") public void executeCMISQuery(QueryModel query) throws Exception { String currentQuery = String.format(query.getValue(), parentFolder.getNodeRef()); diff --git a/e2e-test/src/test/java/org/alfresco/service/search/cmis/SolrSearchInTreeTests.java b/e2e-test/src/test/java/org/alfresco/service/search/cmis/SolrSearchInTreeTests.java index b21fc8b02..4cbb4914e 100644 --- a/e2e-test/src/test/java/org/alfresco/service/search/cmis/SolrSearchInTreeTests.java +++ b/e2e-test/src/test/java/org/alfresco/service/search/cmis/SolrSearchInTreeTests.java @@ -64,7 +64,7 @@ public class SolrSearchInTreeTests extends CmisTest @Test(groups = { TestGroup.CMIS, TestGroup.QUERIES }, dataProviderClass = XMLTestDataProvider.class, dataProvider = "getQueriesData") - @XMLDataConfig(file = "src/main/resources/testdata/search-in-tree.xml") + @XMLDataConfig(file = "src/test/resources/testdata/search-in-tree.xml") public void executeCMISQuery(QueryModel query) throws Exception { String currentQuery = String.format(query.getValue(), parentFolder.getNodeRef());