Skip to content

Build/Test Tools: Use strict assertions in REST schema sanitization tests #12613

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
thisismyurl wants to merge 1 commit into
base: trunk
Choose a base branch
from
+22 −22
Open

Build/Test Tools: Use strict assertions in REST schema sanitization tests #12613

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 22 additions & 22 deletions tests/phpunit/tests/rest-api/rest-schema-sanitization.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,8 @@ public function test_type_array() {
'type' => 'number',
),
);
$this->assertEquals( array( 1 ), rest_sanitize_value_from_schema( array( 1 ), $schema ) );
$this->assertEquals( array( 1 ), rest_sanitize_value_from_schema( array( '1' ), $schema ) );
$this->assertSame( array( 1.0 ), rest_sanitize_value_from_schema( array( 1 ), $schema ) );
$this->assertSame( array( 1.0 ), rest_sanitize_value_from_schema( array( '1' ), $schema ) );
}

public function test_type_array_nested() {
Expand All @@ -125,8 +125,8 @@ public function test_type_array_nested() {
),
),
);
$this->assertEquals( array( array( 1 ), array( 2 ) ), rest_sanitize_value_from_schema( array( array( 1 ), array( 2 ) ), $schema ) );
$this->assertEquals( array( array( 1 ), array( 2 ) ), rest_sanitize_value_from_schema( array( array( '1' ), array( '2' ) ), $schema ) );
$this->assertSame( array( array( 1.0 ), array( 2.0 ) ), rest_sanitize_value_from_schema( array( array( 1 ), array( 2 ) ), $schema ) );
$this->assertSame( array( array( 1.0 ), array( 2.0 ) ), rest_sanitize_value_from_schema( array( array( '1' ), array( '2' ) ), $schema ) );
}

public function test_type_array_as_csv() {
Expand All @@ -136,9 +136,9 @@ public function test_type_array_as_csv() {
'type' => 'number',
),
);
$this->assertEquals( array( 1, 2 ), rest_sanitize_value_from_schema( '1,2', $schema ) );
$this->assertEquals( array( 1, 2, 0 ), rest_sanitize_value_from_schema( '1,2,a', $schema ) );
$this->assertEquals( array( 1, 2 ), rest_sanitize_value_from_schema( '1,2,', $schema ) );
$this->assertSame( array( 1.0, 2.0 ), rest_sanitize_value_from_schema( '1,2', $schema ) );
$this->assertSame( array( 1.0, 2.0, 0.0 ), rest_sanitize_value_from_schema( '1,2,a', $schema ) );
$this->assertSame( array( 1.0, 2.0 ), rest_sanitize_value_from_schema( '1,2,', $schema ) );
}

public function test_type_array_with_enum() {
Expand Down Expand Up @@ -194,11 +194,11 @@ public function test_type_object() {
),
),
);
$this->assertEquals( array( 'a' => 1 ), rest_sanitize_value_from_schema( array( 'a' => 1 ), $schema ) );
$this->assertEquals( array( 'a' => 1 ), rest_sanitize_value_from_schema( array( 'a' => '1' ), $schema ) );
$this->assertEquals(
$this->assertSame( array( 'a' => 1.0 ), rest_sanitize_value_from_schema( array( 'a' => 1 ), $schema ) );
$this->assertSame( array( 'a' => 1.0 ), rest_sanitize_value_from_schema( array( 'a' => '1' ), $schema ) );
$this->assertSame(
array(
'a' => 1,
'a' => 1.0,
'b' => 1,
),
rest_sanitize_value_from_schema(
Expand All @@ -221,10 +221,10 @@ public function test_type_object_strips_additional_properties() {
),
'additionalProperties' => false,
);
$this->assertEquals( array( 'a' => 1 ), rest_sanitize_value_from_schema( array( 'a' => 1 ), $schema ) );
$this->assertEquals( array( 'a' => 1 ), rest_sanitize_value_from_schema( array( 'a' => '1' ), $schema ) );
$this->assertEquals(
array( 'a' => 1 ),
$this->assertSame( array( 'a' => 1.0 ), rest_sanitize_value_from_schema( array( 'a' => 1 ), $schema ) );
$this->assertSame( array( 'a' => 1.0 ), rest_sanitize_value_from_schema( array( 'a' => '1' ), $schema ) );
$this->assertSame(
array( 'a' => 1.0 ),
rest_sanitize_value_from_schema(
array(
'a' => '1',
Expand Down Expand Up @@ -345,11 +345,11 @@ public function test_type_object_nested() {
),
);

$this->assertEquals(
$this->assertSame(
array(
'a' => array(
'b' => 1,
'c' => 3,
'b' => 1.0,
'c' => 3.0,
),
),
rest_sanitize_value_from_schema(
Expand All @@ -362,11 +362,11 @@ public function test_type_object_nested() {
$schema
)
);
$this->assertEquals(
$this->assertSame(
array(
'a' => array(
'b' => 1,
'c' => 3,
'b' => 1.0,
'c' => 3.0,
'd' => '1',
),
'b' => 1,
Expand Down Expand Up @@ -395,7 +395,7 @@ public function test_type_object_stdclass() {
),
),
);
$this->assertEquals( array( 'a' => 1 ), rest_sanitize_value_from_schema( (object) array( 'a' => '1' ), $schema ) );
$this->assertSame( array( 'a' => 1.0 ), rest_sanitize_value_from_schema( (object) array( 'a' => '1' ), $schema ) );
}

/**
Expand Down
Loading