From 2fd0882db18f6f6f115ee1ad86df8ab5b4bca16a Mon Sep 17 00:00:00 2001
From: Jan Schneider <jan@horde.org>
Date: Tue, 14 Nov 2017 22:38:34 +0100
Subject: [PATCH] Fix tests to work with installed Horde_Kolab_Format too.

---
 .../ComponentTest/Data/Object/Message/ModifiedTest.php    | 8 ++++----
 .../Storage/ComponentTest/Data/Object/Message/NewTest.php | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/test/Horde/Kolab/Storage/ComponentTest/Data/Object/Message/ModifiedTest.php b/test/Horde/Kolab/Storage/ComponentTest/Data/Object/Message/ModifiedTest.php
index 4b72239..4030a5b 100644
--- a/test/Horde/Kolab/Storage/ComponentTest/Data/Object/Message/ModifiedTest.php
+++ b/test/Horde/Kolab/Storage/ComponentTest/Data/Object/Message/ModifiedTest.php
@@ -75,12 +75,12 @@ public function testStore()
             ),
             $result
         );
-        $this->assertEquals(
+        $this->assertStringMatchesFormat(
             'From: user
 To: user
-Date: 
+Date:
 Subject: ABC1234
-User-Agent: Horde::Kolab::Storage v@version@
+User-Agent: Horde::Kolab::Storage v%s
 MIME-Version: 1.0
 X-Kolab-Type: application/x-vnd.kolab.note
 Content-Type: multipart/mixed; boundary="";
@@ -108,7 +108,7 @@ public function testStore()
   <creation-date></creation-date>
   <last-modification-date></last-modification-date>
   <sensitivity>public</sensitivity>
-  <product-id>Horde_Kolab_Format_Xml-@version@ (api version: 2)</product-id>
+  <product-id>Horde_Kolab_Format_Xml-%s (api version: 2)</product-id>
   <summary>NEW</summary>
   <x-test>other client</x-test>
   <background-color>#000000</background-color>
diff --git a/test/Horde/Kolab/Storage/ComponentTest/Data/Object/Message/NewTest.php b/test/Horde/Kolab/Storage/ComponentTest/Data/Object/Message/NewTest.php
index 40e567d..00705f8 100644
--- a/test/Horde/Kolab/Storage/ComponentTest/Data/Object/Message/NewTest.php
+++ b/test/Horde/Kolab/Storage/ComponentTest/Data/Object/Message/NewTest.php
@@ -74,12 +74,12 @@ public function testStore()
             ),
             $result
         );
-        $this->assertEquals(
+        $this->assertStringMatchesFormat(
             'From: user
 To: user
-Date: 
+Date:
 Subject: ABC1234
-User-Agent: Horde_Kolab_Storage @version@
+User-Agent: Horde_Kolab_Storage v%s
 MIME-Version: 1.0
 X-Kolab-Type: application/x-vnd.kolab.note
 Content-Type: multipart/mixed; name="Kolab Groupware Data";
@@ -105,7 +105,7 @@ public function testStore()
   <creation-date></creation-date>
   <last-modification-date></last-modification-date>
   <sensitivity>public</sensitivity>
-  <product-id>Horde_Kolab_Format_Xml-@version@ (api version: 2)</product-id>
+  <product-id>Horde_Kolab_Format_Xml-%s (api version: 2)</product-id>
   <summary>TEST</summary>
   <background-color>#000000</background-color>
   <foreground-color>#ffff00</foreground-color>