Merge remote-tracking branch 'upstream/master'

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

diff --git a/test/php/Nominatim/OutputTest.php b/test/php/Nominatim/OutputTest.php
index 486448456c10292bc1df6713a3197c6e6f5fd612..cbfebb7d40bc30820179a88ef188873276d3ad65 100644 (file)
--- a/test/php/Nominatim/OutputTest.php
+++ b/test/php/Nominatim/OutputTest.php
@@ -2,7 +2,7 @@
 
 namespace Nominatim;
 
-require_once(CONST_BasePath.'/lib/output.php');
+require_once(CONST_LibDir.'/output.php');
 
 class OutputTest extends \PHPUnit\Framework\TestCase
 {
@@ -10,67 +10,62 @@ class OutputTest extends \PHPUnit\Framework\TestCase
     {
         $aFeature = array('osm_type' => 'N', 'osm_id'=> 38274, 'class' => 'place');
         $this->assertSame(
-                detailsPermaLink($aFeature),
-                '<a href="details.php?osmtype=N&osmid=38274&class=place">node 38274</a>'
-                );
+            detailsPermaLink($aFeature),
+            '<a href="details.php?osmtype=N&osmid=38274&class=place">node 38274</a>'
+        );
     }
 
     public function testDetailsPermaLinkWay()
     {
         $aFeature = array('osm_type' => 'W', 'osm_id'=> 65, 'class' => 'highway');
         $this->assertSame(
-                detailsPermaLink($aFeature),
-                '<a href="details.php?osmtype=W&osmid=65&class=highway">way 65</a>'
-                );
+            detailsPermaLink($aFeature),
+            '<a href="details.php?osmtype=W&osmid=65&class=highway">way 65</a>'
+        );
     }
 
     public function testDetailsPermaLinkRelation()
     {
         $aFeature = array('osm_type' => 'R', 'osm_id'=> 9908, 'class' => 'waterway');
         $this->assertSame(
-                detailsPermaLink($aFeature),
-                '<a href="details.php?osmtype=R&osmid=9908&class=waterway">relation 9908</a>'
-                );
+            detailsPermaLink($aFeature),
+            '<a href="details.php?osmtype=R&osmid=9908&class=waterway">relation 9908</a>'
+        );
     }
 
     public function testDetailsPermaLinkTiger()
     {
         $aFeature = array('osm_type' => 'T', 'osm_id'=> 2, 'place_id' => 334);
         $this->assertSame(
-                detailsPermaLink($aFeature, 'foo'),
-                '<a href="details.php?place_id=334">foo</a>'
-                );
+            detailsPermaLink($aFeature, 'foo'),
+            '<a href="details.php?place_id=334">foo</a>'
+        );
     }
 
     public function testDetailsPermaLinkInterpolation()
     {
         $aFeature = array('osm_type' => 'I', 'osm_id'=> 400, 'place_id' => 3);
         $this->assertSame(
-                detailsPermaLink($aFeature, 'foo'),
-                '<a href="details.php?place_id=3">foo</a>'
-                );
+            detailsPermaLink($aFeature, 'foo'),
+            '<a href="details.php?place_id=3">foo</a>'
+        );
     }
 
     public function testDetailsPermaLinkWithExtraPropertiesNode()
     {
         $aFeature = array('osm_type' => 'N', 'osm_id'=> 2, 'class' => 'amenity');
         $this->assertSame(
-                detailsPermaLink($aFeature, 'something', 'class="xtype"'),
-                '<a class="xtype" href="details.php?osmtype=N&osmid=2&class=amenity">something</a>'
-                );
+            detailsPermaLink($aFeature, 'something', 'class="xtype"'),
+            '<a class="xtype" href="details.php?osmtype=N&osmid=2&class=amenity">something</a>'
+        );
     }
 
     public function testDetailsPermaLinkWithExtraPropertiesTiger()
     {
         $aFeature = array('osm_type' => 'T', 'osm_id'=> 5, 'place_id' => 46);
         $this->assertSame(
-                detailsPermaLink($aFeature, 'something', 'class="xtype"'),
-                '<a class="xtype" href="details.php?place_id=46">something</a>'
-                );
+            detailsPermaLink($aFeature, 'something', 'class="xtype"'),
+            '<a class="xtype" href="details.php?place_id=46">something</a>'
+        );
     }
-
-
-
-
-
 }