MAGETWO-52792: ACL node title stated as optional in xsd but required in logic

- fixed unit tests

Author: Oleksii Korshenko

lib/internal/Magento/Framework/Acl/Test/Unit/AclResource/Config/SchemaLocatorTest.php

@@ -14,11 +14,11 @@ public function testGetSchema()
         $urnResolverMock = $this->getMock('Magento\Framework\Config\Dom\UrnResolver', [], [], '', false);
         $urnResolverMock->expects($this->once())
             ->method('getRealPath')
-            ->with('urn:magento:framework:Acl/etc/acl.xsd')
-            ->willReturn($urnResolver->getRealPath('urn:magento:framework:Acl/etc/acl.xsd'));
+            ->with('urn:magento:framework:Acl/etc/acl_merged.xsd')
+            ->willReturn($urnResolver->getRealPath('urn:magento:framework:Acl/etc/acl_merged.xsd'));
         $schemaLocator = new \Magento\Framework\Acl\AclResource\Config\SchemaLocator($urnResolverMock);
         $this->assertEquals(
-            $urnResolver->getRealPath('urn:magento:framework:Acl/etc/acl.xsd'),
+            $urnResolver->getRealPath('urn:magento:framework:Acl/etc/acl_merged.xsd'),
             $schemaLocator->getSchema()
         );
     }

lib/internal/Magento/Framework/Acl/Test/Unit/AclResource/Config/_files/invalidAclXmlArray.php

@@ -9,14 +9,17 @@
         'disabled=""/></resources></acl></config>',
         [
             "Element 'resource', attribute 'disabled': '' is not a valid value of the atomic" .
-            " type 'xs:boolean'.\nLine: 1\n"],
+            " type 'xs:boolean'.\nLine: 1\n",
+            "Element 'resource': The attribute 'title' is required but missing.\nLine: 1\n",
+        ],
     ],
     'disabled_attribute_wrong_type_value' => [
         '<?xml version="1.0"?><config><acl><resources><resource id="Test_Value::show_toolbar" ' .
         'disabled="notBool"/></resources></acl></config>',
         [
             "Element 'resource', attribute 'disabled': 'notBool' is not a valid value of the atomic type " .
-            "'xs:boolean'.\nLine: 1\n"
+            "'xs:boolean'.\nLine: 1\n",
+            "Element 'resource': The attribute 'title' is required but missing.\nLine: 1\n",
         ],
     ],
     'double_acl' => [
@@ -59,7 +62,8 @@
             "'typeId'.\nLine: 1\n",
             "Element 'resource', attribute 'id': Warning: No precomputed value available, " .
             "the value was either invalid or " .
-            "something strange happend.\nLine: 1\n"
+            "something strange happend.\nLine: 1\n",
+            "Element 'resource': The attribute 'title' is required but missing.\nLine: 1\n",
         ],
     ],
     'notvalid_id_attribute_value_regexp2' => [
@@ -71,7 +75,8 @@
             "Element 'resource', attribute 'id': 'Test_value::show_toolbar' is not a valid value of the atomic type " .
             "'typeId'.\nLine: 1\n",
             "Element 'resource', attribute 'id': Warning: No precomputed value available, " .
-            "the value was either invalid or something strange happend.\nLine: 1\n"
+            "the value was either invalid or something strange happend.\nLine: 1\n",
+            "Element 'resource': The attribute 'title' is required but missing.\nLine: 1\n",
         ],
     ],
     'notvalid_id_attribute_value_regexp3' => [
@@ -83,7 +88,8 @@
             "Element 'resource', attribute 'id': 'M@#$%^*_Value::show_toolbar' " .
             "is not a valid value of the atomic type 'typeId'.\nLine: 1\n",
             "Element 'resource', attribute 'id': Warning: No precomputed value available, " .
-            "the value was either invalid or something strange happend.\nLine: 1\n"
+            "the value was either invalid or something strange happend.\nLine: 1\n",
+            "Element 'resource': The attribute 'title' is required but missing.\nLine: 1\n",
         ],
     ],
     'notvalid_id_attribute_value_regexp4' => [
@@ -96,7 +102,8 @@
             "is not a valid value of the atomic type 'typeId'.\nLine: 1\n",
             "Element 'resource', attribute 'id': " .
             "Warning: No precomputed value available, the value was either invalid " .
-            "or something strange happend.\nLine: 1\n"
+            "or something strange happend.\nLine: 1\n",
+            "Element 'resource': The attribute 'title' is required but missing.\nLine: 1\n",
         ],
     ],
     'notvalid_id_attribute_value_regexp5' => [
@@ -109,7 +116,8 @@
             "is not a valid value of the atomic type 'typeId'.\nLine: 1\n",
             "Element 'resource', attribute 'id': " .
             "Warning: No precomputed value available, the value was either invalid " .
-            "or something strange happend.\nLine: 1\n"
+            "or something strange happend.\nLine: 1\n",
+            "Element 'resource': The attribute 'title' is required but missing.\nLine: 1\n",
         ],
     ],
     'notvalid_id_attribute_value_regexp6' => [
@@ -122,7 +130,8 @@
             "type 'typeId'.\nLine: 1\n",
             "Element 'resource', attribute 'id': " .
             "Warning: No precomputed value available, the value was either invalid " .
-            "or something strange happend.\nLine: 1\n"
+            "or something strange happend.\nLine: 1\n",
+            "Element 'resource': The attribute 'title' is required but missing.\nLine: 1\n",
         ],
     ],
     'notvalid_id_attribute_value_regexp7' => [
@@ -134,7 +143,8 @@
             " 'typeId'.\nLine: 1\n",
             "Element 'resource', attribute 'id': " .
             "Warning: No precomputed value available, the value was either invalid " .
-            "or something strange happend.\nLine: 1\n"
+            "or something strange happend.\nLine: 1\n",
+            "Element 'resource': The attribute 'title' is required but missing.\nLine: 1\n",
         ],
     ],
     'sortOrder_attribute_empty_value' => [
@@ -153,7 +163,10 @@
     'with_not_allowed_attribute' => [
         '<?xml version="1.0"?><config><acl><resources><resource id="Test_Value::show_toolbar" ' .
         'someatrrname="some value"/></resources></acl></config>',
-        ["Element 'resource', attribute 'someatrrname': The attribute 'someatrrname' is not allowed.\nLine: 1\n"],
+        [
+            "Element 'resource', attribute 'someatrrname': The attribute 'someatrrname' is not allowed.\nLine: 1\n",
+            "Element 'resource': The attribute 'title' is required but missing.\nLine: 1\n",
+        ],
     ],
     'with_two_same_id' => [
         '<?xml version="1.0"?><config><acl><resources><resource id="Test_Value::show_toolbar" ' .