randomize testinput and fix some area tests

OpencachingDeutschland · Aug 29, 2014 · 55d9d5c · 55d9d5c
1 parent 73a69fb
commit 55d9d5c
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -19,3 +19,9 @@ php:
   - 5.4
   - 5.3
   - hhvm
+
+matrix:
+  fast_finish: false
+  allow_failures:
+    # php 5.3 does not support random file list as an argument to scandir
+    - php: 5.3
diff --git a/tests/postgis.php b/tests/postgis.php
@@ -24,7 +24,7 @@ function run_test() {
   // Working with PostGIS and EWKB
   // ----------------------------
 
-  foreach (scandir('./input') as $file) {
+  foreach (scandir('./input', SCANDIR_SORT_NONE) as $file) {
     $parts = explode('.',$file);
     if ($parts[0]) {
       $name = $parts[0];

diff --git a/tests/test.php b/tests/test.php
@@ -17,7 +17,7 @@ function run_test() {
     print "GEOS is not installed.\n";
   }
 
-  foreach (scandir('./input') as $file) {
+  foreach (scandir('./input', SCANDIR_SORT_NONE) as $file) {
     $parts = explode('.',$file);
     if ($parts[0]) {
       $format = $parts[1];

diff --git a/tests/tests/adaptersTest.php b/tests/tests/adaptersTest.php
@@ -7,7 +7,7 @@ function setUp() {
   }
 
   function testAdapters() {
-    foreach (scandir('./input') as $file) {
+    foreach (scandir('./input', SCANDIR_SORT_NONE) as $file) {
       $parts = explode('.',$file);
       if ($parts[0]) {
         $format = $parts[1];

diff --git a/tests/tests/aliasesTest.php b/tests/tests/aliasesTest.php
@@ -7,7 +7,7 @@ function setUp() {
   }
 
   function testAliases() {
-    foreach (scandir('./input') as $file) {
+    foreach (scandir('./input', SCANDIR_SORT_NONE) as $file) {
       $parts = explode('.',$file);
       if ($parts[0]) {
         $format = $parts[1];
@@ -71,10 +71,10 @@ function testAliases() {
               break;
             case 'getArea':
               if ($geometry->geometryType() == 'Point') {
-                $this->assertNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name .' (test file: ' . $file . ')');
+                $this->assertEquals(0, $geometry->$alias_name($argument), 'Failed on ' . $alias_name .' (test file: ' . $file . ')');
               }
               if ($geometry->geometryType() == 'LineString') {
-                $this->assertNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name .' (test file: ' . $file . ')');
+                $this->assertEquals(0, $geometry->$alias_name($argument), 'Failed on ' . $alias_name .' (test file: ' . $file . ')');
               }
               if ($geometry->geometryType() == 'MultiLineString') {
                 $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name .' (test file: ' . $file . ')');

diff --git a/tests/tests/geosTest.php b/tests/tests/geosTest.php
@@ -7,7 +7,7 @@ function setUp() {
   }
 
   function testGeos() {
-    foreach (scandir('./input') as $file) {
+    foreach (scandir('./input', SCANDIR_SORT_NONE) as $file) {
       $parts = explode('.',$file);
       if ($parts[0]) {
         $format = $parts[1];

diff --git a/tests/tests/methodsTest.php b/tests/tests/methodsTest.php
@@ -7,7 +7,7 @@ function setUp() {
   }
 
   function testMethods() {
-    foreach (scandir('./input') as $file) {
+    foreach (scandir('./input', SCANDIR_SORT_NONE) as $file) {
       $parts = explode('.',$file);
       if ($parts[0]) {
         $format = $parts[1];

diff --git a/tests/tests/placeholdersTest.php b/tests/tests/placeholdersTest.php
@@ -7,7 +7,7 @@ function setUp() {
   }
 
   function testPlaceholders() {
-    foreach (scandir('./input') as $file) {
+    foreach (scandir('./input', SCANDIR_SORT_NONE) as $file) {
       $parts = explode('.',$file);
       if ($parts[0]) {
         $format = $parts[1];