Adjust paths and namespaces anfter Git history rewrite

ezsystems · Oct 20, 2015 · 75893f7 · 75893f7
1 parent 0d3a31d
commit 75893f7
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 10 deletions.
diff --git a/composer.json b/composer.json
@@ -22,8 +22,6 @@
     "psr-4": {
       "EzSystems\\EzPlatformXmlTextFieldTypeBundle\\": "bundle",
       "EzSystems\\EzPlatformXmlTextFieldTypeBundle\\Tests\\": "tests/bundle",
-      "eZ\\Publish\\API\\Repository\\Tests\\FieldType\\": "tests/integration/API/Repository/Tests/FieldType",
-      "eZ\\Publish\\SPI\\Tests\\FieldType\\": "tests/integration/SPI/Tests/FieldType",
       "eZ\\Publish\\Core\\FieldType\\XmlText\\": "lib/FieldType/XmlText",
       "eZ\\Publish\\Core\\Persistence\\Legacy\\Content\\FieldValue\\Converter\\": "lib/Persistence/Legacy/Content/FieldValue/Converter",
       "eZ\\Publish\\Core\\REST\\Common\\FieldTypeProcessor\\": "lib/REST/Common/FieldTypeProcessor",

diff --git a/phpunit-integration-legacy-solr.xml b/phpunit-integration-legacy-solr.xml
@@ -15,7 +15,7 @@
     </php>
     <testsuites>
         <testsuite name="eZ\Publish\API\Repository">
-            <directory>./tests/integration/API</directory>
+            <file>./tests/lib/XmlTextAPIIntegrationTest.php</file>
         </testsuite>
     </testsuites>
     <filter>

diff --git a/phpunit-integration-legacy.xml b/phpunit-integration-legacy.xml
@@ -14,7 +14,7 @@
     </php>
     <testsuites>
         <testsuite name="eZ\Publish\API\Repository">
-            <directory>./tests/integration/API</directory>
+            <file>./tests/lib/XmlTextAPIIntegrationTest.php</file>
         </testsuite>
     </testsuites>
     <filter>

diff --git a/phpunit.xml b/phpunit.xml
@@ -9,9 +9,11 @@
         <testsuite name="XmlText field type unit tests">
             <directory suffix="Test.php">./tests/bundle/</directory>
             <directory suffix="Test.php">./tests/lib/</directory>
+            <exclude>./tests/lib/XmlTextAPIIntegrationTest.php</exclude>
+            <exclude>./tests/lib/XmlTextSPIIntegrationTest.php</exclude>
         </testsuite>
-        <testsuite name="eZ Publish SPI test suite">
-            <directory suffix="Test.php">./tests/integration/SPI</directory>
+        <testsuite name="XmlText field type eZ Platform Repository SPI integration test suite">
+            <file>./tests/lib/XmlTextSPIIntegrationTest.php</file>
         </testsuite>
     </testsuites>
     <filter>

diff --git a/tests/lib/XmlTextAPIIntegrationTest.php b/tests/lib/XmlTextAPIIntegrationTest.php
@@ -8,8 +8,9 @@
  *
  * @version //autogentag//
  */
-namespace eZ\Publish\API\Repository\Tests\FieldType;
+namespace EzSystems\EzPlatformXmlTextFieldType\Tests;
 
+use eZ\Publish\API\Repository\Tests\FieldType\RelationSearchBaseIntegrationTest;
 use eZ\Publish\Core\FieldType\XmlText\Value as XmlTextValue;
 use eZ\Publish\Core\FieldType\XmlText\Type as XmlTextType;
 use eZ\Publish\API\Repository\Values\Content\Field;
@@ -23,7 +24,7 @@
  * @group integration
  * @group field-type
  */
-class XmlTextIntegrationTest extends RelationSearchBaseIntegrationTest
+class XmlTexAPItIntegrationTest extends RelationSearchBaseIntegrationTest
 {
     /**
      * @var \DOMDocument

diff --git a/tests/lib/XmlTextSPIIntegrationTest.php b/tests/lib/XmlTextSPIIntegrationTest.php
@@ -8,8 +8,9 @@
  *
  * @version //autogentag//
  */
-namespace eZ\Publish\SPI\Tests\FieldType;
+namespace EzSystems\EzPlatformXmlTextFieldType\Tests;
 
+use eZ\Publish\SPI\Tests\FieldType\BaseIntegrationTest;
 use eZ\Publish\Core\Persistence\Legacy\Content\FieldValue\Converter\XmlTextConverter;
 use eZ\Publish\Core\FieldType;
 use eZ\Publish\Core\FieldType\FieldSettings;
@@ -38,7 +39,7 @@
  *
  * @group integration
  */
-class XmlTextIntegrationTest extends BaseIntegrationTest
+class XmlTextSPIIntegrationTest extends BaseIntegrationTest
 {
     /**
      * Get name of tested field type.