Skip to content

Commit ddb25ba

Browse files
lancewillettlancewillett
committed
Tests: Use strict assertions for REST schema sanitization.
Verify both the values and types returned by schema sanitization. Use float expectations for number schemas while preserving original types for properties without a matching schema. Developed in: #12613 Props thisismyurl, mukesh27. See #64895. git-svn-id: https://develop.svn.wordpress.org/trunk@63773 602fd350-edb4-49c9-b593-d223f7449a82
1 parent 6d3768b commit ddb25ba

1 file changed

Lines changed: 22 additions & 22 deletions

File tree

‎tests/phpunit/tests/rest-api/rest-schema-sanitization.php‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ public function test_type_array() {
111111
'type' => 'number',
112112
),
113113
);
114-
$this->assertEquals( array( 1 ), rest_sanitize_value_from_schema( array( 1 ), $schema ) );
115-
$this->assertEquals( array( 1 ), rest_sanitize_value_from_schema( array( '1' ), $schema ) );
114+
$this->assertSame( array( 1.0 ), rest_sanitize_value_from_schema( array( 1 ), $schema ) );
115+
$this->assertSame( array( 1.0 ), rest_sanitize_value_from_schema( array( '1' ), $schema ) );
116116
}
117117

118118
public function test_type_array_nested() {
@@ -125,8 +125,8 @@ public function test_type_array_nested() {
125125
),
126126
),
127127
);
128-
$this->assertEquals( array( array( 1 ), array( 2 ) ), rest_sanitize_value_from_schema( array( array( 1 ), array( 2 ) ), $schema ) );
129-
$this->assertEquals( array( array( 1 ), array( 2 ) ), rest_sanitize_value_from_schema( array( array( '1' ), array( '2' ) ), $schema ) );
128+
$this->assertSame( array( array( 1.0 ), array( 2.0 ) ), rest_sanitize_value_from_schema( array( array( 1 ), array( 2 ) ), $schema ) );
129+
$this->assertSame( array( array( 1.0 ), array( 2.0 ) ), rest_sanitize_value_from_schema( array( array( '1' ), array( '2' ) ), $schema ) );
130130
}
131131

132132
public function test_type_array_as_csv() {
@@ -136,9 +136,9 @@ public function test_type_array_as_csv() {
136136
'type' => 'number',
137137
),
138138
);
139-
$this->assertEquals( array( 1, 2 ), rest_sanitize_value_from_schema( '1,2', $schema ) );
140-
$this->assertEquals( array( 1, 2, 0 ), rest_sanitize_value_from_schema( '1,2,a', $schema ) );
141-
$this->assertEquals( array( 1, 2 ), rest_sanitize_value_from_schema( '1,2,', $schema ) );
139+
$this->assertSame( array( 1.0, 2.0 ), rest_sanitize_value_from_schema( '1,2', $schema ) );
140+
$this->assertSame( array( 1.0, 2.0, 0.0 ), rest_sanitize_value_from_schema( '1,2,a', $schema ) );
141+
$this->assertSame( array( 1.0, 2.0 ), rest_sanitize_value_from_schema( '1,2,', $schema ) );
142142
}
143143

144144
public function test_type_array_with_enum() {
@@ -194,11 +194,11 @@ public function test_type_object() {
194194
),
195195
),
196196
);
197-
$this->assertEquals( array( 'a' => 1 ), rest_sanitize_value_from_schema( array( 'a' => 1 ), $schema ) );
198-
$this->assertEquals( array( 'a' => 1 ), rest_sanitize_value_from_schema( array( 'a' => '1' ), $schema ) );
199-
$this->assertEquals(
197+
$this->assertSame( array( 'a' => 1.0 ), rest_sanitize_value_from_schema( array( 'a' => 1 ), $schema ) );
198+
$this->assertSame( array( 'a' => 1.0 ), rest_sanitize_value_from_schema( array( 'a' => '1' ), $schema ) );
199+
$this->assertSame(
200200
array(
201-
'a' => 1,
201+
'a' => 1.0,
202202
'b' => 1,
203203
),
204204
rest_sanitize_value_from_schema(
@@ -221,10 +221,10 @@ public function test_type_object_strips_additional_properties() {
221221
),
222222
'additionalProperties' => false,
223223
);
224-
$this->assertEquals( array( 'a' => 1 ), rest_sanitize_value_from_schema( array( 'a' => 1 ), $schema ) );
225-
$this->assertEquals( array( 'a' => 1 ), rest_sanitize_value_from_schema( array( 'a' => '1' ), $schema ) );
226-
$this->assertEquals(
227-
array( 'a' => 1 ),
224+
$this->assertSame( array( 'a' => 1.0 ), rest_sanitize_value_from_schema( array( 'a' => 1 ), $schema ) );
225+
$this->assertSame( array( 'a' => 1.0 ), rest_sanitize_value_from_schema( array( 'a' => '1' ), $schema ) );
226+
$this->assertSame(
227+
array( 'a' => 1.0 ),
228228
rest_sanitize_value_from_schema(
229229
array(
230230
'a' => '1',
@@ -345,11 +345,11 @@ public function test_type_object_nested() {
345345
),
346346
);
347347

348-
$this->assertEquals(
348+
$this->assertSame(
349349
array(
350350
'a' => array(
351-
'b' => 1,
352-
'c' => 3,
351+
'b' => 1.0,
352+
'c' => 3.0,
353353
),
354354
),
355355
rest_sanitize_value_from_schema(
@@ -362,11 +362,11 @@ public function test_type_object_nested() {
362362
$schema
363363
)
364364
);
365-
$this->assertEquals(
365+
$this->assertSame(
366366
array(
367367
'a' => array(
368-
'b' => 1,
369-
'c' => 3,
368+
'b' => 1.0,
369+
'c' => 3.0,
370370
'd' => '1',
371371
),
372372
'b' => 1,
@@ -395,7 +395,7 @@ public function test_type_object_stdclass() {
395395
),
396396
),
397397
);
398-
$this->assertEquals( array( 'a' => 1 ), rest_sanitize_value_from_schema( (object) array( 'a' => '1' ), $schema ) );
398+
$this->assertSame( array( 'a' => 1.0 ), rest_sanitize_value_from_schema( (object) array( 'a' => '1' ), $schema ) );
399399
}
400400

401401
/**

0 commit comments

Comments
 (0)