Improved Tests folder structure

php-telegram-bot · Aug 23, 2016 · c6e430a · c6e430a
1 parent 2bc325e
commit c6e430a
Show file tree

Hide file tree

Showing 18 changed files with 25 additions and 27 deletions.
diff --git a/composer.json b/composer.json
@@ -31,7 +31,7 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "Longman\\TelegramBot\\Tests\\": "tests/TelegramBot/Tests"
+            "Longman\\TelegramBot\\Tests\\Unit\\": "tests/unit"
         }
     },
     "require-dev": {

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -2,7 +2,7 @@
 <phpunit
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.8/phpunit.xsd"
-        bootstrap="./tests/Bootstrap.php"
+        bootstrap="./tests/bootstrap.php"
         backupGlobals="false"
         backupStaticAttributes="false"
         colors="true"

diff --git a/tests/Bootstrap.php → tests/bootstrap.php b/tests/Bootstrap.php → tests/bootstrap.php
@@ -8,8 +8,6 @@
  * file that was distributed with this source code.
  */
 
-namespace Longman\TelegramBot\Tests;
-
 /*
  * Set error reporting to the max level.
  */
@@ -26,7 +24,7 @@
  * Check that --dev composer installation was done
  */
 if (!file_exists($autoloader)) {
-    throw new \Exception(
+    throw new Exception(
         'Please run "php composer.phar install --dev" in root directory '
         . 'to setup unit test dependencies before running the tests'
     );

diff --git a/...elegramBot/Tests/Commands/CommandTest.php → tests/unit/Commands/CommandTest.php b/...elegramBot/Tests/Commands/CommandTest.php → tests/unit/Commands/CommandTest.php
@@ -8,10 +8,10 @@
  * file that was distributed with this source code.
  */
 
-namespace Longman\TelegramBot\Tests\Commands;
+namespace Longman\TelegramBot\Tests\Unit\Commands;
 
-use Longman\TelegramBot\Tests\TestCase;
-use Longman\TelegramBot\Tests\TestHelpers;
+use Longman\TelegramBot\Tests\Unit\TestCase;
+use Longman\TelegramBot\Tests\Unit\TestHelpers;
 use Longman\TelegramBot\Telegram;
 
 /**

diff --git a/...ramBot/Tests/Commands/CommandTestCase.php → tests/unit/Commands/CommandTestCase.php b/...ramBot/Tests/Commands/CommandTestCase.php → tests/unit/Commands/CommandTestCase.php
@@ -8,9 +8,9 @@
  * file that was distributed with this source code.
  */
 
-namespace Longman\TelegramBot\Tests\Commands;
+namespace Longman\TelegramBot\Tests\Unit\Commands;
 
-use Longman\TelegramBot\Tests\TestCase;
+use Longman\TelegramBot\Tests\Unit\TestCase;
 use Longman\TelegramBot\Telegram;
 
 /**

diff --git a/...Commands/UserCommands/EchoCommandTest.php → ...Commands/UserCommands/EchoCommandTest.php b/...Commands/UserCommands/EchoCommandTest.php → ...Commands/UserCommands/EchoCommandTest.php
@@ -8,10 +8,10 @@
  * file that was distributed with this source code.
  */
 
-namespace Longman\TelegramBot\Tests\Commands\UserCommands;
+namespace Longman\TelegramBot\Tests\Unit\Commands\UserCommands;
 
-use Longman\TelegramBot\Tests\Commands\CommandTestCase;
-use Longman\TelegramBot\Tests\TestHelpers;
+use Longman\TelegramBot\Tests\Unit\Commands\CommandTestCase;
+use Longman\TelegramBot\Tests\Unit\TestHelpers;
 use Longman\TelegramBot\Commands\UserCommands\EchoCommand;
 
 /**

diff --git a/...Commands/UserCommands/HelpCommandTest.php → ...Commands/UserCommands/HelpCommandTest.php b/...Commands/UserCommands/HelpCommandTest.php → ...Commands/UserCommands/HelpCommandTest.php
@@ -8,10 +8,10 @@
  * file that was distributed with this source code.
  */
 
-namespace Longman\TelegramBot\Tests\Commands\UserCommands;
+namespace Longman\TelegramBot\Tests\Unit\Commands\UserCommands;
 
-use Longman\TelegramBot\Tests\Commands\CommandTestCase;
-use Longman\TelegramBot\Tests\TestHelpers;
+use Longman\TelegramBot\Tests\Unit\Commands\CommandTestCase;
+use Longman\TelegramBot\Tests\Unit\TestHelpers;
 use Longman\TelegramBot\Commands\UserCommands\HelpCommand;
 
 /**

diff --git a/tests/TelegramBot/Tests/ConversationTest.php → tests/unit/ConversationTest.php b/tests/TelegramBot/Tests/ConversationTest.php → tests/unit/ConversationTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Longman\TelegramBot\Tests;
+namespace Longman\TelegramBot\Tests\Unit;
 
 use Longman\TelegramBot\Conversation;
 use Longman\TelegramBot\Telegram;

diff --git a/...s/TelegramBot/Tests/Entities/ChatTest.php → tests/unit/Entities/ChatTest.php b/...s/TelegramBot/Tests/Entities/ChatTest.php → tests/unit/Entities/ChatTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Longman\TelegramBot\Tests;
+namespace Longman\TelegramBot\Tests\Unit;
 
 /**
  * @package         TelegramTest

diff --git a/...sts/Entities/InlineKeyboardButtonTest.php → ...nit/Entities/InlineKeyboardButtonTest.php b/...sts/Entities/InlineKeyboardButtonTest.php → ...nit/Entities/InlineKeyboardButtonTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Longman\TelegramBot\Tests;
+namespace Longman\TelegramBot\Tests\Unit;
 
 use Longman\TelegramBot\Entities\InlineKeyboardButton;
 

diff --git a/...elegramBot/Tests/Entities/MessageTest.php → tests/unit/Entities/MessageTest.php b/...elegramBot/Tests/Entities/MessageTest.php → tests/unit/Entities/MessageTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Longman\TelegramBot\Tests;
+namespace Longman\TelegramBot\Tests\Unit;
 
 /**
  * @package         TelegramTest

diff --git a/...Bot/Tests/Entities/ReplyToMessageTest.php → tests/unit/Entities/ReplyToMessageTest.php b/...Bot/Tests/Entities/ReplyToMessageTest.php → tests/unit/Entities/ReplyToMessageTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Longman\TelegramBot\Tests;
+namespace Longman\TelegramBot\Tests\Unit;
 
 use \Longman\TelegramBot\Entities\Update;
 

diff --git a/...Bot/Tests/Entities/ServerResponseTest.php → tests/unit/Entities/ServerResponseTest.php b/...Bot/Tests/Entities/ServerResponseTest.php → tests/unit/Entities/ServerResponseTest.php
@@ -10,7 +10,7 @@
  * Written by Marco Boretto
  */
 
-namespace Longman\TelegramBot\Tests;
+namespace Longman\TelegramBot\Tests\Unit;
 
 use \Longman\TelegramBot\Entities\ServerResponse;
 use \Longman\TelegramBot\Request;

diff --git a/...TelegramBot/Tests/Entities/UpdateTest.php → tests/unit/Entities/UpdateTest.php b/...TelegramBot/Tests/Entities/UpdateTest.php → tests/unit/Entities/UpdateTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Longman\TelegramBot\Tests;
+namespace Longman\TelegramBot\Tests\Unit;
 
 use \Longman\TelegramBot\Entities\Update;
 

diff --git a/tests/TelegramBot/Tests/TelegramLogTest.php → tests/unit/TelegramLogTest.php b/tests/TelegramBot/Tests/TelegramLogTest.php → tests/unit/TelegramLogTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Longman\TelegramBot\Tests;
+namespace Longman\TelegramBot\Tests\Unit;
 
 use Longman\TelegramBot\TelegramLog;
 use Monolog\Handler\StreamHandler;

diff --git a/tests/TelegramBot/Tests/TelegramTest.php → tests/unit/TelegramTest.php b/tests/TelegramBot/Tests/TelegramTest.php → tests/unit/TelegramTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Longman\TelegramBot\Tests;
+namespace Longman\TelegramBot\Tests\Unit;
 
 use Longman\TelegramBot\Telegram;
 

diff --git a/tests/TelegramBot/Tests/TestCase.php → tests/unit/TestCase.php b/tests/TelegramBot/Tests/TestCase.php → tests/unit/TestCase.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Longman\TelegramBot\Tests;
+namespace Longman\TelegramBot\Tests\Unit;
 
 class TestCase extends \PHPUnit_Framework_TestCase
 {

diff --git a/tests/TelegramBot/Tests/TestHelpers.php → tests/unit/TestHelpers.php b/tests/TelegramBot/Tests/TestHelpers.php → tests/unit/TestHelpers.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Longman\TelegramBot\Tests;
+namespace Longman\TelegramBot\Tests\Unit;
 
 use Longman\TelegramBot\DB;
 use Longman\TelegramBot\Entities\Chat;