Merge pull request #3463 from lonvia/sqlalchemy14-with-psycopg

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

diff --git a/test/php/Nominatim/AddressDetailsTest.php b/test/php/Nominatim/AddressDetailsTest.php
index b29d908862346cc1c03f3dd819b410f10b53f66a..2041dcb4bff2558ee447ef1fb3c15361090f7b39 100644 (file)
--- a/test/php/Nominatim/AddressDetailsTest.php
+++ b/test/php/Nominatim/AddressDetailsTest.php
@@ -1,15 +1,23 @@
 <?php
 <?php

+/**
+ * SPDX-License-Identifier: GPL-2.0-only
+ *
+ * This file is part of Nominatim. (https://nominatim.org)
+ *
+ * Copyright (C) 2022 by the Nominatim developer community.
+ * For a full list of authors see the git log.
+ */

 
 namespace Nominatim;
 
 
 namespace Nominatim;
 

-require_once(CONST_BasePath.'/lib/init-website.php');
-require_once(CONST_BasePath.'/lib/AddressDetails.php');
+require_once(CONST_LibDir.'/init-website.php');
+require_once(CONST_LibDir.'/AddressDetails.php');

 
 
 class AddressDetailsTest extends \PHPUnit\Framework\TestCase
 {
 
 
 
 class AddressDetailsTest extends \PHPUnit\Framework\TestCase
 {
 

-    protected function setUp()
+    protected function setUp(): void

     {
         // How the fixture got created
         //
     {
         // How the fixture got created
         //


@@ -30,7 +38,7 @@ class AddressDetailsTest extends \PHPUnit\Framework\TestCase
         //
         // 5) copy&paste into file. Add commas between records
         //
         //
         // 5) copy&paste into file. Add commas between records
         //

-        $json = file_get_contents(CONST_BasePath.'/test/php/fixtures/address_details_10_downing_street.json');
+        $json = file_get_contents(CONST_DataDir.'/test/php/fixtures/address_details_10_downing_street.json');

         $data = json_decode($json, true);
 
         $this->oDbStub = $this->getMockBuilder(\DB::class)
         $data = json_decode($json, true);
 
         $this->oDbStub = $this->getMockBuilder(\DB::class)


@@ -70,7 +78,7 @@ class AddressDetailsTest extends \PHPUnit\Framework\TestCase
     {
         $oAD = new AddressDetails($this->oDbStub, 194663412, 10, 'en');
         $expected = array(
     {
         $oAD = new AddressDetails($this->oDbStub, 194663412, 10, 'en');
         $expected = array(

-                     'attraction' => '10 Downing Street',
+                     'tourism' => '10 Downing Street',

                      'house_number' => '10',
                      'road' => 'Downing Street',
                      'neighbourhood' => 'St. James\'s',
                      'house_number' => '10',
                      'road' => 'Downing Street',
                      'neighbourhood' => 'St. James\'s',


@@ -78,6 +86,8 @@ class AddressDetailsTest extends \PHPUnit\Framework\TestCase
                      'city' => 'London',
                      'state_district' => 'Greater London',
                      'state' => 'England',
                      'city' => 'London',
                      'state_district' => 'Greater London',
                      'state' => 'England',

+                     'ISO3166-2-lvl4' => 'GB-ENG',
+                     'ISO3166-2-lvl6' => 'GB-LND',

                      'postcode' => 'SW1A 2AA',
                      'country' => 'United Kingdom',
                      'country_code' => 'gb'
                      'postcode' => 'SW1A 2AA',
                      'country' => 'United Kingdom',
                      'country_code' => 'gb'