Skip to content

PHPLIB-816: Cleanup collections created when tests are successful #1075

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 11 commits into from
Jun 1, 2023
Merged

PHPLIB-816: Cleanup collections created when tests are successful #1075

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
88e5c5a
Explicitly drop collection & databases in tests to clean them on tear…
GromNaN May 19, 2023
6e3a055
Removing all collections is enough to drop the database
GromNaN May 22, 2023
7748920
Update comments & use createCollection and dropCollection when approp…
GromNaN May 23, 2023
4f31668
Drop collections created by CrudSpecFunctionalTest
GromNaN May 24, 2023
1d4f79a
Explicitly set the database and collection name
GromNaN May 25, 2023
91d5b99
Use the collection instance to drop it with its options
GromNaN May 25, 2023
f8ea86e
Keep options to drop encrypted collection on tearDown
GromNaN May 25, 2023
368100d
Apply writeconcern only on create/drop operations
GromNaN May 25, 2023
18e590e
Apply review
GromNaN May 30, 2023
bbc86ec
Update comment
GromNaN Jun 1, 2023
6af4531
Merge branch 'master' into PHPLIB-816
GromNaN Jun 1, 2023
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
10 changes: 5 additions & 5 deletions tests/Collection/CollectionFunctionalTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ public function testAggregateWithinTransaction(): void
$this->skipIfTransactionsAreNotSupported();

// Collection must be created before the transaction starts
$this->createCollection();
$this->createCollection($this->getDatabaseName(), $this->getCollectionName());

$session = $this->manager->startSession();
$session->startTransaction();
Expand Down Expand Up @@ -294,7 +294,7 @@ public function testFindWithinTransaction(): void
$this->skipIfTransactionsAreNotSupported();

// Collection must be created before the transaction starts
$this->createCollection();
$this->createCollection($this->getDatabaseName(), $this->getCollectionName());

$session = $this->manager->startSession();
$session->startTransaction();
Expand Down Expand Up @@ -727,7 +727,7 @@ public function testMethodDoesNotInheritReadWriteConcernInTranasaction(Closure $
{
$this->skipIfTransactionsAreNotSupported();

$this->createCollection();
$this->createCollection($this->getDatabaseName(), $this->getCollectionName());

$session = $this->manager->startSession();
$session->startTransaction();
Expand All @@ -753,7 +753,7 @@ public function testMethodInTransactionWithWriteConcernOption($method): void
{
$this->skipIfTransactionsAreNotSupported();

$this->createCollection();
$this->createCollection($this->getDatabaseName(), $this->getCollectionName());

$session = $this->manager->startSession();
$session->startTransaction();
Expand All @@ -773,7 +773,7 @@ public function testMethodInTransactionWithReadConcernOption($method): void
{
$this->skipIfTransactionsAreNotSupported();

$this->createCollection();
$this->createCollection($this->getDatabaseName(), $this->getCollectionName());

$session = $this->manager->startSession();
$session->startTransaction();
Expand Down
3 changes: 1 addition & 2 deletions tests/Collection/CrudSpecFunctionalTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,7 @@ public function setUp(): void
{
parent::setUp();

$this->expectedCollection = new Collection($this->manager, $this->getDatabaseName(), $this->getCollectionName() . '.expected');
$this->expectedCollection->drop();
$this->expectedCollection = $this->dropCollection($this->getDatabaseName(), $this->getCollectionName() . '.expected');
}

/** @dataProvider provideSpecificationTests */
Expand Down
13 changes: 1 addition & 12 deletions tests/Collection/FunctionalTestCase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,6 @@ public function setUp(): void
{
parent::setUp();

$this->collection = new Collection($this->manager, $this->getDatabaseName(), $this->getCollectionName());

$this->dropCollection();
}

public function tearDown(): void
{
if (! $this->hasFailed()) {
$this->dropCollection();
}

parent::tearDown();
$this->collection = $this->dropCollection($this->getDatabaseName(), $this->getCollectionName());
}
}
Loading