inteligr8/acs-community-packaging
1
0
Fork 0
mirror of https://github.com/Alfresco/acs-community-packaging.git synced 2025-09-10 14:12:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

REPO-5079, ATS-707: Use all-in-one T-Engine and fix tests (#731)

Browse Source 
[release] 6.2.1-A2. (community edition)
This commit is contained in:
montgolfiere
2020-04-21 09:51:37 +01:00
committed by GitHub
parent 859dc09e59
commit 0b0ae21a37
8 changed files with 108 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
.travis.yml
View File

@@ -17,8 +17,8 @@ env:
global: global:
- VERSION_EDITION=Community - VERSION_EDITION=Community
# Must be in the format <alfresco-version>-<additional_versioning> ie. 6.3.0-repo-xxxx-x or 6.3.0-A-x # Must be in the format <alfresco-version>-<additional_versioning> ie. 6.3.0-repo-xxxx-x or 6.3.0-A-x
- RELEASE_VERSION= - RELEASE_VERSION=6.2.1-A2
- DEVELOPMENT_VERSION= - DEVELOPMENT_VERSION=6.2.1-SNAPSHOT
- COMM_RELEASE_VERSION= - COMM_RELEASE_VERSION=
branches: branches:
only: only:
@@ -43,11 +43,9 @@ jobs:
- travis_retry travis_wait 30 mvn -q install "-Dversion.edition=${VERSION_EDITION}" -f war/pom.xml - travis_retry travis_wait 30 mvn -q install "-Dversion.edition=${VERSION_EDITION}" -f war/pom.xml
script: script:
# Download the latest version of WhiteSource Unified Agent # Download the latest version of WhiteSource Unified Agent
#- curl -LJO https://github.com/whitesource/unified-agent-distribution/raw/master/standAlone/wss-unified-agent.jar - curl -LJO https://github.com/whitesource/unified-agent-distribution/releases/latest/download/wss-unified-agent.jar
# Use the latest released version of the agent available in github (temporary solution)
- curl -LJO https://github.com/whitesource/unified-agent-distribution/raw/v20.1.2/standAlone/wss-unified-agent-20.1.2.jar
# Run WhiteSource Unified Agent # Run WhiteSource Unified Agent
- java -jar wss-unified-agent-20.1.2.jar -apiKey ${WHITESOURCE_API_KEY} -c .wss-unified-agent.config -d ./war - java -jar wss-unified-agent.jar -apiKey ${WHITESOURCE_API_KEY} -c .wss-unified-agent.config -d ./war
- name: "REST API TAS tests part1" - name: "REST API TAS tests part1"
jdk: openjdk11 jdk: openjdk11
install: install:

8
pom.xml
View File

@@ -68,10 +68,10 @@
<version.edition>Community</version.edition> <version.edition>Community</version.edition>
<image.tag>latest</image.tag> <image.tag>latest</image.tag>
<dependency.alfresco-remote-api.version>7.119</dependency.alfresco-remote-api.version> <dependency.alfresco-remote-api.version>7.122</dependency.alfresco-remote-api.version>
<dependency.alfresco-repository.version>7.161</dependency.alfresco-repository.version> <dependency.alfresco-repository.version>7.164</dependency.alfresco-repository.version>
<dependency.alfresco-data-model.version>8.50.7</dependency.alfresco-data-model.version> <dependency.alfresco-data-model.version>8.50.9</dependency.alfresco-data-model.version>
<dependency.alfresco-core.version>7.29</dependency.alfresco-core.version> <dependency.alfresco-core.version>7.30</dependency.alfresco-core.version>
<dependency.alfresco-hb-data-sender.version>1.0.12</dependency.alfresco-hb-data-sender.version> <dependency.alfresco-hb-data-sender.version>1.0.12</dependency.alfresco-hb-data-sender.version>
<dependency.alfresco-spring-webscripts.version>8.2</dependency.alfresco-spring-webscripts.version> <dependency.alfresco-spring-webscripts.version>8.2</dependency.alfresco-spring-webscripts.version>

2
tests/environment/.env
View File

@@ -1,4 +1,4 @@
TRANSFORMERS_TAG=2.1.1 TRANSFORMERS_TAG=2.2.0-A4
SOLR6_TAG=1.4.0 SOLR6_TAG=1.4.0
POSTGRES_TAG=11.4 POSTGRES_TAG=11.4
ACTIVEMQ_TAG=5.15.8 ACTIVEMQ_TAG=5.15.8

74
tests/environment/docker-compose-minimal+transforms.yml
View File

@@ -31,24 +31,18 @@ services:
-Daos.baseUrlOverwrite=http://localhost:8082/alfresco/aos -Daos.baseUrlOverwrite=http://localhost:8082/alfresco/aos
-Dmessaging.broker.url=\"failover:(tcp://activemq:61616)?timeout=3000&jms.useCompression=true\" -Dmessaging.broker.url=\"failover:(tcp://activemq:61616)?timeout=3000&jms.useCompression=true\"
-Dlocal.transform.service.enabled=true -DlocalTransform.core-aio.url=http://transform-core-aio:8090/
-DlocalTransform.pdfrenderer.url=http://alfresco-pdf-renderer:8090/
-DlocalTransform.imagemagick.url=http://imagemagick:8090/
-DlocalTransform.libreoffice.url=http://libreoffice:8090/
-DlocalTransform.tika.url=http://tika:8090/
-DlocalTransform.misc.url=http://transform-misc:8090/
-Dlegacy.transform.service.enabled=true -Dalfresco-pdf-renderer.url=http://transform-core-aio:8090/
-Dalfresco-pdf-renderer.url=http://alfresco-pdf-renderer:8090/ -Djodconverter.url=http://transform-core-aio:8090/
-Djodconverter.url=http://libreoffice:8090/ -Dimg.url=http://transform-core-aio:8090/
-Dimg.url=http://imagemagick:8090/ -Dtika.url=http://transform-core-aio:8090/
-Dtika.url=http://tika:8090/ -Dtransform.misc.url=http://transform-core-aio:8090/
-Dtransform.misc.url=http://transform-misc:8090/
-Dimap.server.port=1143 -Dimap.server.port=1143
-Dftp.port=1221 -Dftp.port=1221
-Dcors.enabled=true -Dcors.enabled=true
-Dcors.allowed.origins=http://localhost:4200 -Dcors.allowed.origins=http://localhost:4200,http://localhost:8080
" "
ports: ports:
- 8082:8080 - 8082:8080
@@ -88,57 +82,9 @@ services:
- 61616:61616 # OpenWire - 61616:61616 # OpenWire
- 61613:61613 # STOMP - 61613:61613 # STOMP
alfresco-pdf-renderer: transform-core-aio:
image: alfresco/alfresco-pdf-renderer:${TRANSFORMERS_TAG} image: alfresco/alfresco-transform-core-aio:${TRANSFORMERS_TAG}
environment: environment:
JAVA_OPTS: " -Xms256m -Xmx256m" JAVA_OPTS: " -Xms256m -Xmx512m"
ACTIVEMQ_URL: "nio://activemq:61616"
ACTIVEMQ_USER: "admin"
ACTIVEMQ_PASSWORD: "admin"
FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file"
ports: ports:
- 8090:8090 - 8090:8090
imagemagick:
image: alfresco/alfresco-imagemagick:${TRANSFORMERS_TAG}
environment:
JAVA_OPTS: " -Xms256m -Xmx256m"
ACTIVEMQ_URL: "nio://activemq:61616"
ACTIVEMQ_USER: "admin"
ACTIVEMQ_PASSWORD: "admin"
FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file"
ports:
- 8091:8090
libreoffice:
image: alfresco/alfresco-libreoffice:${TRANSFORMERS_TAG}
environment:
JAVA_OPTS: " -Xms256m -Xmx256m"
ACTIVEMQ_URL: "nio://activemq:61616"
ACTIVEMQ_USER: "admin"
ACTIVEMQ_PASSWORD: "admin"
FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file"
ports:
- 8092:8090
tika:
image: alfresco/alfresco-tika:${TRANSFORMERS_TAG}
environment:
JAVA_OPTS: " -Xms256m -Xmx256m"
ACTIVEMQ_URL: "nio://activemq:61616"
FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file"
ACTIVEMQ_USER: "admin"
ACTIVEMQ_PASSWORD: "admin"
ports:
- 8093:8090
transform-misc:
image: alfresco/alfresco-transform-misc:${TRANSFORMERS_TAG}
environment:
JAVA_OPTS: " -Xms256m -Xmx256m"
ACTIVEMQ_URL: "nio://activemq:61616"
ACTIVEMQ_USER: "admin"
ACTIVEMQ_PASSWORD: "admin"
FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file"
ports:
- 8094:8090

125
tests/tas-restapi/src/test/java/org/alfresco/rest/nodes/NodesLockTests.java
View File

@@ -199,11 +199,13 @@ public class NodesLockTests extends RestTest
.assertThat().field("properties").contains("lockType=READ_ONLY_LOCK"); .assertThat().field("properties").contains("lockType=READ_ONLY_LOCK");
STEP("6. Verify that the file is locked PERSISTENT only after EPHEMERAL lock has expired"); STEP("6. Verify that the file is locked PERSISTENT only after EPHEMERAL lock has expired");
try{Thread.sleep(2500);}finally{} Utility.sleep(500, 5000, () ->
RestNodeModel file1Model4 = restClient.authenticateUser(user1).withCoreAPI().usingNode(file1).usingParams("include=isLocked").getNode(); {
file1Model4.assertThat().field("isLocked").is(true) RestNodeModel file1Model4 = restClient.authenticateUser(user1).withCoreAPI().usingNode(file1).usingParams("include=isLocked").getNode();
.assertThat().field("properties").contains("lockLifetime=PERSISTENT") file1Model4.assertThat().field("isLocked").is(true)
.assertThat().field("properties").contains("lockType=WRITE_LOCK"); .assertThat().field("properties").contains("lockLifetime=PERSISTENT")
.assertThat().field("properties").contains("lockType=WRITE_LOCK");
});
} }
@Test(groups = { TestGroup.REST_API, TestGroup.NODES, TestGroup.REGRESSION }) @Test(groups = { TestGroup.REST_API, TestGroup.NODES, TestGroup.REGRESSION })
@@ -313,12 +315,14 @@ public class NodesLockTests extends RestTest
lockBodyModel2.setLifetime("EPHEMERAL"); lockBodyModel2.setLifetime("EPHEMERAL");
lockBodyModel2.setTimeToExpire(20); lockBodyModel2.setTimeToExpire(20);
lockBodyModel2.setType("FULL"); lockBodyModel2.setType("FULL");
try{Thread.sleep(1500);}finally{} Utility.sleep(500, 5000, () ->
RestNodeModel file1Model3 = restClient.authenticateUser(user2).withCoreAPI().usingNode(file1).usingParams("include=isLocked").lockNode(lockBodyModel2); {
restClient.assertStatusCodeIs(HttpStatus.OK); RestNodeModel file1Model3 = restClient.authenticateUser(user2).withCoreAPI().usingNode(file1).usingParams("include=isLocked").lockNode(lockBodyModel2);
file1Model3.assertThat().field("isLocked").is(true) restClient.assertStatusCodeIs(HttpStatus.OK);
.assertThat().field("properties").contains("lockLifetime=EPHEMERAL") file1Model3.assertThat().field("isLocked").is(true)
.assertThat().field("properties").contains("lockType=READ_ONLY_LOCK"); .assertThat().field("properties").contains("lockLifetime=EPHEMERAL")
.assertThat().field("properties").contains("lockType=READ_ONLY_LOCK");
});
} }
// TODO: uncomment this: @Bug(id = "MNT-17612", status = Status.FIXED, description = "AccessDeniedException in AOS Edit Offline Upload New Version") // TODO: uncomment this: @Bug(id = "MNT-17612", status = Status.FIXED, description = "AccessDeniedException in AOS Edit Offline Upload New Version")
@@ -354,12 +358,15 @@ public class NodesLockTests extends RestTest
lockBodyModel2.setLifetime("PERSISTENT"); lockBodyModel2.setLifetime("PERSISTENT");
lockBodyModel2.setTimeToExpire(20); lockBodyModel2.setTimeToExpire(20);
lockBodyModel2.setType("ALLOW_OWNER_CHANGES"); lockBodyModel2.setType("ALLOW_OWNER_CHANGES");
try{Thread.sleep(1500);}finally{} Utility.sleep(500, 5000, () ->
RestNodeModel file1Model3 = restClient.authenticateUser(user2).withCoreAPI().usingNode(file1).usingParams("include=isLocked").lockNode(lockBodyModel2); {
restClient.assertStatusCodeIs(HttpStatus.OK); RestNodeModel file1Model3 = restClient.authenticateUser(user2).withCoreAPI().usingNode(file1).usingParams("include=isLocked").lockNode(lockBodyModel2);
file1Model3.assertThat().field("isLocked").is(true) restClient.assertStatusCodeIs(HttpStatus.OK);
.assertThat().field("properties").contains("lockLifetime=PERSISTENT") file1Model3.assertThat().field("isLocked").is(true)
.assertThat().field("properties").contains("lockType=WRITE_LOCK"); .assertThat().field("properties").contains("lockLifetime=PERSISTENT")
.assertThat().field("properties").contains("lockType=WRITE_LOCK");
});
} }
@Test(groups = { TestGroup.REST_API, TestGroup.NODES, TestGroup.REGRESSION }) @Test(groups = { TestGroup.REST_API, TestGroup.NODES, TestGroup.REGRESSION })
@@ -393,12 +400,14 @@ public class NodesLockTests extends RestTest
lockBodyModel2.setLifetime("EPHEMERAL"); lockBodyModel2.setLifetime("EPHEMERAL");
lockBodyModel2.setTimeToExpire(20); lockBodyModel2.setTimeToExpire(20);
lockBodyModel2.setType("FULL"); lockBodyModel2.setType("FULL");
try{Thread.sleep(1500);}finally{} Utility.sleep(500, 5000, () ->
RestNodeModel file1Model3 = restClient.authenticateUser(user2).withCoreAPI().usingNode(file1).usingParams("include=isLocked").lockNode(lockBodyModel2); {
restClient.assertStatusCodeIs(HttpStatus.OK); RestNodeModel file1Model3 = restClient.authenticateUser(user2).withCoreAPI().usingNode(file1).usingParams("include=isLocked").lockNode(lockBodyModel2);
file1Model3.assertThat().field("isLocked").is(true) restClient.assertStatusCodeIs(HttpStatus.OK);
.assertThat().field("properties").contains("lockLifetime=EPHEMERAL") file1Model3.assertThat().field("isLocked").is(true)
.assertThat().field("properties").contains("lockType=READ_ONLY_LOCK"); .assertThat().field("properties").contains("lockLifetime=EPHEMERAL")
.assertThat().field("properties").contains("lockType=READ_ONLY_LOCK");
});
} }
@Test(groups = { TestGroup.REST_API, TestGroup.NODES, TestGroup.REGRESSION }) @Test(groups = { TestGroup.REST_API, TestGroup.NODES, TestGroup.REGRESSION })
@@ -432,12 +441,14 @@ public class NodesLockTests extends RestTest
lockBodyModel2.setLifetime("PERSISTENT"); lockBodyModel2.setLifetime("PERSISTENT");
lockBodyModel2.setTimeToExpire(20); lockBodyModel2.setTimeToExpire(20);
lockBodyModel2.setType("ALLOW_OWNER_CHANGES"); lockBodyModel2.setType("ALLOW_OWNER_CHANGES");
try{Thread.sleep(1500);}finally{} Utility.sleep(500, 5000, () ->
RestNodeModel file1Model3 = restClient.authenticateUser(user2).withCoreAPI().usingNode(file1).usingParams("include=isLocked").lockNode(lockBodyModel2); {
restClient.assertStatusCodeIs(HttpStatus.OK); RestNodeModel file1Model3 = restClient.authenticateUser(user2).withCoreAPI().usingNode(file1).usingParams("include=isLocked").lockNode(lockBodyModel2);
file1Model3.assertThat().field("isLocked").is(true) restClient.assertStatusCodeIs(HttpStatus.OK);
.assertThat().field("properties").contains("lockLifetime=PERSISTENT") file1Model3.assertThat().field("isLocked").is(true)
.assertThat().field("properties").contains("lockType=WRITE_LOCK"); .assertThat().field("properties").contains("lockLifetime=PERSISTENT")
.assertThat().field("properties").contains("lockType=WRITE_LOCK");
});
} }
@Test(groups = { TestGroup.REST_API, TestGroup.NODES, TestGroup.REGRESSION }) @Test(groups = { TestGroup.REST_API, TestGroup.NODES, TestGroup.REGRESSION })
@@ -471,12 +482,14 @@ public class NodesLockTests extends RestTest
lockBodyModel2.setLifetime("EPHEMERAL"); lockBodyModel2.setLifetime("EPHEMERAL");
lockBodyModel2.setTimeToExpire(20); lockBodyModel2.setTimeToExpire(20);
lockBodyModel2.setType("FULL"); lockBodyModel2.setType("FULL");
try{Thread.sleep(1500);}finally{} Utility.sleep(500, 5000, () ->
RestNodeModel file1Model3 = restClient.authenticateUser(user1).withCoreAPI().usingNode(file1).usingParams("include=isLocked").lockNode(lockBodyModel2); {
restClient.assertStatusCodeIs(HttpStatus.OK); RestNodeModel file1Model3 = restClient.authenticateUser(user1).withCoreAPI().usingNode(file1).usingParams("include=isLocked").lockNode(lockBodyModel2);
file1Model3.assertThat().field("isLocked").is(true) restClient.assertStatusCodeIs(HttpStatus.OK);
.assertThat().field("properties").contains("lockLifetime=EPHEMERAL") file1Model3.assertThat().field("isLocked").is(true)
.assertThat().field("properties").contains("lockType=READ_ONLY_LOCK"); .assertThat().field("properties").contains("lockLifetime=EPHEMERAL")
.assertThat().field("properties").contains("lockType=READ_ONLY_LOCK");
});
} }
@Test(groups = { TestGroup.REST_API, TestGroup.NODES, TestGroup.REGRESSION }) @Test(groups = { TestGroup.REST_API, TestGroup.NODES, TestGroup.REGRESSION })
@@ -509,12 +522,14 @@ public class NodesLockTests extends RestTest
lockBodyModel2.setLifetime("PERSISTENT"); lockBodyModel2.setLifetime("PERSISTENT");
lockBodyModel2.setTimeToExpire(20); lockBodyModel2.setTimeToExpire(20);
lockBodyModel2.setType("ALLOW_OWNER_CHANGES"); lockBodyModel2.setType("ALLOW_OWNER_CHANGES");
try{Thread.sleep(1500);}finally{} Utility.sleep(500, 5000, () ->
RestNodeModel file1Model3 = restClient.authenticateUser(user1).withCoreAPI().usingNode(file1).usingParams("include=isLocked").lockNode(lockBodyModel2); {
restClient.assertStatusCodeIs(HttpStatus.OK); RestNodeModel file1Model3 = restClient.authenticateUser(user1).withCoreAPI().usingNode(file1).usingParams("include=isLocked").lockNode(lockBodyModel2);
file1Model3.assertThat().field("isLocked").is(true) restClient.assertStatusCodeIs(HttpStatus.OK);
.assertThat().field("properties").contains("lockLifetime=PERSISTENT") file1Model3.assertThat().field("isLocked").is(true)
.assertThat().field("properties").contains("lockType=WRITE_LOCK"); .assertThat().field("properties").contains("lockLifetime=PERSISTENT")
.assertThat().field("properties").contains("lockType=WRITE_LOCK");
});
} }
@Test(groups = { TestGroup.REST_API, TestGroup.NODES, TestGroup.REGRESSION }) @Test(groups = { TestGroup.REST_API, TestGroup.NODES, TestGroup.REGRESSION })
@@ -548,12 +563,14 @@ public class NodesLockTests extends RestTest
lockBodyModel2.setLifetime("EPHEMERAL"); lockBodyModel2.setLifetime("EPHEMERAL");
lockBodyModel2.setTimeToExpire(20); lockBodyModel2.setTimeToExpire(20);
lockBodyModel2.setType("FULL"); lockBodyModel2.setType("FULL");
try{Thread.sleep(1500);}finally{} Utility.sleep(500, 5000, () ->
RestNodeModel file1Model3 = restClient.authenticateUser(user1).withCoreAPI().usingNode(file1).usingParams("include=isLocked").lockNode(lockBodyModel2); {
restClient.assertStatusCodeIs(HttpStatus.OK); RestNodeModel file1Model3 = restClient.authenticateUser(user1).withCoreAPI().usingNode(file1).usingParams("include=isLocked").lockNode(lockBodyModel2);
file1Model3.assertThat().field("isLocked").is(true) restClient.assertStatusCodeIs(HttpStatus.OK);
.assertThat().field("properties").contains("lockLifetime=EPHEMERAL") file1Model3.assertThat().field("isLocked").is(true)
.assertThat().field("properties").contains("lockType=READ_ONLY_LOCK"); .assertThat().field("properties").contains("lockLifetime=EPHEMERAL")
.assertThat().field("properties").contains("lockType=READ_ONLY_LOCK");
});
} }
// TODO: uncomment this: @Bug(id = "MNT-17612", status = Status.FIXED, description = "AccessDeniedException in AOS Edit Offline Upload New Version") // TODO: uncomment this: @Bug(id = "MNT-17612", status = Status.FIXED, description = "AccessDeniedException in AOS Edit Offline Upload New Version")
@@ -590,12 +607,14 @@ public class NodesLockTests extends RestTest
lockBodyModel2.setLifetime("PERSISTENT"); lockBodyModel2.setLifetime("PERSISTENT");
lockBodyModel2.setTimeToExpire(20); lockBodyModel2.setTimeToExpire(20);
lockBodyModel2.setType("ALLOW_OWNER_CHANGES"); lockBodyModel2.setType("ALLOW_OWNER_CHANGES");
try{Thread.sleep(1500);}finally{} Utility.sleep(500, 5000, () ->
RestNodeModel file1Model3 = restClient.authenticateUser(user1).withCoreAPI().usingNode(file1).usingParams("include=isLocked").lockNode(lockBodyModel2); {
restClient.assertStatusCodeIs(HttpStatus.OK); RestNodeModel file1Model3 = restClient.authenticateUser(user1).withCoreAPI().usingNode(file1).usingParams("include=isLocked").lockNode(lockBodyModel2);
file1Model3.assertThat().field("isLocked").is(true) restClient.assertStatusCodeIs(HttpStatus.OK);
.assertThat().field("properties").contains("lockLifetime=PERSISTENT") file1Model3.assertThat().field("isLocked").is(true)
.assertThat().field("properties").contains("lockType=WRITE_LOCK"); .assertThat().field("properties").contains("lockLifetime=PERSISTENT")
.assertThat().field("properties").contains("lockType=WRITE_LOCK");
});
} }
@Test(groups = { TestGroup.REST_API, TestGroup.NODES, TestGroup.REGRESSION }) @Test(groups = { TestGroup.REST_API, TestGroup.NODES, TestGroup.REGRESSION })

2
tests/tas-restapi/src/test/java/org/alfresco/rest/renditions/AvailableRenditionTests.java
View File

@@ -37,7 +37,7 @@ public class AvailableRenditionTests extends RenditionIntegrationTests
super.dataPreparation(); super.dataPreparation();
// Upload files and get available renditions for each file // Upload files and get available renditions for each file
List<String> toTest = Arrays.asList("doc", "xls", "ppt", "docx", "xlsx", "pptx", "msg", "pdf", "png", "gif", "jpg"); List<String> toTest = Arrays.asList("doc", "xls", "ppt", "docx", "pptx", "msg", "pdf", "png", "gif", "jpg");
List<Object[]> renditionsForFiles = new LinkedList<>(); List<Object[]> renditionsForFiles = new LinkedList<>();
for (String extensions : toTest) for (String extensions : toTest)
{ {

5
tests/tas-restapi/src/test/java/org/alfresco/rest/sharedLinks/SharedLinksSanityTests.java
View File

@@ -212,8 +212,11 @@ public class SharedLinksSanityTests extends RestTest
restClient.assertStatusCodeIs(HttpStatus.OK); restClient.assertStatusCodeIs(HttpStatus.OK);
} }
/**
* ATS does not support text -> img (doclib)
*/
@TestRail(section = { TestGroup.REST_API, TestGroup.SHAREDLINKS }, executionType = ExecutionType.SANITY, description = "Sanity tests for GET /renditions, GET /renditions/{renditionId} and GET /renditions/{renditionId}/content endpoints") @TestRail(section = { TestGroup.REST_API, TestGroup.SHAREDLINKS }, executionType = ExecutionType.SANITY, description = "Sanity tests for GET /renditions, GET /renditions/{renditionId} and GET /renditions/{renditionId}/content endpoints")
@Test(groups = { TestGroup.REST_API, TestGroup.SHAREDLINKS, TestGroup.SANITY, TestGroup.RENDITIONS }) @Test(groups = { TestGroup.REST_API, TestGroup.SHAREDLINKS, TestGroup.SANITY, TestGroup.RENDITIONS, TestGroup.NOT_SUPPORTED_BY_ATS })
public void testGetSharedLinkRendition() throws Exception public void testGetSharedLinkRendition() throws Exception
{ {
sharedLink7 = restClient.authenticateUser(testUser1).withCoreAPI().usingSharedLinks().createSharedLink(file7); sharedLink7 = restClient.authenticateUser(testUser1).withCoreAPI().usingSharedLinks().createSharedLink(file7);

20
tests/tas-restapi/src/test/java/org/alfresco/rest/tags/UpdateTagTests.java
View File

@@ -142,10 +142,12 @@ public class UpdateTagTests extends TagsDataPrep
{ {
String invalidTagBody = "|.\"/<>*"; String invalidTagBody = "|.\"/<>*";
RestTagModel tag = restClient.authenticateUser(adminUserModel).withCoreAPI().usingResource(document).addTag(RandomData.getRandomName("tag")); RestTagModel tag = restClient.authenticateUser(adminUserModel).withCoreAPI().usingResource(document).addTag(RandomData.getRandomName("tag"));
Utility.waitToLoopTime(20); Utility.sleep(500, 20000, () ->
restClient.withCoreAPI().usingTag(tag).update(invalidTagBody); {
restClient.assertStatusCodeIs(HttpStatus.BAD_REQUEST) restClient.withCoreAPI().usingTag(tag).update(invalidTagBody);
.assertLastError().containsSummary(String.format(RestErrorModel.INVALID_TAG, invalidTagBody)); restClient.assertStatusCodeIs(HttpStatus.BAD_REQUEST)
.assertLastError().containsSummary(String.format(RestErrorModel.INVALID_TAG, invalidTagBody));
});
} }
@Bug(id="ACE-5629") @Bug(id="ACE-5629")
@@ -156,10 +158,12 @@ public class UpdateTagTests extends TagsDataPrep
{ {
String invalidTagBody = ".\"/<>*"; String invalidTagBody = ".\"/<>*";
RestTagModel tag = restClient.authenticateUser(adminUserModel).withCoreAPI().usingResource(document).addTag(RandomData.getRandomName("tag")); RestTagModel tag = restClient.authenticateUser(adminUserModel).withCoreAPI().usingResource(document).addTag(RandomData.getRandomName("tag"));
Utility.waitToLoopTime(20); Utility.sleep(500, 20000, () ->
restClient.withCoreAPI().usingTag(tag).update(invalidTagBody); {
restClient.assertStatusCodeIs(HttpStatus.BAD_REQUEST) restClient.withCoreAPI().usingTag(tag).update(invalidTagBody);
.assertLastError().containsSummary(String.format(RestErrorModel.INVALID_TAG, invalidTagBody)); restClient.assertStatusCodeIs(HttpStatus.BAD_REQUEST)
.assertLastError().containsSummary(String.format(RestErrorModel.INVALID_TAG, invalidTagBody));
});
} }
@TestRail(section = { TestGroup.REST_API, TestGroup.TAGS }, executionType = ExecutionType.REGRESSION, @TestRail(section = { TestGroup.REST_API, TestGroup.TAGS }, executionType = ExecutionType.REGRESSION,