From c6e430a8a8544b9716eaa4dabf370987dd5c7ebd Mon Sep 17 00:00:00 2001
From: Avtandil Kikabidze <akalongman@gmail.com>
Date: Tue, 23 Aug 2016 18:35:36 +0400
Subject: [PATCH] Improved Tests folder structure

---
 composer.json                                               | 2 +-
 phpunit.xml.dist                                            | 2 +-
 tests/{Bootstrap.php => bootstrap.php}                      | 4 +---
 tests/{TelegramBot/Tests => unit}/Commands/CommandTest.php  | 6 +++---
 .../Tests => unit}/Commands/CommandTestCase.php             | 4 ++--
 .../Commands/UserCommands/EchoCommandTest.php               | 6 +++---
 .../Commands/UserCommands/HelpCommandTest.php               | 6 +++---
 tests/{TelegramBot/Tests => unit}/ConversationTest.php      | 2 +-
 tests/{TelegramBot/Tests => unit}/Entities/ChatTest.php     | 2 +-
 .../Tests => unit}/Entities/InlineKeyboardButtonTest.php    | 2 +-
 tests/{TelegramBot/Tests => unit}/Entities/MessageTest.php  | 2 +-
 .../Tests => unit}/Entities/ReplyToMessageTest.php          | 2 +-
 .../Tests => unit}/Entities/ServerResponseTest.php          | 2 +-
 tests/{TelegramBot/Tests => unit}/Entities/UpdateTest.php   | 2 +-
 tests/{TelegramBot/Tests => unit}/TelegramLogTest.php       | 2 +-
 tests/{TelegramBot/Tests => unit}/TelegramTest.php          | 2 +-
 tests/{TelegramBot/Tests => unit}/TestCase.php              | 2 +-
 tests/{TelegramBot/Tests => unit}/TestHelpers.php           | 2 +-
 18 files changed, 25 insertions(+), 27 deletions(-)
 rename tests/{Bootstrap.php => bootstrap.php} (92%)
 rename tests/{TelegramBot/Tests => unit}/Commands/CommandTest.php (97%)
 rename tests/{TelegramBot/Tests => unit}/Commands/CommandTestCase.php (93%)
 rename tests/{TelegramBot/Tests => unit}/Commands/UserCommands/EchoCommandTest.php (92%)
 rename tests/{TelegramBot/Tests => unit}/Commands/UserCommands/HelpCommandTest.php (92%)
 rename tests/{TelegramBot/Tests => unit}/ConversationTest.php (99%)
 rename tests/{TelegramBot/Tests => unit}/Entities/ChatTest.php (96%)
 rename tests/{TelegramBot/Tests => unit}/Entities/InlineKeyboardButtonTest.php (97%)
 rename tests/{TelegramBot/Tests => unit}/Entities/MessageTest.php (98%)
 rename tests/{TelegramBot/Tests => unit}/Entities/ReplyToMessageTest.php (97%)
 rename tests/{TelegramBot/Tests => unit}/Entities/ServerResponseTest.php (99%)
 rename tests/{TelegramBot/Tests => unit}/Entities/UpdateTest.php (97%)
 rename tests/{TelegramBot/Tests => unit}/TelegramLogTest.php (98%)
 rename tests/{TelegramBot/Tests => unit}/TelegramTest.php (98%)
 rename tests/{TelegramBot/Tests => unit}/TestCase.php (92%)
 rename tests/{TelegramBot/Tests => unit}/TestHelpers.php (99%)

diff --git a/composer.json b/composer.json
index 5e17f8ea2..28d2981bf 100644
--- 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
index 924c4327f..4a39ab878 100644
--- 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 b/tests/bootstrap.php
similarity index 92%
rename from tests/Bootstrap.php
rename to tests/bootstrap.php
index 7f8c82c55..47476e78b 100644
--- a/tests/Bootstrap.php
+++ b/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/tests/TelegramBot/Tests/Commands/CommandTest.php b/tests/unit/Commands/CommandTest.php
similarity index 97%
rename from tests/TelegramBot/Tests/Commands/CommandTest.php
rename to tests/unit/Commands/CommandTest.php
index f08638814..95a46d3e8 100644
--- a/tests/TelegramBot/Tests/Commands/CommandTest.php
+++ b/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/tests/TelegramBot/Tests/Commands/CommandTestCase.php b/tests/unit/Commands/CommandTestCase.php
similarity index 93%
rename from tests/TelegramBot/Tests/Commands/CommandTestCase.php
rename to tests/unit/Commands/CommandTestCase.php
index 111a138f4..94323033d 100644
--- a/tests/TelegramBot/Tests/Commands/CommandTestCase.php
+++ b/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/tests/TelegramBot/Tests/Commands/UserCommands/EchoCommandTest.php b/tests/unit/Commands/UserCommands/EchoCommandTest.php
similarity index 92%
rename from tests/TelegramBot/Tests/Commands/UserCommands/EchoCommandTest.php
rename to tests/unit/Commands/UserCommands/EchoCommandTest.php
index 25f50bac9..71b37a302 100644
--- a/tests/TelegramBot/Tests/Commands/UserCommands/EchoCommandTest.php
+++ b/tests/unit/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/tests/TelegramBot/Tests/Commands/UserCommands/HelpCommandTest.php b/tests/unit/Commands/UserCommands/HelpCommandTest.php
similarity index 92%
rename from tests/TelegramBot/Tests/Commands/UserCommands/HelpCommandTest.php
rename to tests/unit/Commands/UserCommands/HelpCommandTest.php
index a46800f7f..de7b93c63 100644
--- a/tests/TelegramBot/Tests/Commands/UserCommands/HelpCommandTest.php
+++ b/tests/unit/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 b/tests/unit/ConversationTest.php
similarity index 99%
rename from tests/TelegramBot/Tests/ConversationTest.php
rename to tests/unit/ConversationTest.php
index ef81164b7..26f424f9b 100644
--- a/tests/TelegramBot/Tests/ConversationTest.php
+++ b/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/tests/TelegramBot/Tests/Entities/ChatTest.php b/tests/unit/Entities/ChatTest.php
similarity index 96%
rename from tests/TelegramBot/Tests/Entities/ChatTest.php
rename to tests/unit/Entities/ChatTest.php
index 8b745e816..da4931e11 100644
--- a/tests/TelegramBot/Tests/Entities/ChatTest.php
+++ b/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/tests/TelegramBot/Tests/Entities/InlineKeyboardButtonTest.php b/tests/unit/Entities/InlineKeyboardButtonTest.php
similarity index 97%
rename from tests/TelegramBot/Tests/Entities/InlineKeyboardButtonTest.php
rename to tests/unit/Entities/InlineKeyboardButtonTest.php
index 37c4c5697..f682abac3 100644
--- a/tests/TelegramBot/Tests/Entities/InlineKeyboardButtonTest.php
+++ b/tests/unit/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/tests/TelegramBot/Tests/Entities/MessageTest.php b/tests/unit/Entities/MessageTest.php
similarity index 98%
rename from tests/TelegramBot/Tests/Entities/MessageTest.php
rename to tests/unit/Entities/MessageTest.php
index 338135ca7..35a4ffd16 100644
--- a/tests/TelegramBot/Tests/Entities/MessageTest.php
+++ b/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/tests/TelegramBot/Tests/Entities/ReplyToMessageTest.php b/tests/unit/Entities/ReplyToMessageTest.php
similarity index 97%
rename from tests/TelegramBot/Tests/Entities/ReplyToMessageTest.php
rename to tests/unit/Entities/ReplyToMessageTest.php
index 39a118aa4..112e21843 100644
--- a/tests/TelegramBot/Tests/Entities/ReplyToMessageTest.php
+++ b/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/tests/TelegramBot/Tests/Entities/ServerResponseTest.php b/tests/unit/Entities/ServerResponseTest.php
similarity index 99%
rename from tests/TelegramBot/Tests/Entities/ServerResponseTest.php
rename to tests/unit/Entities/ServerResponseTest.php
index d2f16a8f4..df4c2d10b 100644
--- a/tests/TelegramBot/Tests/Entities/ServerResponseTest.php
+++ b/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/tests/TelegramBot/Tests/Entities/UpdateTest.php b/tests/unit/Entities/UpdateTest.php
similarity index 97%
rename from tests/TelegramBot/Tests/Entities/UpdateTest.php
rename to tests/unit/Entities/UpdateTest.php
index 75fb4527e..c2717b679 100644
--- a/tests/TelegramBot/Tests/Entities/UpdateTest.php
+++ b/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 b/tests/unit/TelegramLogTest.php
similarity index 98%
rename from tests/TelegramBot/Tests/TelegramLogTest.php
rename to tests/unit/TelegramLogTest.php
index b684464ad..74762e114 100644
--- a/tests/TelegramBot/Tests/TelegramLogTest.php
+++ b/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 b/tests/unit/TelegramTest.php
similarity index 98%
rename from tests/TelegramBot/Tests/TelegramTest.php
rename to tests/unit/TelegramTest.php
index eef9a659a..d4bcb581f 100644
--- a/tests/TelegramBot/Tests/TelegramTest.php
+++ b/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 b/tests/unit/TestCase.php
similarity index 92%
rename from tests/TelegramBot/Tests/TestCase.php
rename to tests/unit/TestCase.php
index ffeac08be..53a096191 100644
--- a/tests/TelegramBot/Tests/TestCase.php
+++ b/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 b/tests/unit/TestHelpers.php
similarity index 99%
rename from tests/TelegramBot/Tests/TestHelpers.php
rename to tests/unit/TestHelpers.php
index dcdd4da31..4472fc272 100644
--- a/tests/TelegramBot/Tests/TestHelpers.php
+++ b/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;