This commit is contained in:
N Smith
2011-09-06 15:05:59 +00:00
parent 7efdd5aa2f
commit ef3ab0bb95

View File

@@ -292,33 +292,31 @@ public class InviteServiceTest extends BaseWebScriptTest
{ {
public Object doWork() throws Exception public Object doWork() throws Exception
{ {
// delete invite sites
siteService.deleteSite(SITE_SHORT_NAME_INVITE_1);
siteService.deleteSite(SITE_SHORT_NAME_INVITE_2);
siteService.deleteSite(SITE_SHORT_NAME_INVITE_3);
// delete the inviter // delete the inviter
deletePersonByUserName(USER_INVITER); deletePersonByUserName(USER_INVITER);
// delete all invitee people // delete all invitee people
for (String inviteeEmail : InviteServiceTest.this.inviteeEmailAddrs) for (String inviteeEmail : inviteeEmailAddrs)
{ {
// //
// delete all people with given email address // delete all people with given email address
// //
Set<NodeRef> people = InviteServiceTest.this.personService.getPeopleFilteredByProperty( Set<NodeRef> people =
ContentModel.PROP_EMAIL, inviteeEmail); personService.getPeopleFilteredByProperty(ContentModel.PROP_EMAIL, inviteeEmail);
for (NodeRef person : people) for (NodeRef person : people)
{ {
String userName = DefaultTypeConverter.INSTANCE.convert(String.class, String userName = DefaultTypeConverter.INSTANCE.convert(String.class,
InviteServiceTest.this.nodeService.getProperty(person, ContentModel.PROP_USERNAME)); InviteServiceTest.this.nodeService.getProperty(person, ContentModel.PROP_USERNAME));
// delete person // delete person
deletePersonByUserName(userName); deletePersonByUserName(userName);
} }
} }
// delete invite sites
siteService.deleteSite(SITE_SHORT_NAME_INVITE_1);
siteService.deleteSite(SITE_SHORT_NAME_INVITE_2);
siteService.deleteSite(SITE_SHORT_NAME_INVITE_3);
return null; return null;
} }
}; };
@@ -729,9 +727,8 @@ public class InviteServiceTest extends BaseWebScriptTest
assertEquals(true, getInvitesResult.length() > 0); assertEquals(true, getInvitesResult.length() > 0);
// JSONObject inviteJSONObj = getInvitesResult.getJSONArray("invites").getJSONObject(0); JSONObject inviteJSONObj = getInvitesResult.getJSONArray("invites").getJSONObject(0);
assertEquals(USER_INVITER, inviteJSONObj.getJSONObject("inviter").get("userName"));
// assertEquals(USER_INVITER, inviteJSONObj.getJSONObject("inviter").get("userName"));
} }
public void testGetInvitesByInviteeUserName() throws Exception public void testGetInvitesByInviteeUserName() throws Exception