reorg testing

auraphp · Jul 1, 2015 · 4dc49f6 · 4dc49f6
1 parent ee6a340
commit 4dc49f6
Show file tree

Hide file tree

Showing 85 changed files with 23 additions and 59 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,2 @@
-/tests/container/vendor
-/tests/container/composer.*
+/composer.lock
+/vendor
diff --git a/composer.json b/composer.json
@@ -26,17 +26,21 @@
             "Aura\\Filter\\": "src/"
         }
     },
-    "autoload-dev": {
-        "psr-4": {
-            "Aura\\Filter\\": "tests"
-        }
-    },
     "extra": {
         "aura": {
             "type": "library",
             "config": {
                 "common": "Aura\\Filter\\_Config\\Common"
             }
         }
+    },
+    "require-dev": {
+        "aura/di": "~2.0"
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Aura\\Filter\\": "tests/",
+            "Aura\\Di\\": "vendor/aura/di/tests/"
+        }
     }
 }
diff --git a/phpunit.php b/phpunit.php
@@ -0,0 +1,9 @@
+<?php
+error_reporting(E_ALL);
+$autoloader = __DIR__ . '/vendor/autoload.php';
+if (! file_exists($autoloader)) {
+    echo "Composer autoloader not found: $autoloader" . PHP_EOL;
+    echo "Please issue 'composer install' and try again." . PHP_EOL;
+    exit(1);
+}
+require $autoloader;
diff --git a/tests/container/phpunit.xml → phpunit.xml.dist b/tests/container/phpunit.xml → phpunit.xml.dist
@@ -1,7 +1,7 @@
-<phpunit bootstrap="./bootstrap.php">
+<phpunit bootstrap="./phpunit.php">
     <testsuites>
         <testsuite>
-            <directory>./src</directory>
+            <directory>./tests</directory>
         </testsuite>
     </testsuites>
 </phpunit>
diff --git a/tests/container/src/CommonTest.php → tests/ContainerTest.php b/tests/container/src/CommonTest.php → tests/ContainerTest.php
@@ -3,7 +3,7 @@
 
 use Aura\Di\_Config\AbstractContainerTest;
 
-class CommonTest extends AbstractContainerTest
+class ContainerTest extends AbstractContainerTest
 {
     protected function getConfigClasses()
     {

diff --git a/tests/unit/src/FilterFactoryTest.php → tests/FilterFactoryTest.php b/tests/unit/src/FilterFactoryTest.php → tests/FilterFactoryTest.php
diff --git a/tests/unit/src/FilterTest.php → tests/FilterTest.php b/tests/unit/src/FilterTest.php → tests/FilterTest.php
diff --git a/tests/unit/src/Rule/Locator/FakeLocator.php → tests/Rule/Locator/FakeLocator.php b/tests/unit/src/Rule/Locator/FakeLocator.php → tests/Rule/Locator/FakeLocator.php
diff --git a/tests/unit/src/Rule/Locator/LocatorTest.php → tests/Rule/Locator/LocatorTest.php b/tests/unit/src/Rule/Locator/LocatorTest.php → tests/Rule/Locator/LocatorTest.php
diff --git a/...rc/Rule/Sanitize/AbstractSanitizeTest.php → tests/Rule/Sanitize/AbstractSanitizeTest.php b/...rc/Rule/Sanitize/AbstractSanitizeTest.php → tests/Rule/Sanitize/AbstractSanitizeTest.php
diff --git a/tests/unit/src/Rule/Sanitize/AlnumTest.php → tests/Rule/Sanitize/AlnumTest.php b/tests/unit/src/Rule/Sanitize/AlnumTest.php → tests/Rule/Sanitize/AlnumTest.php
diff --git a/tests/unit/src/Rule/Sanitize/AlphaTest.php → tests/Rule/Sanitize/AlphaTest.php b/tests/unit/src/Rule/Sanitize/AlphaTest.php → tests/Rule/Sanitize/AlphaTest.php
diff --git a/tests/unit/src/Rule/Sanitize/BetweenTest.php → tests/Rule/Sanitize/BetweenTest.php b/tests/unit/src/Rule/Sanitize/BetweenTest.php → tests/Rule/Sanitize/BetweenTest.php
diff --git a/tests/unit/src/Rule/Sanitize/BoolTest.php → tests/Rule/Sanitize/BoolTest.php b/tests/unit/src/Rule/Sanitize/BoolTest.php → tests/Rule/Sanitize/BoolTest.php
diff --git a/...s/unit/src/Rule/Sanitize/CallbackTest.php → tests/Rule/Sanitize/CallbackTest.php b/...s/unit/src/Rule/Sanitize/CallbackTest.php → tests/Rule/Sanitize/CallbackTest.php
diff --git a/...s/unit/src/Rule/Sanitize/DateTimeTest.php → tests/Rule/Sanitize/DateTimeTest.php b/...s/unit/src/Rule/Sanitize/DateTimeTest.php → tests/Rule/Sanitize/DateTimeTest.php
diff --git a/tests/unit/src/Rule/Sanitize/FieldTest.php → tests/Rule/Sanitize/FieldTest.php b/tests/unit/src/Rule/Sanitize/FieldTest.php → tests/Rule/Sanitize/FieldTest.php
diff --git a/tests/unit/src/Rule/Sanitize/FloatTest.php → tests/Rule/Sanitize/FloatTest.php b/tests/unit/src/Rule/Sanitize/FloatTest.php → tests/Rule/Sanitize/FloatTest.php
diff --git a/tests/unit/src/Rule/Sanitize/Hex.php → tests/Rule/Sanitize/Hex.php b/tests/unit/src/Rule/Sanitize/Hex.php → tests/Rule/Sanitize/Hex.php
diff --git a/tests/unit/src/Rule/Sanitize/HexTest.php → tests/Rule/Sanitize/HexTest.php b/tests/unit/src/Rule/Sanitize/HexTest.php → tests/Rule/Sanitize/HexTest.php
diff --git a/tests/unit/src/Rule/Sanitize/IntTest.php → tests/Rule/Sanitize/IntTest.php b/tests/unit/src/Rule/Sanitize/IntTest.php → tests/Rule/Sanitize/IntTest.php
diff --git a/tests/unit/src/Rule/Sanitize/IsbnTest.php → tests/Rule/Sanitize/IsbnTest.php b/tests/unit/src/Rule/Sanitize/IsbnTest.php → tests/Rule/Sanitize/IsbnTest.php
diff --git a/tests/unit/src/Rule/Sanitize/MaxTest.php → tests/Rule/Sanitize/MaxTest.php b/tests/unit/src/Rule/Sanitize/MaxTest.php → tests/Rule/Sanitize/MaxTest.php
diff --git a/tests/unit/src/Rule/Sanitize/MinTest.php → tests/Rule/Sanitize/MinTest.php b/tests/unit/src/Rule/Sanitize/MinTest.php → tests/Rule/Sanitize/MinTest.php
diff --git a/tests/unit/src/Rule/Sanitize/NowTest.php → tests/Rule/Sanitize/NowTest.php b/tests/unit/src/Rule/Sanitize/NowTest.php → tests/Rule/Sanitize/NowTest.php
diff --git a/tests/unit/src/Rule/Sanitize/RegexTest.php → tests/Rule/Sanitize/RegexTest.php b/tests/unit/src/Rule/Sanitize/RegexTest.php → tests/Rule/Sanitize/RegexTest.php
diff --git a/tests/unit/src/Rule/Sanitize/RemoveTest.php → tests/Rule/Sanitize/RemoveTest.php b/tests/unit/src/Rule/Sanitize/RemoveTest.php → tests/Rule/Sanitize/RemoveTest.php
diff --git a/tests/unit/src/Rule/Sanitize/StringTest.php → tests/Rule/Sanitize/StringTest.php b/tests/unit/src/Rule/Sanitize/StringTest.php → tests/Rule/Sanitize/StringTest.php
diff --git a/...t/src/Rule/Sanitize/StrlenBetweenTest.php → tests/Rule/Sanitize/StrlenBetweenTest.php b/...t/src/Rule/Sanitize/StrlenBetweenTest.php → tests/Rule/Sanitize/StrlenBetweenTest.php
diff --git a/.../unit/src/Rule/Sanitize/StrlenMaxTest.php → tests/Rule/Sanitize/StrlenMaxTest.php b/.../unit/src/Rule/Sanitize/StrlenMaxTest.php → tests/Rule/Sanitize/StrlenMaxTest.php
diff --git a/.../unit/src/Rule/Sanitize/StrlenMinTest.php → tests/Rule/Sanitize/StrlenMinTest.php b/.../unit/src/Rule/Sanitize/StrlenMinTest.php → tests/Rule/Sanitize/StrlenMinTest.php
diff --git a/tests/unit/src/Rule/Sanitize/StrlenTest.php → tests/Rule/Sanitize/StrlenTest.php b/tests/unit/src/Rule/Sanitize/StrlenTest.php → tests/Rule/Sanitize/StrlenTest.php
diff --git a/tests/unit/src/Rule/Sanitize/TrimTest.php → tests/Rule/Sanitize/TrimTest.php b/tests/unit/src/Rule/Sanitize/TrimTest.php → tests/Rule/Sanitize/TrimTest.php
diff --git a/...nit/src/Rule/Sanitize/UuidHexonlyTest.php → tests/Rule/Sanitize/UuidHexonlyTest.php b/...nit/src/Rule/Sanitize/UuidHexonlyTest.php → tests/Rule/Sanitize/UuidHexonlyTest.php
diff --git a/tests/unit/src/Rule/Sanitize/UuidTest.php → tests/Rule/Sanitize/UuidTest.php b/tests/unit/src/Rule/Sanitize/UuidTest.php → tests/Rule/Sanitize/UuidTest.php
diff --git a/tests/unit/src/Rule/Sanitize/ValueTest.php → tests/Rule/Sanitize/ValueTest.php b/tests/unit/src/Rule/Sanitize/ValueTest.php → tests/Rule/Sanitize/ValueTest.php
diff --git a/tests/unit/src/Rule/Sanitize/WordTest.php → tests/Rule/Sanitize/WordTest.php b/tests/unit/src/Rule/Sanitize/WordTest.php → tests/Rule/Sanitize/WordTest.php
diff --git a/...rc/Rule/Validate/AbstractValidateTest.php → tests/Rule/Validate/AbstractValidateTest.php b/...rc/Rule/Validate/AbstractValidateTest.php → tests/Rule/Validate/AbstractValidateTest.php
diff --git a/tests/unit/src/Rule/Validate/AlnumTest.php → tests/Rule/Validate/AlnumTest.php b/tests/unit/src/Rule/Validate/AlnumTest.php → tests/Rule/Validate/AlnumTest.php
diff --git a/tests/unit/src/Rule/Validate/AlphaTest.php → tests/Rule/Validate/AlphaTest.php b/tests/unit/src/Rule/Validate/AlphaTest.php → tests/Rule/Validate/AlphaTest.php
diff --git a/tests/unit/src/Rule/Validate/BetweenTest.php → tests/Rule/Validate/BetweenTest.php b/tests/unit/src/Rule/Validate/BetweenTest.php → tests/Rule/Validate/BetweenTest.php
diff --git a/tests/unit/src/Rule/Validate/BlankTest.php → tests/Rule/Validate/BlankTest.php b/tests/unit/src/Rule/Validate/BlankTest.php → tests/Rule/Validate/BlankTest.php
diff --git a/tests/unit/src/Rule/Validate/BoolTest.php → tests/Rule/Validate/BoolTest.php b/tests/unit/src/Rule/Validate/BoolTest.php → tests/Rule/Validate/BoolTest.php
diff --git a/...s/unit/src/Rule/Validate/CallbackTest.php → tests/Rule/Validate/CallbackTest.php b/...s/unit/src/Rule/Validate/CallbackTest.php → tests/Rule/Validate/CallbackTest.php
diff --git a/...unit/src/Rule/Validate/CreditCardTest.php → tests/Rule/Validate/CreditCardTest.php b/...unit/src/Rule/Validate/CreditCardTest.php → tests/Rule/Validate/CreditCardTest.php
diff --git a/...s/unit/src/Rule/Validate/DateTimeTest.php → tests/Rule/Validate/DateTimeTest.php b/...s/unit/src/Rule/Validate/DateTimeTest.php → tests/Rule/Validate/DateTimeTest.php
diff --git a/tests/unit/src/Rule/Validate/EmailTest.php → tests/Rule/Validate/EmailTest.php b/tests/unit/src/Rule/Validate/EmailTest.php → tests/Rule/Validate/EmailTest.php
diff --git a/...it/src/Rule/Validate/EqualToFieldTest.php → tests/Rule/Validate/EqualToFieldTest.php b/...it/src/Rule/Validate/EqualToFieldTest.php → tests/Rule/Validate/EqualToFieldTest.php
diff --git a/...it/src/Rule/Validate/EqualToValueTest.php → tests/Rule/Validate/EqualToValueTest.php b/...it/src/Rule/Validate/EqualToValueTest.php → tests/Rule/Validate/EqualToValueTest.php
diff --git a/tests/unit/src/Rule/Validate/FakeUpload.php → tests/Rule/Validate/FakeUpload.php b/tests/unit/src/Rule/Validate/FakeUpload.php → tests/Rule/Validate/FakeUpload.php
diff --git a/tests/unit/src/Rule/Validate/FloatTest.php → tests/Rule/Validate/FloatTest.php b/tests/unit/src/Rule/Validate/FloatTest.php → tests/Rule/Validate/FloatTest.php
diff --git a/tests/unit/src/Rule/Validate/Hex.php → tests/Rule/Validate/Hex.php b/tests/unit/src/Rule/Validate/Hex.php → tests/Rule/Validate/Hex.php
diff --git a/tests/unit/src/Rule/Validate/HexTest.php → tests/Rule/Validate/HexTest.php b/tests/unit/src/Rule/Validate/HexTest.php → tests/Rule/Validate/HexTest.php
diff --git a/tests/unit/src/Rule/Validate/InKeysTest.php → tests/Rule/Validate/InKeysTest.php b/tests/unit/src/Rule/Validate/InKeysTest.php → tests/Rule/Validate/InKeysTest.php
diff --git a/...t/src/Rule/Validate/InTableColumnTest.php → tests/Rule/Validate/InTableColumnTest.php b/...t/src/Rule/Validate/InTableColumnTest.php → tests/Rule/Validate/InTableColumnTest.php
diff --git a/...s/unit/src/Rule/Validate/InValuesTest.php → tests/Rule/Validate/InValuesTest.php b/...s/unit/src/Rule/Validate/InValuesTest.php → tests/Rule/Validate/InValuesTest.php
diff --git a/tests/unit/src/Rule/Validate/IntTest.php → tests/Rule/Validate/IntTest.php b/tests/unit/src/Rule/Validate/IntTest.php → tests/Rule/Validate/IntTest.php
diff --git a/tests/unit/src/Rule/Validate/IpTest.php → tests/Rule/Validate/IpTest.php b/tests/unit/src/Rule/Validate/IpTest.php → tests/Rule/Validate/IpTest.php
diff --git a/tests/unit/src/Rule/Validate/Ipv4Test.php → tests/Rule/Validate/Ipv4Test.php b/tests/unit/src/Rule/Validate/Ipv4Test.php → tests/Rule/Validate/Ipv4Test.php
diff --git a/tests/unit/src/Rule/Validate/Ipv6Test.php → tests/Rule/Validate/Ipv6Test.php b/tests/unit/src/Rule/Validate/Ipv6Test.php → tests/Rule/Validate/Ipv6Test.php
diff --git a/tests/unit/src/Rule/Validate/IsbnTest.php → tests/Rule/Validate/IsbnTest.php b/tests/unit/src/Rule/Validate/IsbnTest.php → tests/Rule/Validate/IsbnTest.php
diff --git a/tests/unit/src/Rule/Validate/LocaleTest.php → tests/Rule/Validate/LocaleTest.php b/tests/unit/src/Rule/Validate/LocaleTest.php → tests/Rule/Validate/LocaleTest.php
diff --git a/tests/unit/src/Rule/Validate/MaxTest.php → tests/Rule/Validate/MaxTest.php b/tests/unit/src/Rule/Validate/MaxTest.php → tests/Rule/Validate/MaxTest.php
diff --git a/tests/unit/src/Rule/Validate/MinTest.php → tests/Rule/Validate/MinTest.php b/tests/unit/src/Rule/Validate/MinTest.php → tests/Rule/Validate/MinTest.php
diff --git a/tests/unit/src/Rule/Validate/RegexTest.php → tests/Rule/Validate/RegexTest.php b/tests/unit/src/Rule/Validate/RegexTest.php → tests/Rule/Validate/RegexTest.php
diff --git a/.../Rule/Validate/StrictEqualToFieldTest.php → .../Rule/Validate/StrictEqualToFieldTest.php b/.../Rule/Validate/StrictEqualToFieldTest.php → .../Rule/Validate/StrictEqualToFieldTest.php
diff --git a/.../Rule/Validate/StrictEqualToValueTest.php → .../Rule/Validate/StrictEqualToValueTest.php b/.../Rule/Validate/StrictEqualToValueTest.php → .../Rule/Validate/StrictEqualToValueTest.php
diff --git a/tests/unit/src/Rule/Validate/StringTest.php → tests/Rule/Validate/StringTest.php b/tests/unit/src/Rule/Validate/StringTest.php → tests/Rule/Validate/StringTest.php
diff --git a/...t/src/Rule/Validate/StrlenBetweenTest.php → tests/Rule/Validate/StrlenBetweenTest.php b/...t/src/Rule/Validate/StrlenBetweenTest.php → tests/Rule/Validate/StrlenBetweenTest.php
diff --git a/.../unit/src/Rule/Validate/StrlenMaxTest.php → tests/Rule/Validate/StrlenMaxTest.php b/.../unit/src/Rule/Validate/StrlenMaxTest.php → tests/Rule/Validate/StrlenMaxTest.php
diff --git a/.../unit/src/Rule/Validate/StrlenMinTest.php → tests/Rule/Validate/StrlenMinTest.php b/.../unit/src/Rule/Validate/StrlenMinTest.php → tests/Rule/Validate/StrlenMinTest.php
diff --git a/tests/unit/src/Rule/Validate/StrlenTest.php → tests/Rule/Validate/StrlenTest.php b/tests/unit/src/Rule/Validate/StrlenTest.php → tests/Rule/Validate/StrlenTest.php
diff --git a/tests/unit/src/Rule/Validate/TrimTest.php → tests/Rule/Validate/TrimTest.php b/tests/unit/src/Rule/Validate/TrimTest.php → tests/Rule/Validate/TrimTest.php
diff --git a/tests/unit/src/Rule/Validate/UploadTest.php → tests/Rule/Validate/UploadTest.php b/tests/unit/src/Rule/Validate/UploadTest.php → tests/Rule/Validate/UploadTest.php
diff --git a/tests/unit/src/Rule/Validate/UrlTest.php → tests/Rule/Validate/UrlTest.php b/tests/unit/src/Rule/Validate/UrlTest.php → tests/Rule/Validate/UrlTest.php
diff --git a/...nit/src/Rule/Validate/UuidHexonlyTest.php → tests/Rule/Validate/UuidHexonlyTest.php b/...nit/src/Rule/Validate/UuidHexonlyTest.php → tests/Rule/Validate/UuidHexonlyTest.php
diff --git a/tests/unit/src/Rule/Validate/UuidTest.php → tests/Rule/Validate/UuidTest.php b/tests/unit/src/Rule/Validate/UuidTest.php → tests/Rule/Validate/UuidTest.php
diff --git a/tests/unit/src/Rule/Validate/WordTest.php → tests/Rule/Validate/WordTest.php b/tests/unit/src/Rule/Validate/WordTest.php → tests/Rule/Validate/WordTest.php
diff --git a/tests/unit/src/Spec/SanitizeSpecTest.php → tests/Spec/SanitizeSpecTest.php b/tests/unit/src/Spec/SanitizeSpecTest.php → tests/Spec/SanitizeSpecTest.php
diff --git a/tests/unit/src/Spec/ValidateSpecTest.php → tests/Spec/ValidateSpecTest.php b/tests/unit/src/Spec/ValidateSpecTest.php → tests/Spec/ValidateSpecTest.php
diff --git a/tests/unit/src/ValueFilterTest.php → tests/ValueFilterTest.php b/tests/unit/src/ValueFilterTest.php → tests/ValueFilterTest.php
diff --git a/tests/container/bootstrap.php b/tests/container/bootstrap.php
diff --git a/tests/container/phpunit.sh b/tests/container/phpunit.sh
diff --git a/tests/unit/bootstrap.php b/tests/unit/bootstrap.php
diff --git a/tests/unit/phpunit.xml b/tests/unit/phpunit.xml