Move tests into tests folder.

cmfcmf · cmfcmf · commit 883d335ba2ed · 2015-06-20T12:13:13.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 /.idea
 /vendor
 /composer.lock
-/phpunit.phar
+/phpunit.phar
+/composer.phar
diff --git a/composer.json b/composer.json
@@ -19,6 +19,9 @@
     "require": {
         "php": ">=5.3.0"
     },
+    "require-dev": {
+      "phpunit/phpunit": "^4.7"
+    },
     "autoload": {
         "psr-0": {
             "Cmfcmf\\": ""
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -5,7 +5,7 @@
 
     <testsuites>
         <testsuite name="cmfcmf/openweathermap-php-api test suite">
-            <directory suffix="Test.php">.</directory>
+            <directory suffix="Test.php">./tests</directory>
         </testsuite>
     </testsuites>
 
diff --git a/tests/Fetcher/CurlFetcherTest.php b/tests/Fetcher/CurlFetcherTest.php
@@ -16,7 +16,9 @@
  * @see http://openweathermap.org/appid
  */
 
-namespace Cmfcmf\OpenWeatherMap\Fetcher;
+namespace Cmfcmf\OpenWeatherMap\Tests\Fetcher;
+
+use \Cmfcmf\OpenWeatherMap\Fetcher\CurlFetcher;
 
 /**
  * @requires function curl_version
diff --git a/tests/Fetcher/FileGetContentsFetcherTest.php b/tests/Fetcher/FileGetContentsFetcherTest.php
@@ -16,7 +16,9 @@
  * @see http://openweathermap.org/appid
  */
 
-namespace Cmfcmf\OpenWeatherMap\Fetcher;
+namespace Cmfcmf\OpenWeatherMap\Tests\Fetcher;
+
+use \Cmfcmf\OpenWeatherMap\Fetcher\FileGetContentsFetcher;
 
 class FileGetContentsFetcherTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/Util/SunTest.php b/tests/Util/SunTest.php
@@ -12,7 +12,9 @@
  * information regarding copyright and licensing.
  */
 
-namespace Cmfcmf\OpenWeatherMap\Util;
+namespace Cmfcmf\OpenWeatherMap\Tests\Util;
+
+use Cmfcmf\OpenWeatherMap\Util\Sun;
 
 class SunTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/Util/UnitTest.php b/tests/Util/UnitTest.php
@@ -12,7 +12,9 @@
  * information regarding copyright and licensing.
  */
 
-namespace Cmfcmf\OpenWeatherMap\Util;
+namespace Cmfcmf\OpenWeatherMap\Tests\Util;
+
+use \Cmfcmf\OpenWeatherMap\Util\Unit;
 
 class UnitTest extends \PHPUnit_Framework_TestCase
 {

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,9 @@`
`16`	`16`	`* @see http://openweathermap.org/appid`
`17`	`17`	`*/`
`18`	`18`
`19`		`-namespace Cmfcmf\OpenWeatherMap\Fetcher;`
	`19`	`+namespace Cmfcmf\OpenWeatherMap\Tests\Fetcher;`
	`20`	`+`
	`21`	`+use \Cmfcmf\OpenWeatherMap\Fetcher\FileGetContentsFetcher;`
`20`	`22`
`21`	`23`	`class FileGetContentsFetcherTest extends \PHPUnit_Framework_TestCase`
`22`	`24`	`{`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,9 @@`
`12`	`12`	`* information regarding copyright and licensing.`
`13`	`13`	`*/`
`14`	`14`
`15`		`-namespace Cmfcmf\OpenWeatherMap\Util;`
	`15`	`+namespace Cmfcmf\OpenWeatherMap\Tests\Util;`
	`16`	`+`
	`17`	`+use Cmfcmf\OpenWeatherMap\Util\Sun;`
`16`	`18`
`17`	`19`	`class SunTest extends \PHPUnit_Framework_TestCase`
`18`	`20`	`{`