inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/RM-5391_UI_Test_Classifcation_Mark_Indicator' into 'master'

Browse Source 
Feature/rm 5391 ui test classifcation mark indicator

See merge request !531
This commit is contained in:
Rodica Sutu
2017-09-18 08:09:16 +01:00
parent 9383eaae70 38f69fab50
commit e16fb0ab71
3 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
rm-automation/rm-automation-community-rest-api/pom.xml
View File

@@ -15,7 +15,7 @@
<maven.build.sourceVersion>1.8</maven.build.sourceVersion>
<alfresco.rm.share>alfresco-rm-community-share</alfresco.rm.share>
<alfresco.rm.repo>alfresco-rm-community-repo</alfresco.rm.repo>
<tas.restapi.version>5.2.0-7</tas.restapi.version>
<tas.restapi.version>5.2.0-9</tas.restapi.version>
<fluent.json.version>2.0.0</fluent.json.version>
</properties>
@@ -68,5 +68,10 @@
<artifactId>fluent-json</artifactId>
<version>${fluent.json.version}</version>
</dependency>
<dependency>
<groupId>org.alfresco.test</groupId>
<artifactId>alfresco-testng</artifactId>
<version>1.1</version>
</dependency>
</dependencies>
</project>

3
rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/v0/BaseAPI.java
View File

@@ -83,11 +83,12 @@ public abstract class BaseAPI
@Autowired
private AlfrescoHttpClientFactory alfrescoHttpClientFactory;
@Autowired
private ContentService contentService;
private static final String NODE_REF_WORKSPACE_SPACES_STORE = "workspace://SpacesStore/";
private static final String FILE_PLAN_PATH = "Sites/rm/documentLibrary";
private static final String FILE_PLAN_PATH = "/Sites/rm/documentLibrary";
/**
* Helper method to extract list of properties values from result.

10
rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/site/RMSiteTests.java
View File

@@ -44,10 +44,10 @@ import static org.springframework.http.HttpStatus.FORBIDDEN;
import static org.springframework.http.HttpStatus.NOT_FOUND;
import static org.springframework.http.HttpStatus.NO_CONTENT;
import static org.springframework.http.HttpStatus.OK;
import static org.springframework.social.alfresco.api.entities.Site.Visibility.PUBLIC;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertNotNull;
import org.alfresco.dataprep.SiteService.Visibility;
import org.alfresco.rest.rm.community.base.BaseRMRestTest;
import org.alfresco.rest.rm.community.base.TestData;
import org.alfresco.rest.rm.community.model.site.RMSite;
@@ -97,7 +97,7 @@ public class RMSiteTests extends BaseRMRestTest
assertEquals(rmSiteResponse.getTitle(), RM_TITLE);
assertEquals(rmSiteResponse.getDescription(), RM_DESCRIPTION);
assertEquals(rmSiteResponse.getCompliance(), STANDARD);
assertEquals(rmSiteResponse.getVisibility(), PUBLIC);
assertEquals(rmSiteResponse.getVisibility(), Visibility.PUBLIC);
assertEquals(rmSiteResponse.getRole(), SiteManager.toString());
}
@@ -178,7 +178,7 @@ public class RMSiteTests extends BaseRMRestTest
assertEquals(rmSiteModel.getId(), RM_ID);
assertEquals(rmSiteModel.getDescription(), RM_DESCRIPTION);
assertEquals(rmSiteModel.getCompliance(), STANDARD);
assertEquals(rmSiteModel.getVisibility(), PUBLIC);
assertEquals(rmSiteModel.getVisibility(), Visibility.PUBLIC);
}
}
@@ -217,7 +217,7 @@ public class RMSiteTests extends BaseRMRestTest
assertEquals(rmSiteModel.getTitle(), RM_TITLE);
assertEquals(rmSiteModel.getDescription(), RM_DESCRIPTION);
assertEquals(rmSiteModel.getCompliance(), DOD5015);
assertEquals(rmSiteModel.getVisibility(), PUBLIC);
assertEquals(rmSiteModel.getVisibility(), Visibility.PUBLIC);
assertEquals(rmSiteModel.getRole(), SiteManager.toString());
}
@@ -259,7 +259,7 @@ public class RMSiteTests extends BaseRMRestTest
assertEquals(rmSiteModel.getTitle(), NEW_TITLE);
assertEquals(rmSiteModel.getDescription(), NEW_DESCRIPTION);
assertNotNull(rmSiteModel.getCompliance());
assertEquals(rmSiteModel.getVisibility(), PUBLIC);
assertEquals(rmSiteModel.getVisibility(), Visibility.PUBLIC);
}
/**