Skip to content

Commit 3707804

Browse files
lornajanelornajane
committed
Move tests to using class constants instead of strings
1 parent 43d3001 commit 3707804

File tree

2 files changed

+29
-29
lines changed

2 files changed

+29
-29
lines changed

‎tests/PHPCouchDB/DatabaseTest.php

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ public function testGetAllDocs() {
3030
$client = new Client(['handler' => $handler]);
3131

3232
// userland code starts
33-
$server = new \PHPCouchDB\Server(["client" => $client]);
34-
$database = $server->useDB(["name" => "egdb"]);
33+
$server = new \PHPCouchDB\Server([\PHPCouchDB\Server::OPTION_CLIENT => $client]);
34+
$database = $server->useDB([\PHPCouchDB\Server::OPTION_NAME => "egdb"]);
3535
$docs = $database->getAllDocs();
3636

3737
$this->assertInternalType('array', $docs);
@@ -50,8 +50,8 @@ public function testGetAllDocsWithNoDocs() {
5050
$client = new Client(['handler' => $handler]);
5151

5252
// userland code starts
53-
$server = new \PHPCouchDB\Server(["client" => $client]);
54-
$database = $server->useDB(["name" => "egdb"]);
53+
$server = new \PHPCouchDB\Server([\PHPCouchDB\Server::OPTION_CLIENT => $client]);
54+
$database = $server->useDB([\PHPCouchDB\Server::OPTION_NAME => "egdb"]);
5555
$docs = $database->getAllDocs();
5656

5757
$this->assertInternalType('array', $docs);
@@ -67,8 +67,8 @@ public function testCreateWithID() {
6767
$client = new Client(['handler' => $handler]);
6868

6969
// userland code starts
70-
$server = new \PHPCouchDB\Server(["client" => $client]);
71-
$database = $server->useDB(["name" => "egdb"]);
70+
$server = new \PHPCouchDB\Server([\PHPCouchDB\Server::OPTION_CLIENT => $client]);
71+
$database = $server->useDB([\PHPCouchDB\Server::OPTION_NAME => "egdb"]);
7272
$doc = $database->create(["noise" => "howl", "id" => "abcde12345"]);
7373

7474
$this->assertInstanceOf('PHPCouchDB\Document', $doc);
@@ -85,8 +85,8 @@ public function testCreateWithoutID() {
8585
$client = new Client(['handler' => $handler]);
8686

8787
// userland code starts
88-
$server = new \PHPCouchDB\Server(["client" => $client]);
89-
$database = $server->useDB(["name" => "egdb"]);
88+
$server = new \PHPCouchDB\Server([\PHPCouchDB\Server::OPTION_CLIENT => $client]);
89+
$database = $server->useDB([\PHPCouchDB\Server::OPTION_NAME => "egdb"]);
9090
$doc = $database->create(["noise" => "howl"]);
9191

9292
$this->assertInstanceOf('PHPCouchDB\Document', $doc);
@@ -105,8 +105,8 @@ public function testGetDocById() {
105105
$client = new Client(['handler' => $handler]);
106106

107107
// userland code starts
108-
$server = new \PHPCouchDB\Server(["client" => $client]);
109-
$database = $server->useDB(["name" => "egdb"]);
108+
$server = new \PHPCouchDB\Server([\PHPCouchDB\Server::OPTION_CLIENT => $client]);
109+
$database = $server->useDB([\PHPCouchDB\Server::OPTION_NAME => "egdb"]);
110110
$doc = $database->create(["noise" => "crackle"]);
111111

112112
$fetched_doc = $database->getDocById($doc->id);
@@ -122,8 +122,8 @@ public function testGetName() {
122122
$client = new Client(['handler' => $handler]);
123123

124124
// userland code starts
125-
$server = new \PHPCouchDB\Server(["client" => $client]);
126-
$database = $server->useDB(["name" => "egdb"]);
125+
$server = new \PHPCouchDB\Server([\PHPCouchDB\Server::OPTION_CLIENT => $client]);
126+
$database = $server->useDB([\PHPCouchDB\Server::OPTION_NAME => "egdb"]);
127127

128128
$this->assertInternalType('string', $database->getName());
129129
}
@@ -135,8 +135,8 @@ public function testGetClient() {
135135
$client = new Client(['handler' => $handler]);
136136

137137
// userland code starts
138-
$server = new \PHPCouchDB\Server(["client" => $client]);
139-
$database = $server->useDB(["name" => "egdb"]);
138+
$server = new \PHPCouchDB\Server([\PHPCouchDB\Server::OPTION_CLIENT => $client]);
139+
$database = $server->useDB([\PHPCouchDB\Server::OPTION_NAME => "egdb"]);
140140

141141
$this->assertInstanceOf('\GuzzleHttp\ClientInterface', $database->getClient());
142142
}
@@ -154,9 +154,9 @@ public function testAllDocsWithoutIncludeDocs() {
154154
$client = new Client(['handler' => $handler]);
155155

156156
// userland code starts
157-
$server = new \PHPCouchDB\Server(["client" => $client]);
158-
$database = $server->useDB(["name" => "egdb"]);
159-
$docs = $database->getAllDocs(["include_docs" => false]);
157+
$server = new \PHPCouchDB\Server([\PHPCouchDB\Server::OPTION_CLIENT => $client]);
158+
$database = $server->useDB([\PHPCouchDB\Server::OPTION_NAME => "egdb"]);
159+
$docs = $database->getAllDocs([\PHPCouchDB\Database::OPTION_INCLUDE_DOCS => false]);
160160

161161
$this->assertInternalType('array', $docs);
162162
$this->assertInternalType('array', $docs[0]);
@@ -178,8 +178,8 @@ public function testView() {
178178
$client = new Client(['handler' => $handler]);
179179

180180
// userland code starts
181-
$server = new \PHPCouchDB\Server(["client" => $client]);
182-
$database = $server->useDB(["name" => "egdb"]);
181+
$server = new \PHPCouchDB\Server([\PHPCouchDB\Server::OPTION_CLIENT => $client]);
182+
$database = $server->useDB([\PHPCouchDB\Server::OPTION_NAME => "egdb"]);
183183
$docs = $database->getView(["ddoc" => "myview", "view" => "year", "group" => true]);
184184

185185
$this->assertInternalType('array', $docs);
@@ -201,8 +201,8 @@ public function testViewWithIncludeDocs() {
201201
$client = new Client(['handler' => $handler]);
202202

203203
// userland code starts
204-
$server = new \PHPCouchDB\Server(["client" => $client]);
205-
$database = $server->useDB(["name" => "egdb"]);
204+
$server = new \PHPCouchDB\Server([\PHPCouchDB\Server::OPTION_CLIENT => $client]);
205+
$database = $server->useDB([\PHPCouchDB\Server::OPTION_NAME => "egdb"]);
206206
$docs = $database->getView(["ddoc" => "myview", "view" => "year", "reduce" => false, "limit" => 3, "include_docs" => true]);
207207

208208
$this->assertInternalType('array', $docs);

‎tests/PHPCouchDB/DocumentTest.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ public function testUpdate() {
2929
$client = new Client(['handler' => $handler]);
3030

3131
// userland code starts
32-
$server = new \PHPCouchDB\Server(["client" => $client]);
33-
$database = $server->useDB(["name" => "egdb"]);
32+
$server = new \PHPCouchDB\Server([\PHPCouchDB\Server::OPTION_CLIENT => $client]);
33+
$database = $server->useDB([\PHPCouchDB\Server::OPTION_NAME => "egdb"]);
3434
$doc = $database->create(["noise" => "howl", "id" => "abcde12345"]);
3535

3636
$doc->noise = "purr";
@@ -54,8 +54,8 @@ public function testUpdateConflict() {
5454
$client = new Client(['handler' => $handler]);
5555

5656
// userland code starts
57-
$server = new \PHPCouchDB\Server(["client" => $client]);
58-
$database = $server->useDB(["name" => "egdb"]);
57+
$server = new \PHPCouchDB\Server([\PHPCouchDB\Server::OPTION_CLIENT => $client]);
58+
$database = $server->useDB([\PHPCouchDB\Server::OPTION_NAME => "egdb"]);
5959
$doc = $database->create(["noise" => "howl", "id" => "abcde12345"]);
6060

6161
$doc->noise = "purr";
@@ -74,8 +74,8 @@ public function testDelete() {
7474
$client = new Client(['handler' => $handler]);
7575

7676
// userland code starts
77-
$server = new \PHPCouchDB\Server(["client" => $client]);
78-
$database = $server->useDB(["name" => "egdb"]);
77+
$server = new \PHPCouchDB\Server([\PHPCouchDB\Server::OPTION_CLIENT => $client]);
78+
$database = $server->useDB([\PHPCouchDB\Server::OPTION_NAME => "egdb"]);
7979
$doc = $database->create(["noise" => "howl", "id" => "abcde12345"]);
8080

8181
$result = $doc->delete();
@@ -99,8 +99,8 @@ public function testDeleteConflict() {
9999
$client = new Client(['handler' => $handler]);
100100

101101
// userland code starts
102-
$server = new \PHPCouchDB\Server(["client" => $client]);
103-
$database = $server->useDB(["name" => "egdb"]);
102+
$server = new \PHPCouchDB\Server([\PHPCouchDB\Server::OPTION_CLIENT => $client]);
103+
$database = $server->useDB([\PHPCouchDB\Server::OPTION_NAME => "egdb"]);
104104
$doc = $database->create(["noise" => "howl", "id" => "abcde12345"]);
105105

106106
$result = $doc->delete();

0 commit comments

Comments
 (0)