Skip to content

Commit

Permalink
Merge pull request #122 from prooph/refactor_test_suite
Browse files Browse the repository at this point in the history
replace assertEquals with assertSame where appropiate
  • Loading branch information
prolic committed Apr 6, 2020
2 parents 5ad391a + ea30af9 commit 3b56360
Show file tree
Hide file tree
Showing 11 changed files with 137 additions and 137 deletions.
Expand Up @@ -110,11 +110,11 @@ public function can_describe_persistent_subscription(): Generator
$details = yield $this->manager->describe($this->stream, 'existing');
\assert($details instanceof PersistentSubscriptionDetails);

$this->assertEquals($this->stream, $details->eventStreamId());
$this->assertEquals('existing', $details->groupName());
$this->assertEquals(2, $details->totalItemsProcessed());
$this->assertEquals('Live', $details->status());
$this->assertEquals(1, $details->lastKnownEventNumber());
$this->assertSame($this->stream, $details->eventStreamId());
$this->assertSame('existing', $details->groupName());
$this->assertSame(2, $details->totalItemsProcessed());
$this->assertSame('Live', $details->status());
$this->assertSame(1, $details->lastKnownEventNumber());
});
}

Expand Down Expand Up @@ -198,7 +198,7 @@ public function can_list_persistent_subscriptions_for_stream(): Generator
foreach ($list as $details) {
\assert($details instanceof PersistentSubscriptionDetails);

$this->assertEquals($this->stream, $details->eventStreamId());
$this->assertSame($this->stream, $details->eventStreamId());

if ($details->groupName() === 'existing') {
$found = true;
Expand Down
12 changes: 6 additions & 6 deletions tests/UserManagement/creating_a_user.php
Expand Up @@ -97,25 +97,25 @@ public function creating_a_user_with_parameters_can_be_read(): Generator

$this->assertSame($login, $user->loginName());
$this->assertSame('ourofull', $user->fullName());
$this->assertEquals(['foo', 'bar'], $user->groups());
$this->assertSame(['foo', 'bar'], $user->groups());
$this->assertCount(5, $user->links());
$this->assertNull($user->dateLastUpdated());
$this->assertFalse($user->disabled());

$this->assertStringEndsWith('/users/' . $login . '/command/reset-password', $user->links()[0]->href());
$this->assertEquals('reset-password', $user->links()[0]->rel());
$this->assertSame('reset-password', $user->links()[0]->rel());

$this->assertStringEndsWith('/users/' . $login . '/command/change-password', $user->links()[1]->href());
$this->assertEquals('change-password', $user->links()[1]->rel());
$this->assertSame('change-password', $user->links()[1]->rel());

$this->assertStringEndsWith('/users/' . $login, $user->links()[2]->href());
$this->assertEquals('edit', $user->links()[2]->rel());
$this->assertSame('edit', $user->links()[2]->rel());

$this->assertStringEndsWith('/users/' . $login, $user->links()[3]->href());
$this->assertEquals('delete', $user->links()[3]->rel());
$this->assertSame('delete', $user->links()[3]->rel());

$this->assertStringEndsWith('/users/' . $login . '/command/disable', $user->links()[4]->href());
$this->assertEquals('disable', $user->links()[4]->rel());
$this->assertSame('disable', $user->links()[4]->rel());

$href = $user->getRelLink('disable');
$this->assertStringEndsWith('/users/' . $login . '/command/disable', $href);
Expand Down
2 changes: 1 addition & 1 deletion tests/UserManagement/updating_a_user.php
Expand Up @@ -68,6 +68,6 @@ public function updating_a_user_with_parameters_can_be_read(): Generator

$this->assertSame($name, $user->loginName());
$this->assertSame('something', $user->fullName());
$this->assertEquals(['bar', 'baz'], $user->groups());
$this->assertSame(['bar', 'baz'], $user->groups());
}
}
10 changes: 5 additions & 5 deletions tests/append_to_stream.php
Expand Up @@ -66,9 +66,9 @@ public function should_allow_appending_zero_events_to_stream_with_no_problems():
$slice = yield $this->connection->readStreamEventsForwardAsync($stream1, 0, 2, false);
\assert($slice instanceof StreamEventsSlice);
$this->assertCount(0, $slice->events());
$this->assertEquals($stream1, $slice->stream());
$this->assertEquals(0, $slice->fromEventNumber());
$this->assertEquals($slice->readDirection()->name(), ReadDirection::forward()->name());
$this->assertSame($stream1, $slice->stream());
$this->assertSame(0, $slice->fromEventNumber());
$this->assertSame($slice->readDirection()->name(), ReadDirection::forward()->name());

$result = yield $this->connection->appendToStreamAsync($stream2, ExpectedVersion::NO_STREAM, []);
$this->assertSame(-1, $result->nextExpectedVersion());
Expand Down Expand Up @@ -450,7 +450,7 @@ public function writes_predefined_event_id(): Generator

$this->connection->close();

$this->assertEquals($event->eventId()->toString(), $readEvent->eventId()->toString());
$this->assertSame($event->eventId()->toString(), $readEvent->eventId()->toString());

$url = \sprintf(
'http://%s:%s/streams/%s/head/backward/1?embed=body',
Expand Down Expand Up @@ -485,6 +485,6 @@ public function writes_predefined_event_id(): Generator

$eventId = $json['entries'][0]['eventId'];

$this->assertEquals($event->eventId()->toString(), $eventId);
$this->assertSame($event->eventId()->toString(), $eventId);
}
}
2 changes: 1 addition & 1 deletion tests/connect.php
Expand Up @@ -109,7 +109,7 @@ public function should_close_connection_after_configured_amount_of_failed_reconn

$connection->onClosed(function (ClientClosedEventArgs $args) use ($closed): void {
$this->assertInstanceOf(EventStoreConnection::class, $args->connection());
$this->assertEquals('Reconnection limit reached', $args->reason());
$this->assertSame('Reconnection limit reached', $args->reason());

$closed->resolve(true);
});
Expand Down
6 changes: 3 additions & 3 deletions tests/connection_string.php
Expand Up @@ -22,7 +22,7 @@ class connection_string extends TestCase
public function can_set_string_value(): void
{
$settings = ConnectionString::getConnectionSettings('targethost=testtest');
$this->assertEquals('testtest', $settings->targetHost());
$this->assertSame('testtest', $settings->targetHost());
}

/** @test */
Expand Down Expand Up @@ -72,7 +72,7 @@ public function can_set_gossip_seeds(): void
public function can_set_user_credentials(): void
{
$settings = ConnectionString::getConnectionSettings('DefaultUserCredentials=foo:bar');
$this->assertEquals('foo', $settings->defaultUserCredentials()->username());
$this->assertEquals('bar', $settings->defaultUserCredentials()->password());
$this->assertSame('foo', $settings->defaultUserCredentials()->username());
$this->assertSame('bar', $settings->defaultUserCredentials()->password());
}
}
4 changes: 2 additions & 2 deletions tests/transaction.php
Expand Up @@ -302,7 +302,7 @@ public function idempotency_is_correct_for_explicit_transactions_with_expected_v
yield $transaction1->writeAsync([$event]);
$result1 = yield $transaction1->commitAsync();
\assert($result1 instanceof WriteResult);
$this->assertEquals(0, $result1->nextExpectedVersion());
$this->assertSame(0, $result1->nextExpectedVersion());

$transaction2 = yield $this->connection->startTransactionAsync(
$stream,
Expand All @@ -312,7 +312,7 @@ public function idempotency_is_correct_for_explicit_transactions_with_expected_v
yield $transaction2->writeAsync([$event]);
$result2 = yield $transaction2->commitAsync();
\assert($result2 instanceof WriteResult);
$this->assertEquals(0, $result2->nextExpectedVersion());
$this->assertSame(0, $result2->nextExpectedVersion());

$result = yield $this->connection->readStreamEventsForwardAsync(
$stream,
Expand Down
2 changes: 1 addition & 1 deletion tests/when_a_projection_is_running.php
Expand Up @@ -89,7 +89,7 @@ public function should_be_able_to_get_the_projection_result(): Generator
$this->credentials
);

$this->assertEquals('{"count":1}', $result);
$this->assertSame('{"count":1}', $result);
});
}

Expand Down
2 changes: 1 addition & 1 deletion tests/when_updating_a_projection_query.php
Expand Up @@ -66,7 +66,7 @@ public function should_update_the_projection_query(): Generator
$this->credentials
);

$this->assertEquals($this->newQuery, $query);
$this->assertSame($this->newQuery, $query);
});
}
}
48 changes: 24 additions & 24 deletions tests/when_working_with_raw_stream_metadata.php
Expand Up @@ -43,10 +43,10 @@ public function setting_empty_metadata_works(): Generator

$meta = yield $this->connection->getRawStreamMetadataAsync($this->stream);
\assert($meta instanceof RawStreamMetadataResult);
$this->assertEquals($this->stream, $meta->stream());
$this->assertSame($this->stream, $meta->stream());
$this->assertFalse($meta->isStreamDeleted());
$this->assertEquals(0, $meta->metastreamVersion());
$this->assertEquals('', $meta->streamMetadata());
$this->assertSame(0, $meta->metastreamVersion());
$this->assertSame('', $meta->streamMetadata());
}

/**
Expand All @@ -61,10 +61,10 @@ public function setting_metadata_few_times_returns_last_metadata(): Generator

$meta = yield $this->connection->getRawStreamMetadataAsync($this->stream);
\assert($meta instanceof RawStreamMetadataResult);
$this->assertEquals($this->stream, $meta->stream());
$this->assertSame($this->stream, $meta->stream());
$this->assertFalse($meta->isStreamDeleted());
$this->assertEquals(0, $meta->metastreamVersion());
$this->assertEquals('', $meta->streamMetadata());
$this->assertSame(0, $meta->metastreamVersion());
$this->assertSame('', $meta->streamMetadata());

yield $this->connection->setStreamMetadataAsync(
$this->stream,
Expand Down Expand Up @@ -104,10 +104,10 @@ public function setting_metadata_with_expected_version_any_works(): Generator

$meta = yield $this->connection->getRawStreamMetadataAsync($this->stream);
\assert($meta instanceof RawStreamMetadataResult);
$this->assertEquals($this->stream, $meta->stream());
$this->assertSame($this->stream, $meta->stream());
$this->assertFalse($meta->isStreamDeleted());
$this->assertEquals(0, $meta->metastreamVersion());
$this->assertEquals('', $meta->streamMetadata());
$this->assertSame(0, $meta->metastreamVersion());
$this->assertSame('', $meta->streamMetadata());

yield $this->connection->setStreamMetadataAsync(
$this->stream,
Expand All @@ -116,10 +116,10 @@ public function setting_metadata_with_expected_version_any_works(): Generator

$meta = yield $this->connection->getRawStreamMetadataAsync($this->stream);
\assert($meta instanceof RawStreamMetadataResult);
$this->assertEquals($this->stream, $meta->stream());
$this->assertSame($this->stream, $meta->stream());
$this->assertFalse($meta->isStreamDeleted());
$this->assertEquals(1, $meta->metastreamVersion());
$this->assertEquals('', $meta->streamMetadata());
$this->assertSame(1, $meta->metastreamVersion());
$this->assertSame('', $meta->streamMetadata());
}

/**
Expand All @@ -134,10 +134,10 @@ public function setting_metadata_for_not_existing_stream_works(): Generator

$meta = yield $this->connection->getRawStreamMetadataAsync($this->stream);
\assert($meta instanceof RawStreamMetadataResult);
$this->assertEquals($this->stream, $meta->stream());
$this->assertSame($this->stream, $meta->stream());
$this->assertFalse($meta->isStreamDeleted());
$this->assertEquals(0, $meta->metastreamVersion());
$this->assertEquals('', $meta->streamMetadata());
$this->assertSame(0, $meta->metastreamVersion());
$this->assertSame('', $meta->streamMetadata());
}

/**
Expand All @@ -158,10 +158,10 @@ public function setting_metadata_for_existing_stream_works(): Generator

$meta = yield $this->connection->getRawStreamMetadataAsync($this->stream);
\assert($meta instanceof RawStreamMetadataResult);
$this->assertEquals($this->stream, $meta->stream());
$this->assertSame($this->stream, $meta->stream());
$this->assertFalse($meta->isStreamDeleted());
$this->assertEquals(0, $meta->metastreamVersion());
$this->assertEquals('', $meta->streamMetadata());
$this->assertSame(0, $meta->metastreamVersion());
$this->assertSame('', $meta->streamMetadata());
}

/**
Expand Down Expand Up @@ -190,10 +190,10 @@ public function getting_metadata_for_nonexisting_stream_returns_empty_string():
{
$meta = yield $this->connection->getRawStreamMetadataAsync($this->stream);
\assert($meta instanceof RawStreamMetadataResult);
$this->assertEquals($this->stream, $meta->stream());
$this->assertSame($this->stream, $meta->stream());
$this->assertFalse($meta->isStreamDeleted());
$this->assertEquals(-1, $meta->metastreamVersion());
$this->assertEquals('', $meta->streamMetadata());
$this->assertSame(-1, $meta->metastreamVersion());
$this->assertSame('', $meta->streamMetadata());
}

/**
Expand All @@ -207,9 +207,9 @@ public function getting_metadata_for_deleted_stream_returns_empty_string_and_sig

$meta = yield $this->connection->getRawStreamMetadataAsync($this->stream);
\assert($meta instanceof RawStreamMetadataResult);
$this->assertEquals($this->stream, $meta->stream());
$this->assertSame($this->stream, $meta->stream());
$this->assertTrue($meta->isStreamDeleted());
$this->assertEquals(EventNumber::DELETED_STREAM, $meta->metastreamVersion());
$this->assertEquals('', $meta->streamMetadata());
$this->assertSame(EventNumber::DELETED_STREAM, $meta->metastreamVersion());
$this->assertSame('', $meta->streamMetadata());
}
}

0 comments on commit 3b56360

Please sign in to comment.