From 1fcd057a28f4fe4a68609fd7a29358b6efd063f7 Mon Sep 17 00:00:00 2001 From: Gethin James Date: Thu, 19 May 2016 08:33:35 +0000 Subject: [PATCH] Merged 5.2.N (5.2.1) to HEAD (5.2) 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 --- .../rest/api/tests/BaseCustomModelApiTest.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/source/test-java/org/alfresco/rest/api/tests/BaseCustomModelApiTest.java b/source/test-java/org/alfresco/rest/api/tests/BaseCustomModelApiTest.java index 6668ab8869..908f9d8581 100644 --- a/source/test-java/org/alfresco/rest/api/tests/BaseCustomModelApiTest.java +++ b/source/test-java/org/alfresco/rest/api/tests/BaseCustomModelApiTest.java @@ -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); }