Skip to content

Commit eeb7c04

Browse files
jmikolajmikola
committed
Remove unnecessary SKIPIFs from Manager ctor tests
1 parent 701e07f commit eeb7c04

6 files changed

+27
-36
lines changed

‎tests/manager/manager-ctor-001.phpt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
--TEST--
22
MongoDB\Driver\Manager::__construct() with default URI
3-
--SKIPIF--
4-
<?php require __DIR__ . "/../utils/basic-skipif.inc"; CLEANUP(STANDALONE) ?>
53
--FILE--
64
<?php
7-
require_once __DIR__ . "/../utils/basic.inc";
85

96
$manager = new MongoDB\Driver\Manager();
107

‎tests/manager/manager-ctor-003.phpt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
--TEST--
22
MongoDB\Driver\Manager::__construct() URI defaults to "mongodb://127.0.0.1/"
3-
--SKIPIF--
4-
<?php require __DIR__ . "/../utils/basic-skipif.inc"; CLEANUP(STANDALONE) ?>
53
--FILE--
64
<?php
7-
require_once __DIR__ . "/../utils/basic.inc";
85

96
ini_set('mongodb.debug', 'stderr');
107
$manager = new MongoDB\Driver\Manager();

‎tests/manager/manager-ctor-read_preference-error-001.phpt

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,32 @@
11
--TEST--
22
MongoDB\Driver\Manager::__construct(): invalid read preference
3-
--SKIPIF--
4-
<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
53
--FILE--
64
<?php
7-
require_once __DIR__ . "/../utils/basic.inc";
5+
6+
require_once __DIR__ . '/../utils/tools.php';
87

98
echo throws(function() {
10-
$manager = new MongoDB\Driver\Manager(STANDALONE . '/?readPreference=primary&readPreferenceTags=dc:ny');
9+
$manager = new MongoDB\Driver\Manager('mongodb://127.0.0.1/?readPreference=primary&readPreferenceTags=dc:ny');
1110
}, "MongoDB\Driver\Exception\InvalidArgumentException"), "\n";
1211

1312
echo throws(function() {
14-
$manager = new MongoDB\Driver\Manager(STANDALONE, ['readPreference' => 'nothing']);
13+
$manager = new MongoDB\Driver\Manager(null, ['readPreference' => 'nothing']);
1514
}, "MongoDB\Driver\Exception\InvalidArgumentException"), "\n";
1615

1716
echo throws(function() {
18-
$manager = new MongoDB\Driver\Manager(STANDALONE . '/?readPreference=primary', ['readPreferenceTags' => [[]]]);
17+
$manager = new MongoDB\Driver\Manager('mongodb://127.0.0.1/?readPreference=primary', ['readPreferenceTags' => [[]]]);
1918
}, "MongoDB\Driver\Exception\InvalidArgumentException"), "\n";
2019

2120
echo throws(function() {
22-
$manager = new MongoDB\Driver\Manager(STANDALONE . '/?readPreference=primary', ['readPreferenceTags' => ['invalid']]);
21+
$manager = new MongoDB\Driver\Manager('mongodb://127.0.0.1/?readPreference=primary', ['readPreferenceTags' => ['invalid']]);
2322
}, "MongoDB\Driver\Exception\InvalidArgumentException"), "\n";
2423

2524
?>
2625
===DONE===
2726
<?php exit(0); ?>
28-
--EXPECTF--
27+
--EXPECT--
2928
OK: Got MongoDB\Driver\Exception\InvalidArgumentException
30-
Failed to parse MongoDB URI: '%s/?readPreference=primary&readPreferenceTags=dc:ny'
29+
Failed to parse MongoDB URI: 'mongodb://127.0.0.1/?readPreference=primary&readPreferenceTags=dc:ny'
3130
OK: Got MongoDB\Driver\Exception\InvalidArgumentException
3231
Unsupported readPreference value: 'nothing'
3332
OK: Got MongoDB\Driver\Exception\InvalidArgumentException

‎tests/manager/manager-ctor-write_concern-error-001.phpt

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,54 @@
11
--TEST--
22
MongoDB\Driver\Manager::__construct(): invalid write concern
3-
--SKIPIF--
4-
<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
53
--FILE--
64
<?php
7-
require_once __DIR__ . "/../utils/basic.inc";
5+
6+
require_once __DIR__ . '/../utils/tools.php';
87

98
echo throws(function() {
10-
$manager = new MongoDB\Driver\Manager(STANDALONE . '/?w=-1&journal=true');
9+
$manager = new MongoDB\Driver\Manager('mongodb://127.0.0.1/?w=-1&journal=true');
1110
}, "MongoDB\Driver\Exception\InvalidArgumentException"), "\n";
1211

1312
echo throws(function() {
14-
$manager = new MongoDB\Driver\Manager(STANDALONE . '/?w=0&journal=true');
13+
$manager = new MongoDB\Driver\Manager('mongodb://127.0.0.1/?w=0&journal=true');
1514
}, "MongoDB\Driver\Exception\InvalidArgumentException"), "\n";
1615

1716
echo throws(function() {
18-
$manager = new MongoDB\Driver\Manager(STANDALONE . '/?w=-1', array('journal' => true));
17+
$manager = new MongoDB\Driver\Manager('mongodb://127.0.0.1/?w=-1', ['journal' => true]);
1918
}, "MongoDB\Driver\Exception\InvalidArgumentException"), "\n";
2019

2120
echo throws(function() {
22-
$manager = new MongoDB\Driver\Manager(STANDALONE . '/?w=0', array('journal' => true));
21+
$manager = new MongoDB\Driver\Manager('mongodb://127.0.0.1/?w=0', ['journal' => true]);
2322
}, "MongoDB\Driver\Exception\InvalidArgumentException"), "\n";
2423

2524
echo throws(function() {
26-
$manager = new MongoDB\Driver\Manager(STANDALONE . '/?journal=true', array('w' => -1));
25+
$manager = new MongoDB\Driver\Manager('mongodb://127.0.0.1/?journal=true', ['w' => -1]);
2726
}, "MongoDB\Driver\Exception\InvalidArgumentException"), "\n";
2827

2928
echo throws(function() {
30-
$manager = new MongoDB\Driver\Manager(STANDALONE . '/?journal=true', array('w' => 0));
29+
$manager = new MongoDB\Driver\Manager('mongodb://127.0.0.1/?journal=true', ['w' => 0]);
3130
}, "MongoDB\Driver\Exception\InvalidArgumentException"), "\n";
3231

3332
echo throws(function() {
34-
$manager = new MongoDB\Driver\Manager(STANDALONE, array('w' => -1, 'journal' => true));
33+
$manager = new MongoDB\Driver\Manager(null, ['w' => -1, 'journal' => true]);
3534
}, "MongoDB\Driver\Exception\InvalidArgumentException"), "\n";
3635

3736
echo throws(function() {
38-
$manager = new MongoDB\Driver\Manager(STANDALONE, array('w' => 0, 'journal' => true));
37+
$manager = new MongoDB\Driver\Manager(null, ['w' => 0, 'journal' => true]);
3938
}, "MongoDB\Driver\Exception\InvalidArgumentException"), "\n";
4039

4140
echo throws(function() {
42-
$manager = new MongoDB\Driver\Manager(STANDALONE, array('w' => -2));
41+
$manager = new MongoDB\Driver\Manager(null, ['w' => -2]);
4342
}, "MongoDB\Driver\Exception\InvalidArgumentException"), "\n";
4443

4544
?>
4645
===DONE===
4746
<?php exit(0); ?>
48-
--EXPECTF--
47+
--EXPECT--
4948
OK: Got MongoDB\Driver\Exception\InvalidArgumentException
50-
Failed to parse MongoDB URI: '%s/?w=-1&journal=true'
49+
Failed to parse MongoDB URI: 'mongodb://127.0.0.1/?w=-1&journal=true'
5150
OK: Got MongoDB\Driver\Exception\InvalidArgumentException
52-
Failed to parse MongoDB URI: '%s/?w=0&journal=true'
51+
Failed to parse MongoDB URI: 'mongodb://127.0.0.1/?w=0&journal=true'
5352
OK: Got MongoDB\Driver\Exception\InvalidArgumentException
5453
Journal conflicts with w value: -1
5554
OK: Got MongoDB\Driver\Exception\InvalidArgumentException

‎tests/manager/manager-ctor_error-001.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
--TEST--
22
MongoDB\Driver\Manager::__construct(): too many arguments
33
--SKIPIF--
4-
<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
54
<?php if (defined("HHVM_VERSION_ID")) exit("skip HHVM throws Exception instead of InvalidArgumentException"); ?>
65
--FILE--
76
<?php
8-
require_once __DIR__ . "/../utils/basic.inc";
7+
8+
require_once __DIR__ . '/../utils/tools.php';
99

1010
echo throws(function() {
11-
$manager = new MongoDB\Driver\Manager(STANDALONE, array(), array(), 1);
11+
$manager = new MongoDB\Driver\Manager(null, [], [], 1);
1212
}, "MongoDB\Driver\Exception\InvalidArgumentException"), "\n";
1313

1414
?>

‎tests/manager/manager-ctor_error-002.phpt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
--TEST--
22
MongoDB\Driver\Manager::__construct(): invalid URI
3-
--SKIPIF--
4-
<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
53
--FILE--
64
<?php
7-
require_once __DIR__ . "/../utils/basic.inc";
5+
6+
require_once __DIR__ . '/../utils/tools.php';
87

98
echo throws(function() {
109
$manager = new MongoDB\Driver\Manager("not a valid connection string");

0 commit comments

Comments
 (0)