Skip to content

BSON test cleanup #368

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

Merged
merged 4 commits into from
Aug 5, 2016
Merged

BSON test cleanup #368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
35d53d4
Remove unnecessary SKIPIFs from BSON tests
jmikola Aug 4, 2016
f8398b4
Add necessary SKIPIF if for test requiring 64-bit integers
jmikola Aug 4, 2016
fa5815e
Use string UTCDateTime argument for 32 and 64-bit compatibility
jmikola Aug 4, 2016
59b0751
Split UTCDateTime integer parsing test for 64-bit requirement
jmikola Aug 4, 2016
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
5 changes: 2 additions & 3 deletions tests/bson/bson-binary-001.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
--TEST--
BSON BSON\Binary #001
--SKIPIF--
<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
--FILE--
<?php
require_once __DIR__ . "/../utils/basic.inc";

require_once __DIR__ . '/../utils/tools.php';

$classname = BSON_NAMESPACE . "\\Binary";

Expand Down
Binary file modified tests/bson/bson-binary-serialization-001.phpt
View file
Open in desktop
Binary file not shown.
5 changes: 2 additions & 3 deletions tests/bson/bson-binary-serialization_error-001.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
--TEST--
MongoDB\BSON\Binary unserialization requires "data" string and "type" integer fields
--SKIPIF--
<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
--FILE--
<?php
require_once __DIR__ . "/../utils/basic.inc";

require_once __DIR__ . '/../utils/tools.php';

echo throws(function() {
unserialize('O:19:"MongoDB\BSON\Binary":1:{s:4:"data";s:6:"foobar";}');
Expand Down
5 changes: 2 additions & 3 deletions tests/bson/bson-binary-serialization_error-002.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
--TEST--
MongoDB\BSON\Binary unserialization requires unsigned 8-bit integer for type
--SKIPIF--
<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
--FILE--
<?php
require_once __DIR__ . "/../utils/basic.inc";

require_once __DIR__ . '/../utils/tools.php';

echo throws(function() {
unserialize('O:19:"MongoDB\BSON\Binary":2:{s:4:"data";s:6:"foobar";s:4:"type";i:-1;}');
Expand Down
3 changes: 0 additions & 3 deletions tests/bson/bson-binary-set_state-001.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
--TEST--
MongoDB\BSON\Binary::__set_state()
--SKIPIF--
<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
--FILE--
<?php
require_once __DIR__ . "/../utils/basic.inc";

$tests = [
['foobar', MongoDB\BSON\Binary::TYPE_GENERIC],
Expand Down
5 changes: 2 additions & 3 deletions tests/bson/bson-binary-set_state_error-001.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
--TEST--
MongoDB\BSON\Binary::__set_state() requires "data" string and "type" integer fields
--SKIPIF--
<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
--FILE--
<?php
require_once __DIR__ . "/../utils/basic.inc";

require_once __DIR__ . '/../utils/tools.php';

echo throws(function() {
MongoDB\BSON\Binary::__set_state(['data' => 'foobar']);
Expand Down
5 changes: 2 additions & 3 deletions tests/bson/bson-binary-set_state_error-002.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
--TEST--
MongoDB\BSON\Binary::__set_state() requires unsigned 8-bit integer for type
--SKIPIF--
<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
--FILE--
<?php
require_once __DIR__ . "/../utils/basic.inc";

require_once __DIR__ . '/../utils/tools.php';

echo throws(function() {
MongoDB\BSON\Binary::__set_state(['data' => 'foobar', 'type' => -1]);
Expand Down
4 changes: 2 additions & 2 deletions tests/bson/bson-binary_error-001.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
BSON BSON\Binary #001 error
--SKIPIF--
<?php if (defined("HHVM_VERSION_ID")) exit("skip HHVM handles parameter parsing differently"); ?>
<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
--FILE--
<?php
require_once __DIR__ . "/../utils/basic.inc";

require_once __DIR__ . '/../utils/tools.php';

$classname = BSON_NAMESPACE . "\\Binary";

Expand Down
3 changes: 0 additions & 3 deletions tests/bson/bson-binary_error-002.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
--TEST--
BSON BSON\Binary cannot be extended
--SKIPIF--
<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
--FILE--
<?php
require_once __DIR__ . "/../utils/basic.inc";

use MongoDB\BSON as BSON;

Expand Down
5 changes: 2 additions & 3 deletions tests/bson/bson-binary_error-003.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
--TEST--
BSON BSON\Binary constructor requires unsigned 8-bit integer for type
--SKIPIF--
<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
--FILE--
<?php
require_once __DIR__ . "/../utils/basic.inc";

require_once __DIR__ . '/../utils/tools.php';

use MongoDB\BSON as BSON;

Expand Down
2 changes: 0 additions & 2 deletions tests/bson/bson-decimal128-001.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,8 @@
BSON\Decimal128
--SKIPIF--
<?php if (!class_exists('MongoDB\BSON\Decimal128')) { die('skip MongoDB\BSON\Decimal128 is not available'); } ?>
<?php require __DIR__ . '/../utils/basic-skipif.inc'?>
--FILE--
<?php
require_once __DIR__ . '/../utils/basic.inc';

$tests = [
'1234.5678',
Expand Down
2 changes: 0 additions & 2 deletions tests/bson/bson-decimal128-002.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,8 @@
BSON\Decimal128 NaN values
--SKIPIF--
<?php if (!class_exists('MongoDB\BSON\Decimal128')) { die('skip MongoDB\BSON\Decimal128 is not available'); } ?>
<?php require __DIR__ . '/../utils/basic-skipif.inc'?>
--FILE--
<?php
require_once __DIR__ . '/../utils/basic.inc';

$tests = [
acos(8),
Expand Down
2 changes: 0 additions & 2 deletions tests/bson/bson-decimal128-003.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,8 @@
BSON\Decimal128 Infinity values
--SKIPIF--
<?php if (!class_exists('MongoDB\BSON\Decimal128')) { die('skip MongoDB\BSON\Decimal128 is not available'); } ?>
<?php require __DIR__ . '/../utils/basic-skipif.inc'?>
--FILE--
<?php
require_once __DIR__ . '/../utils/basic.inc';

$tests = [
1.7976931348623158e+308+1.7976931348623158e+308,
Expand Down
2 changes: 0 additions & 2 deletions tests/bson/bson-decimal128-004.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,8 @@
BSON\Decimal128 debug handler
--SKIPIF--
<?php if (!class_exists('MongoDB\BSON\Decimal128')) { die('skip MongoDB\BSON\Decimal128 is not available'); } ?>
<?php require __DIR__ . '/../utils/basic-skipif.inc'?>
--FILE--
<?php
require_once __DIR__ . '/../utils/basic.inc';

$tests = [
1234.5678,
Expand Down
2 changes: 0 additions & 2 deletions tests/bson/bson-decimal128-serialization-001.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,8 @@
MongoDB\BSON\Decimal128 serialization
--SKIPIF--
<?php if (!class_exists('MongoDB\BSON\Decimal128')) { die('skip MongoDB\BSON\Decimal128 is not available'); } ?>
<?php require __DIR__ . '/../utils/basic-skipif.inc'?>
--FILE--
<?php
require_once __DIR__ . '/../utils/basic.inc';

$tests = [
'1234.5678',
Expand Down
4 changes: 2 additions & 2 deletions tests/bson/bson-decimal128-serialization_error-001.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
MongoDB\BSON\Decimal128 unserialization requires "dec" string field
--SKIPIF--
<?php if (!class_exists('MongoDB\BSON\Decimal128')) { die('skip MongoDB\BSON\Decimal128 is not available'); } ?>
<?php require __DIR__ . '/../utils/basic-skipif.inc'?>
--FILE--
<?php
require_once __DIR__ . '/../utils/basic.inc';

require_once __DIR__ . '/../utils/tools.php';

echo throws(function() {
unserialize('O:23:"MongoDB\BSON\Decimal128":1:{s:3:"dec";i:0;}');
Expand Down
4 changes: 2 additions & 2 deletions tests/bson/bson-decimal128-serialization_error-002.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
MongoDB\BSON\Decimal128 unserialization requires valid decimal string
--SKIPIF--
<?php if (!class_exists('MongoDB\BSON\Decimal128')) { die('skip MongoDB\BSON\Decimal128 is not available'); } ?>
<?php require __DIR__ . '/../utils/basic-skipif.inc'?>
--FILE--
<?php
require_once __DIR__ . '/../utils/basic.inc';

require_once __DIR__ . '/../utils/tools.php';

echo throws(function() {
unserialize('O:23:"MongoDB\BSON\Decimal128":1:{s:3:"dec";s:7:"INVALID";}');
Expand Down
2 changes: 0 additions & 2 deletions tests/bson/bson-decimal128-set_state-001.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,8 @@
MongoDB\BSON\Decimal128::__set_state()
--SKIPIF--
<?php if (!class_exists('MongoDB\BSON\Decimal128')) { die('skip MongoDB\BSON\Decimal128 is not available'); } ?>
<?php require __DIR__ . '/../utils/basic-skipif.inc'?>
--FILE--
<?php
require_once __DIR__ . '/../utils/basic.inc';

$tests = [
'1234.5678',
Expand Down
4 changes: 2 additions & 2 deletions tests/bson/bson-decimal128-set_state_error-001.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
MongoDB\BSON\Decimal128::__set_state() requires "dec" string field
--SKIPIF--
<?php if (!class_exists('MongoDB\BSON\Decimal128')) { die('skip MongoDB\BSON\Decimal128 is not available'); } ?>
<?php require __DIR__ . '/../utils/basic-skipif.inc'?>
--FILE--
<?php
require_once __DIR__ . '/../utils/basic.inc';

require_once __DIR__ . '/../utils/tools.php';

echo throws(function() {
MongoDB\BSON\Decimal128::__set_state(['dec' => 0]);
Expand Down
4 changes: 2 additions & 2 deletions tests/bson/bson-decimal128-set_state_error-002.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
MongoDB\BSON\Decimal128::__set_state() requires valid decimal string
--SKIPIF--
<?php if (!class_exists('MongoDB\BSON\Decimal128')) { die('skip MongoDB\BSON\Decimal128 is not available'); } ?>
<?php require __DIR__ . '/../utils/basic-skipif.inc'?>
--FILE--
<?php
require_once __DIR__ . '/../utils/basic.inc';

require_once __DIR__ . '/../utils/tools.php';

echo throws(function() {
MongoDB\BSON\Decimal128::__set_state(['dec' => 'INVALID']);
Expand Down
4 changes: 2 additions & 2 deletions tests/bson/bson-decimal128_error-001.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ MongoDB\BSON\Decimal128 requires valid decimal string
--SKIPIF--
<?php if (!class_exists('MongoDB\BSON\Decimal128')) { die('skip MongoDB\BSON\Decimal128 is not available'); } ?>
<?php if (defined("HHVM_VERSION_ID")) exit("skip HHVM handles parameter parsing differently"); ?>
<?php require __DIR__ . '/../utils/basic-skipif.inc'?>
--FILE--
<?php
require_once __DIR__ . '/../utils/basic.inc';

require_once __DIR__ . '/../utils/tools.php';

echo throws(function() {
new MongoDB\BSON\Decimal128([]);
Expand Down
4 changes: 1 addition & 3 deletions tests/bson/bson-decode-001.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
--TEST--
BSON encoding: Encoding data into BSON representation, and BSON into Extended JSON
--SKIPIF--
<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
--FILE--
<?php

require_once __DIR__ . "/../utils/basic.inc";
require_once __DIR__ . '/../utils/tools.php';

$tests = array(
array("hello" => "world"),
Expand Down
4 changes: 1 addition & 3 deletions tests/bson/bson-decode-002.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
--TEST--
BSON encoding: Encoding object/arrays data into user specificied classes
--SKIPIF--
<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
--FILE--
<?php
use MongoDB\BSON as BSON;

require_once __DIR__ . "/../utils/basic.inc";
require_once __DIR__ . '/../utils/tools.php';

class MyArrayObject extends ArrayObject implements BSON\Unserializable {
function bsonUnserialize(array $data) {
Expand Down
4 changes: 1 addition & 3 deletions tests/bson/bson-encode-001.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
--TEST--
BSON encoding: Encoding data into BSON representation, and BSON into Extended JSON
--SKIPIF--
<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
--FILE--
<?php
use MongoDB\BSON as BSON;

require_once __DIR__ . "/../utils/basic.inc";
require_once __DIR__ . '/../utils/tools.php';

$tests = array(
array("hello" => "world"),
Expand Down
5 changes: 2 additions & 3 deletions tests/bson/bson-encode-002.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
--TEST--
BSON encoding: Encoding objects into BSON representation
--SKIPIF--
<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
--FILE--
<?php
use MongoDB\BSON as BSON;
require_once __DIR__ . "/../utils/basic.inc";

require_once __DIR__ . '/../utils/tools.php';

class AssociativeArray implements BSON\Serializable, BSON\Unserializable
{
Expand Down
3 changes: 1 addition & 2 deletions tests/bson/bson-encode-003.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,11 @@
BSON encoding: Encoding objects into BSON representation
--SKIPIF--
<?php if (defined("HHVM_VERSION_ID")) exit("skip HHVM encodes __pclass last"); ?>
<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
--FILE--
<?php
use MongoDB\BSON as BSON;

require_once __DIR__ . "/../utils/basic.inc";
require_once __DIR__ . '/../utils/tools.php';

class MyClass implements BSON\Persistable {
function bsonSerialize() {
Expand Down
3 changes: 1 addition & 2 deletions tests/bson/bson-encode-004.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,11 @@
BSON encoding: Object Document Mapper
--SKIPIF--
<?php if (defined("HHVM_VERSION_ID")) exit("skip HHVM encodes __pclass last"); ?>
<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
--FILE--
<?php
use MongoDB\BSON as BSON;

require_once __DIR__ . "/../utils/basic.inc";
require_once __DIR__ . '/../utils/tools.php';
require_once __DIR__ . "/../utils/classes.inc";

$hannes = new Person("Hannes", 42);
Expand Down
4 changes: 1 addition & 3 deletions tests/bson/bson-encode-005.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
--TEST--
BSON encoding: Object Document Mapper
--SKIPIF--
<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
--FILE--
<?php
use MongoDB\BSON as BSON;

require_once __DIR__ . "/../utils/basic.inc";
require_once __DIR__ . '/../utils/tools.php';

$data = array(
"emptyarray" => array(),
Expand Down
4 changes: 1 addition & 3 deletions tests/bson/bson-fromJSON-001.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
--TEST--
BSON\fromJSON(): Decoding JSON
--SKIPIF--
<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
--FILE--
<?php

require_once __DIR__ . "/../utils/basic.inc";
require_once __DIR__ . '/../utils/tools.php';

$tests = [
'{}',
Expand Down
4 changes: 1 addition & 3 deletions tests/bson/bson-fromJSON-002.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
--TEST--
BSON\fromJSON(): Decoding extended JSON types
--SKIPIF--
<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
--FILE--
<?php

require_once __DIR__ . "/../utils/basic.inc";
require_once __DIR__ . '/../utils/tools.php';

$tests = [
'{ "_id": { "$oid": "56315a7c6118fd1b920270b1" }}',
Expand Down
4 changes: 1 addition & 3 deletions tests/bson/bson-fromJSON_error-001.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
--TEST--
BSON\fromJSON(): invalid JSON
--SKIPIF--
<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
--FILE--
<?php

require_once __DIR__ . "/../utils/basic.inc";
require_once __DIR__ . '/../utils/tools.php';

echo throws(function() {
fromJSON('foo');
Expand Down
4 changes: 1 addition & 3 deletions tests/bson/bson-fromPHP-001.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
--TEST--
BSON\fromPHP(): bsonSerialize() allows array and stdClass
--SKIPIF--
<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
--FILE--
<?php
use MongoDB\BSON as BSON;

require_once __DIR__ . "/../utils/basic.inc";
require_once __DIR__ . '/../utils/tools.php';

class MyDocument implements BSON\Serializable
{
Expand Down
Loading