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 HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

Browse Source 
92755: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      92746: Merged DEV (5.0.1) to 5.0.N (5.0.1)
         92700: MNT-13026: JDK8: 5 test failures in remote-api
         Fixed tests to check JSON correctly as in JDK8 the objects have different order.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94912 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-01-31 12:05:28 +00:00
parent b0bc4b7189
commit cfb92ca02b
4 changed files with 47 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/test-java/org/alfresco/repo/web/scripts/replication/ReplicationRestApiTest.java
View File

@@ -461,7 +461,7 @@ public class ReplicationRestApiTest extends BaseWebScriptTest
key.equals("executionDetails") || key.equals("payload") ||
key.equals("transferLocalReport") ||
key.equals("transferRemoteReport") ||
key.equals("enabled") || key.equals("schedule")) {
key.equals("enabled") || key.equals("targetName") || key.equals("schedule")) {
// All good
} else {
fail("Unexpected key '"+key+"' found in json, raw json is\n" + jsonStr);
@@ -1071,7 +1071,7 @@ public class ReplicationRestApiTest extends BaseWebScriptTest
key.equals("executionDetails") || key.equals("payload") ||
key.equals("transferLocalReport") ||
key.equals("transferRemoteReport") ||
key.equals("enabled") || key.equals("schedule")) {
key.equals("enabled") || key.equals("targetName") || key.equals("schedule")) {
// All good
} else {
fail("Unexpected key '"+key+"' found in json, raw json is\n" + jsonStr);