refactor tests dir structure; enable coveralls upload in travis.yml

.travis.yml

@@ -5,8 +5,6 @@ language: php
 before_script:
   - composer self-update
 
-env: GEOPHP_RUN_TESTS=1
-
 cache:
   directories:
   - $HOME/.composer/cache/files
@@ -16,10 +14,11 @@ install:
   # TODO Install geos library -- as a matrix test
   # TODO optionally set up a postgis database for testing
 
-script: 
+script:
+  - GEOS_DISABLED=1 vendor/bin/phpunit --coverage-clover build/logs/clover.xml
   - cd tests
-  - GEOS_DISABLED=1 ../vendor/bin/phpunit
   - php test.php
+  - php performanceTest.php
 
 # run tests on the following versions
 php:
@@ -32,3 +31,6 @@ php:
 
 matrix:
   fast_finish: false
+
+after_success:
+  - vendor/bin/php-coveralls -v

composer.json

@@ -23,6 +23,11 @@
       "geoPHP\\": "src/"
     }
   },
+  "autoload-dev": {
+    "psr-4": {
+      "geoPHP\\": "tests/"
+    }
+  },
   "require": {
     "php": ">=5.5.0"
   },

tests/phpunit.xml → phpunit.xml

@@ -9,17 +9,17 @@
 >
     <testsuites>
         <testsuite name="funiQ\geoPHP tests">
-            <directory>unitTests/Geometry</directory>
+            <directory>tests/unit/Geometry</directory>
         </testsuite>
     </testsuites>
     <filter>
         <whitelist addUncoveredFilesFromWhitelist="true">
-            <directory>../src/</directory>
+            <directory>src/</directory>
         </whitelist>
     </filter>
     <logging>
         <log type="coverage-text" target="php://stdout"/>
-        <!--<log type="coverage-html" target="coverage" />-->
-        <!--<log type="coverage-clover" target="coverage/clover.xml" />-->
+        <!--<log type="coverage-html" target="build/coverage" />-->
+        <!--<log type="coverage-clover" target="build/logs/clover.xml" />-->
     </logging>
 </phpunit>

tests/test.php

@@ -4,13 +4,7 @@
 
 use \geoPHP\geoPHP;
 
-// Uncomment to test
-if (getenv("GEOPHP_RUN_TESTS") == 1) {
-  run_test();
-}
-else {
-  print "Skipping tests. Please set GEOPHP_RUN_TESTS=1 environment variable if you wish to run tests\n";
-}
+run_test();
 
 function run_test() {
   set_time_limit(0);

tests/unitTests/20120702Test.php → tests/unit/20120702Test.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace geoPHP\Tests;
+
 use \geoPHP\geoPHP;
 use \geoPHP\Geometry\Geometry;
 use PHPUnit\Framework\TestCase;

tests/unitTests/Adapter/geohashTest.php → tests/unit/Adapter/geohashTest.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace geoPHP\Tests\Adapter;
+
 use \geoPHP\Adapter\GeoHash;
 use PHPUnit\Framework\TestCase;
 

tests/unitTests/Geometry/CollectionTest.php → tests/unit/Geometry/CollectionTest.php

@@ -7,6 +7,8 @@
  * @since 2020-03-19
  */
 
+namespace geoPHP\Tests\Geometry;
+
 use \geoPHP\Geometry\Collection;
 use \geoPHP\Geometry\Point;
 use \geoPHP\Geometry\LineString;

tests/unitTests/Geometry/LineStringTest.php → tests/unit/Geometry/LineStringTest.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace geoPHP\Tests\Geometry;
+
 use \geoPHP\Exception\InvalidGeometryException;
 use \geoPHP\Geometry\Point;
 use \geoPHP\Geometry\LineString;

tests/unitTests/Geometry/MultiPointTest.php → tests/unit/Geometry/MultiPointTest.php

@@ -1,8 +1,9 @@
 <?php
 
+namespace geoPHP\Tests\Geometry;
+
 use \geoPHP\Exception\InvalidGeometryException;
 use \geoPHP\Geometry\Point;
-use \geoPHP\geoPHP;
 use \geoPHP\Geometry\MultiPoint;
 use \PHPUnit\Framework\TestCase;
 

tests/unitTests/Geometry/PointTest.php → tests/unit/Geometry/PointTest.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace geoPHP\Tests\Geometry;
+
 use \geoPHP\Exception\InvalidGeometryException;
 use \geoPHP\Geometry\Point;
 use \PHPUnit\Framework\TestCase;

tests/unitTests/adaptersTest.php → tests/unit/adaptersTest.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace geoPHP\Tests;
+
 use \geoPHP\geoPHP;
 use PHPUnit\Framework\TestCase;
 

tests/unitTests/geosTest.php → tests/unit/geosTest.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace geoPHP\Tests;
+
 use \geoPHP\geoPHP;
 use PHPUnit\Framework\TestCase;
 

tests/unitTests/methodsTest.php → tests/unit/methodsTest.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace geoPHP\Tests;
+
 use \geoPHP\geoPHP;
 use PHPUnit\Framework\TestCase;
 

tests/unitTests/placeholdersTest.php → tests/unit/placeholdersTest.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace geoPHP\Tests;
+
 use \geoPHP\geoPHP;
 use PHPUnit\Framework\TestCase;