From 85aee9c3c3b14503b67949efcf20f7b0742765c3 Mon Sep 17 00:00:00 2001
From: Andrew Longosz <alongosz@users.noreply.github.com>
Date: Thu, 12 Jul 2018 16:36:15 +0200
Subject: [PATCH] [PHPUnit] Fixed configuration files to conform to XSD schema
 (#2393)

Moved testsuite directories to the top of testsuite configuration to conform to XSD schema.
---
 phpunit-integration-legacy-elasticsearch.xml | 4 ++--
 phpunit-integration-legacy-solr.xml          | 4 ++--
 phpunit-integration-legacy.xml               | 4 ++--
 phpunit-integration-rest-json.xml            | 4 ++--
 phpunit-integration-rest-xml.xml             | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/phpunit-integration-legacy-elasticsearch.xml b/phpunit-integration-legacy-elasticsearch.xml
index b2ac6cc72d5..d7aad4c28e0 100644
--- a/phpunit-integration-legacy-elasticsearch.xml
+++ b/phpunit-integration-legacy-elasticsearch.xml
@@ -23,6 +23,8 @@
                @todo: Search service is used all over the place, so we must test
                       all services here.
           -->
+          <directory>eZ/Publish/API/Repository/Tests/Values/User/Limitation</directory>
+          <directory>eZ/Publish/API/Repository/Tests/FieldType/</directory>
           <file>eZ/Publish/API/Repository/Tests/RepositoryTest.php</file>
           <file>eZ/Publish/API/Repository/Tests/SectionServiceTest.php</file>
           <file>eZ/Publish/API/Repository/Tests/LanguageServiceTest.php</file>
@@ -53,8 +55,6 @@
           <file>eZ/Publish/API/Repository/Tests/SearchEngineIndexingTest.php</file>
           <file>eZ/Publish/API/Repository/Tests/LimitationTest.php</file>
           <file>eZ/Publish/API/Repository/Tests/FieldTypeServiceTest.php</file>
-          <directory>eZ/Publish/API/Repository/Tests/Values/User/Limitation</directory>
-          <directory>eZ/Publish/API/Repository/Tests/FieldType/</directory>
         </testsuite>
     </testsuites>
     <filter>
diff --git a/phpunit-integration-legacy-solr.xml b/phpunit-integration-legacy-solr.xml
index a5426d01788..da995e519f5 100644
--- a/phpunit-integration-legacy-solr.xml
+++ b/phpunit-integration-legacy-solr.xml
@@ -24,6 +24,8 @@
                  @todo: Search service is used all over the place, so we must test
                         all services here.
             -->
+            <directory>eZ/Publish/API/Repository/Tests/Values/User/Limitation</directory>
+            <directory>eZ/Publish/API/Repository/Tests/FieldType/</directory>
             <file>eZ/Publish/API/Repository/Tests/RepositoryTest.php</file>
             <file>eZ/Publish/API/Repository/Tests/SectionServiceTest.php</file>
             <file>eZ/Publish/API/Repository/Tests/LanguageServiceTest.php</file>
@@ -55,8 +57,6 @@
             <file>eZ/Publish/API/Repository/Tests/SearchEngineIndexingTest.php</file>
             <file>eZ/Publish/API/Repository/Tests/LimitationTest.php</file>
             <file>eZ/Publish/API/Repository/Tests/FieldTypeServiceTest.php</file>
-            <directory>eZ/Publish/API/Repository/Tests/Values/User/Limitation</directory>
-            <directory>eZ/Publish/API/Repository/Tests/FieldType/</directory>
         </testsuite>
         <testsuite name="eZ\Publish\API\Repository\Tests\Regression">
             <directory>eZ/Publish/API/Repository/Tests/Regression/</directory>
diff --git a/phpunit-integration-legacy.xml b/phpunit-integration-legacy.xml
index 8785bdbe061..bf935412deb 100644
--- a/phpunit-integration-legacy.xml
+++ b/phpunit-integration-legacy.xml
@@ -16,6 +16,8 @@
     </php>
     <testsuites>
         <testsuite name="eZ\Publish\API\Repository">
+            <directory>eZ/Publish/API/Repository/Tests/Values/User/Limitation</directory>
+            <directory>eZ/Publish/API/Repository/Tests/FieldType/</directory>
             <file>eZ/Publish/API/Repository/Tests/RepositoryTest.php</file>
             <file>eZ/Publish/API/Repository/Tests/PermissionServiceTest.php</file>
             <file>eZ/Publish/API/Repository/Tests/SectionServiceTest.php</file>
@@ -48,8 +50,6 @@
             <file>eZ/Publish/API/Repository/Tests/SearchEngineIndexingTest.php</file>
             <file>eZ/Publish/API/Repository/Tests/LimitationTest.php</file>
             <file>eZ/Publish/API/Repository/Tests/FieldTypeServiceTest.php</file>
-            <directory>eZ/Publish/API/Repository/Tests/Values/User/Limitation</directory>
-            <directory>eZ/Publish/API/Repository/Tests/FieldType/</directory>
         </testsuite>
         <testsuite name="eZ\Publish\API\Repository\Tests\Regression">
             <directory>eZ/Publish/API/Repository/Tests/Regression/</directory>
diff --git a/phpunit-integration-rest-json.xml b/phpunit-integration-rest-json.xml
index e4198ea08d4..1f0649969b1 100644
--- a/phpunit-integration-rest-json.xml
+++ b/phpunit-integration-rest-json.xml
@@ -15,6 +15,8 @@
     </php>
     <testsuites>
         <testsuite name="eZ\Publish\API\Repository">
+            <directory>eZ/Publish/API/Repository/Tests/Values/User/Limitation</directory>
+            <directory>eZ/Publish/API/Repository/Tests/FieldType/</directory>
             <file>eZ/Publish/API/Repository/Tests/RepositoryTest.php</file>
             <file>eZ/Publish/API/Repository/Tests/SectionServiceTest.php</file>
             <file>eZ/Publish/API/Repository/Tests/LanguageServiceTest.php</file>
@@ -39,8 +41,6 @@
             <file>eZ/Publish/API/Repository/Tests/URLWildcardServiceAuthorizationTest.php</file>
             <file>eZ/Publish/API/Repository/Tests/ObjectStateServiceAuthorizationTest.php</file>
             <file>eZ/Publish/API/Repository/Tests/LimitationTest.php</file>
-            <directory>eZ/Publish/API/Repository/Tests/Values/User/Limitation</directory>
-            <directory>eZ/Publish/API/Repository/Tests/FieldType/</directory>
         </testsuite>
     </testsuites>
     <filter>
diff --git a/phpunit-integration-rest-xml.xml b/phpunit-integration-rest-xml.xml
index 42060d282cc..63833eac322 100644
--- a/phpunit-integration-rest-xml.xml
+++ b/phpunit-integration-rest-xml.xml
@@ -15,6 +15,8 @@
     </php>
     <testsuites>
         <testsuite name="eZ\Publish\API\Repository">
+            <directory>eZ/Publish/API/Repository/Tests/Values/User/Limitation</directory>
+            <directory>eZ/Publish/API/Repository/Tests/FieldType/</directory>
             <file>eZ/Publish/API/Repository/Tests/RepositoryTest.php</file>
             <file>eZ/Publish/API/Repository/Tests/SectionServiceTest.php</file>
             <file>eZ/Publish/API/Repository/Tests/LanguageServiceTest.php</file>
@@ -39,8 +41,6 @@
             <file>eZ/Publish/API/Repository/Tests/URLWildcardServiceAuthorizationTest.php</file>
             <file>eZ/Publish/API/Repository/Tests/ObjectStateServiceAuthorizationTest.php</file>
             <file>eZ/Publish/API/Repository/Tests/LimitationTest.php</file>
-            <directory>eZ/Publish/API/Repository/Tests/Values/User/Limitation</directory>
-            <directory>eZ/Publish/API/Repository/Tests/FieldType/</directory>
         </testsuite>
     </testsuites>
     <filter>