MQE-421: Create Unit Tests for the object model

- Fixed CR feedback
- Merged in sprint-develop and fixed conflicts

Author: tomreece

dev/tests/unit/Magento/FunctionalTestFramework/Page/Objects/ElementObjectTest.php

@@ -6,6 +6,7 @@
 
 namespace tests\unit\Magento\FunctionalTestFramework\Page\Objects;
 
+use Magento\FunctionalTestingFramework\Exceptions\XmlException;
 use Magento\FunctionalTestingFramework\Page\Objects\ElementObject;
 use PHPUnit\Framework\TestCase;
 
@@ -19,7 +20,7 @@ class ElementObjectTest extends TestCase
      */
     public function testTimeoutDefault()
     {
-        $element = new ElementObject('name', 'type', 'selector', '-', false);
+        $element = new ElementObject('name', 'type', 'selector', null, '-', false);
         $this->assertNull($element->getTimeout());
     }
 
@@ -28,7 +29,7 @@ public function testTimeoutDefault()
      */
     public function testTimeoutNotNull()
     {
-        $element = new ElementObject('name', 'type', 'selector', '15', false);
+        $element = new ElementObject('name', 'type', 'selector', null, '15', false);
         $timeout = $element->getTimeout();
         $this->assertEquals(15, $timeout);
         $this->assertInternalType('int', $timeout);
@@ -39,9 +40,19 @@ public function testTimeoutNotNull()
      */
     public function testTimeoutCastFromString()
     {
-        $element = new ElementObject('name', 'type', 'selector', 'helloString', true);
+        $element = new ElementObject('name', 'type', 'selector', null, 'helloString', true);
         $timeout = $element->getTimeout();
         $this->assertEquals(0, $timeout);
         $this->assertInternalType('int', $timeout);
     }
+
+
+    /**
+     * An exception should be thrown if both a selector and locatorFunction are passed
+     */
+    public function testBothSelectorAndLocatorFunction()
+    {
+        $this->expectException(XmlException::class);
+        new ElementObject('name', 'type', 'selector', 'cantDoThis', 'helloString', true);
+    }
 }

dev/tests/unit/Magento/FunctionalTestFramework/Page/Objects/SectionObjectTest.php

@@ -19,8 +19,8 @@ class SectionObjectTest extends TestCase
      * Assert that the section object has an element
      */
     public function testHasElement() {
-        $element1 = new ElementObject('element1', 'type', '#selector', '41', false);
-        $element2 = new ElementObject('element2', 'type', '#selector', '42', true);
+        $element1 = new ElementObject('element1', 'type', '#selector', null, '41', false);
+        $element2 = new ElementObject('element2', 'type', '#selector', null, '42', true);
         $elements = [
             'element1' => $element1,
             'element2' => $element2
@@ -33,7 +33,7 @@ public function testHasElement() {
      * Assert that the section object doesn't have an element
      */
     public function testDoesntHaveElement() {
-        $element2 = new ElementObject('element2', 'type', '#selector', '42', true);
+        $element2 = new ElementObject('element2', 'type', '#selector', null, '42', true);
         $elements = [
             'element2' => $element2
         ];
@@ -45,8 +45,8 @@ public function testDoesntHaveElement() {
      * Assert that an element object is returned
      */
     public function testGetElement() {
-        $element1 = new ElementObject('element1', 'type', '#selector', '41', false);
-        $element2 = new ElementObject('element2', 'type', '#selector', '42', true);
+        $element1 = new ElementObject('element1', 'type', '#selector', null, '41', false);
+        $element2 = new ElementObject('element2', 'type', '#selector', null, '42', true);
         $elements = [
             'element1' => $element1,
             'element2' => $element2
@@ -61,7 +61,7 @@ public function testGetElement() {
      * Assert that null is returned if no such element
      */
     public function testNullGetElement() {
-        $element1 = new ElementObject('element1', 'type', '#selector', '41', false);
+        $element1 = new ElementObject('element1', 'type', '#selector', null, '41', false);
         $elements = [
             'element1' => $element1
         ];

dev/tests/unit/Magento/FunctionalTestFramework/Test/Objects/ActionObjectTest.php

@@ -50,7 +50,7 @@ public function testResolveElementInSelector()
             'selector' => '{{SectionObject.elementObject}}',
             'userInput' => 'Hello world'
         ]);
-        $elementObject = new ElementObject('elementObject', 'button', '#replacementSelector', '42', false);
+        $elementObject = new ElementObject('elementObject', 'button', '#replacementSelector', null, '42', false);
         $sectionObject = new SectionObject('SectionObject', ['elementObject' => $elementObject]);
         $instance = AspectMock::double(SectionObjectHandler::class, ['getObject' => $sectionObject])
             ->make(); // bypass the private constructor
@@ -92,7 +92,7 @@ public function testTimeoutFromElement()
         $actionObject = new ActionObject('merge123', 'click', [
             'selector' => '{{SectionObject.elementObject}}'
         ]);
-        $elementObject = new ElementObject('elementObject', 'button', '#replacementSelector', '42', false);
+        $elementObject = new ElementObject('elementObject', 'button', '#replacementSelector', null, '42', false);
         $sectionObject = new SectionObject('SectionObject', ['elementObject' => $elementObject]);
         $instance = AspectMock::double(SectionObjectHandler::class, ['getObject' => $sectionObject])
             ->make(); // bypass the private constructor