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

Fixed failing integration and UI tests

Browse Source
This commit is contained in:
Tuna Aksoy
2016-10-06 16:26:18 +01:00
parent 19e02d402c
commit f0a83e23d1
3 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/module.properties
View File

@@ -8,5 +8,4 @@ module.title=Records Management
module.description=Alfresco Record Management Extension module.description=Alfresco Record Management Extension
module.version=${rm.module.version} module.version=${rm.module.version}
#module.repo.version.min=${rm.module.repo.version.min} module.repo.version.min=${rm.module.repo.version.min}
module.repo.version.min=5.1

8
rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/rm3314/RM3314Test.java
View File

@@ -31,6 +31,7 @@ import java.util.HashMap;
import java.util.Map; import java.util.Map;
import org.alfresco.module.org_alfresco_module_rm.test.util.BaseRMTestCase; import org.alfresco.module.org_alfresco_module_rm.test.util.BaseRMTestCase;
import org.apache.commons.lang3.ArrayUtils;
/** /**
* Test for https://issues.alfresco.com/jira/browse/RM-3114 * Test for https://issues.alfresco.com/jira/browse/RM-3114
@@ -43,12 +44,7 @@ public class RM3314Test extends BaseRMTestCase
/** Application context */ /** Application context */
protected String[] getConfigLocations() protected String[] getConfigLocations()
{ {
return new String[] return ArrayUtils.add(super.getConfigLocations(), "classpath:test-rm3314-context.xml");
{
"classpath:alfresco/application-context.xml",
"classpath:test-context.xml",
"classpath:test-rm3314-context.xml"
};
} }
/** registry to record callback from test beans "test.rm3114.1" and "test.rm3114.2" */ /** registry to record callback from test beans "test.rm3114.1" and "test.rm3114.2" */

8
rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/job/AutomaticDispositionTest.java
View File

@@ -40,6 +40,7 @@ import org.alfresco.module.org_alfresco_module_rm.test.util.CommonRMTestUtils;
import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.QName;
import org.alfresco.util.GUID; import org.alfresco.util.GUID;
import org.apache.commons.lang3.ArrayUtils;
/** /**
* Test automatic disposition via scheduled job. * Test automatic disposition via scheduled job.
@@ -55,12 +56,7 @@ public class AutomaticDispositionTest extends BaseRMTestCase
/** additional job context to override job frequency */ /** additional job context to override job frequency */
protected String[] getConfigLocations() protected String[] getConfigLocations()
{ {
return new String[] return ArrayUtils.add(super.getConfigLocations(), "classpath:test-job-context.xml");
{
"classpath:alfresco/application-context.xml",
"classpath:test-context.xml",
"classpath:test-job-context.xml"
};
} }
/** /**