inteligr8/SearchServices
1
0
Fork 0
mirror of https://github.com/Alfresco/SearchServices.git synced 2026-09-16 18:12:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

TAS-3987 ability to execute TAS RestAPI on java11

Browse Source
This commit is contained in:
Paul Brodner
2019-03-04 17:18:01 +00:00
committed by Meenal Bhave
parent 5e0b967727
commit a42e753ff2
18 changed files with 32 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
e2e-test/java/org/alfresco/rest/auth/AuthTests.java
-1
View File
@@ -10,7 +10,6 @@ import org.alfresco.utility.model.UserModel;
import org.alfresco.utility.testrail.ExecutionType;
import org.alfresco.utility.testrail.annotation.TestRail;
import org.apache.commons.codec.binary.Base64;
import org.springframework.http.HttpMethod;
import org.springframework.http.HttpStatus;
import org.testng.Assert;
import org.testng.annotations.Test;
e2e-test/java/org/alfresco/rest/comments/AddCommentTests.java
+1 -1
View File
@@ -19,7 +19,7 @@ import org.alfresco.utility.model.UserModel;
import org.alfresco.utility.report.Bug;
import org.alfresco.utility.testrail.ExecutionType;
import org.alfresco.utility.testrail.annotation.TestRail;
import org.apache.commons.lang.RandomStringUtils;
import org.apache.commons.lang3.RandomStringUtils;
import org.springframework.http.HttpStatus;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
e2e-test/java/org/alfresco/rest/comments/AddCommentsTests.java
+1 -1
View File
@@ -24,7 +24,7 @@ import org.alfresco.utility.model.UserModel;
import org.alfresco.utility.report.Bug;
import org.alfresco.utility.testrail.ExecutionType;
import org.alfresco.utility.testrail.annotation.TestRail;
import org.apache.commons.lang.RandomStringUtils;
import org.apache.commons.lang3.RandomStringUtils;
import org.springframework.http.HttpMethod;
import org.springframework.http.HttpStatus;
import org.testng.annotations.BeforeClass;
e2e-test/java/org/alfresco/rest/comments/UpdateCommentTests.java
+1 -1
View File
@@ -18,7 +18,7 @@ import org.alfresco.utility.model.UserModel;
import org.alfresco.utility.report.Bug;
import org.alfresco.utility.testrail.ExecutionType;
import org.alfresco.utility.testrail.annotation.TestRail;
import org.apache.commons.lang.RandomStringUtils;
import org.apache.commons.lang3.RandomStringUtils;
import org.springframework.http.HttpStatus;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
e2e-test/java/org/alfresco/rest/favorites/GetFavoriteSiteTests.java
+5 -2
View File
@@ -9,10 +9,13 @@ import org.alfresco.rest.model.RestSiteModel;
import org.alfresco.rest.model.RestSiteModelsCollection;
import org.alfresco.utility.constants.UserRole;
import org.alfresco.utility.data.DataUser;
import org.alfresco.utility.model.*;
import org.alfresco.utility.model.FileModel;
import org.alfresco.utility.model.FolderModel;
import org.alfresco.utility.model.SiteModel;
import org.alfresco.utility.model.TestGroup;
import org.alfresco.utility.model.UserModel;
import org.alfresco.utility.testrail.ExecutionType;
import org.alfresco.utility.testrail.annotation.TestRail;
import org.apache.commons.lang3.RandomStringUtils;
import org.springframework.http.HttpMethod;
import org.springframework.http.HttpStatus;
import org.testng.annotations.BeforeClass;
e2e-test/java/org/alfresco/rest/people/GetPeopleFullTests.java
-2
View File
@@ -2,7 +2,6 @@ package org.alfresco.rest.people;
import org.alfresco.rest.RestTest;
import org.alfresco.rest.core.RestRequest;
import org.alfresco.rest.model.RestErrorModel;
import org.alfresco.rest.model.RestPersonModel;
import org.alfresco.rest.model.RestPersonModelsCollection;
import org.alfresco.utility.constants.UserRole;
@@ -11,7 +10,6 @@ import org.alfresco.utility.model.TestGroup;
import org.alfresco.utility.model.UserModel;
import org.alfresco.utility.testrail.ExecutionType;
import org.alfresco.utility.testrail.annotation.TestRail;
import org.apache.commons.lang3.RandomStringUtils;
import org.springframework.http.HttpMethod;
import org.springframework.http.HttpStatus;
import org.testng.annotations.BeforeClass;
e2e-test/java/org/alfresco/rest/ratings/GetRatingTests.java
+1 -1
View File
@@ -15,7 +15,7 @@ import org.alfresco.utility.model.TestGroup;
import org.alfresco.utility.model.UserModel;
import org.alfresco.utility.testrail.ExecutionType;
import org.alfresco.utility.testrail.annotation.TestRail;
import org.apache.commons.lang.RandomStringUtils;
import org.apache.commons.lang3.RandomStringUtils;
import org.springframework.http.HttpMethod;
import org.springframework.http.HttpStatus;
import org.testng.annotations.BeforeClass;
e2e-test/java/org/alfresco/rest/ratings/GetRatingsTests.java
+1 -1
View File
@@ -16,7 +16,7 @@ import org.alfresco.utility.model.UserModel;
import org.alfresco.utility.report.Bug;
import org.alfresco.utility.testrail.ExecutionType;
import org.alfresco.utility.testrail.annotation.TestRail;
import org.apache.commons.lang.RandomStringUtils;
import org.apache.commons.lang3.RandomStringUtils;
import org.springframework.http.HttpStatus;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
e2e-test/java/org/alfresco/rest/renditions/GetRenditionTests.java
-1
View File
@@ -2,7 +2,6 @@ package org.alfresco.rest.renditions;
import static org.alfresco.utility.report.log.Step.STEP;
import org.alfresco.dataprep.CMISUtil;
import org.alfresco.dataprep.CMISUtil.DocumentType;
import org.alfresco.rest.RestTest;
import org.alfresco.rest.core.RestResponse;
e2e-test/java/org/alfresco/rest/search/FacetRangeSearchTest.java
+9 -9
View File
@@ -134,7 +134,7 @@ public class FacetRangeSearchTest extends AbstractSearchTest
bucket.assertThat().field("label").is("[0 - 200)");
bucket.assertThat().field("filterQuery").is("content.size:[\"0\" TO \"200\">");
Map<String,String> metric = (Map<String, String>) bucket.getMetrics().get(0).getValue();
Assert.assertTrue(new Integer(metric.get("count")) >= 4);
Assert.assertTrue(Integer.valueOf(metric.get("count")) >= 4);
Map<String, String> info = (Map<String, String>) bucket.getBucketInfo();
Assert.assertEquals(info.get("start"),"0");
Assert.assertEquals(info.get("end"),"200");
@@ -146,7 +146,7 @@ public class FacetRangeSearchTest extends AbstractSearchTest
bucket.assertThat().field("label").is("[200 - 400)");
bucket.assertThat().field("filterQuery").is("content.size:[\"200\" TO \"400\">");
metric = (Map<String, String>) bucket.getMetrics().get(0).getValue();
Integer count = new Integer(metric.get("count"));
Integer count = Integer.valueOf(metric.get("count"));
Assert.assertTrue(count >= 4);
info = (Map<String, String>) bucket.getBucketInfo();
Assert.assertEquals(info.get("start"),"200");
@@ -158,7 +158,7 @@ public class FacetRangeSearchTest extends AbstractSearchTest
bucket.assertThat().field("label").is("[400 - 600]");
bucket.assertThat().field("filterQuery").is("content.size:[\"400\" TO \"600\"]");
metric = (Map<String, String>) bucket.getMetrics().get(0).getValue();
Assert.assertTrue(new Integer(metric.get("count")) >= 7);
Assert.assertTrue(Integer.valueOf(metric.get("count")) >= 7);
info = (Map<String, String>) bucket.getBucketInfo();
Assert.assertEquals(info.get("start"),"400");
Assert.assertEquals(info.get("end"),"600");
@@ -191,7 +191,7 @@ public class FacetRangeSearchTest extends AbstractSearchTest
bucket.assertThat().field("label").is("[0 - 200)");
bucket.assertThat().field("filterQuery").is("content.size:[\"0\" TO \"200\">");
Map<String,String> metric = (Map<String, String>) bucket.getMetrics().get(0).getValue();
Assert.assertTrue(new Integer(metric.get("count")) >= 4);
Assert.assertTrue(Integer.valueOf(metric.get("count")) >= 4);
Map<String, String> info = (Map<String, String>) bucket.getBucketInfo();
Assert.assertEquals(info.get("start"),"0");
Assert.assertEquals(info.get("end"),"200");
@@ -206,7 +206,7 @@ public class FacetRangeSearchTest extends AbstractSearchTest
Assert.assertEquals(info.get("start"),"200");
Assert.assertEquals(info.get("end"),"400");
metric = (Map<String, String>) bucket.getMetrics().get(0).getValue();
Assert.assertTrue(new Integer(metric.get("count")) >= 4);
Assert.assertTrue(Integer.valueOf(metric.get("count")) >= 4);
Assert.assertNull(info.get("count"));
Assert.assertEquals(info.get("startInclusive"),"true");
Assert.assertEquals(info.get("endInclusive"),"false");
@@ -215,7 +215,7 @@ public class FacetRangeSearchTest extends AbstractSearchTest
bucket.assertThat().field("label").is("[400 - 500]");
bucket.assertThat().field("filterQuery").is("content.size:[\"400\" TO \"500\"]");
metric = (Map<String, String>) bucket.getMetrics().get(0).getValue();
Assert.assertTrue(new Integer(metric.get("count")) >= 3);
Assert.assertTrue(Integer.valueOf(metric.get("count")) >= 3);
info = (Map<String, String>) bucket.getBucketInfo();
Assert.assertEquals(info.get("start"),"400");
Assert.assertEquals(info.get("end"),"500");
@@ -307,7 +307,7 @@ public class FacetRangeSearchTest extends AbstractSearchTest
bucket.assertThat().field("label").is("(0 - 200]");
bucket.assertThat().field("filterQuery").is("content.size:<\"0\" TO \"200\"]");
Map<String,String> metric = (Map<String, String>) bucket.getMetrics().get(0).getValue();
Assert.assertTrue(new Integer(metric.get("count")) >= 4);
Assert.assertTrue(Integer.valueOf(metric.get("count")) >= 4);
Map<String, String> info = (Map<String, String>) bucket.getBucketInfo();
Assert.assertEquals(info.get("start"),"0");
Assert.assertEquals(info.get("end"),"200");
@@ -319,7 +319,7 @@ public class FacetRangeSearchTest extends AbstractSearchTest
bucket.assertThat().field("label").is("(200 - 400]");
bucket.assertThat().field("filterQuery").is("content.size:<\"200\" TO \"400\"]");
metric = (Map<String, String>) bucket.getMetrics().get(0).getValue();
Integer count = new Integer(metric.get("count"));
Integer count = Integer.valueOf(metric.get("count"));
Assert.assertTrue(count >= 4);
info = (Map<String, String>) bucket.getBucketInfo();
Assert.assertEquals(info.get("start"),"200");
@@ -331,7 +331,7 @@ public class FacetRangeSearchTest extends AbstractSearchTest
bucket.assertThat().field("label").is("(400 - 600]");
bucket.assertThat().field("filterQuery").is("content.size:<\"400\" TO \"600\"]");
metric = (Map<String, String>) bucket.getMetrics().get(0).getValue();
Assert.assertTrue(new Integer(metric.get("count")) >= 7);
Assert.assertTrue(Integer.valueOf(metric.get("count")) >= 7);
info = (Map<String, String>) bucket.getBucketInfo();
Assert.assertEquals(info.get("start"),"400");
Assert.assertEquals(info.get("end"),"600");
e2e-test/java/org/alfresco/rest/search/sql/SearchSQLWithQuotedIdentifiers.java
+5 -2
View File
@@ -22,10 +22,13 @@ import java.util.UUID;
import org.alfresco.rest.RestTest;
import org.alfresco.rest.search.AbstractSearchTest;
import org.alfresco.rest.search.SearchSqlRequest;
import org.alfresco.utility.constants.UserRole;
import org.alfresco.utility.data.CustomObjectTypeProperties;
import org.alfresco.utility.model.*;
import org.alfresco.utility.model.ContentModel;
import org.alfresco.utility.model.FileModel;
import org.alfresco.utility.model.FileType;
import org.alfresco.utility.model.FolderModel;
import org.alfresco.utility.model.TestGroup;
import org.alfresco.utility.report.Bug;
import org.hamcrest.Matchers;
import org.springframework.http.HttpStatus;
e2e-test/java/org/alfresco/rest/tags/UpdateTagTests.java
+1 -1
View File
@@ -10,7 +10,7 @@ import org.alfresco.utility.model.UserModel;
import org.alfresco.utility.report.Bug;
import org.alfresco.utility.testrail.ExecutionType;
import org.alfresco.utility.testrail.annotation.TestRail;
import org.apache.commons.lang.RandomStringUtils;
import org.apache.commons.lang3.RandomStringUtils;
import org.springframework.http.HttpStatus;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeMethod;
e2e-test/java/org/alfresco/rest/tags/nodes/AddTagTests.java
+1 -1
View File
@@ -14,7 +14,7 @@ import org.alfresco.utility.model.TestGroup;
import org.alfresco.utility.model.UserModel;
import org.alfresco.utility.testrail.ExecutionType;
import org.alfresco.utility.testrail.annotation.TestRail;
import org.apache.commons.lang.RandomStringUtils;
import org.apache.commons.lang3.RandomStringUtils;
import org.springframework.http.HttpStatus;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeMethod;
e2e-test/java/org/alfresco/rest/tags/nodes/DeleteTagTests.java
+2 -2
View File
@@ -226,7 +226,7 @@ public class DeleteTagTests extends TagsDataPrep
@Test(groups = { TestGroup.REST_API, TestGroup.TAGS, TestGroup.REGRESSION })
public void userCollaboratorCanDeleteLongTag() throws Exception
{
String longTag = org.apache.commons.lang.RandomStringUtils.randomAlphanumeric(800);
String longTag = RandomStringUtils.randomAlphanumeric(800);
tag = restClient.authenticateUser(adminUserModel)
.withCoreAPI().usingResource(document).addTag(longTag);
@@ -241,7 +241,7 @@ public class DeleteTagTests extends TagsDataPrep
@Test(groups = { TestGroup.REST_API, TestGroup.TAGS, TestGroup.REGRESSION })
public void managerCanDeleteShortTag() throws Exception
{
String shortTag = org.apache.commons.lang.RandomStringUtils.randomAlphanumeric(10);
String shortTag = RandomStringUtils.randomAlphanumeric(10);
tag = restClient.authenticateUser(adminUserModel)
.withCoreAPI().usingResource(document).addTag(shortTag);
e2e-test/java/org/alfresco/rest/tags/nodes/GetNodeTagsTests.java
+1 -1
View File
@@ -11,7 +11,7 @@ import org.alfresco.utility.model.TestGroup;
import org.alfresco.utility.model.UserModel;
import org.alfresco.utility.testrail.ExecutionType;
import org.alfresco.utility.testrail.annotation.TestRail;
import org.apache.commons.lang.RandomStringUtils;
import org.apache.commons.lang3.RandomStringUtils;
import org.springframework.http.HttpStatus;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
e2e-test/java/org/alfresco/rest/workflow/processes/GetProcessCoreTests.java
+1 -1
View File
@@ -8,7 +8,7 @@ import org.alfresco.utility.model.TestGroup;
import org.alfresco.utility.model.UserModel;
import org.alfresco.utility.testrail.ExecutionType;
import org.alfresco.utility.testrail.annotation.TestRail;
import org.apache.commons.lang.RandomStringUtils;
import org.apache.commons.lang3.RandomStringUtils;
import org.springframework.http.HttpStatus;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
e2e-test/java/org/alfresco/rest/workflow/processes/variables/GetProcessVariablesCoreTests.java
+1 -1
View File
@@ -13,7 +13,7 @@ import org.alfresco.utility.model.TestGroup;
import org.alfresco.utility.model.UserModel;
import org.alfresco.utility.testrail.ExecutionType;
import org.alfresco.utility.testrail.annotation.TestRail;
import org.apache.commons.lang.RandomStringUtils;
import org.apache.commons.lang3.RandomStringUtils;
import org.springframework.http.HttpStatus;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
e2e-test/java/org/alfresco/rest/workflow/tasks/GetTaskTests.java
+1 -1
View File
@@ -16,7 +16,7 @@ import org.alfresco.utility.model.UserModel;
import org.alfresco.utility.report.Bug;
import org.alfresco.utility.testrail.ExecutionType;
import org.alfresco.utility.testrail.annotation.TestRail;
import org.apache.commons.lang.RandomStringUtils;
import org.apache.commons.lang3.RandomStringUtils;
import org.springframework.http.HttpMethod;
import org.springframework.http.HttpStatus;
import org.testng.annotations.BeforeClass;