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

Merge branch 'feature/RM-4195_CreateRMSite3' into 'feature/RM-4195_CreateRMSite2'

Browse Source 
Feature/rm 4195 create rm site3

See merge request !4
This commit is contained in:
Rodica Sutu
2016-10-28 08:05:57 +01:00
parent ca65f0a5a9 65472ca6c1
commit 1c4ebf8abf
4 changed files with 31 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/test/java/org/alfresco/rest/BaseRestTest.java
View File

@@ -41,21 +41,21 @@ import org.testng.annotations.BeforeClass;
* @since 1.0 * @since 1.0
*/ */
@Configuration @Configuration
@PropertySource("classpath:config.properties") @PropertySource("classpath:default.properties")
@PropertySource(value = "classpath:local.properties", ignoreResourceNotFound = true) @PropertySource(value = "classpath:local.properties", ignoreResourceNotFound = true)
public class BaseRestTest extends RestTest public class BaseRestTest extends RestTest
{ {
@Value ("${alfresco.rm.scheme}") @Value ("${alfresco.scheme}")
private String scheme; private String scheme;
@Value ("${alfresco.rm.host}") @Value ("${alfresco.server}")
private String host; private String server;
@Value ("${alfresco.rm.port}") @Value ("${alfresco.port}")
private String port; private String port;
@Value ("${alfresco.rm.basePath}") @Value ("${rest.rmPath}")
private String basePath; private String restRmPath;
@Autowired @Autowired
public RMSiteAPI rmSiteAPI; public RMSiteAPI rmSiteAPI;
@@ -75,9 +75,9 @@ public class BaseRestTest extends RestTest
@BeforeClass(alwaysRun = true) @BeforeClass(alwaysRun = true)
public void checkServerHealth() throws Exception public void checkServerHealth() throws Exception
{ {
RestAssured.baseURI = scheme + "://" + host; RestAssured.baseURI = scheme + "://" + server;
RestAssured.port = parseInt(port); RestAssured.port = parseInt(port);
RestAssured.basePath = basePath; RestAssured.basePath = restRmPath;
//create RM Site if not exist //create RM Site if not exist
createRMSiteIfNotExists(); createRMSiteIfNotExists();

3
src/test/java/org/alfresco/rest/fileplancomponents/RMSiteTests.java → src/test/java/org/alfresco/rest/site/RMSiteTests.java
View File

@@ -9,7 +9,7 @@
* agreement is prohibited. * agreement is prohibited.
* #L% * #L%
*/ */
package org.alfresco.rest.fileplancomponents; package org.alfresco.rest.site;
import static org.alfresco.com.site.RMSiteCompliance.DOD5015; import static org.alfresco.com.site.RMSiteCompliance.DOD5015;
import static org.alfresco.com.site.RMSiteCompliance.STANDARD; import static org.alfresco.com.site.RMSiteCompliance.STANDARD;
@@ -33,6 +33,7 @@ import com.google.gson.JsonObject;
import org.alfresco.dataprep.UserService; import org.alfresco.dataprep.UserService;
import org.alfresco.rest.BaseRestTest; import org.alfresco.rest.BaseRestTest;
import org.alfresco.rest.core.RestWrapper; import org.alfresco.rest.core.RestWrapper;
import org.alfresco.rest.fileplancomponents.RecordCategoryTest;
import org.alfresco.rest.model.site.RMSite; import org.alfresco.rest.model.site.RMSite;
import org.alfresco.utility.model.UserModel; import org.alfresco.utility.model.UserModel;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;

4
src/test/resources/config.properties
View File

@@ -1,4 +0,0 @@
alfresco.rm.scheme=http
alfresco.rm.host=localhost
alfresco.rm.port=8080
alfresco.rm.basePath=alfresco/api/-default-/public/ig/versions/1

20
src/test/resources/default.properties Normal file
View File

@@ -0,0 +1,20 @@
#########################################################################
# Original property values from default.properties #
#########################################################################
# dataprep related
alfresco.scheme=http
alfresco.server=localhost
alfresco.port=8080
# credentials
admin.user=admin
admin.password=admin
# rest related
rest.basePath=alfresco/api/-default-/public/alfresco/versions/1
rest.workflowPath=alfresco/api/-default-/public/workflow/versions/1
#########################################################################
rest.rmPath=alfresco/api/-default-/public/ig/versions/1