Minor fixes in unittests.

Author: evert

ChangeLog

@@ -1,3 +1,6 @@
+3.1.1-stable (2013-08-02)
+	* Fixed: Issue #53. A regression in RecurrenceIterator.
+
 3.1.0-stable (2013-07-27)
 	* Added: bad-ass new cli debugging utility (in bin/vobject).
 	* Added: jCal and jCard parser.

lib/Sabre/VObject/Version.php

@@ -14,6 +14,6 @@ class Version {
     /**
      * Full version number
      */
-    const VERSION = '3.1.0';
+    const VERSION = '3.1.1';
 
 }

tests/Sabre/VObject/CliTest.php

@@ -145,8 +145,9 @@ public function testConvertJson() {
         );
 
         rewind($this->cli->stdout);
+        $version = Version::VERSION;
         $this->assertEquals(
-            '["vcard",[["version",{},"text","4.0"],["prodid",{},"text","-\/\/Sabre\/\/Sabre VObject 3.1.0\/\/EN"],["fn",{},"text","Cowboy Henk"]]]',
+            '["vcard",[["version",{},"text","4.0"],["prodid",{},"text","-\/\/Sabre\/\/Sabre VObject '. $version .'\/\/EN"],["fn",{},"text","Cowboy Henk"]]]',
             stream_get_contents($this->cli->stdout)
         );
 
@@ -176,6 +177,7 @@ public function testConvertJCardPretty() {
         );
 
         rewind($this->cli->stdout);
+        $version = Version::VERSION;
         $expected = <<<JCARD
 [
     "vcard",
@@ -194,7 +196,7 @@ public function testConvertJCardPretty() {
 
             },
             "text",
-            "-\/\/Sabre\/\/Sabre VObject 3.1.0\/\/EN"
+            "-\/\/Sabre\/\/Sabre VObject $version\/\/EN"
         ],
         [
             "fn",
@@ -345,10 +347,12 @@ public function testVCard3040() {
         );
 
         rewind($this->cli->stdout);
+
+        $version = Version::VERSION;
         $expected = <<<VCF
 BEGIN:VCARD
 VERSION:4.0
-PRODID:-//Sabre//Sabre VObject 3.1.0//EN
+PRODID:-//Sabre//Sabre VObject $version//EN
 FN:Cowboy Henk
 END:VCARD
 
@@ -382,11 +386,13 @@ public function testVCard4030() {
             $this->cli->main(array('vobject', 'convert','--format=vcard30', '--pretty', '-'))
         );
 
+        $version = Version::VERSION;
+
         rewind($this->cli->stdout);
         $expected = <<<VCF
 BEGIN:VCARD
 VERSION:3.0
-PRODID:-//Sabre//Sabre VObject 3.1.0//EN
+PRODID:-//Sabre//Sabre VObject $version//EN
 FN:Cowboy Henk
 END:VCARD
 

tests/Sabre/VObject/RecurrenceIteratorIncorrectExpandTest.php

@@ -43,8 +43,8 @@ function testExpand() {
 VERSION:2.0
 BEGIN:VEVENT
 UID:foo
-DTSTART;VALUE=DATE-TIME:20130711T050000Z
-DTEND;VALUE=DATE-TIME:20130711T053000Z
+DTSTART:20130711T050000Z
+DTEND:20130711T053000Z
 END:VEVENT
 BEGIN:VEVENT
 UID:foo

tests/Sabre/VObject/RecurrenceIteratorMissingOverriddenTest.php

@@ -42,7 +42,7 @@ function testExpand() {
 VERSION:2.0
 BEGIN:VEVENT
 UID:foo
-DTSTART;VALUE=DATE-TIME:20130727T120000Z
+DTSTART:20130727T120000Z
 DURATION:PT1H
 SUMMARY:A
 END:VEVENT