Merge remote-tracking branch 'upstream/master'

[nominatim.git] / test / php / Nominatim / DBTest.php

diff --git a/test/php/Nominatim/DBTest.php b/test/php/Nominatim/DBTest.php
index e47919758a449175683fa5721d3ab75d1ec7fa38..1991f6f1e7655d69da15c4096ea237e801ca5b08 100644 (file)
--- a/test/php/Nominatim/DBTest.php
+++ b/test/php/Nominatim/DBTest.php
@@ -128,11 +128,19 @@ class DBTest extends \PHPUnit\Framework\TestCase
 
     public function testAgainstDatabase()
     {
 
     public function testAgainstDatabase()
     {

-        if (getenv('UNIT_TEST_DSN') == false) $this->markTestSkipped('UNIT_TEST_DSN not set');
+        $unit_test_dsn = getenv('UNIT_TEST_DSN') != false ?
+                            getenv('UNIT_TEST_DSN') :
+                            'pgsql:dbname=nominatim_unit_tests';
+
+        $this->assertRegExp(
+            '/unit_test/',
+            $unit_test_dsn,
+            'Test database will get destroyed, thus should have a name like unit_test to be safe'
+        );

 
         ## Create the database.
         {
 
         ## Create the database.
         {

-            $aDSNParsed = \Nominatim\DB::parseDSN(getenv('UNIT_TEST_DSN'));
+            $aDSNParsed = \Nominatim\DB::parseDSN($unit_test_dsn);

             $sDbname = $aDSNParsed['database'];
             $aDSNParsed['database'] = 'postgres';
 
             $sDbname = $aDSNParsed['database'];
             $aDSNParsed['database'] = 'postgres';
 


@@ -142,7 +150,7 @@ class DBTest extends \PHPUnit\Framework\TestCase
             $oDB->exec('CREATE DATABASE ' . $sDbname);
         }
 
             $oDB->exec('CREATE DATABASE ' . $sDbname);
         }
 

-        $oDB = new \Nominatim\DB(getenv('UNIT_TEST_DSN'));
+        $oDB = new \Nominatim\DB($unit_test_dsn);

         $oDB->connect();
 
         $this->assertTrue(
         $oDB->connect();
 
         $this->assertTrue(