PHPC-180: Rename constant and pass the cleanup uri explicitly

- Use the new connection string constant that includes auth
- Call the cleanup routines explicitly when needed

Author: bjori

tests/bson/bson-utcdatetime-001.phpt

@@ -1,12 +1,12 @@
 --TEST--
 BSON BSON\UTCDatetime #001
 --SKIPIF--
-<?php require "tests/utils/basic-skipif.inc" ?>
+<?php require "tests/utils/basic-skipif.inc"; CLEANUP(STANDALONE) ?>
 --FILE--
 <?php
 require_once "tests/utils/basic.inc";
 
-$manager = new MongoDB\Driver\Manager(MONGODB_URI);
+$manager = new MongoDB\Driver\Manager(STANDALONE);
 
 $utcdatetime = new BSON\UTCDatetime(1416445411987);
 $result = $manager->executeInsert(NS, array('_id' => 1, 'x' => $utcdatetime));

tests/bulk/write-0001.phpt

@@ -6,7 +6,7 @@ MongoDB\Driver\BulkWrite: #001 Variety Bulk
 <?php
 require_once "tests/utils/basic.inc";
 
-$manager = new MongoDB\Driver\Manager(MONGODB_URI);
+$manager = new MongoDB\Driver\Manager(STANDALONE);
 
 $bulk = new MongoDB\Driver\BulkWrite;
 var_dump($bulk);

tests/bulk/write-0002.phpt

@@ -6,7 +6,7 @@ MongoDB\Driver\BulkWrite: #002 Get the generated ID
 <?php
 require_once "tests/utils/basic.inc";
 
-$manager = new MongoDB\Driver\Manager(MONGODB_URI);
+$manager = new MongoDB\Driver\Manager(STANDALONE);
 
 $hannes = array("name" => "Hannes", "country" => "USA", "gender" => "male");
 $hayley = array("name" => "Hayley", "country" => "USA", "gender" => "female");

tests/connect/standalone-auth-0001.phpt

@@ -1,18 +1,12 @@
 --TEST--
 Connect to MongoDB with using default auth mechanism
 --SKIPIF--
-<?php require "tests/utils/basic-skipif.inc"?>
+<?php require "tests/utils/basic-skipif.inc"; CLEANUP(STANDALONE_AUTH) ?>
 --FILE--
 <?php
 require_once "tests/utils/basic.inc";
 
-$username = "root";
-$password = "toor";
-$database = "admin";
-
-$parsed = parse_url(MONGODB_STANDALONE_AUTH_URI);
-$dsn = sprintf("mongodb://%s:%s@%s:%d/%s", $username, $password, $parsed["host"], $parsed["port"], $database);
-$manager = new MongoDB\Driver\Manager($dsn);
+$manager = new MongoDB\Driver\Manager(STANDALONE_AUTH);
 
 $bulk = new MongoDB\Driver\BulkWrite;
 

tests/connect/standalone-auth-0002.phpt

@@ -1,7 +1,7 @@
 --TEST--
 Connect to MongoDB with using default auth mechanism #002
 --SKIPIF--
-<?php require "tests/utils/basic-skipif.inc"?>
+<?php require "tests/utils/basic-skipif.inc"; CLEANUP(STANDALONE_AUTH) ?>
 --FILE--
 <?php
 require_once "tests/utils/basic.inc";
@@ -10,7 +10,7 @@ $username = "root";
 $password = "tooring";
 $database = "admin";
 
-$parsed = parse_url(MONGODB_STANDALONE_AUTH_URI);
+$parsed = parse_url(STANDALONE_AUTH);
 $dsn = sprintf("mongodb://%s:%s@%s:%d/%s", $username, $password, $parsed["host"], $parsed["port"], $database);
 $manager = new MongoDB\Driver\Manager($dsn);
 

tests/connect/standalone-plain-0001.phpt

@@ -1,7 +1,7 @@
 --TEST--
 Connect to MongoDB with using PLAIN auth mechanism
 --SKIPIF--
-<?php require "tests/utils/auth-plain-skipif.inc"?>
+<?php require "tests/utils/auth-plain-skipif.inc"; CLEANUP(STANDALONE_PLAIN) ?>
 --FILE--
 <?php
 require_once "tests/utils/basic.inc";
@@ -10,7 +10,7 @@ $username = "root";
 $password = "toor";
 $database = "admin";
 
-$parsed = parse_url(MONGODB_STANDALONE_PLAIN_URI);
+$parsed = parse_url(STANDALONE_PLAIN);
 $dsn = sprintf("mongodb://%s:%s@%s:%d/%s", $username, $password, $parsed["host"], $parsed["port"], $database);
 $adminmanager = new MongoDB\Driver\Manager($dsn);
 

tests/connect/standalone-plain-0002.phpt

@@ -10,7 +10,7 @@ $username = "root";
 $password = "toor";
 $database = "admin";
 
-$parsed = parse_url(MONGODB_STANDALONE_PLAIN_URI);
+$parsed = parse_url(STANDALONE_PLAIN);
 $dsn = sprintf("mongodb://%s:%s@%s:%d/%s", $username, $password, $parsed["host"], $parsed["port"], $database);
 $adminmanager = new MongoDB\Driver\Manager($dsn);
 

tests/connect/standalone-ssl-0001.phpt

@@ -16,7 +16,7 @@ $opts = array(
 );
 $context = stream_context_create($opts);
 
-$dsn = sprintf("%s/?ssl=true", MONGODB_STANDALONE_SSL_URI);
+$dsn = sprintf("%s/?ssl=true", STANDALONE_SSL);
 
 $manager = new MongoDB\Driver\Manager($dsn, array(), array("context" => $context));
 

tests/connect/standalone-ssl-0002.phpt

@@ -6,7 +6,7 @@ Connect to MongoDB with using SSL and verify the stream
 <?php
 require_once "tests/utils/basic.inc";
 
-$dsn = sprintf("%s/?ssl=true", MONGODB_STANDALONE_SSL_URI);
+$dsn = sprintf("%s/?ssl=true", STANDALONE_SSL);
 
 $SSL_DIR = realpath(__DIR__ . "/" . "./../../scripts/ssl/");
 function isValid(array $cert) {

tests/connect/standalone-x509-0001.phpt

@@ -29,12 +29,8 @@ $opts = array(
 );
 $context = stream_context_create($opts);
 
-$certusername = "C=US,ST=New York,L=New York City,O=MongoDB,OU=KernelUser,CN=client";
-
-
 try {
-    $parsed = parse_url(MONGODB_STANDALONE_X509_URI);
-    $dsn = sprintf("mongodb://%s@%s:%d/%s?ssl=true&authMechanism=MONGODB-X509", $certusername, $parsed["host"], $parsed["port"], DATABASE_NAME);
+    $dsn = sprintf("%s&ssl=true", STANDALONE_X509);
 
     $manager = new MongoDB\Driver\Manager($dsn, array(), array("context" => $context));