Use the MONGODB_URI constant

bjori · bjori · commit a541690559f4 · 2014-12-16T12:09:28.000-08:00
diff --git a/tests/batch/write-0002.phpt b/tests/batch/write-0002.phpt
@@ -33,7 +33,7 @@ printf("hannes: %s\nhayley: %s\n", $hannes_id, $hayley_id);
 ===DONE===
 <?php exit(0); ?>
 --EXPECTF--
-Inserted 2 documents to localhost
+Inserted 2 documents to %s
 hannes: %s
 hayley: %s
 ===DONE===
diff --git a/tests/standalone/manager-executeCommand-001.phpt b/tests/standalone/manager-executeCommand-001.phpt
@@ -28,7 +28,7 @@ var_dump($server->getPort());
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECT--
+--EXPECTF--
 bool(true)
 Dumping response document:
 array(1) {
@@ -44,6 +44,6 @@ array(1) {
   }
 }
 bool(true)
-string(9) "localhost"
-int(27017)
+string(%d) "%s"
+int(%d)
 ===DONE===
diff --git a/tests/standalone/manager-executeDelete-001.phpt b/tests/standalone/manager-executeDelete-001.phpt
@@ -24,9 +24,9 @@ var_dump(iterator_to_array($cursor));
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECT--
+--EXPECTF--
 ===> WriteResult
-server: localhost:27017
+server: %s:%d
 insertedCount: 0
 matchedCount: 0
 modifiedCount: 0
diff --git a/tests/standalone/manager-executeDelete-002.phpt b/tests/standalone/manager-executeDelete-002.phpt
@@ -25,9 +25,9 @@ var_dump(iterator_to_array($cursor));
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECT--
+--EXPECTF--
 ===> WriteResult
-server: localhost:27017
+server: %s:%d
 insertedCount: 0
 matchedCount: 0
 modifiedCount: 0
diff --git a/tests/standalone/manager-executeInsert-001.phpt b/tests/standalone/manager-executeInsert-001.phpt
@@ -20,9 +20,9 @@ var_dump(iterator_to_array($cursor));
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECT--
+--EXPECTF--
 ===> WriteResult
-server: localhost:27017
+server: %s:%d
 insertedCount: 1
 matchedCount: 0
 modifiedCount: 0
diff --git a/tests/standalone/manager-executeQuery-001.phpt b/tests/standalone/manager-executeQuery-001.phpt
@@ -31,10 +31,10 @@ var_dump(iterator_to_array($cursor));
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECT--
+--EXPECTF--
 bool(true)
 bool(true)
-string(9) "localhost"
+string(%d) "%s"
 int(27017)
 array(1) {
   [0]=>
diff --git a/tests/standalone/manager-executeUpdate-001.phpt b/tests/standalone/manager-executeUpdate-001.phpt
@@ -28,9 +28,9 @@ var_dump(iterator_to_array($cursor));
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECT--
+--EXPECTF--
 ===> WriteResult
-server: localhost:27017
+server: %s:%d
 insertedCount: 0
 matchedCount: 1
 modifiedCount: 1
diff --git a/tests/standalone/manager-executeUpdate-002.phpt b/tests/standalone/manager-executeUpdate-002.phpt
@@ -31,9 +31,9 @@ var_dump(iterator_to_array($cursor));
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECT--
+--EXPECTF--
 ===> WriteResult
-server: localhost:27017
+server: %s:%d
 insertedCount: 0
 matchedCount: 2
 modifiedCount: 2
diff --git a/tests/standalone/manager-executeUpdate-003.phpt b/tests/standalone/manager-executeUpdate-003.phpt
@@ -25,9 +25,9 @@ var_dump(iterator_to_array($cursor));
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECT--
+--EXPECTF--
 ===> WriteResult
-server: localhost:27017
+server: %s:%d
 insertedCount: 0
 matchedCount: 0
 modifiedCount: 0
diff --git a/tests/standalone/manager-executeUpdate-004.phpt b/tests/standalone/manager-executeUpdate-004.phpt
@@ -25,9 +25,9 @@ var_dump(iterator_to_array($cursor));
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECT--
+--EXPECTF--
 ===> WriteResult
-server: localhost:27017
+server: %s:%d
 insertedCount: 0
 matchedCount: 0
 modifiedCount: 0
diff --git a/tests/standalone/manager-executeWriteBatch-001.phpt b/tests/standalone/manager-executeWriteBatch-001.phpt
@@ -27,9 +27,9 @@ var_dump(iterator_to_array($cursor));
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECT--
+--EXPECTF--
 ===> WriteResult
-server: localhost:27017
+server: %s:%d
 insertedCount: 2
 matchedCount: 1
 modifiedCount: 1
diff --git a/tests/standalone/manager-executeWriteBatch-002.phpt b/tests/standalone/manager-executeWriteBatch-002.phpt
@@ -37,7 +37,7 @@ WriteException.message: %s
 WriteException.code: 0
 
 ===> WriteResult
-server: localhost:27017
+server: %s:%d
 insertedCount: 1
 matchedCount: 0
 modifiedCount: 0
diff --git a/tests/standalone/manager-executeWriteBatch-003.phpt b/tests/standalone/manager-executeWriteBatch-003.phpt
@@ -37,7 +37,7 @@ WriteException.message: %s
 WriteException.code: 0
 
 ===> WriteResult
-server: localhost:27017
+server: %s:%d
 insertedCount: 2
 matchedCount: 0
 modifiedCount: 0
diff --git a/tests/standalone/manager-executeWriteBatch-004.phpt b/tests/standalone/manager-executeWriteBatch-004.phpt
@@ -27,7 +27,7 @@ var_dump(iterator_to_array($cursor));
 <?php exit(0); ?>
 --EXPECTF--
 ===> WriteResult
-server: localhost:27017
+server: %s:%d
 insertedCount: 0
 matchedCount: 1
 modifiedCount: 1
diff --git a/tests/standalone/server-construct-001.phpt b/tests/standalone/server-construct-001.phpt
@@ -6,15 +6,16 @@ MongoDB\Server::__construct()
 <?php
 require_once "tests/utils/basic.inc";
 
-$server = new MongoDB\Server('localhost', 27017);
+$parsed = parse_url(MONGODB_URI);
+$server = new MongoDB\Server($parsed["host"], $parsed["port"]);
 
-var_dump($server->getHost());
-var_dump($server->getPort());
+var_dump($server->getHost() == $parsed["host"]);
+var_dump($server->getPort() == $parsed["port"]);
 
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECT--
-string(9) "localhost"
-int(27017)
+--EXPECTF--
+bool(true)
+bool(true)
 ===DONE===
diff --git a/tests/standalone/server-executeCommand-001.phpt b/tests/standalone/server-executeCommand-001.phpt
@@ -6,7 +6,8 @@ MongoDB\Server::executeCommand()
 <?php
 require_once "tests/utils/basic.inc";
 
-$server = new MongoDB\Server('localhost', 27017);
+$parsed = parse_url(MONGODB_URI);
+$server = new MongoDB\Server($parsed["host"], $parsed["port"]);
 
 $command = new MongoDB\Command(array('isMaster' => 1));
 $result = $server->executeCommand(DATABASE_NAME, $command);
diff --git a/tests/standalone/server-executeQuery-001.phpt b/tests/standalone/server-executeQuery-001.phpt
@@ -6,7 +6,8 @@ MongoDB\Server::executeQuery() with filter and projection
 <?php
 require_once "tests/utils/basic.inc";
 
-$server = new MongoDB\Server('localhost', 27017);
+$parsed = parse_url(MONGODB_URI);
+$server = new MongoDB\Server($parsed["host"], $parsed["port"]);
 
 // load fixtures for test
 $batch = new \MongoDB\WriteBatch();
diff --git a/tests/standalone/server-executeQuery-002.phpt b/tests/standalone/server-executeQuery-002.phpt
@@ -6,7 +6,8 @@ MongoDB\Server::executeQuery() with sort and empty filter
 <?php
 require_once "tests/utils/basic.inc";
 
-$server = new MongoDB\Server('localhost', 27017);
+$parsed = parse_url(MONGODB_URI);
+$server = new MongoDB\Server($parsed["host"], $parsed["port"]);
 
 // load fixtures for test
 $batch = new \MongoDB\WriteBatch();
diff --git a/tests/standalone/server-executeQuery-003.phpt b/tests/standalone/server-executeQuery-003.phpt
@@ -6,7 +6,8 @@ MongoDB\Server::executeQuery() with modifiers and empty filter
 <?php
 require_once "tests/utils/basic.inc";
 
-$server = new MongoDB\Server('localhost', 27017);
+$parsed = parse_url(MONGODB_URI);
+$server = new MongoDB\Server($parsed["host"], $parsed["port"]);
 
 // load fixtures for test
 $batch = new \MongoDB\WriteBatch();
diff --git a/tests/standalone/server-executeWriteBatch-001.phpt b/tests/standalone/server-executeWriteBatch-001.phpt
@@ -6,7 +6,8 @@ MongoDB\Server::executeWriteBatch()
 <?php
 require_once "tests/utils/basic.inc";
 
-$server = new MongoDB\Server('localhost', 27017);
+$parsed = parse_url(MONGODB_URI);
+$server = new MongoDB\Server($parsed["host"], $parsed["port"]);
 
 $batch = new MongoDB\WriteBatch();
 $batch->insert(array('_id' => 1, 'x' => 1));
@@ -29,11 +30,11 @@ var_dump(iterator_to_array($cursor));
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECT--
+--EXPECTF--
 WriteResult.server is the same: yes
 
 ===> WriteResult
-server: localhost:27017
+server: %s:%d
 insertedCount: 2
 matchedCount: 1
 modifiedCount: 1
diff --git a/tests/standalone/write-error-001.phpt b/tests/standalone/write-error-001.phpt
@@ -26,8 +26,8 @@ try {
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECT--
-server: localhost:27017
+--EXPECTF--
+server: %s:%d
 insertedCount: 0
 matchedCount: 0
 modifiedCount: 0
