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
|
Description: Adapt to PHPUnit 8.x and 9.x API.
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Index: php-horde-serialize/Horde_Serialize-2.0.5/test/Horde/Serialize/JsonTest.php
===================================================================
--- php-horde-serialize.orig/Horde_Serialize-2.0.5/test/Horde/Serialize/JsonTest.php
+++ php-horde-serialize/Horde_Serialize-2.0.5/test/Horde/Serialize/JsonTest.php
@@ -9,7 +9,7 @@
* @subpackage UnitTests
*/
-class Horde_Serialize_JsonTest extends PHPUnit_Framework_TestCase
+class Horde_Serialize_JsonTest extends Horde_Test_Case
{
// JSON associative arrays tests.
public function testJsonAssociativeArray()
@@ -51,8 +51,7 @@ class Horde_Serialize_JsonTest extends P
Horde_Serialize::serialize($arn, Horde_Serialize::JSON)
);
- $this->assertInternalType(
- 'array',
+ $this->assertIsArray(
Horde_Serialize::unserialize($arn_ja, Horde_Serialize::JSON)
);
@@ -76,8 +75,7 @@ class Horde_Serialize_JsonTest extends P
$obj0_j = '{}';
$obj1_j = '{ }';
- $this->assertInternalType(
- 'object',
+ $this->assertIsObject(
Horde_Serialize::unserialize($obj0_j, Horde_Serialize::JSON)
);
$this->assertEquals(
@@ -85,8 +83,7 @@ class Horde_Serialize_JsonTest extends P
count(get_object_vars(Horde_Serialize::unserialize($obj0_j, Horde_Serialize::JSON)))
);
- $this->assertInternalType(
- 'object',
+ $this->assertIsObject(
Horde_Serialize::unserialize($obj1_j, Horde_Serialize::JSON)
);
$this->assertEquals(
@@ -243,8 +240,7 @@ class Horde_Serialize_JsonTest extends P
1.0,
Horde_Serialize::unserialize('1.0', Horde_Serialize::JSON)
);
- $this->assertInternalType(
- 'float',
+ $this->assertIsFloat(
Horde_Serialize::unserialize('1.0', Horde_Serialize::JSON)
);
@@ -253,8 +249,7 @@ class Horde_Serialize_JsonTest extends P
1.1,
Horde_Serialize::unserialize('1.1', Horde_Serialize::JSON)
);
- $this->assertInternalType(
- 'float',
+ $this->assertIsFloat(
Horde_Serialize::unserialize('1.1', Horde_Serialize::JSON)
);
@@ -410,7 +405,7 @@ class Horde_Serialize_JsonTest extends P
// numeric case: 1.0
$this->assertEquals(
- '1.0',
+ '1',
Horde_Serialize::serialize(Horde_Serialize::unserialize('1.0', Horde_Serialize::JSON), Horde_Serialize::JSON)
);
@@ -549,8 +544,7 @@ class Horde_Serialize_JsonTest extends P
$obj1->car2->model = 'sports';
$obj1_j = '{"car1":{"color":"tan","model":"sedan"},"car2":{"color":"red","model":"sports"}}';
- $this->assertInternalType(
- 'object',
+ $this->assertIsObject(
Horde_Serialize::unserialize($obj_j, Horde_Serialize::JSON)
);
|
