test: Reorganize test namespaces.

rekalogika · Jan 15, 2024 · 3411ad2 · 3411ad2
1 parent f57a94e
commit 3411ad2
Show file tree

Hide file tree

Showing 21 changed files with 30 additions and 28 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 0.5.12
+
+* test: Reorganize test namespaces.
+
 ## 0.5.11
 
 * feat: Make the fourth argument optional in `TryPropertyCommand`.

diff --git a/tests/Fixtures/ArrayLikeDto/ObjectWithArrayAccessPropertyDto.php b/tests/Fixtures/ArrayLikeDto/ObjectWithArrayAccessPropertyDto.php
@@ -13,7 +13,7 @@
 
 namespace Rekalogika\Mapper\Tests\Fixtures\ArrayLikeDto;
 
-use Rekalogika\Mapper\Tests\Fixtures\Scalar\ObjectWithScalarPropertiesDto;
+use Rekalogika\Mapper\Tests\Fixtures\ScalarDto\ObjectWithScalarPropertiesDto;
 
 class ObjectWithArrayAccessPropertyDto
 {

diff --git a/tests/Fixtures/ArrayLikeDto/ObjectWithArrayPropertyDto.php b/tests/Fixtures/ArrayLikeDto/ObjectWithArrayPropertyDto.php
@@ -13,7 +13,7 @@
 
 namespace Rekalogika\Mapper\Tests\Fixtures\ArrayLikeDto;
 
-use Rekalogika\Mapper\Tests\Fixtures\Scalar\ObjectWithScalarPropertiesDto;
+use Rekalogika\Mapper\Tests\Fixtures\ScalarDto\ObjectWithScalarPropertiesDto;
 
 class ObjectWithArrayPropertyDto
 {

diff --git a/tests/Fixtures/ArrayLikeDto/ObjectWithArrayPropertyDtoWithIntKey.php b/tests/Fixtures/ArrayLikeDto/ObjectWithArrayPropertyDtoWithIntKey.php
@@ -13,7 +13,7 @@
 
 namespace Rekalogika\Mapper\Tests\Fixtures\ArrayLikeDto;
 
-use Rekalogika\Mapper\Tests\Fixtures\Scalar\ObjectWithScalarPropertiesDto;
+use Rekalogika\Mapper\Tests\Fixtures\ScalarDto\ObjectWithScalarPropertiesDto;
 
 class ObjectWithArrayPropertyDtoWithIntKey
 {

diff --git a/tests/Fixtures/ArrayLikeDto/ObjectWithCollectionPropertyDto.php b/tests/Fixtures/ArrayLikeDto/ObjectWithCollectionPropertyDto.php
@@ -14,7 +14,7 @@
 namespace Rekalogika\Mapper\Tests\Fixtures\ArrayLikeDto;
 
 use Doctrine\Common\Collections\Collection;
-use Rekalogika\Mapper\Tests\Fixtures\Scalar\ObjectWithScalarPropertiesDto;
+use Rekalogika\Mapper\Tests\Fixtures\ScalarDto\ObjectWithScalarPropertiesDto;
 
 class ObjectWithCollectionPropertyDto
 {

diff --git a/tests/Fixtures/ArrayLikeDto/ObjectWithTraversablePropertyDto.php b/tests/Fixtures/ArrayLikeDto/ObjectWithTraversablePropertyDto.php
@@ -13,7 +13,7 @@
 
 namespace Rekalogika\Mapper\Tests\Fixtures\ArrayLikeDto;
 
-use Rekalogika\Mapper\Tests\Fixtures\Scalar\ObjectWithScalarPropertiesDto;
+use Rekalogika\Mapper\Tests\Fixtures\ScalarDto\ObjectWithScalarPropertiesDto;
 
 class ObjectWithTraversablePropertyDto
 {

diff --git a/tests/Fixtures/MethodMapper/ObjectWithArrayPropertyDto.php b/tests/Fixtures/MethodMapper/ObjectWithArrayPropertyDto.php
@@ -16,7 +16,7 @@
 use Rekalogika\Mapper\Context\Context;
 use Rekalogika\Mapper\MethodMapper\MapFromObjectInterface;
 use Rekalogika\Mapper\MethodMapper\SubMapperInterface;
-use Rekalogika\Mapper\Tests\Fixtures\Scalar\ObjectWithScalarPropertiesDto;
+use Rekalogika\Mapper\Tests\Fixtures\ScalarDto\ObjectWithScalarPropertiesDto;
 
 final class ObjectWithArrayPropertyDto implements MapFromObjectInterface
 {

diff --git a/tests/Fixtures/MethodMapper/ObjectWithObjectWithScalarPropertiesDto.php b/tests/Fixtures/MethodMapper/ObjectWithObjectWithScalarPropertiesDto.php
@@ -18,7 +18,7 @@
 use Rekalogika\Mapper\MethodMapper\MapToObjectInterface;
 use Rekalogika\Mapper\MethodMapper\SubMapperInterface;
 use Rekalogika\Mapper\Tests\Fixtures\Scalar\ObjectWithScalarProperties;
-use Rekalogika\Mapper\Tests\Fixtures\Scalar\ObjectWithScalarPropertiesDto;
+use Rekalogika\Mapper\Tests\Fixtures\ScalarDto\ObjectWithScalarPropertiesDto;
 
 final class ObjectWithObjectWithScalarPropertiesDto implements
     MapFromObjectInterface,

diff --git a/...ransformer/MoneyToMoneyDtoTransformer.php → ...ures/Money/MoneyToMoneyDtoTransformer.php b/...ransformer/MoneyToMoneyDtoTransformer.php → ...ures/Money/MoneyToMoneyDtoTransformer.php
@@ -11,12 +11,11 @@
  * that was distributed with this source code.
  */
 
-namespace Rekalogika\Mapper\Tests\Fixtures\Transformer;
+namespace Rekalogika\Mapper\Tests\Fixtures\Money;
 
 use Brick\Money\Money;
 use Rekalogika\Mapper\Context\Context;
 use Rekalogika\Mapper\Exception\InvalidArgumentException;
-use Rekalogika\Mapper\Tests\Fixtures\Money\MoneyDto;
 use Rekalogika\Mapper\Transformer\Contracts\TransformerInterface;
 use Rekalogika\Mapper\Transformer\Contracts\TypeMapping;
 use Rekalogika\Mapper\Util\TypeCheck;

diff --git a/...es/Scalar/ObjectWithBoolPropertiesDto.php → ...ScalarDto/ObjectWithBoolPropertiesDto.php b/...es/Scalar/ObjectWithBoolPropertiesDto.php → ...ScalarDto/ObjectWithBoolPropertiesDto.php
@@ -11,7 +11,7 @@
  * that was distributed with this source code.
  */
 
-namespace Rekalogika\Mapper\Tests\Fixtures\Scalar;
+namespace Rekalogika\Mapper\Tests\Fixtures\ScalarDto;
 
 class ObjectWithBoolPropertiesDto
 {

diff --git a/...s/Scalar/ObjectWithFloatPropertiesDto.php → ...calarDto/ObjectWithFloatPropertiesDto.php b/...s/Scalar/ObjectWithFloatPropertiesDto.php → ...calarDto/ObjectWithFloatPropertiesDto.php
@@ -11,7 +11,7 @@
  * that was distributed with this source code.
  */
 
-namespace Rekalogika\Mapper\Tests\Fixtures\Scalar;
+namespace Rekalogika\Mapper\Tests\Fixtures\ScalarDto;
 
 class ObjectWithFloatPropertiesDto
 {

diff --git a/...res/Scalar/ObjectWithIntPropertiesDto.php → .../ScalarDto/ObjectWithIntPropertiesDto.php b/...res/Scalar/ObjectWithIntPropertiesDto.php → .../ScalarDto/ObjectWithIntPropertiesDto.php
@@ -11,7 +11,7 @@
  * that was distributed with this source code.
  */
 
-namespace Rekalogika\Mapper\Tests\Fixtures\Scalar;
+namespace Rekalogika\Mapper\Tests\Fixtures\ScalarDto;
 
 class ObjectWithIntPropertiesDto
 {

diff --git a/.../Scalar/ObjectWithScalarPropertiesDto.php → ...alarDto/ObjectWithScalarPropertiesDto.php b/.../Scalar/ObjectWithScalarPropertiesDto.php → ...alarDto/ObjectWithScalarPropertiesDto.php
@@ -11,7 +11,7 @@
  * that was distributed with this source code.
  */
 
-namespace Rekalogika\Mapper\Tests\Fixtures\Scalar;
+namespace Rekalogika\Mapper\Tests\Fixtures\ScalarDto;
 
 class ObjectWithScalarPropertiesDto
 {

diff --git a/.../Scalar/ObjectWithStringPropertiesDto.php → ...alarDto/ObjectWithStringPropertiesDto.php b/.../Scalar/ObjectWithStringPropertiesDto.php → ...alarDto/ObjectWithStringPropertiesDto.php
@@ -11,7 +11,7 @@
  * that was distributed with this source code.
  */
 
-namespace Rekalogika\Mapper\Tests\Fixtures\Scalar;
+namespace Rekalogika\Mapper\Tests\Fixtures\ScalarDto;
 
 class ObjectWithStringPropertiesDto
 {

diff --git a/tests/IntegrationTest/ArrayAndObjectMappingTest.php b/tests/IntegrationTest/ArrayAndObjectMappingTest.php
@@ -14,7 +14,7 @@
 namespace Rekalogika\Mapper\Tests\IntegrationTest;
 
 use Rekalogika\Mapper\Tests\Common\AbstractIntegrationTest;
-use Rekalogika\Mapper\Tests\Fixtures\Scalar\ObjectWithScalarPropertiesDto;
+use Rekalogika\Mapper\Tests\Fixtures\ScalarDto\ObjectWithScalarPropertiesDto;
 
 class ArrayAndObjectMappingTest extends AbstractIntegrationTest
 {

diff --git a/tests/IntegrationTest/CustomTransformerTest.php b/tests/IntegrationTest/CustomTransformerTest.php
@@ -16,7 +16,7 @@
 use Brick\Money\Money;
 use Rekalogika\Mapper\Tests\Common\AbstractIntegrationTest;
 use Rekalogika\Mapper\Tests\Fixtures\Money\MoneyDto;
-use Rekalogika\Mapper\Tests\Fixtures\Transformer\MoneyToMoneyDtoTransformer;
+use Rekalogika\Mapper\Tests\Fixtures\Money\MoneyToMoneyDtoTransformer;
 
 class CustomTransformerTest extends AbstractIntegrationTest
 {

diff --git a/tests/IntegrationTest/MappingTest.php b/tests/IntegrationTest/MappingTest.php
@@ -13,6 +13,8 @@
 
 namespace Rekalogika\Mapper\Tests\IntegrationTest;
 
+use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
 use Rekalogika\Mapper\Attribute\InheritanceMap;
 use Rekalogika\Mapper\Tests\Common\AbstractIntegrationTest;
 use Rekalogika\Mapper\Tests\Fixtures\EnumAndStringable\ObjectImplementingStringable;
@@ -25,12 +27,10 @@
 use Rekalogika\Mapper\Transformer\ObjectToStringTransformer;
 use Rekalogika\Mapper\Transformer\ScalarToScalarTransformer;
 use Rekalogika\Mapper\Transformer\StringToBackedEnumTransformer;
+use Rekalogika\Mapper\Transformer\TraversableToArrayAccessTransformer;
 use Rekalogika\Mapper\Util\TypeFactory;
 use Symfony\Component\Clock\DatePoint;
 use Symfony\Component\PropertyInfo\Type;
-use Doctrine\Common\Collections\ArrayCollection;
-use Doctrine\Common\Collections\Collection;
-use Rekalogika\Mapper\Transformer\TraversableToArrayAccessTransformer;
 
 class MappingTest extends AbstractIntegrationTest
 {

diff --git a/tests/IntegrationTest/MethodMapperTest.php b/tests/IntegrationTest/MethodMapperTest.php
@@ -20,7 +20,7 @@
 use Rekalogika\Mapper\Tests\Fixtures\MethodMapper\ObjectWithCollectionProperty;
 use Rekalogika\Mapper\Tests\Fixtures\MethodMapper\ObjectWithObjectWithScalarProperties;
 use Rekalogika\Mapper\Tests\Fixtures\MethodMapper\ObjectWithObjectWithScalarPropertiesDto;
-use Rekalogika\Mapper\Tests\Fixtures\Scalar\ObjectWithScalarPropertiesDto;
+use Rekalogika\Mapper\Tests\Fixtures\ScalarDto\ObjectWithScalarPropertiesDto;
 
 class MethodMapperTest extends AbstractIntegrationTest
 {

diff --git a/tests/IntegrationTest/ScalarPropertiesMappingTest.php b/tests/IntegrationTest/ScalarPropertiesMappingTest.php
@@ -14,12 +14,12 @@
 namespace Rekalogika\Mapper\Tests\IntegrationTest;
 
 use Rekalogika\Mapper\Tests\Common\AbstractIntegrationTest;
-use Rekalogika\Mapper\Tests\Fixtures\Scalar\ObjectWithBoolPropertiesDto;
-use Rekalogika\Mapper\Tests\Fixtures\Scalar\ObjectWithFloatPropertiesDto;
-use Rekalogika\Mapper\Tests\Fixtures\Scalar\ObjectWithIntPropertiesDto;
 use Rekalogika\Mapper\Tests\Fixtures\Scalar\ObjectWithScalarProperties;
-use Rekalogika\Mapper\Tests\Fixtures\Scalar\ObjectWithScalarPropertiesDto;
-use Rekalogika\Mapper\Tests\Fixtures\Scalar\ObjectWithStringPropertiesDto;
+use Rekalogika\Mapper\Tests\Fixtures\ScalarDto\ObjectWithBoolPropertiesDto;
+use Rekalogika\Mapper\Tests\Fixtures\ScalarDto\ObjectWithFloatPropertiesDto;
+use Rekalogika\Mapper\Tests\Fixtures\ScalarDto\ObjectWithIntPropertiesDto;
+use Rekalogika\Mapper\Tests\Fixtures\ScalarDto\ObjectWithScalarPropertiesDto;
+use Rekalogika\Mapper\Tests\Fixtures\ScalarDto\ObjectWithStringPropertiesDto;
 
 class ScalarPropertiesMappingTest extends AbstractIntegrationTest
 {

diff --git a/tests/IntegrationTest/TraversableToArrayAccessMappingTest.php b/tests/IntegrationTest/TraversableToArrayAccessMappingTest.php
@@ -13,7 +13,6 @@
 
 namespace Rekalogika\Mapper\Tests\IntegrationTest;
 
-use ArrayObject;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Rekalogika\Mapper\Tests\Common\AbstractIntegrationTest;
@@ -26,7 +25,7 @@
 use Rekalogika\Mapper\Tests\Fixtures\ArrayLikeDto\ObjectWithArrayPropertyWithoutTypeHintDto;
 use Rekalogika\Mapper\Tests\Fixtures\ArrayLikeDto\ObjectWithCollectionPropertyDto;
 use Rekalogika\Mapper\Tests\Fixtures\Scalar\ObjectWithScalarProperties;
-use Rekalogika\Mapper\Tests\Fixtures\Scalar\ObjectWithScalarPropertiesDto;
+use Rekalogika\Mapper\Tests\Fixtures\ScalarDto\ObjectWithScalarPropertiesDto;
 
 class TraversableToArrayAccessMappingTest extends AbstractIntegrationTest
 {

diff --git a/tests/IntegrationTest/TraversableToTraversableMappingTest.php b/tests/IntegrationTest/TraversableToTraversableMappingTest.php
@@ -19,7 +19,7 @@
 use Rekalogika\Mapper\Tests\Fixtures\ArrayLike\ObjectWithLazyDoctrineCollectionWithPresetCountableProperty;
 use Rekalogika\Mapper\Tests\Fixtures\ArrayLike\ObjectWithTraversableProperties;
 use Rekalogika\Mapper\Tests\Fixtures\ArrayLikeDto\ObjectWithTraversablePropertyDto;
-use Rekalogika\Mapper\Tests\Fixtures\Scalar\ObjectWithScalarPropertiesDto;
+use Rekalogika\Mapper\Tests\Fixtures\ScalarDto\ObjectWithScalarPropertiesDto;
 use Rekalogika\Mapper\Transformer\Model\TraversableCountableWrapper;
 
 class TraversableToTraversableMappingTest extends AbstractIntegrationTest