Merge pull request KnpLabs#75 from dantleech/testing-standard

Standardized testing in accordance with component documentation (in PR)
EmmanuelVella · Jun 18, 2013 · fd41a91 · fd41a91
2 parents 006b3a0 + db23634
commit fd41a91
Show file tree

Hide file tree

Showing 10 changed files with 9 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,4 @@
-Tests/Functional/App/cache
-Tests/Functional/App/logs
+Tests/Resources/app/cache
+Tests/Resources/app/logs
 composer.lock
 vendor
diff --git a/Tests/Functional/App/config/config.php b/Tests/Functional/App/config/config.php
diff --git a/Tests/Functional/App/AppKernel.php → Tests/Resources/app/AppKernel.php b/Tests/Functional/App/AppKernel.php → Tests/Resources/app/AppKernel.php
diff --git a/Tests/Functional/App/config/cmf_menu.yml → Tests/Resources/app/config/cmf_menu.yml b/Tests/Functional/App/config/cmf_menu.yml → Tests/Resources/app/config/cmf_menu.yml
diff --git a/Tests/Resources/app/config/config.php b/Tests/Resources/app/config/config.php
@@ -0,0 +1,6 @@
+<?php
+
+$loader->import(CMF_TEST_CONFIG_DIR.'/default.php');
+$loader->import(CMF_TEST_CONFIG_DIR.'/phpcr_odm.php');
+$loader->import(CMF_TEST_CONFIG_DIR.'/sonata_admin.php');
+$loader->import(__DIR__.'/cmf_menu.yml');
diff --git a/Tests/Functional/App/config/routing.php → Tests/Resources/app/config/routing.php b/Tests/Functional/App/config/routing.php → Tests/Resources/app/config/routing.php
diff --git a/Tests/ContentAwareFactoryTest.php → Tests/Unit/ContentAwareFactoryTest.php b/Tests/ContentAwareFactoryTest.php → Tests/Unit/ContentAwareFactoryTest.php
diff --git a/Tests/Document/MenuNodeTest.php → Tests/Unit/Document/MenuNodeTest.php b/Tests/Document/MenuNodeTest.php → Tests/Unit/Document/MenuNodeTest.php
diff --git a/Tests/Document/MultilangMenuNodeTest.php → ...s/Unit/Document/MultilangMenuNodeTest.php b/Tests/Document/MultilangMenuNodeTest.php → ...s/Unit/Document/MultilangMenuNodeTest.php
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -26,7 +26,7 @@
     </filter>
 
     <php>
-        <server name="KERNEL_DIR" value="Tests/Functional/App" />
+        <server name="KERNEL_DIR" value="Tests/Resources/app" />
     </php>
 
 </phpunit>