mirror of
https://github.com/vanitasvitae/Smack.git
synced 2025-09-10 17:49:38 +02:00
Fixed vCard issues. SMACK-116
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@3315 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
parent
07f5fc9ef6
commit
237ab44301
3 changed files with 145 additions and 60 deletions
|
@ -1,8 +1,9 @@
|
|||
package org.jivesoftware.smackx;
|
||||
|
||||
import org.jivesoftware.smack.test.SmackTestCase;
|
||||
import org.jivesoftware.smack.XMPPException;
|
||||
import org.jivesoftware.smack.test.SmackTestCase;
|
||||
import org.jivesoftware.smackx.packet.VCard;
|
||||
import org.jivesoftware.smackx.provider.VCardProvider;
|
||||
|
||||
/**
|
||||
* Created by IntelliJ IDEA.
|
||||
|
@ -23,13 +24,18 @@ public class VCardTest extends SmackTestCase {
|
|||
origVCard.setFirstName("kir");
|
||||
origVCard.setLastName("max");
|
||||
origVCard.setEmailHome("foo@fee.bar");
|
||||
origVCard.setEmailWork("foo@fee.www.bar");
|
||||
|
||||
origVCard.setJabberId("jabber@id.org");
|
||||
origVCard.setOrganization("Jetbrains, s.r.o");
|
||||
origVCard.setNickName("KIR");
|
||||
|
||||
origVCard.setField("TITLE", "Mr");
|
||||
origVCard.setAddressFieldHome("STREET", "Some street");
|
||||
origVCard.setAddressFieldWork("STREET", "Some street work");
|
||||
|
||||
origVCard.setPhoneWork("FAX", "3443233");
|
||||
origVCard.setPhoneHome("VOICE", "3443233");
|
||||
|
||||
origVCard.save(getConnection(0));
|
||||
|
||||
|
@ -41,7 +47,7 @@ public class VCardTest extends SmackTestCase {
|
|||
fail(e.getMessage());
|
||||
}
|
||||
|
||||
assertEquals("Should load own VCard successfully", origVCard, loaded);
|
||||
assertEquals("Should load own VCard successfully", origVCard.toString(), loaded.toString());
|
||||
|
||||
loaded = new VCard();
|
||||
try {
|
||||
|
@ -51,7 +57,41 @@ public class VCardTest extends SmackTestCase {
|
|||
fail(e.getMessage());
|
||||
}
|
||||
|
||||
assertEquals("Should load another user's VCard successfully", origVCard, loaded);
|
||||
assertEquals("Should load another user's VCard successfully", origVCard.toString(), loaded.toString());
|
||||
}
|
||||
|
||||
public void testNoWorkHomeSpecifier_EMAIL() throws Throwable {
|
||||
VCard card = VCardProvider._createVCardFromXml("<vcard><EMAIL><USERID>foo@fee.www.bar</USERID></EMAIL></vcard>");
|
||||
assertEquals("foo@fee.www.bar", card.getEmailWork());
|
||||
}
|
||||
|
||||
public void testNoWorkHomeSpecifier_TEL() throws Throwable {
|
||||
VCard card = VCardProvider._createVCardFromXml("<vcard><TEL><FAX/><NUMBER>3443233</NUMBER></TEL></vcard>");
|
||||
assertEquals("3443233", card.getPhoneWork("FAX"));
|
||||
}
|
||||
|
||||
public void testNoWorkHomeSpecifier_ADDR() throws Throwable {
|
||||
VCard card = VCardProvider._createVCardFromXml("<vcard><ADR><STREET>Some street</STREET><FF>ddss</FF></ADR></vcard>");
|
||||
assertEquals("Some street", card.getAddressFieldWork("STREET"));
|
||||
assertEquals("ddss", card.getAddressFieldWork("FF"));
|
||||
}
|
||||
|
||||
public void testFN() throws Throwable {
|
||||
VCard card = VCardProvider._createVCardFromXml("<vcard><FN>kir max</FN></vcard>");
|
||||
assertEquals("kir max", card.getField("FN"));
|
||||
assertEquals("kir max", card.getFullName());
|
||||
}
|
||||
|
||||
public void testFullName() throws Throwable {
|
||||
VCard card = new VCard();
|
||||
card.setFirstName("kir");
|
||||
assertEquals("kir", card.getFullName());
|
||||
|
||||
card.setLastName("maximov");
|
||||
assertEquals("kir maximov", card.getFullName());
|
||||
|
||||
card.setField("FN", "some name");
|
||||
assertEquals("some name", card.getFullName());
|
||||
}
|
||||
|
||||
protected int getMaxConnections() {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue