more tests for libphp - incorporate lonvias feedback

diff --git a/tests-php/Nominatim/NominatimTest.php b/tests-php/Nominatim/NominatimTest.php
index a36c029e606a2e691d60a3961867203435a5d197..4c5638b14eaebaa26f25ab2b310b720c49bec1fb 100644 (file)
--- a/tests-php/Nominatim/NominatimTest.php
+++ b/tests-php/Nominatim/NominatimTest.php
@@ -128,8 +128,10 @@ class NominatimTest extends \PHPUnit_Framework_TestCase
                // 4 words => 8 sets
                // 10 words => 511 sets
                // 15 words => 12911 sets
                // 4 words => 8 sets
                // 10 words => 511 sets
                // 15 words => 12911 sets

+               // 18 words => 65536 sets

                // 20 words => 169766 sets
                // 20 words => 169766 sets

-               // 28 words => 397594 sets
+               // 22 words => 401930 sets
+               // 28 words => 3505699 sets (needs more than 4GB via 'phpunit -d memory_limit=' to run)

                $this->assertEquals(
                        8,
                        count( getWordSets(array_fill( 0, 4, 'a'),0) )
                $this->assertEquals(
                        8,
                        count( getWordSets(array_fill( 0, 4, 'a'),0) )


@@ -137,8 +139,8 @@ class NominatimTest extends \PHPUnit_Framework_TestCase
 
 
                $this->assertEquals(
 
 
                $this->assertEquals(

-                       8,
-                       count( getWordSets(array_fill( 0, 28, 'a'),0) )
+                       65536,
+                       count( getWordSets(array_fill( 0, 18, 'a'),0) )

                );
 
 
                );
 
 

diff --git a/tests-php/README.txt b/tests-php/README.txt
index 8aee5d8ef3df5f3842d59cd2a6c19be70c60dc3d..d551c1da811ae9a5c292966a7e31f639652c928f 100644 (file)
--- a/tests-php/README.txt
+++ b/tests-php/README.txt
@@ -7,7 +7,7 @@ installed.
 
 To execute the test suite run
 $ cd tests-php
 
 To execute the test suite run
 $ cd tests-php

-$ phpunit
+$ phpunit ./

 
 It will read phpunit.xml which points to the library, test path, bootstrap
 strip and set other parameters.
 
 It will read phpunit.xml which points to the library, test path, bootstrap
 strip and set other parameters.