Fix tests namespace

dmitry-ivanov · dmitry-ivanov · commit 18bf494e300f · 2019-09-10T20:27:41.000+03:00
diff --git a/composer.json b/composer.json
@@ -29,8 +29,8 @@
         }
     },
     "autoload-dev": {
-        "classmap": [
-            "tests/HelperFunctions/TestCase.php"
-        ]
+        "psr-4": {
+            "Illuminated\\Helpers\\Tests\\": "tests/"
+        }
     }
 }
diff --git a/tests/HelperFunctions/debug/BacktraceAsStringTest/backtrace.travis.txt b/tests/HelperFunctions/debug/BacktraceAsStringTest/backtrace.travis.txt
diff --git a/tests/HelperFunctions/debug/BacktraceAsStringTest/backtrace.txt b/tests/HelperFunctions/debug/BacktraceAsStringTest/backtrace.txt
diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Illuminated\Helpers\HelperFunctions\Tests;
+namespace Illuminated\Helpers\Tests;
 
 use Mockery;
 use Illuminated\Testing\TestingTools;
diff --git a/tests/array/ArrayExceptValueTest.php b/tests/array/ArrayExceptValueTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Illuminated\Helpers\HelperFunctions\Tests\ArrayTests;
+namespace Illuminated\Helpers\Tests\ArrayTests;
 
-use Illuminated\Helpers\HelperFunctions\Tests\TestCase;
+use Illuminated\Helpers\Tests\TestCase;
 
 class ArrayExceptValueTest extends TestCase
 {
diff --git a/tests/array/MultiarraySetTest.php b/tests/array/MultiarraySetTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Illuminated\Helpers\HelperFunctions\Tests\ArrayTests;
+namespace Illuminated\Helpers\Tests\ArrayTests;
 
-use Illuminated\Helpers\HelperFunctions\Tests\TestCase;
+use Illuminated\Helpers\Tests\TestCase;
 
 class MultiarraySetTest extends TestCase
 {
diff --git a/tests/array/MultiarraySortByTest.php b/tests/array/MultiarraySortByTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Illuminated\Helpers\HelperFunctions\Tests\ArrayTests;
+namespace Illuminated\Helpers\Tests\ArrayTests;
 
-use Illuminated\Helpers\HelperFunctions\Tests\TestCase;
+use Illuminated\Helpers\Tests\TestCase;
 
 class MultiarraySortByTest extends TestCase
 {
diff --git a/tests/artisan/CallInBackgroundTest.php b/tests/artisan/CallInBackgroundTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Illuminated\Helpers\HelperFunctions\Tests\Artisan;
+namespace Illuminated\Helpers\Tests\Artisan;
 
-use Illuminated\Helpers\HelperFunctions\Tests\TestCase;
+use Illuminated\Helpers\Tests\TestCase;
 
 /**
  * @runTestsInSeparateProcesses
diff --git a/tests/classes/Artisan/CommandTest.php b/tests/classes/Artisan/CommandTest.php
@@ -2,7 +2,7 @@
 
 namespace Illuminated\Helpers\Artisan;
 
-use Illuminated\Helpers\HelperFunctions\Tests\TestCase;
+use Illuminated\Helpers\Tests\TestCase;
 
 class CommandTest extends TestCase
 {
diff --git a/tests/classes/Artisan/mocks.php b/tests/classes/Artisan/mocks.php
@@ -2,7 +2,7 @@
 
 namespace Illuminated\Helpers\System
 {
-    use Illuminated\Helpers\HelperFunctions\Tests\TestCase;
+    use Illuminated\Helpers\Tests\TestCase;
 
     if (!function_exists(__NAMESPACE__ . '\php_uname')) {
         function php_uname()
diff --git a/tests/date/ToDefaultTimezoneTest.php b/tests/date/ToDefaultTimezoneTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Illuminated\Helpers\HelperFunctions\Tests\Date;
+namespace Illuminated\Helpers\Tests\Date;
 
 use Illuminate\Support\Facades\Config;
-use Illuminated\Helpers\HelperFunctions\Tests\TestCase;
+use Illuminated\Helpers\Tests\TestCase;
 
 class ToDefaultTimezoneTest extends TestCase
 {
diff --git a/tests/db/DbIsMysqlTest.php b/tests/db/DbIsMysqlTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Illuminated\Helpers\HelperFunctions\Tests\Db;
+namespace Illuminated\Helpers\Tests\Db;
 
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Config;
-use Illuminated\Helpers\HelperFunctions\Tests\TestCase;
+use Illuminated\Helpers\Tests\TestCase;
 
 /**
  * @runTestsInSeparateProcesses
diff --git a/tests/db/DbIsSqliteTest.php b/tests/db/DbIsSqliteTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Illuminated\Helpers\HelperFunctions\Tests\Db;
+namespace Illuminated\Helpers\Tests\Db;
 
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Config;
-use Illuminated\Helpers\HelperFunctions\Tests\TestCase;
+use Illuminated\Helpers\Tests\TestCase;
 
 /**
  * @runTestsInSeparateProcesses
diff --git a/tests/db/DbMysqlNowTest.php b/tests/db/DbMysqlNowTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Illuminated\Helpers\HelperFunctions\Tests\Db;
+namespace Illuminated\Helpers\Tests\Db;
 
-use Illuminated\Helpers\HelperFunctions\Tests\TestCase;
+use Illuminated\Helpers\Tests\TestCase;
 
 class DbMysqlNowTest extends TestCase
 {
diff --git a/tests/db/DbMysqlVariableTest.php b/tests/db/DbMysqlVariableTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Illuminated\Helpers\HelperFunctions\Tests\Db;
+namespace Illuminated\Helpers\Tests\Db;
 
-use Illuminated\Helpers\HelperFunctions\Tests\TestCase;
+use Illuminated\Helpers\Tests\TestCase;
 
 class DbMysqlVariableTest extends TestCase
 {
diff --git a/tests/debug/BacktraceAsStringTest.php b/tests/debug/BacktraceAsStringTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Illuminated\Helpers\HelperFunctions\Tests\Debug;
+namespace Illuminated\Helpers\Tests\Debug;
 
-use Illuminated\Helpers\HelperFunctions\Tests\TestCase;
+use Illuminated\Helpers\Tests\TestCase;
 
 class BacktraceAsStringTest extends TestCase
 {
diff --git a/tests/debug/BacktraceAsStringTest/backtrace.travis.txt b/tests/debug/BacktraceAsStringTest/backtrace.travis.txt
@@ -0,0 +1,4 @@
+#0  backtrace_as_string() called at [/home/travis/build/dmitry-ivanov/laravel-helper-functions/tests/debug/BacktraceAsStringTest.php:32]
+#1  Illuminated\Helpers\Tests\Debug\BacktraceAsStringTest->anotherExtraMethod() called at [/home/travis/build/dmitry-ivanov/laravel-helper-functions/tests/debug/BacktraceAsStringTest.php:27]
+#2  Illuminated\Helpers\Tests\Debug\BacktraceAsStringTest->getBacktrace() called at [/home/travis/build/dmitry-ivanov/laravel-helper-functions/tests/debug/BacktraceAsStringTest.php:13]
+#3  Illuminated\Helpers\Tests\Debug\BacktraceAsStringTest->it_returns_backtrace_as_string_without_args()
diff --git a/tests/debug/BacktraceAsStringTest/backtrace.txt b/tests/debug/BacktraceAsStringTest/backtrace.txt
@@ -0,0 +1,4 @@
+#0  backtrace_as_string() called at [/Applications/MAMP/htdocs/illuminated/helper-functions/tests/debug/BacktraceAsStringTest.php:32]
+#1  Illuminated\Helpers\Tests\Debug\BacktraceAsStringTest->anotherExtraMethod() called at [/Applications/MAMP/htdocs/illuminated/helper-functions/tests/debug/BacktraceAsStringTest.php:27]
+#2  Illuminated\Helpers\Tests\Debug\BacktraceAsStringTest->getBacktrace() called at [/Applications/MAMP/htdocs/illuminated/helper-functions/tests/debug/BacktraceAsStringTest.php:13]
+#3  Illuminated\Helpers\Tests\Debug\BacktraceAsStringTest->it_returns_backtrace_as_string_without_args()
diff --git a/tests/debug/MinimizedBacktraceAsStringTest.php b/tests/debug/MinimizedBacktraceAsStringTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Illuminated\Helpers\HelperFunctions\Tests\Debug;
+namespace Illuminated\Helpers\Tests\Debug;
 
-use Illuminated\Helpers\HelperFunctions\Tests\TestCase;
+use Illuminated\Helpers\Tests\TestCase;
 
 class MinimizedBacktraceAsStringTest extends TestCase
 {
diff --git a/tests/debug/MinimizedBacktraceAsStringTest/backtrace.travis.txt b/tests/debug/MinimizedBacktraceAsStringTest/backtrace.travis.txt
@@ -1,4 +1,4 @@
 #0 /home/travis/build/dmitry-ivanov/laravel-helper-functions/src/debug.php:22
-#1 /home/travis/build/dmitry-ivanov/laravel-helper-functions/tests/HelperFunctions/debug/MinimizedBacktraceAsStringTest.php:32
-#2 /home/travis/build/dmitry-ivanov/laravel-helper-functions/tests/HelperFunctions/debug/MinimizedBacktraceAsStringTest.php:27
-#3 /home/travis/build/dmitry-ivanov/laravel-helper-functions/tests/HelperFunctions/debug/MinimizedBacktraceAsStringTest.php:13
+#1 /home/travis/build/dmitry-ivanov/laravel-helper-functions/tests/debug/MinimizedBacktraceAsStringTest.php:32
+#2 /home/travis/build/dmitry-ivanov/laravel-helper-functions/tests/debug/MinimizedBacktraceAsStringTest.php:27
+#3 /home/travis/build/dmitry-ivanov/laravel-helper-functions/tests/debug/MinimizedBacktraceAsStringTest.php:13
diff --git a/tests/debug/MinimizedBacktraceAsStringTest/backtrace.txt b/tests/debug/MinimizedBacktraceAsStringTest/backtrace.txt
@@ -1,4 +1,4 @@
 #0 /Applications/MAMP/htdocs/illuminated/helper-functions/src/debug.php:22
-#1 /Applications/MAMP/htdocs/illuminated/helper-functions/tests/HelperFunctions/debug/MinimizedBacktraceAsStringTest.php:32
-#2 /Applications/MAMP/htdocs/illuminated/helper-functions/tests/HelperFunctions/debug/MinimizedBacktraceAsStringTest.php:27
-#3 /Applications/MAMP/htdocs/illuminated/helper-functions/tests/HelperFunctions/debug/MinimizedBacktraceAsStringTest.php:13
+#1 /Applications/MAMP/htdocs/illuminated/helper-functions/tests/debug/MinimizedBacktraceAsStringTest.php:32
+#2 /Applications/MAMP/htdocs/illuminated/helper-functions/tests/debug/MinimizedBacktraceAsStringTest.php:27
+#3 /Applications/MAMP/htdocs/illuminated/helper-functions/tests/debug/MinimizedBacktraceAsStringTest.php:13
diff --git a/tests/email/IsEmailTest.php b/tests/email/IsEmailTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Illuminated\Helpers\HelperFunctions\Tests\Email;
+namespace Illuminated\Helpers\Tests\Email;
 
 use StdClass;
-use Illuminated\Helpers\HelperFunctions\Tests\TestCase;
+use Illuminated\Helpers\Tests\TestCase;
 
 class IsEmailTest extends TestCase
 {
diff --git a/tests/email/ToRfc2822EmailTest.php b/tests/email/ToRfc2822EmailTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Illuminated\Helpers\HelperFunctions\Tests\Email;
+namespace Illuminated\Helpers\Tests\Email;
 
-use Illuminated\Helpers\HelperFunctions\Tests\TestCase;
+use Illuminated\Helpers\Tests\TestCase;
 
 class ToRfc2822EmailTest extends TestCase
 {
diff --git a/tests/email/ToSwiftmailerEmailsTest.php b/tests/email/ToSwiftmailerEmailsTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Illuminated\Helpers\HelperFunctions\Tests\Email;
+namespace Illuminated\Helpers\Tests\Email;
 
-use Illuminated\Helpers\HelperFunctions\Tests\TestCase;
+use Illuminated\Helpers\Tests\TestCase;
 
 class ToSwiftmailerEmailsTest extends TestCase
 {
diff --git a/tests/filesystem/RelativePathTest.php b/tests/filesystem/RelativePathTest.php
@@ -1,27 +1,27 @@
 <?php
 
-namespace Illuminated\Helpers\HelperFunctions\Tests\Filesystem;
+namespace Illuminated\Helpers\Tests\Filesystem;
 
-use Illuminated\Helpers\HelperFunctions\Tests\TestCase;
+use Illuminated\Helpers\Tests\TestCase;
 
 class RelativePathTest extends TestCase
 {
     /** @test */
     public function it_returns_relative_path_for_two_folders()
     {
-        $path1 = realpath(__DIR__ . '/../../../src/');
-        $path2 = realpath(__DIR__ . '/../../../tests/HelperFunctions/filesystem');
+        $path1 = realpath(__DIR__ . '/../../src/');
+        $path2 = realpath(__DIR__ . '/../../tests/filesystem');
 
-        $this->assertEquals('../../../src/', relative_path($path1, $path2));
+        $this->assertEquals('../../src/', relative_path($path1, $path2));
     }
 
     /** @test */
     public function it_correctly_works_with_params_which_are_relative_paths()
     {
-        $path1 = __DIR__ . '/../../../src/';
-        $path2 = __DIR__ . '/../../../tests/HelperFunctions/filesystem';
+        $path1 = __DIR__ . '/../../src/';
+        $path2 = __DIR__ . '/../../tests/filesystem';
 
-        $this->assertEquals('../../../src/', relative_path($path1, $path2));
+        $this->assertEquals('../../src/', relative_path($path1, $path2));
     }
 
     /** @test */
@@ -37,7 +37,7 @@ public function it_correctly_works_for_the_same_folder()
     public function even_if_the_paths_are_relative_and_different()
     {
         $path1 = __DIR__;
-        $path2 = __DIR__ . '/../../../tests/HelperFunctions/filesystem';
+        $path2 = __DIR__ . '/../../tests/filesystem';
 
         $this->assertEquals('./', relative_path($path1, $path2));
     }
diff --git a/tests/format/FormatBytesTest.php b/tests/format/FormatBytesTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Illuminated\Helpers\HelperFunctions\Tests\Format;
+namespace Illuminated\Helpers\Tests\Format;
 
-use Illuminated\Helpers\HelperFunctions\Tests\TestCase;
+use Illuminated\Helpers\Tests\TestCase;
 
 class FormatBytesTest extends TestCase
 {
diff --git a/tests/format/FormatXmlTest.php b/tests/format/FormatXmlTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Illuminated\Helpers\HelperFunctions\Tests\Format;
+namespace Illuminated\Helpers\Tests\Format;
 
 use Exception;
-use Illuminated\Helpers\HelperFunctions\Tests\TestCase;
+use Illuminated\Helpers\Tests\TestCase;
 
 class FormatXmlTest extends TestCase
 {
diff --git a/tests/format/FormatXmlTest/formatted.xml b/tests/format/FormatXmlTest/formatted.xml
diff --git a/tests/format/FormatXmlTest/unformatted.xml b/tests/format/FormatXmlTest/unformatted.xml
diff --git a/tests/format/GetDumpTest.php b/tests/format/GetDumpTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Illuminated\Helpers\HelperFunctions\Tests\Format;
+namespace Illuminated\Helpers\Tests\Format;
 
-use Illuminated\Helpers\HelperFunctions\Tests\TestCase;
+use Illuminated\Helpers\Tests\TestCase;
 
 class GetDumpTest extends TestCase
 {
diff --git a/tests/json/IsJsonTest.php b/tests/json/IsJsonTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Illuminated\Helpers\HelperFunctions\Tests\Json;
+namespace Illuminated\Helpers\Tests\Json;
 
 use StdClass;
-use Illuminated\Helpers\HelperFunctions\Tests\TestCase;
+use Illuminated\Helpers\Tests\TestCase;
 
 class IsJsonTest extends TestCase
 {
diff --git a/tests/str/StrLowerTest.php b/tests/str/StrLowerTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Illuminated\Helpers\HelperFunctions\Tests\Str;
+namespace Illuminated\Helpers\Tests\Str;
 
-use Illuminated\Helpers\HelperFunctions\Tests\TestCase;
+use Illuminated\Helpers\Tests\TestCase;
 
 class StrLowerTest extends TestCase
 {
diff --git a/tests/str/StrUpperTest.php b/tests/str/StrUpperTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Illuminated\Helpers\HelperFunctions\Tests\Str;
+namespace Illuminated\Helpers\Tests\Str;
 
-use Illuminated\Helpers\HelperFunctions\Tests\TestCase;
+use Illuminated\Helpers\Tests\TestCase;
 
 class StrUpperTest extends TestCase
 {
diff --git a/tests/system/IsWindowsOsTest.php b/tests/system/IsWindowsOsTest.php
@@ -2,7 +2,7 @@
 
 namespace Illuminated\Helpers\System;
 
-use Illuminated\Helpers\HelperFunctions\Tests\TestCase;
+use Illuminated\Helpers\Tests\TestCase;
 
 class IsWindowsOsTest extends TestCase
 {
diff --git a/tests/xml/ArrayToXmlTest.php b/tests/xml/ArrayToXmlTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Illuminated\Helpers\HelperFunctions\Tests\Xml;
+namespace Illuminated\Helpers\Tests\Xml;
 
-use Illuminated\Helpers\HelperFunctions\Tests\TestCase;
+use Illuminated\Helpers\Tests\TestCase;
 
 class ArrayToXmlTest extends TestCase
 {
diff --git a/tests/xml/ArrayToXmlTest/with-attributes.xml b/tests/xml/ArrayToXmlTest/with-attributes.xml
diff --git a/tests/xml/ArrayToXmlTest/with-custom-root.xml b/tests/xml/ArrayToXmlTest/with-custom-root.xml
diff --git a/tests/xml/ArrayToXmlTest/with-spaces-in-keys.xml b/tests/xml/ArrayToXmlTest/with-spaces-in-keys.xml
diff --git a/tests/xml/ArrayToXmlTest/without-attributes.xml b/tests/xml/ArrayToXmlTest/without-attributes.xml
diff --git a/tests/xml/XmlToArrayTest.php b/tests/xml/XmlToArrayTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Illuminated\Helpers\HelperFunctions\Tests\Xml;
+namespace Illuminated\Helpers\Tests\Xml;
 
 use Exception;
 use SimpleXMLElement;
-use Illuminated\Helpers\HelperFunctions\Tests\TestCase;
+use Illuminated\Helpers\Tests\TestCase;
 
 class XmlToArrayTest extends TestCase
 {
diff --git a/tests/xml/XmlToArrayTest/example.xml b/tests/xml/XmlToArrayTest/example.xml

Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,8 @@`
`29`	`29`	`}`
`30`	`30`	`},`
`31`	`31`	`"autoload-dev": {`
`32`		`- "classmap": [`
`33`		`- "tests/HelperFunctions/TestCase.php"`
`34`		`- ]`
	`32`	`+ "psr-4": {`
	`33`	`+ "Illuminated\\Helpers\\Tests\\": "tests/"`
	`34`	`+ }`
`35`	`35`	`}`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`		`-namespace Illuminated\Helpers\HelperFunctions\Tests\ArrayTests;`
	`3`	`+namespace Illuminated\Helpers\Tests\ArrayTests;`
`4`	`4`
`5`		`-use Illuminated\Helpers\HelperFunctions\Tests\TestCase;`
	`5`	`+use Illuminated\Helpers\Tests\TestCase;`
`6`	`6`
`7`	`7`	`class ArrayExceptValueTest extends TestCase`
`8`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace Illuminated\Helpers\Artisan;`
`4`	`4`
`5`		`-use Illuminated\Helpers\HelperFunctions\Tests\TestCase;`
	`5`	`+use Illuminated\Helpers\Tests\TestCase;`
`6`	`6`
`7`	`7`	`class CommandTest extends TestCase`
`8`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace Illuminated\Helpers\System`
`4`	`4`	`{`
`5`		`- use Illuminated\Helpers\HelperFunctions\Tests\TestCase;`
	`5`	`+ use Illuminated\Helpers\Tests\TestCase;`
`6`	`6`
`7`	`7`	`if (!function_exists(__NAMESPACE__ . '\php_uname')) {`
`8`	`8`	`function php_uname()`