Updated to conform with testing comp. standards

dantleech · dantleech · commit 4b9e1ddf3655 · 2013-06-18T20:25:16.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
-/vendor/
-/Tests/Functional/App/Kernel/cache/
-/Tests/Functional/App/Kernel/logs/
+./Tests/Resources/app/cache/
+./Tests/Resources/app/logs/
+composer.lock
+vendor
diff --git a/Tests/Functional/Command/RefreshCommandTest.php b/Tests/Functional/Command/RefreshCommandTest.php
@@ -2,9 +2,10 @@
 
 namespace Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\Functional\Command;
 
-use Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\Functional\App\Document\Blog;
 use Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\Functional\BaseTestCase;
-use Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\Functional\App\Document\Post;
+use Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\Resources\Document\Blog;
+use Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\Resources\Document\Post;
+
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Output\NullOutput;
 use Symfony\Cmf\Bundle\RoutingAutoBundle\Command\RefreshCommand;
diff --git a/Tests/Functional/EventListener/AutoRouteListenerTest.php b/Tests/Functional/EventListener/AutoRouteListenerTest.php
@@ -2,9 +2,9 @@
 
 namespace Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\Functional\Subscriber;
 
-use Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\Functional\App\Document\Blog;
 use Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\Functional\BaseTestCase;
-use Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\Functional\App\Document\Post;
+use Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\Resources\Document\Blog;
+use Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\Resources\Document\Post;
 
 class AutoRouteListenerTest extends BaseTestCase
 {
diff --git a/Tests/Resources/Document/Blog.php b/Tests/Resources/Document/Blog.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\Functional\App\Document;
+namespace Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\Resources\Document;
 
 use Doctrine\ODM\PHPCR\Mapping\Annotations as PHPCR;
 use Symfony\Cmf\Bundle\RoutingBundle\Mapping\Annotations as CMFRouting;
diff --git a/Tests/Resources/Document/Post.php b/Tests/Resources/Document/Post.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\Functional\App\Document;
+namespace Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\Resources\Document;
 
 use Doctrine\ODM\PHPCR\Mapping\Annotations as PHPCR;
 use Symfony\Cmf\Bundle\RoutingBundle\Mapping\Annotations as CMFRouting;
diff --git a/Tests/Resources/app/AppKernel.php b/Tests/Resources/app/AppKernel.php
diff --git a/Tests/Resources/app/config/config.php b/Tests/Resources/app/config/config.php
diff --git a/Tests/Resources/app/config/routingautoroute.yml b/Tests/Resources/app/config/routingautoroute.yml
@@ -4,7 +4,7 @@ cmf_routing_auto:
 
         ## 
         # e.g. /cms/auto-route/blog/my-blogs-title
-        Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\Functional\App\Document\Blog:
+        Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\Resources\Document\Blog:
 
             # generate or use path components leading up to the final part of the path
             content_path:
@@ -37,7 +37,7 @@ cmf_routing_auto:
 
         ##
         # e.g. /cms/auto-route/blog/my-blogs-title/2013-04-09/my-post-title
-        Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\Functional\App\Document\Post:
+        Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\Resources\Document\Post:
 
             content_path:
 
diff --git a/Tests/Unit/AutoRoute/AutoRouteManagerTest.php b/Tests/Unit/AutoRoute/AutoRouteManagerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\AutoRoute;
+namespace Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\Unit\AutoRoute;
 
 use Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\AutoRouteManager;
 
diff --git a/Tests/Unit/AutoRoute/BuilderContextTest.php b/Tests/Unit/AutoRoute/BuilderContextTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\AutoRoute;
+namespace Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\Unit\AutoRoute;
 
 use Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\BuilderContext;
 
diff --git a/Tests/Unit/AutoRoute/FactoryTest.php b/Tests/Unit/AutoRoute/FactoryTest.php
diff --git a/Tests/Unit/AutoRoute/PathExists/AutoIncrementPathTest.php b/Tests/Unit/AutoRoute/PathExists/AutoIncrementPathTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\AutoRoute;
+namespace Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\Unit\AutoRoute;
 
 use Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\PathExists\AutoIncrementPath;
 
diff --git a/Tests/Unit/AutoRoute/PathExists/UsePathTest.php b/Tests/Unit/AutoRoute/PathExists/UsePathTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\AutoRoute;
+namespace Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\Unit\AutoRoute;
 
 use Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\PathExists\UsePath;
 
diff --git a/Tests/Unit/AutoRoute/PathNotExists/CreatePathTest.php b/Tests/Unit/AutoRoute/PathNotExists/CreatePathTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\AutoRoute\PathNotExists;
+namespace Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\Unit\AutoRoute\PathNotExists;
 
 use Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\PathNotExists\CreatePath;
 
diff --git a/Tests/Unit/AutoRoute/PathNotExists/ThrowExceptionTest.php b/Tests/Unit/AutoRoute/PathNotExists/ThrowExceptionTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\AutoRoute\PathNotExists;
+namespace Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\Unit\AutoRoute\PathNotExists;
 
 use Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\PathNotExists\ThrowException;
 
diff --git a/Tests/Unit/AutoRoute/PathProvider/ContentDateTimeProviderTest.php b/Tests/Unit/AutoRoute/PathProvider/ContentDateTimeProviderTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\AutoRoute\PathProvider;
+namespace Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\Unit\AutoRoute\PathProvider;
 
 use Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\PathExists\PathProvider;
 use Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\PathProvider\ContentDateTimeProvider;
diff --git a/Tests/Unit/AutoRoute/PathProvider/ContentMethodProviderTest.php b/Tests/Unit/AutoRoute/PathProvider/ContentMethodProviderTest.php
diff --git a/Tests/Unit/AutoRoute/PathProvider/ContentObjectProviderTest.php b/Tests/Unit/AutoRoute/PathProvider/ContentObjectProviderTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\AutoRoute\PathProvider;
+namespace Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\Unit\AutoRoute\PathProvider;
 
 use Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\PathExists\PathProvider;
 use Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\PathProvider\ContentObjectProvider;
diff --git a/Tests/Unit/AutoRoute/PathProvider/SpecifiedProviderTest.php b/Tests/Unit/AutoRoute/PathProvider/SpecifiedProviderTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\AutoRoute;
+namespace Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\Unit\AutoRoute\PathProvider;
 
 use Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\PathExists\PathProvider;
 use Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\PathProvider\SpecifiedProvider;
diff --git a/Tests/Unit/AutoRoute/RouteMaker/AutoRouteMakerTest.php b/Tests/Unit/AutoRoute/RouteMaker/AutoRouteMakerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\AutoRoute\RouteMaker;
+namespace Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\Unit\AutoRoute\RouteMaker;
 
 use Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\RouteMaker\AutoRouteMaker;
 use Doctrine\Common\Collections\ArrayCollection;
diff --git a/Tests/Unit/AutoRoute/RouteMaker/DefaultMakerTest.php b/Tests/Unit/AutoRoute/RouteMaker/DefaultMakerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\AutoRoute\DefaultMaker;
+namespace Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\Unit\AutoRoute\DefaultMaker;
 
 use Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\RouteMaker\DefaultMaker;
 
diff --git a/Tests/Unit/AutoRoute/RouteMaker/GenericMakerTest.php b/Tests/Unit/AutoRoute/RouteMaker/GenericMakerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\AutoRoute\RouteMaker;
+namespace Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\Unit\AutoRoute\RouteMaker;
 
 use Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\RouteMaker\GenericMaker;
 
diff --git a/Tests/Unit/AutoRoute/RouteMaker/RouteMakerTest.php b/Tests/Unit/AutoRoute/RouteMaker/RouteMakerTest.php
@@ -1,6 +1,8 @@
 <?php
 
-namespace Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\AutoRoute\RouteMaker;
+namespace Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\Unit\AutoRoute\RouteMaker;
+
+use Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\Unit\AutoRoute\RouteMaker\GenericMakerTest;
 
 class RouteMakerTest extends GenericMakerTest
 {
diff --git a/Tests/Unit/AutoRoute/RouteStack/BuilderTest.php b/Tests/Unit/AutoRoute/RouteStack/BuilderTest.php
diff --git a/Tests/Unit/AutoRoute/RouteStack/BuilderUnitChainTest.php b/Tests/Unit/AutoRoute/RouteStack/BuilderUnitChainTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\AutoRoute\RouteStack\RouteStack;
+namespace Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\Unit\AutoRoute\RouteStack\RouteStack;
 
 use Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\BuilderContext;
 use Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\RouteStack\BuilderUnitChain;
diff --git a/Tests/Unit/AutoRoute/RouteStack/BuilderUnitTest.php b/Tests/Unit/AutoRoute/RouteStack/BuilderUnitTest.php
diff --git a/Tests/Unit/AutoRoute/RouteStackTest.php b/Tests/Unit/AutoRoute/RouteStackTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\AutoRoute;
+namespace Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\Unit\AutoRoute;
 
 use Symfony\Cmf\Bundle\RoutingAutoBundle\AutoRoute\RouteStack;
 
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -26,7 +26,7 @@
     </filter>
 
     <php>
-        <server name="KERNEL_DIR" value="Tests/Functional/App/Kernel" />
+        <server name="KERNEL_DIR" value="Tests/Resources/app" />
     </php>
 
 </phpunit>

Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,9 @@`
`2`	`2`
`3`	`3`	`namespace Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\Functional\Subscriber;`
`4`	`4`
`5`		`-use Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\Functional\App\Document\Blog;`
`6`	`5`	`use Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\Functional\BaseTestCase;`
`7`		`-use Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\Functional\App\Document\Post;`
	`6`	`+use Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\Resources\Document\Blog;`
	`7`	`+use Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\Resources\Document\Post;`
`8`	`8`
`9`	`9`	`class AutoRouteListenerTest extends BaseTestCase`
`10`	`10`	`{`