diff --git a/src/Meritoo/Common/Utilities/TestCase.php b/src/Meritoo/Common/Test/Base/BaseTestCase.php similarity index 96% rename from src/Meritoo/Common/Utilities/TestCase.php rename to src/Meritoo/Common/Test/Base/BaseTestCase.php index a4e4530..de7e4b0 100644 --- a/src/Meritoo/Common/Utilities/TestCase.php +++ b/src/Meritoo/Common/Test/Base/BaseTestCase.php @@ -6,7 +6,7 @@ * file that was distributed with this source code. */ -namespace Meritoo\Common\Utilities; +namespace Meritoo\Common\Test\Base; use DateTime; use Generator; @@ -17,12 +17,12 @@ use ReflectionClass; use ReflectionMethod; /** - * Test case with common methods and data providers + * Base test case with common methods and data providers * * @author Krzysztof Niziol * @copyright Meritoo.pl */ -class TestCase extends PHPUnit_Framework_TestCase +abstract class BaseTestCase extends PHPUnit_Framework_TestCase { /** * Provides an empty value @@ -109,7 +109,7 @@ class TestCase extends PHPUnit_Framework_TestCase $directoryPath = '/' . $directoryPath; } - return sprintf('%s/../../../../data/tests/%s%s', __DIR__, $fileName, $directoryPath); + return sprintf('%s/../../../../../data/tests/%s%s', __DIR__, $fileName, $directoryPath); } /** diff --git a/tests/Meritoo/Common/Test/Collection/CollectionTest.php b/tests/Meritoo/Common/Test/Collection/CollectionTest.php index 178f920..bfeb579 100644 --- a/tests/Meritoo/Common/Test/Collection/CollectionTest.php +++ b/tests/Meritoo/Common/Test/Collection/CollectionTest.php @@ -10,8 +10,8 @@ namespace Meritoo\Common\Test\Collection; use ArrayIterator; use Meritoo\Common\Collection\Collection; +use Meritoo\Common\Test\Base\BaseTestCase; use Meritoo\Common\Type\OopVisibilityType; -use Meritoo\Common\Utilities\TestCase; /** * Tests of the collection of elements @@ -19,7 +19,7 @@ use Meritoo\Common\Utilities\TestCase; * @author Krzysztof Niziol * @copyright Meritoo.pl */ -class CollectionTest extends TestCase +class CollectionTest extends BaseTestCase { /** * An empty collection diff --git a/tests/Meritoo/Common/Test/Utilities/ComposerTest.php b/tests/Meritoo/Common/Test/Utilities/ComposerTest.php index fcca6af..c52900d 100644 --- a/tests/Meritoo/Common/Test/Utilities/ComposerTest.php +++ b/tests/Meritoo/Common/Test/Utilities/ComposerTest.php @@ -8,8 +8,9 @@ namespace Meritoo\Common\Test\Utilities; +use Generator; +use Meritoo\Common\Test\Base\BaseTestCase; use Meritoo\Common\Utilities\Composer; -use Meritoo\Common\Utilities\TestCase; /** * Tests of the useful Composer-related methods @@ -17,7 +18,7 @@ use Meritoo\Common\Utilities\TestCase; * @author Krzysztof Niziol * @copyright Meritoo.pl */ -class ComposerTest extends TestCase +class ComposerTest extends BaseTestCase { /** * Path of existing composer.json used as source of data for tests @@ -60,7 +61,7 @@ class ComposerTest extends TestCase /** * Provides names and values of existing nodes * - * @return \Generator + * @return Generator */ public function getExistingNode() { diff --git a/tests/Meritoo/Common/Test/Utilities/DatePeriodTest.php b/tests/Meritoo/Common/Test/Utilities/DatePeriodTest.php index 2407ad5..ccc8d60 100644 --- a/tests/Meritoo/Common/Test/Utilities/DatePeriodTest.php +++ b/tests/Meritoo/Common/Test/Utilities/DatePeriodTest.php @@ -10,9 +10,9 @@ namespace Meritoo\Common\Test\Utilities; use DateTime; use Generator; +use Meritoo\Common\Test\Base\BaseTestCase; use Meritoo\Common\Type\OopVisibilityType; use Meritoo\Common\Utilities\DatePeriod; -use Meritoo\Common\Utilities\TestCase; /** * Tests of date's period @@ -20,7 +20,7 @@ use Meritoo\Common\Utilities\TestCase; * @author Krzysztof Niziol * @copyright Meritoo.pl */ -class DatePeriodTest extends TestCase +class DatePeriodTest extends BaseTestCase { public function testConstructorVisibilityAndArguments() { diff --git a/tests/Meritoo/Common/Test/Utilities/DateTest.php b/tests/Meritoo/Common/Test/Utilities/DateTest.php index 432fcfc..c287a56 100644 --- a/tests/Meritoo/Common/Test/Utilities/DateTest.php +++ b/tests/Meritoo/Common/Test/Utilities/DateTest.php @@ -12,8 +12,8 @@ use DateInterval; use DateTime; use Generator; use Meritoo\Common\Exception\Date\UnknownDatePartTypeException; +use Meritoo\Common\Test\Base\BaseTestCase; use Meritoo\Common\Utilities\Date; -use Meritoo\Common\Utilities\TestCase; /** * Tests of the Date methods (only static functions) @@ -21,7 +21,7 @@ use Meritoo\Common\Utilities\TestCase; * @author Krzysztof Niziol * @copyright Meritoo.pl */ -class DateTest extends TestCase +class DateTest extends BaseTestCase { /** * @param mixed $value Empty value, e.g. "" diff --git a/tests/Meritoo/Common/Test/Utilities/GeneratorUtilityTest.php b/tests/Meritoo/Common/Test/Utilities/GeneratorUtilityTest.php index 401c71e..284d80d 100644 --- a/tests/Meritoo/Common/Test/Utilities/GeneratorUtilityTest.php +++ b/tests/Meritoo/Common/Test/Utilities/GeneratorUtilityTest.php @@ -8,8 +8,8 @@ namespace Meritoo\Common\Test\Utilities; +use Meritoo\Common\Test\Base\BaseTestCase; use Meritoo\Common\Utilities\GeneratorUtility; -use Meritoo\Common\Utilities\TestCase; /** * Tests of the useful methods for the Generator class @@ -17,7 +17,7 @@ use Meritoo\Common\Utilities\TestCase; * @author Krzysztof Niziol * @copyright Meritoo.pl */ -class GeneratorUtilityTest extends TestCase +class GeneratorUtilityTest extends BaseTestCase { public function testGetGeneratorElements() { diff --git a/tests/Meritoo/Common/Test/Utilities/LocaleTest.php b/tests/Meritoo/Common/Test/Utilities/LocaleTest.php index 7137dda..790a313 100644 --- a/tests/Meritoo/Common/Test/Utilities/LocaleTest.php +++ b/tests/Meritoo/Common/Test/Utilities/LocaleTest.php @@ -9,8 +9,8 @@ namespace Meritoo\Common\Test\Utilities; use Generator; +use Meritoo\Common\Test\Base\BaseTestCase; use Meritoo\Common\Utilities\Locale; -use Meritoo\Common\Utilities\TestCase; /** * Tests of the useful locale methods @@ -18,7 +18,7 @@ use Meritoo\Common\Utilities\TestCase; * @author Krzysztof Niziol * @copyright Meritoo.pl */ -class LocaleTest extends TestCase +class LocaleTest extends BaseTestCase { /** * @param mixed $languageCode Empty value, e.g. "" diff --git a/tests/Meritoo/Common/Test/Utilities/MimeTypesTest.php b/tests/Meritoo/Common/Test/Utilities/MimeTypesTest.php index 55724ce..b252b28 100644 --- a/tests/Meritoo/Common/Test/Utilities/MimeTypesTest.php +++ b/tests/Meritoo/Common/Test/Utilities/MimeTypesTest.php @@ -9,8 +9,8 @@ namespace Meritoo\Common\Test\Utilities; use Generator; +use Meritoo\Common\Test\Base\BaseTestCase; use Meritoo\Common\Utilities\MimeTypes; -use Meritoo\Common\Utilities\TestCase; /** * Tests of the useful methods for mime types of files @@ -18,7 +18,7 @@ use Meritoo\Common\Utilities\TestCase; * @author Krzysztof Niziol * @copyright Meritoo.pl */ -class MimeTypesTest extends TestCase +class MimeTypesTest extends BaseTestCase { /** * @param mixed $mimeType Empty value, e.g. "" diff --git a/tests/Meritoo/Common/Test/Utilities/MiscellaneousTest.php b/tests/Meritoo/Common/Test/Utilities/MiscellaneousTest.php index b72e1ff..3297a29 100644 --- a/tests/Meritoo/Common/Test/Utilities/MiscellaneousTest.php +++ b/tests/Meritoo/Common/Test/Utilities/MiscellaneousTest.php @@ -11,9 +11,9 @@ namespace Meritoo\Common\Test\Utilities; use Generator; use Meritoo\Common\Exception\Regex\IncorrectColorHexLengthException; use Meritoo\Common\Exception\Regex\InvalidColorHexValueException; +use Meritoo\Common\Test\Base\BaseTestCase; use Meritoo\Common\Utilities\Locale; use Meritoo\Common\Utilities\Miscellaneous; -use Meritoo\Common\Utilities\TestCase; use stdClass; /** @@ -22,7 +22,7 @@ use stdClass; * @author Krzysztof Niziol * @copyright Meritoo.pl */ -class MiscellaneousTest extends TestCase +class MiscellaneousTest extends BaseTestCase { private $stringSmall; private $stringCommaSeparated; diff --git a/tests/Meritoo/Common/Test/Utilities/ReflectionTest.php b/tests/Meritoo/Common/Test/Utilities/ReflectionTest.php index 7d858a0..94f97ac 100644 --- a/tests/Meritoo/Common/Test/Utilities/ReflectionTest.php +++ b/tests/Meritoo/Common/Test/Utilities/ReflectionTest.php @@ -13,13 +13,13 @@ use Generator; use Meritoo\Common\Exception\Reflection\CannotResolveClassNameException; use Meritoo\Common\Exception\Reflection\MissingChildClassesException; use Meritoo\Common\Exception\Reflection\TooManyChildClassesException; +use Meritoo\Common\Test\Base\BaseTestCase; use Meritoo\Common\Test\Utilities\Reflection\A; use Meritoo\Common\Test\Utilities\Reflection\B; use Meritoo\Common\Test\Utilities\Reflection\C; use Meritoo\Common\Test\Utilities\Reflection\D; use Meritoo\Common\Test\Utilities\Reflection\E; use Meritoo\Common\Utilities\Reflection; -use Meritoo\Common\Utilities\TestCase; /** * Tests of the useful reflection methods @@ -27,7 +27,7 @@ use Meritoo\Common\Utilities\TestCase; * @author Krzysztof Niziol * @copyright Meritoo.pl */ -class ReflectionTest extends TestCase +class ReflectionTest extends BaseTestCase { /** * @param mixed $invalidClass Empty value, e.g. "" diff --git a/tests/Meritoo/Common/Test/Utilities/UriTest.php b/tests/Meritoo/Common/Test/Utilities/UriTest.php index 611d4fb..179a430 100644 --- a/tests/Meritoo/Common/Test/Utilities/UriTest.php +++ b/tests/Meritoo/Common/Test/Utilities/UriTest.php @@ -8,7 +8,7 @@ namespace Meritoo\Common\Test\Utilities; -use Meritoo\Common\Utilities\TestCase; +use Meritoo\Common\Test\Base\BaseTestCase; use Meritoo\Common\Utilities\Uri; /** @@ -17,7 +17,7 @@ use Meritoo\Common\Utilities\Uri; * @author Krzysztof Niziol * @copyright Meritoo.pl */ -class UriTest extends TestCase +class UriTest extends BaseTestCase { public function testAddProtocolToUrl() {