Merge pull request #68 from dcrissman/fix65

fixes #65
lightblue-platform · Apr 24, 2015 · 99d0949 · 99d0949
2 parents 403da1d + 218b5cb
commit 99d0949
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...ation-test/src/test/java/com/redhat/lightblue/crud/ldap/ITCaseLdapCRUDControllerTest.java b/...ation-test/src/test/java/com/redhat/lightblue/crud/ldap/ITCaseLdapCRUDControllerTest.java
@@ -158,7 +158,7 @@ public void series2_phase1_Department_InsertWithRoles() throws Exception {
         String insert = AbstractJsonNodeTest.loadResource("./crud/insert/department-insert-template.json")
                 .replaceFirst("#cn", "Marketing")
                 .replaceFirst("#description", "Department devoted to Marketing")
-                .replaceFirst("#members", "\"" + StringUtils.join(Arrays.asList("cn=John Doe," + BASEDB_USERS, "cn=Jane Doe," + BASEDB_USERS), "\",\"") + "\"");
+                .replaceFirst("#members", StringUtils.join(Arrays.asList("cn=John Doe," + BASEDB_USERS, "cn=Jane Doe," + BASEDB_USERS), "\",\""));
 
         InsertionRequest insertRequest = createRequest_FromJsonString(InsertionRequest.class, insert);
         insertRequest.setClientId(new FakeClientIdentification("fakeUser", "admin"));
@@ -182,7 +182,7 @@ public void series2_phase1_Department_InsertWithInvalidRoles() throws Exception
         String insert = AbstractJsonNodeTest.loadResource("./crud/insert/department-insert-template.json")
                 .replaceFirst("#cn", "HR")
                 .replaceFirst("#description", "Department devoted to HR")
-                .replaceFirst("#members", "\"cn=John Doe," + BASEDB_USERS + "\"");
+                .replaceFirst("#members", "cn=John Doe," + BASEDB_USERS);
 
         InsertionRequest insertRequest = createRequest_FromJsonString(InsertionRequest.class, insert);
         insertRequest.setClientId(new FakeClientIdentification("fakeUser"));

diff --git a/...blue-ldap-integration-test/src/test/resources/crud/insert/department-insert-template.json b/...blue-ldap-integration-test/src/test/resources/crud/insert/department-insert-template.json
@@ -8,6 +8,6 @@
         "objectClass": ["top", "groupofNames"],
         "cn": "#cn",
         "description": "#description",
-        "member": [#members]
+        "member": ["#members"]
     }
 }