Merge pull request #118 from magento-commerce/imported-magento-magento2-functional-testing-framework-872

[Imported] AC-1193: Fix broken MFTF tests

Author: jilu1

dev/tests/unit/Util/EntityDataObjectBuilder.php

@@ -18,7 +18,8 @@ class EntityDataObjectBuilder
         "name" => "Hopper",
         "gpa" => "3.5678",
         "phone" => "5555555",
-        "isprimary" => "true"
+        "isprimary" => "true",
+        "empty_string" => ""
     ];
 
     /**

dev/tests/unit/Util/OperationElementBuilder.php

@@ -20,7 +20,8 @@ class OperationElementBuilder
         'name' => 'string',
         'gpa' => 'number',
         'phone' => 'integer',
-        'isPrimary' => 'boolean'
+        'isPrimary' => 'boolean',
+        'empty_string' => 'string'
     ];
 
     /**

src/Magento/FunctionalTestingFramework/DataGenerator/Persist/OperationDataArrayResolver.php

@@ -403,7 +403,7 @@ private function resolvePrimitiveReferenceElement($entityObject, $operationEleme
         // If data was defined at all, attempt to put it into operation data array
         // If data was not defined, and element is required, throw exception
         // If no data is defined, don't input defaults per primitive into operation data array
-        if ($elementData !== null) {
+        if ($elementData !== null && $elementData !== '') {
             if (array_key_exists($operationElement->getKey(), $entityObject->getUniquenessData())) {
                 $uniqueData = $entityObject->getUniquenessDataByName($operationElement->getKey());
                 if ($uniqueData === 'suffix') {

src/Magento/FunctionalTestingFramework/Util/TestGenerator.php

@@ -1948,7 +1948,7 @@ private function addUniquenessFunctionCall($input, $wrapWithDoubleQuotes = true)
      */
     private function wrapWithDoubleQuotes($input)
     {
-        if ($input === null) {
+        if ($input === null || $input === '') {
             return '';
         }
         //Only replace " with \" so that it doesn't break outer string.