[Pkg-owncloud-commits] [php-sabre-vobject] 293/341: Reordering of properties caused some unittests to fail.
David Prévot
taffit at moszumanska.debian.org
Tue Aug 11 13:35:58 UTC 2015
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository php-sabre-vobject.
commit f84b9345cd848eda7619d2ed9eb9c9ccedd772ac
Author: Evert Pot <me at evertpot.com>
Date: Fri Jul 3 23:26:11 2015 -0400
Reordering of properties caused some unittests to fail.
---
tests/VObject/JCalTest.php | 19 +++++++-------
tests/VObject/JCardTest.php | 28 ++++++++++-----------
tests/VObject/Parser/JsonTest.php | 53 ++++++++++++++++++++-------------------
tests/VObject/Parser/XmlTest.php | 8 +++---
4 files changed, 54 insertions(+), 54 deletions(-)
diff --git a/tests/VObject/JCalTest.php b/tests/VObject/JCalTest.php
index 0aea9ee..5df2e6b 100644
--- a/tests/VObject/JCalTest.php
+++ b/tests/VObject/JCalTest.php
@@ -76,11 +76,19 @@ class JCalTest extends \PHPUnit_Framework_TestCase {
[
"created", new \StdClass(), "date-time", "2013-05-26T18:10:00Z",
],
-
[
"attendee", new \StdClass(), "cal-address", "mailto:armin at example.org",
],
[
+ "attendee",
+ (object)[
+ "cn" => "Dominik",
+ "partstat" => "DECLINED",
+ ],
+ "cal-address",
+ "mailto:dominik at example.org"
+ ],
+ [
"geo", new \StdClass(), "float", [51.96668, 7.61876],
],
[
@@ -111,15 +119,6 @@ class JCalTest extends \PHPUnit_Framework_TestCase {
"attach", new \StdClass(), "binary", base64_encode('attachment')
],
[
- "attendee",
- (object)[
- "cn" => "Dominik",
- "partstat" => "DECLINED",
- ],
- "cal-address",
- "mailto:dominik at example.org"
- ],
- [
"request-status",
new \StdClass(),
"text",
diff --git a/tests/VObject/JCardTest.php b/tests/VObject/JCardTest.php
index 86dc61e..87ff2ff 100644
--- a/tests/VObject/JCardTest.php
+++ b/tests/VObject/JCardTest.php
@@ -70,6 +70,20 @@ class JCardTest extends \PHPUnit_Framework_TestCase {
"1985-04-07",
],
[
+ "bday",
+ (object)[
+ 'x-param' => [1,2],
+ ],
+ "date",
+ "1979-12-25",
+ ],
+ [
+ "bday",
+ new \StdClass(),
+ "date-time",
+ "1979-12-25T02:00:00",
+ ],
+ [
"rev",
new \StdClass(),
"timestamp",
@@ -118,20 +132,6 @@ class JCardTest extends \PHPUnit_Framework_TestCase {
],
],
[
- "bday",
- (object)[
- 'x-param' => [1,2],
- ],
- "date",
- "1979-12-25",
- ],
- [
- "bday",
- new \StdClass(),
- "date-time",
- "1979-12-25T02:00:00",
- ],
- [
"x-truncated",
new \StdClass(),
"date",
diff --git a/tests/VObject/Parser/JsonTest.php b/tests/VObject/Parser/JsonTest.php
index d10f303..58f02c1 100644
--- a/tests/VObject/Parser/JsonTest.php
+++ b/tests/VObject/Parser/JsonTest.php
@@ -37,6 +37,20 @@ class JsonTest extends \PHPUnit_Framework_TestCase {
"1985-04-07",
],
[
+ "bday",
+ (object)[
+ 'x-param' => [1,2],
+ ],
+ "date",
+ "1979-12-25",
+ ],
+ [
+ "bday",
+ new \StdClass(),
+ "date-time",
+ "1979-12-25T02:00:00",
+ ],
+ [
"rev",
new \StdClass(),
"timestamp",
@@ -84,20 +98,7 @@ class JsonTest extends \PHPUnit_Framework_TestCase {
"U.S.A",
],
],
- [
- "bday",
- (object)[
- 'x-param' => [1,2],
- ],
- "date",
- "1979-12-25",
- ],
- [
- "bday",
- new \StdClass(),
- "date-time",
- "1979-12-25T02:00:00",
- ],
+
[
"x-truncated",
new \StdClass(),
@@ -167,14 +168,14 @@ VERSION:4.0
PRODID:-//Sabre//Sabre VObject $version//EN
UID:foo
BDAY:1985-04-07
+BDAY;X-PARAM=1,2;VALUE=DATE:1979-12-25
+BDAY;VALUE=DATE-TIME:1979-12-25T02:00:00
REV:1995-10-31T22:27:10Z
LANG:nl
N:Last;First;Middle;;
item1.TEL:+1 555 123456
item1.X-AB-LABEL:Walkie Talkie
ADR:;;My Street,Left Side,Second Shack;Hometown;PA;18252;U.S.A
-BDAY;X-PARAM=1,2;VALUE=DATE:1979-12-25
-BDAY;VALUE=DATE-TIME:1979-12-25T02:00:00
X-TRUNCATED;VALUE=DATE:--12-25
X-TIME-LOCAL;VALUE=TIME:12:30:00
X-TIME-UTC;VALUE=TIME:12:30:00Z
@@ -245,6 +246,15 @@ VCF;
"attendee", new \StdClass(), "cal-address", "mailto:armin at example.org",
],
[
+ "attendee",
+ (object)[
+ "cn" => "Dominik",
+ "partstat" => "DECLINED",
+ ],
+ "cal-address",
+ "mailto:dominik at example.org"
+ ],
+ [
"geo", new \StdClass(), "float", [51.96668, 7.61876],
],
[
@@ -272,15 +282,6 @@ VCF;
"x-time", new \StdClass(), "time", "08:00:00",
],
[
- "attendee",
- (object)[
- "cn" => "Dominik",
- "partstat" => "DECLINED",
- ],
- "cal-address",
- "mailto:dominik at example.org"
- ],
- [
"request-status",
new \StdClass(),
"text",
@@ -326,6 +327,7 @@ CATEGORIES:home,testing
CREATED:20130526T181000Z
ATTACH;VALUE=BINARY:YXR0YWNobWVudA==
ATTENDEE:mailto:armin at example.org
+ATTENDEE;CN=Dominik;PARTSTAT=DECLINED:mailto:dominik at example.org
GEO:51.96668;7.61876
SEQUENCE:5
FREEBUSY:20130526T210213/PT1H,20130626T120000/20130626T130000
@@ -334,7 +336,6 @@ TZOFFSETFROM:+0500
RRULE:FREQ=WEEKLY;BYDAY=MO,TU
X-BOOL;VALUE=BOOLEAN:TRUE
X-TIME;VALUE=TIME:08:00:00
-ATTENDEE;CN=Dominik;PARTSTAT=DECLINED:mailto:dominik at example.org
REQUEST-STATUS:2.0;Success
REQUEST-STATUS:3.7;Invalid Calendar User;ATTENDEE:mailto:jsmith at example.org
BEGIN:VALARM
diff --git a/tests/VObject/Parser/XmlTest.php b/tests/VObject/Parser/XmlTest.php
index 4beae7b..ea84ae4 100644
--- a/tests/VObject/Parser/XmlTest.php
+++ b/tests/VObject/Parser/XmlTest.php
@@ -1256,12 +1256,12 @@ XML
<text>tel:+1-555-555-556</text>
</tel>
<group name="contact">
- <fn>
- <text>Gordon</text>
- </fn>
<tel>
<text>tel:+1-555-555-555</text>
</tel>
+ <fn>
+ <text>Gordon</text>
+ </fn>
</group>
<group name="media">
<fn>
@@ -1275,8 +1275,8 @@ XML
'BEGIN:VCARD' . CRLF .
'VERSION:4.0' . CRLF .
'TEL:tel:+1-555-555-556' . CRLF .
- 'contact.FN:Gordon' . CRLF .
'contact.TEL:tel:+1-555-555-555' . CRLF .
+ 'contact.FN:Gordon' . CRLF .
'media.FN:Gordon' . CRLF .
'END:VCARD' . CRLF
);
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/php-sabre-vobject.git
More information about the Pkg-owncloud-commits
mailing list