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 remote-tracking branch 'remotes/origin/release/V2.7' into merge-3.0/APPS-236_RunCRTests_merge3.0_no

Browse Source 
# Conflicts:
#	.travis.yml
#	rm-automation/rm-automation-community-rest-api/src/test/resources/log4j.properties
#	travis-env-vars.yml
This commit is contained in:
Claudia Agache
2020-08-28 14:21:14 +03:00
parent 38e6e96375 d6b5c28d54
commit e1b56e06d7
4 changed files with 111 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/search/SearchRecordsV1CmisTests.java
View File

@@ -123,7 +123,8 @@ public class SearchRecordsV1CmisTests extends BaseRMRestTest
assertEquals(searchResponse.getEntries().size(), 5, "Expected total entries to be five");
}
@Test
// TODO enable the test when APPS-46 is fixed
@Test (enabled = false)
public void searchWhenTotalItemsReachWithNonRM() throws Exception
{
final SearchRequestBuilder sqlRequest = new SearchRequestBuilder().setQueryBuilder(queryModel)
@@ -157,7 +158,8 @@ public class SearchRecordsV1CmisTests extends BaseRMRestTest
assertEquals(searchResponse.getEntries().size(), 4, "Expected total entries to be four");
}
@Test
// TODO enable the test when APPS-46 is fixed
@Test (enabled = false)
public void searchWhenTotalItemsExceedNonRMUser() throws Exception
{
final SearchRequestBuilder sqlRequest = new SearchRequestBuilder().setQueryBuilder(queryModel)
@@ -191,7 +193,8 @@ public class SearchRecordsV1CmisTests extends BaseRMRestTest
assertEquals(searchResponse.getEntries().size(), 4, "Expected total entries to be four");
}
@Test
// TODO enable the test when APPS-46 is fixed
@Test (enabled = false)
public void searchResultsUnderTotalItemsNonRMUser() throws Exception
{
final SearchRequestBuilder sqlRequest = new SearchRequestBuilder().setQueryBuilder(queryModel)

17
rm-automation/rm-automation-community-rest-api/src/test/resources/log4j.properties
View File

@@ -1,7 +1,14 @@
log4j.rootLogger=info, console
# Root logger option
log4j.rootLogger=INFO, file, stdout
log4j.appender.console=org.apache.log4j.ConsoleAppender
log4j.appender.console.layout=org.apache.log4j.PatternLayout
log4j.appender.console.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n
# Direct log messages to a log file
log4j.appender.file=org.apache.log4j.RollingFileAppender
log4j.appender.file.File=./target/reports/rm-automation-community-rest-api.log
log4j.appender.file.MaxBackupIndex=10
log4j.appender.file.layout=org.apache.log4j.PatternLayout
log4j.appender.file.layout.ConversionPattern=[%t] %d{HH:mm:ss} %-5p %c{1}:%L - %m%n
log4j.logger.com.example=debug
# Direct log messages to console
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.stdout.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n