Permalink
Browse files

Moved tests according to new Symfony 3 directory structure

  • Loading branch information...
1 parent 90c9190 commit c7f5f2c25ab18d8b085c2784e9107b06f4bf4b85 @manuelkiessling manuelkiessling committed Dec 8, 2015
Showing with 25 additions and 28 deletions.
  1. +3 −6 phpunit.xml.dist
  2. +2 −2 {src/ApiBundle/Tests → tests/ApiBundle}/Controller/Internal/TestcasesApiControllerTest.php
  3. +2 −2 {src/ApiBundle/Tests → tests/ApiBundle}/Controller/TestresultsApiControllerTest.php
  4. +1 −1 {src/ApiBundle/Tests → tests/ApiBundle}/Service/HarTransformerServiceTest.php
  5. +1 −1 {src/ApiBundle/Tests → tests/ApiBundle}/Service/SeleneseRunnerLogAnalyzerServiceTest.php
  6. 0 {src/ApiBundle/Tests → tests/ApiBundle}/fixtures/selenese-runner.log
  7. 0 {src/ApiBundle/Tests → tests/ApiBundle}/fixtures/selenese-runner.nyt.log
  8. 0 {src/ApiBundle/Tests → tests/ApiBundle}/fixtures/testrun.actual.har.json
  9. 0 {src/ApiBundle/Tests → tests/ApiBundle}/fixtures/testrun.expected.har.json
  10. 0 {src/ApiBundle/Tests → tests/ApiBundle}/fixtures/testrun.nyt.actual.har.json
  11. +2 −2 {src/AppBundle/Tests → tests/AppBundle}/Command/ImportStatisticsCommandTest.php
  12. +1 −1 {src/AppBundle/Tests → tests/AppBundle}/Controller/ContentControllerWebTest.php
  13. +2 −2 {src/AppBundle/Tests → tests/AppBundle}/Controller/TestcasesControllerWebTest.php
  14. +2 −2 {src/AppBundle/Tests → tests/AppBundle}/Functional/DemoModeFunctionalWebTest.php
  15. +2 −2 {src/AppBundle/Tests → tests/AppBundle}/Functional/HomepageFunctionalWebTest.php
  16. +2 −2 {src/AppBundle/Tests → tests/AppBundle}/Functional/LoggedInLoggedOutFunctionalWebTest.php
  17. +1 −1 {src/AppBundle/Tests → tests/AppBundle}/Service/DemoServiceTest.php
  18. +2 −2 {src/AppBundle/Tests → tests/AppBundle}/Service/RegistrationServiceTest.php
  19. +1 −1 {src/AppBundle/Tests → tests/AppBundle}/Stubs/LoginManagerStub.php
  20. +1 −1 {src/AppBundle/Tests → tests/AppBundle}/TestHelpers.php
  21. 0 {src/AppBundle/Tests → tests/AppBundle}/fixtures/statistics.httpresponse
View
@@ -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>
@@ -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
@@ -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
@@ -1,6 +1,6 @@
<?php
-namespace ApiBundle\Tests\Service;
+namespace Tests\ApiBundle\Service;
use PHPUnit_Framework_TestCase;
use ApiBundle\Service\HarTransformerService;
@@ -1,6 +1,6 @@
<?php
-namespace ApiBundle\Tests\Service;
+namespace Tests\ApiBundle\Service;
use PHPUnit_Framework_TestCase;
use ApiBundle\Service\SeleneseRunnerLogAnalyzerService;
@@ -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;
@@ -1,6 +1,6 @@
<?php
-namespace AppBundle\Tests\Controller;
+namespace Tests\AppBundle\Controller;
use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
@@ -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;
@@ -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
@@ -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
@@ -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
@@ -1,6 +1,6 @@
<?php
-namespace AppBundle\Tests\Service;
+namespace Tests\AppBundle\Service;
use AppBundle\Entity\User;
use AppBundle\Service\DemoService;
@@ -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();
@@ -1,6 +1,6 @@
<?php
-namespace AppBundle\Tests\Stubs;
+namespace Tests\AppBundle\Stubs;
use FOS\UserBundle\Model\UserInterface;
use FOS\UserBundle\Security\LoginManagerInterface;
@@ -1,6 +1,6 @@
<?php
-namespace AppBundle\Tests;
+namespace Tests\AppBundle;
use Symfony\Bundle\FrameworkBundle\Console\Application;
use Symfony\Component\HttpKernel\KernelInterface;

0 comments on commit c7f5f2c

Please sign in to comment.