Resolved conflicts

manjusha729 · manjusha729 · commit a7ffdb84c994 · 2023-11-20T17:02:05.000+05:30
diff --git a/dev/tests/verification/Tests/XmlDuplicateGenerationTest.php b/dev/tests/verification/Tests/XmlDuplicateGenerationTest.php
@@ -9,7 +9,7 @@
 use Magento\FunctionalTestingFramework\Test\Handlers\TestObjectHandler;
 use tests\util\MftfTestCase;
 
-class XmlDuplicateGerationTest extends MftfTestCase
+class XmlDuplicateGenerationTest extends MftfTestCase
 {
     const XML_DUPLICATE_TEST = 'XmlDuplicateTest';
     const XML_DUPLICATE_ACTIONGROUP = 'xmlDuplicateActionGroup';
@@ -39,4 +39,5 @@ public function testDuplicatesInMergeTest()
         TestObjectHandler::getInstance()->getObject(self::XML_DUPLICATE_MERGE_TEST);
         $this->addToAssertionCount(1); // No exception thrown thus far, can assert dupes didn't cause an error.
     }
+
 }

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`use Magento\FunctionalTestingFramework\Test\Handlers\TestObjectHandler;`
`10`	`10`	`use tests\util\MftfTestCase;`
`11`	`11`
`12`		`-class XmlDuplicateGerationTest extends MftfTestCase`
	`12`	`+class XmlDuplicateGenerationTest extends MftfTestCase`
`13`	`13`	`{`
`14`	`14`	`const XML_DUPLICATE_TEST = 'XmlDuplicateTest';`
`15`	`15`	`const XML_DUPLICATE_ACTIONGROUP = 'xmlDuplicateActionGroup';`
`@@ -39,4 +39,5 @@ public function testDuplicatesInMergeTest()`
`39`	`39`	`TestObjectHandler::getInstance()->getObject(self::XML_DUPLICATE_MERGE_TEST);`
`40`	`40`	`$this->addToAssertionCount(1); // No exception thrown thus far, can assert dupes didn't cause an error.`
`41`	`41`	`}`
	`42`	`+`
`42`	`43`	`}`