Moved tests according to new Symfony 3 directory structure

manuelkiessling · manuelkiessling · commit c7f5f2c25ab1 · 2015-12-08T11:21:42.000+01:00
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -15,9 +15,7 @@
 
     <testsuites>
         <testsuite name="Project Test Suite">
-            <directory>src/*Bundle/Tests</directory>
-            <directory>src/*/*Bundle/Tests</directory>
-            <directory>src/*/Bundle/*Bundle/Tests</directory>
+            <directory>tests</directory>
         </testsuite>
     </testsuites>
 
@@ -27,12 +25,11 @@
 
     <filter>
         <whitelist>
-            <directory>../src</directory>
+            <directory>src</directory>
             <exclude>
+                <directory>src/*Bundle/Resources</directory>
                 <directory>src/*/*Bundle/Resources</directory>
-                <directory>src/*/*Bundle/Tests</directory>
                 <directory>src/*/Bundle/*Bundle/Resources</directory>
-                <directory>src/*/Bundle/*Bundle/Tests</directory>
             </exclude>
         </whitelist>
     </filter>
diff --git a/tests/ApiBundle/Controller/Internal/TestcasesApiControllerTest.php b/tests/ApiBundle/Controller/Internal/TestcasesApiControllerTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace AppBundle\Tests\Controller\Internal;
+namespace Tests\ApiBundle\Controller\Internal;
 
 use AppBundle\Entity\Testcase;
 use AppBundle\Entity\User;
-use AppBundle\Tests\TestHelpers;
+use Tests\AppBundle\TestHelpers;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 class TestcasesApiControllerWebTest extends WebTestCase
diff --git a/tests/ApiBundle/Controller/TestresultsApiControllerTest.php b/tests/ApiBundle/Controller/TestresultsApiControllerTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace AppBundle\Tests\Controller;
+namespace Tests\ApiBundle\Controller;
 
 use AppBundle\Entity\Testresult;
 use AppBundle\Entity\Testcase;
 use AppBundle\Entity\User;
-use AppBundle\Tests\TestHelpers;
+use Tests\AppBundle\TestHelpers;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 class TestresultsApiControllerWebTest extends WebTestCase
diff --git a/tests/ApiBundle/Service/HarTransformerServiceTest.php b/tests/ApiBundle/Service/HarTransformerServiceTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace ApiBundle\Tests\Service;
+namespace Tests\ApiBundle\Service;
 
 use PHPUnit_Framework_TestCase;
 use ApiBundle\Service\HarTransformerService;
diff --git a/tests/ApiBundle/Service/SeleneseRunnerLogAnalyzerServiceTest.php b/tests/ApiBundle/Service/SeleneseRunnerLogAnalyzerServiceTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace ApiBundle\Tests\Service;
+namespace Tests\ApiBundle\Service;
 
 use PHPUnit_Framework_TestCase;
 use ApiBundle\Service\SeleneseRunnerLogAnalyzerService;
diff --git a/tests/ApiBundle/fixtures/selenese-runner.log b/tests/ApiBundle/fixtures/selenese-runner.log
diff --git a/tests/ApiBundle/fixtures/selenese-runner.nyt.log b/tests/ApiBundle/fixtures/selenese-runner.nyt.log
diff --git a/tests/ApiBundle/fixtures/testrun.actual.har.json b/tests/ApiBundle/fixtures/testrun.actual.har.json
diff --git a/tests/ApiBundle/fixtures/testrun.expected.har.json b/tests/ApiBundle/fixtures/testrun.expected.har.json
diff --git a/tests/ApiBundle/fixtures/testrun.nyt.actual.har.json b/tests/ApiBundle/fixtures/testrun.nyt.actual.har.json
diff --git a/tests/AppBundle/Command/ImportStatisticsCommandTest.php b/tests/AppBundle/Command/ImportStatisticsCommandTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace AppBundle\Tests\Command;
+namespace Tests\AppBundle\Command;
 
 use AppBundle\Command\ImportStatisticsCommand;
 use AppBundle\Entity\Testresult;
-use AppBundle\Tests\TestHelpers;
+use Tests\AppBundle\TestHelpers;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use Symfony\Component\Console\Tester\CommandTester;
diff --git a/tests/AppBundle/Controller/ContentControllerWebTest.php b/tests/AppBundle/Controller/ContentControllerWebTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace AppBundle\Tests\Controller;
+namespace Tests\AppBundle\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
diff --git a/tests/AppBundle/Controller/TestcasesControllerWebTest.php b/tests/AppBundle/Controller/TestcasesControllerWebTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace AppBundle\Tests\Controller;
+namespace Tests\AppBundle\Controller;
 
 use AppBundle\Entity\Testresult;
-use AppBundle\Tests\TestHelpers;
+use Tests\AppBundle\TestHelpers;
 use Doctrine\ORM\EntityManager;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
diff --git a/tests/AppBundle/Functional/DemoModeFunctionalWebTest.php b/tests/AppBundle/Functional/DemoModeFunctionalWebTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace AppBundle\Tests\Functional;
+namespace Tests\AppBundle\Functional;
 
-use AppBundle\Tests\TestHelpers;
+use Tests\AppBundle\TestHelpers;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 class DemoModeFunctionalWebTest extends WebTestCase
diff --git a/tests/AppBundle/Functional/HomepageFunctionalWebTest.php b/tests/AppBundle/Functional/HomepageFunctionalWebTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace AppBundle\Tests\Functional;
+namespace Tests\AppBundle\Functional;
 
-use AppBundle\Tests\TestHelpers;
+use Tests\AppBundle\TestHelpers;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 class HomepageFunctionalWebTest extends WebTestCase
diff --git a/tests/AppBundle/Functional/LoggedInLoggedOutFunctionalWebTest.php b/tests/AppBundle/Functional/LoggedInLoggedOutFunctionalWebTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace AppBundle\Tests\Functional;
+namespace Tests\AppBundle\Functional;
 
-use AppBundle\Tests\TestHelpers;
+use Tests\AppBundle\TestHelpers;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 class LoggedInLoggedOutFunctionalWebTest extends WebTestCase
diff --git a/tests/AppBundle/Service/DemoServiceTest.php b/tests/AppBundle/Service/DemoServiceTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace AppBundle\Tests\Service;
+namespace Tests\AppBundle\Service;
 
 use AppBundle\Entity\User;
 use AppBundle\Service\DemoService;
diff --git a/tests/AppBundle/Service/RegistrationServiceTest.php b/tests/AppBundle/Service/RegistrationServiceTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace AppBundle\Tests\Service;
+namespace Tests\AppBundle\Service;
 
 use AppBundle\Entity\User;
 use AppBundle\Service\RegistrationService;
@@ -52,7 +52,7 @@ public function setUp()
     {
         $this->userManagerMock = $this->getMockBuilder('FOS\UserBundle\Doctrine\UserManager')
             ->disableOriginalConstructor()->getMock();
-        $this->loginManagerMock = $this->getMockBuilder('AppBundle\Tests\Stubs\LoginManagerStub')
+        $this->loginManagerMock = $this->getMockBuilder('Tests\AppBundle\Stubs\LoginManagerStub')
             ->disableOriginalConstructor()->getMock();
         $this->encoderFactoryMock = $this->getMockBuilder('Symfony\Component\Security\Core\Encoder\EncoderFactory')
             ->disableOriginalConstructor()->getMock();
diff --git a/tests/AppBundle/Stubs/LoginManagerStub.php b/tests/AppBundle/Stubs/LoginManagerStub.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace AppBundle\Tests\Stubs;
+namespace Tests\AppBundle\Stubs;
 
 use FOS\UserBundle\Model\UserInterface;
 use FOS\UserBundle\Security\LoginManagerInterface;
diff --git a/tests/AppBundle/TestHelpers.php b/tests/AppBundle/TestHelpers.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace AppBundle\Tests;
+namespace Tests\AppBundle;
 
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 use Symfony\Component\HttpKernel\KernelInterface;
diff --git a/tests/AppBundle/fixtures/statistics.httpresponse b/tests/AppBundle/fixtures/statistics.httpresponse
