1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
|
From f07864e5b4b201999944decc13b629eadb3d4248 Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@horde.org>
Date: Mon, 10 Nov 2014 23:56:08 -0700
Subject: [PATCH] Fix tests
---
.../lib/Horde/Kolab/Storage/Object/MimeType.php | 2 +-
.../test/Horde/Kolab/Storage/Unit/ObjectTest.php | 20 ++++++++------------
.../test/Horde/Push/Unit/Push/Recipient/MailTest.php | 2 +-
3 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/framework/Kolab_Storage/test/Horde/Kolab/Storage/Unit/ObjectTest.php b/framework/Kolab_Storage/test/Horde/Kolab/Storage/Unit/ObjectTest.php
index 9ca5ebb..3b3381f 100644
--- a/framework/Kolab_Storage/test/Horde/Kolab/Storage/Unit/ObjectTest.php
+++ b/framework/Kolab_Storage/test/Horde/Kolab/Storage/Unit/ObjectTest.php
@@ -71,9 +71,8 @@ public function testObjectTypeDeviatesFromFolderType()
$data = $this->getMock('Horde_Kolab_Storage_Object_Writer');
$object = new Horde_Kolab_Storage_Object();
$headers = $this->getMock('Horde_Mime_Headers');
- $headers->expects($this->once())
- ->method('getValue')
- ->with('X-Kolab-Type')
+ $headers->method('__call')
+ ->with('getValue', array('X-Kolab-Type'))
->will($this->returnValue('application/x-vnd.kolab.note'));
$this->folder->expects($this->once())
->method('getType')
@@ -100,9 +99,8 @@ public function testMissingKolabPart()
$data = $this->getMock('Horde_Kolab_Storage_Object_Writer');
$object = new Horde_Kolab_Storage_Object();
$headers = $this->getMock('Horde_Mime_Headers');
- $headers->expects($this->once())
- ->method('getValue')
- ->with('X-Kolab-Type')
+ $headers->method('__call')
+ ->with('getValue', array('X-Kolab-Type'))
->will($this->returnValue('application/x-vnd.kolab.note'));
$this->folder->expects($this->once())
->method('getType')
@@ -137,9 +135,8 @@ public function testObjectRetainsHeadersIfLoaded()
$data = $this->getMock('Horde_Kolab_Storage_Object_Writer');
$object = new Horde_Kolab_Storage_Object();
$headers = $this->getMock('Horde_Mime_Headers');
- $headers->expects($this->once())
- ->method('getValue')
- ->with('X-Kolab-Type')
+ $headers->method('__call')
+ ->with('getValue', array('X-Kolab-Type'))
->will($this->returnValue('application/x-vnd.kolab.note'));
$this->folder->expects($this->once())
->method('getType')
@@ -326,9 +323,8 @@ public function testSerializeUnserializeRetainsErrors()
$data = $this->getMock('Horde_Kolab_Storage_Object_Writer');
$object = new Horde_Kolab_Storage_Object();
$headers = $this->getMock('Horde_Mime_Headers');
- $headers->expects($this->once())
- ->method('getValue')
- ->with('X-Kolab-Type')
+ $headers->method('__call')
+ ->with('getValue', array('X-Kolab-Type'))
->will($this->returnValue('application/x-vnd.kolab.note'));
$this->folder->expects($this->once())
->method('getType')
From c6e85ba158ec4b7cc9d2c22f592aaffaee7751de Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@horde.org>
Date: Thu, 20 Nov 2014 17:09:45 -0700
Subject: [PATCH] Fix test
---
.../Storage/ComponentTest/Data/Object/Message/ModifiedTest.php | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/framework/Kolab_Storage/test/Horde/Kolab/Storage/ComponentTest/Data/Object/Message/ModifiedTest.php b/framework/Kolab_Storage/test/Horde/Kolab/Storage/ComponentTest/Data/Object/Message/ModifiedTest.php
index d8b6551..bf00433 100644
--- a/framework/Kolab_Storage/test/Horde/Kolab/Storage/ComponentTest/Data/Object/Message/ModifiedTest.php
+++ b/framework/Kolab_Storage/test/Horde/Kolab/Storage/ComponentTest/Data/Object/Message/ModifiedTest.php
@@ -90,14 +90,14 @@ public function testStore()
User-Agent: Horde::Kolab::Storage v@version@
MIME-Version: 1.0
X-Kolab-Type: application/x-vnd.kolab.note
-Content-Type: multipart/mixed; boundary="";
- name="Kolab Groupware Data"
+Content-Type: multipart/mixed; name="Kolab Groupware Data";
+ boundary=""
Content-Disposition: attachment; filename="Kolab Groupware Data"
This message is in MIME format.
--=_
-Content-Type: text/plain; charset=utf-8; name="Kolab Groupware Information"
+Content-Type: text/plain; name="Kolab Groupware Information"; charset=utf-8
Content-Disposition: inline; filename="Kolab Groupware Information"
This is a Kolab Groupware object. To view this object you will need an email
|
