Skip to content

Commit 2e2e205

Browse files
alcaeusalcaeus
committed
Rename matrix testing exclusion groups
1 parent 903f190 commit 2e2e205

10 files changed

+57
-57
lines changed

‎.evergreen/run-tests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ if [ "$IS_MATRIX_TESTING" == "true" ]; then
3737
;;
3838
esac
3939

40-
PHPUNIT_OPTS="--dont-report-useless-tests --exclude-group matrix-testing-server-${MONGODB_VERSION_NUMBER}-driver-${DRIVER_MONGODB_VERSION},matrix-testing-server-${MONGODB_VERSION_NUMBER}-driver-${DRIVER_MONGODB_VERSION}-topology-${TOPOLOGY}"
40+
PHPUNIT_OPTS="--dont-report-useless-tests --exclude-group matrix-testing-exclude-server-${MONGODB_VERSION_NUMBER}-driver-${DRIVER_MONGODB_VERSION},matrix-testing-exclude-server-${MONGODB_VERSION_NUMBER}-driver-${DRIVER_MONGODB_VERSION}-topology-${TOPOLOGY}"
4141

4242
DIR=$(dirname $0)
4343
. $DIR/install-dependencies.sh

‎tests/Collection/CollectionFunctionalTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,8 +228,8 @@ public function testWithOptionsPassesOptions()
228228
}
229229

230230
/**
231-
* @group matrix-testing-server-4.4-driver-4.0
232-
* @group matrix-testing-server-5.0-driver-4.0
231+
* @group matrix-testing-exclude-server-4.4-driver-4.0
232+
* @group matrix-testing-exclude-server-5.0-driver-4.0
233233
*/
234234
public function testMapReduce()
235235
{

‎tests/Collection/CrudSpecFunctionalTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
*
1414
* @see https://github.com/mongodb/specifications/tree/master/source/crud/tests
1515
*
16-
* @group matrix-testing-server-5.0-driver-4.0
16+
* @group matrix-testing-exclude-server-5.0-driver-4.0
1717
*/
1818
class CrudSpecFunctionalTest extends FunctionalTestCase
1919
{

‎tests/Database/DatabaseFunctionalTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -154,9 +154,9 @@ public function testGetSelectsCollectionAndInheritsOptions()
154154
}
155155

156156
/**
157-
* @group matrix-testing-server-4.2-driver-4.0-topology-sharded_cluster
158-
* @group matrix-testing-server-4.4-driver-4.0-topology-sharded_cluster
159-
* @group matrix-testing-server-5.0-driver-4.0-topology-sharded_cluster
157+
* @group matrix-testing-exclude-server-4.2-driver-4.0-topology-sharded_cluster
158+
* @group matrix-testing-exclude-server-4.4-driver-4.0-topology-sharded_cluster
159+
* @group matrix-testing-exclude-server-5.0-driver-4.0-topology-sharded_cluster
160160
*/
161161
public function testModifyCollection()
162162
{

‎tests/DocumentationExamplesTest.php

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -63,19 +63,19 @@ public function testExample_3()
6363
// Start Example 3
6464
$insertManyResult = $db->inventory->insertMany([
6565
[
66-
'item' => 'journal',
66+
'item' => 'journal',
6767
'qty' => 25,
6868
'tags' => ['blank', 'red'],
6969
'size' => ['h' => 14, 'w' => 21, 'uom' => 'cm'],
7070
],
7171
[
72-
'item' => 'mat',
72+
'item' => 'mat',
7373
'qty' => 85,
7474
'tags' => ['gray'],
7575
'size' => ['h' => 27.9, 'w' => 35.5, 'uom' => 'cm'],
7676
],
7777
[
78-
'item' => 'mousepad',
78+
'item' => 'mousepad',
7979
'qty' => 25,
8080
'tags' => ['gel', 'blue'],
8181
'size' => ['h' => 19, 'w' => 22.85, 'uom' => 'cm'],
@@ -97,31 +97,31 @@ public function testExample_6_13()
9797
// Start Example 6
9898
$insertManyResult = $db->inventory->insertMany([
9999
[
100-
'item' => 'journal',
100+
'item' => 'journal',
101101
'qty' => 25,
102102
'size' => ['h' => 14, 'w' => 21, 'uom' => 'cm'],
103103
'status' => 'A',
104104
],
105105
[
106-
'item' => 'notebook',
106+
'item' => 'notebook',
107107
'qty' => 50,
108108
'size' => ['h' => 8.5, 'w' => 11, 'uom' => 'in'],
109109
'status' => 'A',
110110
],
111111
[
112-
'item' => 'paper',
112+
'item' => 'paper',
113113
'qty' => 100,
114114
'size' => ['h' => 8.5, 'w' => 11, 'uom' => 'in'],
115115
'status' => 'D',
116116
],
117117
[
118-
'item' => 'planner',
118+
'item' => 'planner',
119119
'qty' => 75,
120120
'size' => ['h' => 22.85, 'w' => 30, 'uom' => 'cm'],
121121
'status' => 'D',
122122
],
123123
[
124-
'item' => 'postcard',
124+
'item' => 'postcard',
125125
'qty' => 45,
126126
'size' => ['h' => 10, 'w' => 15.25, 'uom' => 'cm'],
127127
'status' => 'A',
@@ -200,31 +200,31 @@ public function testExample_14_19()
200200
// Start Example 14
201201
$insertManyResult = $db->inventory->insertMany([
202202
[
203-
'item' => 'journal',
203+
'item' => 'journal',
204204
'qty' => 25,
205205
'size' => ['h' => 14, 'w' => 21, 'uom' => 'cm'],
206206
'status' => 'A',
207207
],
208208
[
209-
'item' => 'notebook',
209+
'item' => 'notebook',
210210
'qty' => 50,
211211
'size' => ['h' => 8.5, 'w' => 11, 'uom' => 'in'],
212212
'status' => 'A',
213213
],
214214
[
215-
'item' => 'paper',
215+
'item' => 'paper',
216216
'qty' => 100,
217217
'size' => ['h' => 8.5, 'w' => 11, 'uom' => 'in'],
218218
'status' => 'D',
219219
],
220220
[
221-
'item' => 'planner',
221+
'item' => 'planner',
222222
'qty' => 75,
223223
'size' => ['h' => 22.85, 'w' => 30, 'uom' => 'cm'],
224224
'status' => 'D',
225225
],
226226
[
227-
'item' => 'postcard',
227+
'item' => 'postcard',
228228
'qty' => 45,
229229
'size' => ['h' => 10, 'w' => 15.25, 'uom' => 'cm'],
230230
'status' => 'A',
@@ -280,31 +280,31 @@ public function testExample_20_28()
280280
// Start Example 20
281281
$insertManyResult = $db->inventory->insertMany([
282282
[
283-
'item' => 'journal',
283+
'item' => 'journal',
284284
'qty' => 25,
285285
'tags' => ['blank', 'red'],
286286
'dim_cm' => [14, 21],
287287
],
288288
[
289-
'item' => 'notebook',
289+
'item' => 'notebook',
290290
'qty' => 50,
291291
'tags' => ['red', 'blank'],
292292
'dim_cm' => [14, 21],
293293
],
294294
[
295-
'item' => 'paper',
295+
'item' => 'paper',
296296
'qty' => 100,
297297
'tags' => ['red', 'blank', 'plain'],
298298
'dim_cm' => [14, 21],
299299
],
300300
[
301-
'item' => 'planner',
301+
'item' => 'planner',
302302
'qty' => 75,
303303
'tags' => ['blank', 'red'],
304304
'dim_cm' => [22.85, 30],
305305
],
306306
[
307-
'item' => 'postcard',
307+
'item' => 'postcard',
308308
'qty' => 45,
309309
'tags' => ['blue'],
310310
'dim_cm' => [10, 15.25],
@@ -386,34 +386,34 @@ public function testExample_29_37()
386386
// Start Example 29
387387
$insertManyResult = $db->inventory->insertMany([
388388
[
389-
'item' => 'journal',
389+
'item' => 'journal',
390390
'instock' => [
391391
['warehouse' => 'A', 'qty' => 5],
392392
['warehouse' => 'C', 'qty' => 15],
393393
],
394394
],
395395
[
396-
'item' => 'notebook',
396+
'item' => 'notebook',
397397
'instock' => [
398398
['warehouse' => 'C', 'qty' => 5],
399399
],
400400
],
401401
[
402-
'item' => 'paper',
402+
'item' => 'paper',
403403
'instock' => [
404404
['warehouse' => 'A', 'qty' => 60],
405405
['warehouse' => 'B', 'qty' => 15],
406406
],
407407
],
408408
[
409-
'item' => 'planner',
409+
'item' => 'planner',
410410
'instock' => [
411411
['warehouse' => 'A', 'qty' => 40],
412412
['warehouse' => 'B', 'qty' => 5],
413413
],
414414
],
415415
[
416-
'item' => 'postcard',
416+
'item' => 'postcard',
417417
'instock' => [
418418
['warehouse' => 'B', 'qty' => 15],
419419
['warehouse' => 'C', 'qty' => 35],
@@ -919,7 +919,7 @@ public function testExample_55_58()
919919
$this->assertInventoryCount(0);
920920
}
921921

922-
/** @group matrix-testing-server-5.0-driver-4.0-topology-sharded_cluster */
922+
/** @group matrix-testing-exclude-server-5.0-driver-4.0-topology-sharded_cluster */
923923
public function testChangeStreamExample_1_4()
924924
{
925925
if ($this->getPrimaryServer()->getType() === Server::TYPE_STANDALONE) {

‎tests/Model/IndexInfoFunctionalTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public function testIs2dSphere()
4242
$this->assertEquals($expectedVersion, $index['2dsphereIndexVersion']);
4343
}
4444

45-
/** @group matrix-testing-server-5.0-driver-4.0 */
45+
/** @group matrix-testing-exclude-server-5.0-driver-4.0 */
4646
public function testIsGeoHaystack()
4747
{
4848
$indexName = $this->collection->createIndex(['pos' => 'geoHaystack', 'x' => 1], ['bucketSize' => 5]);

‎tests/Operation/ListCollectionsFunctionalTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ public function testListCollectionsForNewlyCreatedDatabase()
3535
}
3636

3737
/**
38-
* @group matrix-testing-server-4.4-driver-4.0
39-
* @group matrix-testing-server-5.0-driver-4.0
38+
* @group matrix-testing-exclude-server-4.4-driver-4.0
39+
* @group matrix-testing-exclude-server-5.0-driver-4.0
4040
*/
4141
public function testIdIndexAndInfo()
4242
{

‎tests/Operation/MapReduceFunctionalTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
use stdClass;
1313

1414
/**
15-
* @group matrix-testing-server-4.4-driver-4.0
16-
* @group matrix-testing-server-5.0-driver-4.0
15+
* @group matrix-testing-exclude-server-4.4-driver-4.0
16+
* @group matrix-testing-exclude-server-5.0-driver-4.0
1717
*/
1818
class MapReduceFunctionalTest extends FunctionalTestCase
1919
{

‎tests/Operation/ModifyCollectionFunctionalTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
class ModifyCollectionFunctionalTest extends FunctionalTestCase
1010
{
1111
/**
12-
* @group matrix-testing-server-4.2-driver-4.0-topology-sharded_cluster
13-
* @group matrix-testing-server-4.4-driver-4.0-topology-sharded_cluster
14-
* @group matrix-testing-server-5.0-driver-4.0-topology-sharded_cluster
12+
* @group matrix-testing-exclude-server-4.2-driver-4.0-topology-sharded_cluster
13+
* @group matrix-testing-exclude-server-4.4-driver-4.0-topology-sharded_cluster
14+
* @group matrix-testing-exclude-server-5.0-driver-4.0-topology-sharded_cluster
1515
*/
1616
public function testCollMod()
1717
{

‎tests/Operation/WatchFunctionalTest.php

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
use ReflectionClass;
2121

2222
/**
23-
* @group matrix-testing-server-4.2-driver-4.0-topology-sharded_cluster
24-
* @group matrix-testing-server-4.4-driver-4.0-topology-sharded_cluster
25-
* @group matrix-testing-server-5.0-driver-4.0-topology-sharded_cluster
23+
* @group matrix-testing-exclude-server-4.2-driver-4.0-topology-sharded_cluster
24+
* @group matrix-testing-exclude-server-4.4-driver-4.0-topology-sharded_cluster
25+
* @group matrix-testing-exclude-server-5.0-driver-4.0-topology-sharded_cluster
2626
*/
2727
class WatchFunctionalTest extends FunctionalTestCase
2828
{
@@ -596,9 +596,9 @@ public function testInitialCursorIsNotClosed()
596596
}
597597

598598
/**
599-
* @group matrix-testing-server-4.2-driver-4.0-topology-replica_set
600-
* @group matrix-testing-server-4.4-driver-4.0-topology-replica_set
601-
* @group matrix-testing-server-5.0-driver-4.0-topology-replica_set
599+
* @group matrix-testing-exclude-server-4.2-driver-4.0-topology-replica_set
600+
* @group matrix-testing-exclude-server-4.4-driver-4.0-topology-replica_set
601+
* @group matrix-testing-exclude-server-5.0-driver-4.0-topology-replica_set
602602
*/
603603
public function testNextResumeTokenNotFound()
604604
{
@@ -617,9 +617,9 @@ public function testNextResumeTokenNotFound()
617617
}
618618

619619
/**
620-
* @group matrix-testing-server-4.2-driver-4.0-topology-replica_set
621-
* @group matrix-testing-server-4.4-driver-4.0-topology-replica_set
622-
* @group matrix-testing-server-5.0-driver-4.0-topology-replica_set
620+
* @group matrix-testing-exclude-server-4.2-driver-4.0-topology-replica_set
621+
* @group matrix-testing-exclude-server-4.4-driver-4.0-topology-replica_set
622+
* @group matrix-testing-exclude-server-5.0-driver-4.0-topology-replica_set
623623
*/
624624
public function testRewindResumeTokenNotFound()
625625
{
@@ -636,9 +636,9 @@ public function testRewindResumeTokenNotFound()
636636
}
637637

638638
/**
639-
* @group matrix-testing-server-4.2-driver-4.0-topology-replica_set
640-
* @group matrix-testing-server-4.4-driver-4.0-topology-replica_set
641-
* @group matrix-testing-server-5.0-driver-4.0-topology-replica_set
639+
* @group matrix-testing-exclude-server-4.2-driver-4.0-topology-replica_set
640+
* @group matrix-testing-exclude-server-4.4-driver-4.0-topology-replica_set
641+
* @group matrix-testing-exclude-server-5.0-driver-4.0-topology-replica_set
642642
*/
643643
public function testNextResumeTokenInvalidType()
644644
{
@@ -657,9 +657,9 @@ public function testNextResumeTokenInvalidType()
657657
}
658658

659659
/**
660-
* @group matrix-testing-server-4.2-driver-4.0-topology-replica_set
661-
* @group matrix-testing-server-4.4-driver-4.0-topology-replica_set
662-
* @group matrix-testing-server-5.0-driver-4.0-topology-replica_set
660+
* @group matrix-testing-exclude-server-4.2-driver-4.0-topology-replica_set
661+
* @group matrix-testing-exclude-server-4.4-driver-4.0-topology-replica_set
662+
* @group matrix-testing-exclude-server-5.0-driver-4.0-topology-replica_set
663663
*/
664664
public function testRewindResumeTokenInvalidType()
665665
{
@@ -848,9 +848,9 @@ public function testNextAdvancesKey()
848848
}
849849

850850
/**
851-
* @group matrix-testing-server-4.2-driver-4.0-topology-replica_set
852-
* @group matrix-testing-server-4.4-driver-4.0-topology-replica_set
853-
* @group matrix-testing-server-5.0-driver-4.0-topology-replica_set
851+
* @group matrix-testing-exclude-server-4.2-driver-4.0-topology-replica_set
852+
* @group matrix-testing-exclude-server-4.4-driver-4.0-topology-replica_set
853+
* @group matrix-testing-exclude-server-5.0-driver-4.0-topology-replica_set
854854
*/
855855
public function testResumeTokenNotFoundAdvancesKey()
856856
{

0 commit comments

Comments
 (0)