Skip to content

Commit

Permalink
Fix tests.
Browse files Browse the repository at this point in the history
  • Loading branch information
@yunosh
yunosh committed Mar 10, 2014
1 parent 708048e commit f4884df
Show file tree
Hide file tree
Showing 3 changed files with 87 additions and 85 deletions.
2 changes: 1 addition & 1 deletion turba/lib/Driver.php
View file
Expand Up @@ -2290,7 +2290,7 @@ public function toHash(Horde_Icalendar_Vcard $vcard)
$hash['email'] = $e ? $e : '';
}

if (!isset($hash['emails'])) {
if (!isset($hash['emails']) || !strlen($hash['emails'])) {
$e = Horde_Icalendar_Vcard::getBareEmail($item['value']);
$hash['emails'] = $e ? $e : '';
} else {
Expand Down
162 changes: 81 additions & 81 deletions turba/test/Turba/Unit/ExportTest.php
View file
Expand Up @@ -65,33 +65,33 @@ public function testExportVcard21()
{
$vcard = $this->driver->tovCard($this->object, '2.1');
$this->assertEquals(
'BEGIN:VCARD
VERSION:2.1
FN;CHARSET=UTF-8;ENCODING=QUOTED-PRINTABLE:Jan Schneider=C3=B6
EMAIL;INTERNET:jan@horde.org
NICKNAME:yunosh
X-EPOCSECONDNAME:yunosh
LABEL;HOME;ENCODING=QUOTED-PRINTABLE;CHARSET=UTF-8:Sch=C3=B6nestr. 15=0D=0A=
33604 Bielefeld
TEL;HOME;VOICE:+49 521 555123
TEL;WORK;VOICE:+49 521 555456
TEL;CELL;VOICE:+49 177 555123
TEL;FAX:+49 521 555789
TEL;PAGER:+49 123 555789
BDAY:1971-10-01
TITLE;CHARSET=UTF-8;ENCODING=QUOTED-PRINTABLE:Senior Developer (=C3=A4=C3=B6=C3=BC)
ROLE;CHARSET=UTF-8;ENCODING=QUOTED-PRINTABLE:Developer (=C3=A4=C3=B6=C3=BC)
NOTE;CHARSET=UTF-8;ENCODING=QUOTED-PRINTABLE:A German guy (=C3=A4=C3=B6=C3=BC)
URL:http://janschneider.de
TZ;VALUE=text:Europe/Berlin
GEO:13.377778,52.516276
PHOTO;ENCODING=b;TYPE=image/png:iVBORw0KGgoAAAANSUhEUgAAAAkAAAAJAgMAAACd/+6DAAAACVBMVEW6ABZmZmYAAACMtcxCAAAAAXRSTlMAQObYZgAAABlJREFUeAFjAIMGBiZGAQhmYYFgAUYwBgEAFWYA4dv5cHYAAAAASUVORK5CYII=
N;CHARSET=UTF-8;ENCODING=QUOTED-PRINTABLE:Schneider=C3=B6;Jan;K.;Mr.;
ORG;CHARSET=UTF-8;ENCODING=QUOTED-PRINTABLE:Horde Project;=C3=A4=C3=B6=C3=BC
ADR;HOME;CHARSET=UTF-8;ENCODING=QUOTED-PRINTABLE:;;Sch=C3=B6nestr. 15=0D=0A=
33604 Bielefeld;;;;
ADR;WORK;CHARSET=UTF-8;ENCODING=QUOTED-PRINTABLE:;;H=C3=BCbschestr. 19;K=C3=B6ln;Allg=C3=A4u;;Denmark
END:VCARD
'BEGIN:VCARD
VERSION:2.1
FN;CHARSET=UTF-8;ENCODING=QUOTED-PRINTABLE:Jan Schneider=C3=B6
EMAIL;INTERNET:jan@horde.org
NICKNAME:yunosh
X-EPOCSECONDNAME:yunosh
LABEL;HOME;ENCODING=QUOTED-PRINTABLE;CHARSET=UTF-8:Sch=C3=B6nestr. 15=0D=0A=
33604 Bielefeld
TEL;HOME;VOICE:+49 521 555123
TEL;WORK;VOICE:+49 521 555456
TEL;CELL;VOICE:+49 177 555123
TEL;FAX:+49 521 555789
TEL;PAGER:+49 123 555789
BDAY:1971-10-01
TITLE;CHARSET=UTF-8;ENCODING=QUOTED-PRINTABLE:Senior Developer (=C3=A4=C3=B6=C3=BC)
ROLE;CHARSET=UTF-8;ENCODING=QUOTED-PRINTABLE:Developer (=C3=A4=C3=B6=C3=BC)
NOTE;CHARSET=UTF-8;ENCODING=QUOTED-PRINTABLE:A German guy (=C3=A4=C3=B6=C3=BC)
URL:http://janschneider.de
TZ;VALUE=text:Europe/Berlin
GEO:13.377778,52.516276
PHOTO;ENCODING=b;TYPE=image/png:iVBORw0KGgoAAAANSUhEUgAAAAkAAAAJAgMAAACd/+6DAAAACVBMVEW6ABZmZmYAAACMtcxCAAAAAXRSTlMAQObYZgAAABlJREFUeAFjAIMGBiZGAQhmYYFgAUYwBgEAFWYA4dv5cHYAAAAASUVORK5CYII=
N;CHARSET=UTF-8;ENCODING=QUOTED-PRINTABLE:Schneider=C3=B6;Jan;K.;Mr.;
ORG;CHARSET=UTF-8;ENCODING=QUOTED-PRINTABLE:Horde Project;=C3=A4=C3=B6=C3=BC
ADR;HOME;CHARSET=UTF-8;ENCODING=QUOTED-PRINTABLE:;;Sch=C3=B6nestr. 15=0D=0A=
33604 Bielefeld;;;;
ADR;WORK;CHARSET=UTF-8;ENCODING=QUOTED-PRINTABLE:;;H=C3=BCbschestr. 19;K=C3=B6ln;Allg=C3=A4u;;Denmark
END:VCARD
',
$vcard->exportvCalendar());
}
Expand All @@ -100,33 +100,33 @@ public function testExportVcard30()
{
$vcard = $this->driver->tovCard($this->object, '3.0');
$this->assertEquals(
'BEGIN:VCARD
VERSION:3.0
FN:Jan Schneiderö
EMAIL;TYPE=INTERNET:jan@horde.org
NICKNAME:yunosh
X-EPOCSECONDNAME:yunosh
LABEL;TYPE=HOME:Schönestr. 15\n33604 Bielefeld
TEL;TYPE=HOME,VOICE:+49 521 555123
TEL;TYPE=WORK,VOICE:+49 521 555456
TEL;TYPE=CELL,VOICE:+49 177 555123
TEL;TYPE=FAX:+49 521 555789
TEL;TYPE=PAGER:+49 123 555789
BDAY:1971-10-01
TITLE:Senior Developer (äöü)
ROLE:Developer (äöü)
NOTE:A German guy (äöü)
URL:http://janschneider.de
TZ;VALUE=text:Europe/Berlin
GEO:52.516276;13.377778
PHOTO;ENCODING=b;TYPE=image/png:iVBORw0KGgoAAAANSUhEUgAAAAkAAAAJAgMAAACd/+6
DAAAACVBMVEW6ABZmZmYAAACMtcxCAAAAAXRSTlMAQObYZgAAABlJREFUeAFjAIMGBiZGAQhmYY
FgAUYwBgEAFWYA4dv5cHYAAAAASUVORK5CYII=
N:Schneiderö;Jan;K.;Mr.;
ORG:Horde Project;äöü
ADR;TYPE=HOME:;;Schönestr. 15\n33604 Bielefeld;;;;
ADR;TYPE=WORK:;;Hübschestr. 19;Köln;Allgäu;;Denmark
END:VCARD
'BEGIN:VCARD
VERSION:3.0
FN:Jan Schneiderö
EMAIL;TYPE=INTERNET:jan@horde.org
NICKNAME:yunosh
X-EPOCSECONDNAME:yunosh
LABEL;TYPE=HOME:Schönestr. 15\n33604 Bielefeld
TEL;TYPE=HOME,VOICE:+49 521 555123
TEL;TYPE=WORK,VOICE:+49 521 555456
TEL;TYPE=CELL,VOICE:+49 177 555123
TEL;TYPE=FAX:+49 521 555789
TEL;TYPE=PAGER:+49 123 555789
BDAY:1971-10-01
TITLE:Senior Developer (äöü)
ROLE:Developer (äöü)
NOTE:A German guy (äöü)
URL:http://janschneider.de
TZ;VALUE=text:Europe/Berlin
GEO:52.516276;13.377778
PHOTO;ENCODING=b;TYPE=image/png:iVBORw0KGgoAAAANSUhEUgAAAAkAAAAJAgMAAACd/+6
DAAAACVBMVEW6ABZmZmYAAACMtcxCAAAAAXRSTlMAQObYZgAAABlJREFUeAFjAIMGBiZGAQhmYY
FgAUYwBgEAFWYA4dv5cHYAAAAASUVORK5CYII=
N:Schneiderö;Jan;K.;Mr.;
ORG:Horde Project;äöü
ADR;TYPE=HOME:;;Schönestr. 15\n33604 Bielefeld;;;;
ADR;TYPE=WORK:;;Hübschestr. 19;Köln;Allgäu;;Denmark
END:VCARD
',
$vcard->exportvCalendar());
}
Expand All @@ -144,33 +144,33 @@ public function testExportBug9207()
$object = new Turba_Object($driver, $contact);
$vcard = $this->driver->tovCard($object, '3.0');
$this->assertEquals(
'BEGIN:VCARD
VERSION:3.0
EMAIL;TYPE=INTERNET:jan@horde.org
NICKNAME:yunosh
X-EPOCSECONDNAME:yunosh
LABEL;TYPE=HOME:Schönestr. 15\n33604 Bielefeld
TEL;TYPE=HOME,VOICE:+49 521 555123
TEL;TYPE=WORK,VOICE:+49 521 555456
TEL;TYPE=CELL,VOICE:+49 177 555123
TEL;TYPE=FAX:+49 521 555789
TEL;TYPE=PAGER:+49 123 555789
BDAY:1971-10-01
TITLE:Senior Developer (äöü)
ROLE:Developer (äöü)
NOTE:A German guy (äöü)
URL:http://janschneider.de
TZ;VALUE=text:Europe/Berlin
GEO:52.516276;13.377778
PHOTO;ENCODING=b;TYPE=image/png:iVBORw0KGgoAAAANSUhEUgAAAAkAAAAJAgMAAACd/+6
DAAAACVBMVEW6ABZmZmYAAACMtcxCAAAAAXRSTlMAQObYZgAAABlJREFUeAFjAIMGBiZGAQhmYY
FgAUYwBgEAFWYA4dv5cHYAAAAASUVORK5CYII=
N:Schneiderö;Jan;K.;Mr.;
FN:Mr. Jan K. Schneiderö
ORG:Horde Project;äöü
ADR;TYPE=HOME:;;Schönestr. 15\n33604 Bielefeld;;;;
ADR;TYPE=WORK:;;Hübschestr. 19;Köln;Allgäu;;Denmark
END:VCARD
'BEGIN:VCARD
VERSION:3.0
EMAIL;TYPE=INTERNET:jan@horde.org
NICKNAME:yunosh
X-EPOCSECONDNAME:yunosh
LABEL;TYPE=HOME:Schönestr. 15\n33604 Bielefeld
TEL;TYPE=HOME,VOICE:+49 521 555123
TEL;TYPE=WORK,VOICE:+49 521 555456
TEL;TYPE=CELL,VOICE:+49 177 555123
TEL;TYPE=FAX:+49 521 555789
TEL;TYPE=PAGER:+49 123 555789
BDAY:1971-10-01
TITLE:Senior Developer (äöü)
ROLE:Developer (äöü)
NOTE:A German guy (äöü)
URL:http://janschneider.de
TZ;VALUE=text:Europe/Berlin
GEO:52.516276;13.377778
PHOTO;ENCODING=b;TYPE=image/png:iVBORw0KGgoAAAANSUhEUgAAAAkAAAAJAgMAAACd/+6
DAAAACVBMVEW6ABZmZmYAAACMtcxCAAAAAXRSTlMAQObYZgAAABlJREFUeAFjAIMGBiZGAQhmYY
FgAUYwBgEAFWYA4dv5cHYAAAAASUVORK5CYII=
N:Schneiderö;Jan;K.;Mr.;
FN:Mr. Jan K. Schneiderö
ORG:Horde Project;äöü
ADR;TYPE=HOME:;;Schönestr. 15\n33604 Bielefeld;;;;
ADR;TYPE=WORK:;;Hübschestr. 19;Köln;Allgäu;;Denmark
END:VCARD
',
$vcard->exportvCalendar());
}
Expand Down
8 changes: 5 additions & 3 deletions turba/test/Turba/Unit/ImportTest.php
View file
Expand Up @@ -239,6 +239,7 @@ public function testImportVcard30()
'email' => 'email@domain.tld',
'emails' => 'email@domain.tld',
'cellPhone' => '0123-123456',
'__uid' => 'b33393c4-98a1-4e1a-8f5c-d29459406093',
),
$this->toHash($vcard)
);
Expand Down Expand Up @@ -368,9 +369,9 @@ public function testImportPhone()
'fax' => '+49 123 1234564',
'nickname' => '',
'alias' => '',
'email' => null,
'emails' => null,
'homeEmail' => null,
'email' => '',
'emails' => '',
'homeEmail' => '',
'homeAddress' => 'Carl-Bantzer-Str. 99
Foobar, Sachsen 01234',
'homeStreet' => 'Carl-Bantzer-Str. 99',
Expand Down Expand Up @@ -498,6 +499,7 @@ public function testImportEmail()
'emails' => 'work@example.com,home@example.com,mail@example.com,pref@example.com',
'homeEmail' => 'home@example.com',
'email' => 'pref@example.com',
'__uid' => 'nhCnPyv0u7',
),
$this->toHash($vcard)
);
Expand Down

0 comments on commit f4884df

Please sign in to comment.