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

Merged 5.2.N (5.2.1) to HEAD (5.2)

Browse Source 
127228 jkaabimofrad: ACE-5340: Fixed test failures in TestCustomConstraint class as a result of switching to Java 8. The test class depends on "org.apache.commons.lang3.builder.EqualsBuilder.reflectionEquals", but somehow didn't behave in Java 8.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127230 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gethin James
2016-05-19 08:33:35 +00:00
parent ab4ca5b2dd
commit 1fcd057a28
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/test-java/org/alfresco/rest/api/tests/BaseCustomModelApiTest.java
View File

@@ -33,7 +33,6 @@ import org.alfresco.rest.api.model.CustomModelConstraint;
import org.alfresco.rest.api.model.CustomModelNamedValue;
import org.alfresco.rest.api.model.CustomModelProperty;
import org.alfresco.rest.api.model.CustomType;
import org.alfresco.rest.api.tests.RepoService.TestPerson;
import org.alfresco.rest.api.tests.client.HttpResponse;
import org.alfresco.rest.api.tests.util.RestApiUtil;
import org.alfresco.service.cmr.dictionary.CustomModelDefinition;
@@ -230,6 +229,15 @@ public class BaseCustomModelApiTest extends AbstractBaseApiTest
protected void compareCustomModelConstraints(CustomModelConstraint expectedConstraint, CustomModelConstraint actualConstraint, String... excludeFields)
{
if (expectedConstraint.getParameters() != null)
{
Collections.sort(expectedConstraint.getParameters());
}
if (actualConstraint.getParameters() != null)
{
Collections.sort(actualConstraint.getParameters());
}
boolean result = EqualsBuilder.reflectionEquals(expectedConstraint, actualConstraint, excludeFields);
assertTrue("Two constraints are not equal. Expected:<" + expectedConstraint.toString() + "> but was:<" + actualConstraint.toString() + ">", result);
}