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

Various fixes to REST Person Service and Web Script Unit Test

Browse Source 
- Delete people and authentications for users created in setUp()
- Modify person.lib.ftl so that it copes with firstName and lastName being undefined
- Modify people.post.js to use var.properties["propKey"]=value when adding person properties so that it copes with setting properties that don't already exist 

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@9619 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Glen Johnson
2008-07-02 07:34:41 +00:00
parent 708a28e535
commit 739b875bd4
3 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
config/alfresco/templates/webscripts/org/alfresco/repository/person/people.post.js
View File

@@ -19,12 +19,12 @@ function main()
} }
// assign values to the person's properties // assign values to the person's properties
person.properties.title = json.get("title"); person.properties["title"] = json.get("title");
person.properties.firstName = json.get("firstName"); person.properties["firstName"] = json.get("firstName");
person.properties.lastName = json.get("lastName"); person.properties["lastName"] = json.get("lastName");
person.properties.organization = json.get("organisation"); person.properties["organization"] = json.get("organisation");
person.properties.jobTitle = json.get("jobTitle"); person.properties["jobTitle"] = json.get("jobTitle");
person.properties.email = json.get("email"); person.properties["email"] = json.get("email");
person.save(); person.save();
// Put the created person into the model // Put the created person into the model

12
config/alfresco/templates/webscripts/org/alfresco/repository/person/person.lib.ftl
View File

@@ -7,8 +7,16 @@
<#else> <#else>
"title" : undefined, "title" : undefined,
</#if> </#if>
"firstName" : "${person.properties.firstName}", <#if person.properties.firstName??>
"lastName" : "${person.properties.lastName}", "firstName" : "${person.properties.firstName}",
<#else>
"firstName" : undefined,
</#if>
<#if person.properties.lastName??>
"lastName" : "${person.properties.lastName}",
<#else>
"lastName" : undefined,
</#if>
<#if person.properties.organization??> <#if person.properties.organization??>
"organisation" : "${person.properties.organization}", "organisation" : "${person.properties.organization}",
<#else> <#else>

12
source/java/org/alfresco/repo/web/scripts/person/PersonServiceTest.java
View File

@@ -29,16 +29,11 @@ import java.util.List;
import org.alfresco.model.ContentModel; import org.alfresco.model.ContentModel;
import org.alfresco.repo.security.authentication.AuthenticationComponent; import org.alfresco.repo.security.authentication.AuthenticationComponent;
import org.alfresco.repo.site.SiteModel;
import org.alfresco.repo.web.scripts.BaseWebScriptTest; import org.alfresco.repo.web.scripts.BaseWebScriptTest;
import org.alfresco.service.cmr.security.AuthenticationService; import org.alfresco.service.cmr.security.AuthenticationService;
import org.alfresco.service.cmr.security.PersonService; import org.alfresco.service.cmr.security.PersonService;
import org.alfresco.service.namespace.NamespaceService;
import org.alfresco.service.namespace.QName;
import org.alfresco.util.GUID;
import org.alfresco.util.PropertyMap; import org.alfresco.util.PropertyMap;
import org.apache.commons.lang.RandomStringUtils; import org.apache.commons.lang.RandomStringUtils;
import org.json.JSONArray;
import org.json.JSONObject; import org.json.JSONObject;
import org.springframework.mock.web.MockHttpServletResponse; import org.springframework.mock.web.MockHttpServletResponse;
@@ -94,6 +89,8 @@ public class PersonServiceTest extends BaseWebScriptTest
personProps.put(ContentModel.PROP_JOBTITLE, "myOrganisation"); personProps.put(ContentModel.PROP_JOBTITLE, "myOrganisation");
this.personService.createPerson(personProps); this.personService.createPerson(personProps);
this.createdPeople.add(userName);
} }
} }
@@ -116,6 +113,11 @@ public class PersonServiceTest extends BaseWebScriptTest
personService.deletePerson(userName); personService.deletePerson(userName);
} }
// delete authentications for users created in setUp()
this.authenticationService.deleteAuthentication(USER_ONE);
this.authenticationService.deleteAuthentication(USER_TWO);
this.authenticationService.deleteAuthentication(USER_THREE);
// Clear the list // Clear the list
this.createdPeople.clear(); this.createdPeople.clear();
} }