MAGETWO-43452: Ogre sprint 38 contribution to mainline

- fixed tests with merged XSD

Author: Olga Kopylova

app/code/Magento/Catalog/etc/view.xsd

@@ -6,7 +6,7 @@
  */
 -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
-    <xs:redefine schemaLocation="../../../../../lib/internal/Magento/Framework/Config/etc/view.xsd">
+    <xs:redefine schemaLocation="urn:magento:framework:Config/etc/view.xsd">
         <xs:complexType name="mediaType" mixed="true">
             <xs:complexContent>
                 <xs:extension base="mediaType">

app/code/Magento/ProductVideo/etc/view.xsd

@@ -6,7 +6,7 @@
  */
 -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
-    <xs:redefine schemaLocation="../../../../../lib/internal/Magento/Framework/Config/etc/view.xsd">
+    <xs:redefine schemaLocation="urn:magento:framework:Config/etc/view.xsd">
         <xs:complexType name="mediaType" mixed="true">
             <xs:complexContent>
                 <xs:extension base="mediaType">

app/design/adminhtml/Magento/backend/etc/view.xsd

@@ -6,7 +6,7 @@
  */
 -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
-    <xs:redefine schemaLocation="../../../../../../lib/internal/Magento/Framework/Config/etc/view.xsd">
+    <xs:redefine schemaLocation="urn:magento:framework:Config/etc/view.xsd">
         <xs:complexType name="mediaType" mixed="true">
             <xs:complexContent>
                 <xs:extension base="mediaType">

app/design/frontend/Magento/blank/etc/view.xsd

@@ -6,7 +6,7 @@
  */
 -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
-    <xs:redefine schemaLocation="../../../../../../lib/internal/Magento/Framework/Config/etc/view.xsd">
+    <xs:redefine schemaLocation="urn:magento:framework:Config/etc/view.xsd">
         <xs:complexType name="mediaType" mixed="true">
             <xs:complexContent>
                 <xs:extension base="mediaType">

app/design/frontend/Magento/luma/etc/view.xsd

@@ -6,7 +6,7 @@
  */
 -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
-    <xs:redefine schemaLocation="../../../../../../lib/internal/Magento/Framework/Config/etc/view.xsd">
+    <xs:redefine schemaLocation="urn:magento:framework:Config/etc/view.xsd">
         <xs:complexType name="mediaType" mixed="true">
             <xs:complexContent>
                 <xs:extension base="mediaType">

dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/ViewConfigFilesTest.php

@@ -5,8 +5,6 @@
  */
 namespace Magento\Test\Integrity\Modular;
 
-use Magento\Framework\App\Filesystem\DirectoryList;
-
 class ViewConfigFilesTest extends \PHPUnit_Framework_TestCase
 {
     /**
@@ -15,17 +13,16 @@ class ViewConfigFilesTest extends \PHPUnit_Framework_TestCase
      */
     public function testViewConfigFile($file)
     {
+        $reader = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+            'Magento\Framework\View\Xsd\Reader'
+        );
+        $mergeXsd = $reader->read();
         $domConfig = new \Magento\Framework\Config\Dom($file);
-        $urnResolver = new \Magento\Framework\Config\Dom\UrnResolver();
         $result = $domConfig->validate(
-            $urnResolver->getRealPath('urn:magento:framework:Config/etc/view.xsd'),
+            $mergeXsd,
             $errors
         );
-        $message = "Invalid XML-file: {$file}\n";
-        foreach ($errors as $error) {
-            $message .= "{$error->message} Line: {$error->line}\n";
-        }
-        $this->assertTrue($result, $message);
+        $this->assertTrue($result, "Invalid XML-file: {$file}\n" . join("\n", $errors));
     }
 
     /**

dev/tests/integration/testsuite/Magento/Test/Integrity/Theme/XmlFilesTest.php

@@ -15,10 +15,14 @@ class XmlFilesTest extends \PHPUnit_Framework_TestCase
      */
     public function testViewConfigFile($file)
     {
-        $this->_validateConfigFile(
-            $file,
-            'urn:magento:framework:Config/etc/view.xsd'
+        $reader = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+            'Magento\Framework\View\Xsd\Reader'
         );
+        $mergeXsd = $reader->read();
+        $domConfig = new \Magento\Framework\Config\Dom(file_get_contents($file));
+        $errors = [];
+        $result = $domConfig->validate($mergeXsd, $errors);
+        $this->assertTrue($result, "Invalid XML-file: {$file}\n" . join("\n", $errors));
     }
 
     /**
@@ -67,10 +71,10 @@ public function themeConfigFileExistsDataProvider()
      */
     public function testThemeConfigFileSchema($file)
     {
-        $this->_validateConfigFile(
-            $file,
-            'urn:magento:framework:Config/etc/theme.xsd'
-        );
+        $domConfig = new \Magento\Framework\Config\Dom(file_get_contents($file));
+        $errors = [];
+        $result = $domConfig->validate('urn:magento:framework:Config/etc/theme.xsd', $errors);
+        $this->assertTrue($result, "Invalid XML-file: {$file}\n" . join("\n", $errors));
     }
 
     /**
@@ -102,20 +106,4 @@ public function themeConfigFileDataProvider()
         }
         return $result;
     }
-
-    /**
-     * Perform test whether a configuration file is valid
-     *
-     * @param string $file
-     * @param string $schema
-     * @throws \PHPUnit_Framework_AssertionFailedError if file is invalid
-     */
-    protected function _validateConfigFile($file, $schema)
-    {
-        $this->markTestSkipped('MAGETWO-43738: validates against incorrect scheme');
-        $domConfig = new \Magento\Framework\Config\Dom(file_get_contents($file));
-        $errors = [];
-        $result = $domConfig->validate($schema, $errors);
-        $this->assertTrue($result, "Invalid XML-file: {$file}\n" . join("\n", $errors));
-    }
 }