Merge pull request #2164 from magento-panda/PANDA-FIXES-2.2

Fixed issues:
  - MAGETWO-87487 phpunit.xml files should be ignored by Magento/Test/Integrity/Xml/SchemaTest.php

Author: igrybkov

dev/tests/static/testsuite/Magento/Test/Integrity/Xml/SchemaTest.php

@@ -14,9 +14,6 @@ public function testXmlFiles()
     {
         $invoker = new \Magento\Framework\App\Utility\AggregateInvoker($this);
         $invoker(
-            /**
-             * @param string $filename
-             */
             function ($filename) {
                 $dom = new \DOMDocument();
                 $xmlFile = file_get_contents($filename);
@@ -27,9 +24,9 @@ function ($filename) {
 
                 $schemaLocations = [];
                 preg_match('/xsi:noNamespaceSchemaLocation=\s*"(urn:[^"]+)"/s', $xmlFile, $schemaLocations);
-                $this->assertEquals(
+                $this->assertCount(
                     2,
-                    count($schemaLocations),
+                    $schemaLocations,
                     'The XML file at ' . $filename . ' does not have a schema properly defined.  It should '
                     . 'have a xsi:noNamespaceSchemaLocation attribute defined with a URN path.  E.g. '
                     . 'xsi:noNamespaceSchemaLocation="urn:magento:framework:Relative_Path/something.xsd"'
@@ -60,6 +57,7 @@ public function getSchemas()
         foreach ($componentRegistrar->getPaths(ComponentRegistrar::LIBRARY) as $libraryPath) {
             $libSchemas = array_merge($libSchemas, $this->_getFiles($libraryPath, '*.xsd'));
         }
+
         return $this->_dataSet(array_merge($codeSchemas, $libSchemas));
     }
 
@@ -79,6 +77,7 @@ public function getXmlFiles()
         foreach ($componentRegistrar->getPaths(ComponentRegistrar::LIBRARY) as $libraryPath) {
             $libXml = array_merge($libXml, $this->_getFiles($libraryPath, '*.xml', '/.\/Test\/./'));
         }
+
         return $this->_dataSet(array_merge($codeXml, $designXml, $libXml));
     }
 
@@ -107,8 +106,11 @@ private function _filterSpecialCases(&$files)
             '#conf/schema.xml$#',
             '#conf/solrconfig.xml$#',
             '#layout/swagger_index_index.xml$#',
-            '#Doc/etc/doc/vars.xml$#'
+            '#Doc/etc/doc/vars.xml$#',
+            '#phpunit.xml$#',
+            '#app/code/(?!Magento)(.*?)/.*?/Test/.*\.xml$#',
         ];
+
         foreach ($list as $pattern) {
             foreach ($files as $key => $value) {
                 if (preg_match($pattern, $value)) {
@@ -124,6 +126,7 @@ protected function _dataSet($files)
         foreach ($files as $file) {
             $data[substr($file, strlen(BP))] = [$file];
         }
+
         return $data;
     }
 }