MQE-571: Replace loginAsAdmin() function with an Action Group.

ivy00johns · ivy00johns · commit 058d21fc5836 · 2018-01-11T15:20:32.000-06:00
- Removing the loginAsAdmin() function from MagentoWebDriver. - Removing the loginAsAdmin() function from the Test Schema. - Adding @throw \Exception to function Doc Blocks. - Updating verification tests for loginAsAdmin and \Exception changes.
diff --git a/dev/tests/verification/Resources/ActionGroupWithDataOverrideTest.txt b/dev/tests/verification/Resources/ActionGroupWithDataOverrideTest.txt
@@ -49,6 +49,7 @@ class ActionGroupWithDataOverrideTestCest
 	 * @Parameter(name = "AcceptanceTester", value="$I")
 	 * @param AcceptanceTester $I
 	 * @return void
+	 * @throws \Exception
 	 */
 	public function ActionGroupWithDataOverrideTest(AcceptanceTester $I)
 	{
diff --git a/dev/tests/verification/Resources/ActionGroupWithDataTest.txt b/dev/tests/verification/Resources/ActionGroupWithDataTest.txt
@@ -49,6 +49,7 @@ class ActionGroupWithDataTestCest
 	 * @Parameter(name = "AcceptanceTester", value="$I")
 	 * @param AcceptanceTester $I
 	 * @return void
+	 * @throws \Exception
 	 */
 	public function ActionGroupWithDataTest(AcceptanceTester $I)
 	{
diff --git a/dev/tests/verification/Resources/ActionGroupWithDefaultArgumentAndStringSelectorParam.txt b/dev/tests/verification/Resources/ActionGroupWithDefaultArgumentAndStringSelectorParam.txt
@@ -25,6 +25,7 @@ class ActionGroupWithDefaultArgumentAndStringSelectorParamCest
 	 * @Parameter(name = "AcceptanceTester", value="$I")
 	 * @param AcceptanceTester $I
 	 * @return void
+	 * @throws \Exception
 	 */
 	public function ActionGroupWithDefaultArgumentAndStringSelectorParam(AcceptanceTester $I)
 	{
diff --git a/dev/tests/verification/Resources/ActionGroupWithMultipleParameterSelectorsFromDefaultArgument.txt b/dev/tests/verification/Resources/ActionGroupWithMultipleParameterSelectorsFromDefaultArgument.txt
@@ -25,6 +25,7 @@ class ActionGroupWithMultipleParameterSelectorsFromDefaultArgumentCest
 	 * @Parameter(name = "AcceptanceTester", value="$I")
 	 * @param AcceptanceTester $I
 	 * @return void
+	 * @throws \Exception
 	 */
 	public function ActionGroupWithMultipleParameterSelectorsFromDefaultArgument(AcceptanceTester $I)
 	{
diff --git a/dev/tests/verification/Resources/ActionGroupWithNoArguments.txt b/dev/tests/verification/Resources/ActionGroupWithNoArguments.txt
@@ -25,6 +25,7 @@ class ActionGroupWithNoArgumentsCest
 	 * @Parameter(name = "AcceptanceTester", value="$I")
 	 * @param AcceptanceTester $I
 	 * @return void
+	 * @throws \Exception
 	 */
 	public function ActionGroupWithNoArguments(AcceptanceTester $I)
 	{
diff --git a/dev/tests/verification/Resources/ActionGroupWithNoDefaultTest.txt b/dev/tests/verification/Resources/ActionGroupWithNoDefaultTest.txt
@@ -49,6 +49,7 @@ class ActionGroupWithNoDefaultTestCest
 	 * @Parameter(name = "AcceptanceTester", value="$I")
 	 * @param AcceptanceTester $I
 	 * @return void
+	 * @throws \Exception
 	 */
 	public function ActionGroupWithNoDefaultTest(AcceptanceTester $I)
 	{
diff --git a/dev/tests/verification/Resources/ActionGroupWithPassedArgumentAndStringSelectorParam.txt b/dev/tests/verification/Resources/ActionGroupWithPassedArgumentAndStringSelectorParam.txt
@@ -25,6 +25,7 @@ class ActionGroupWithPassedArgumentAndStringSelectorParamCest
 	 * @Parameter(name = "AcceptanceTester", value="$I")
 	 * @param AcceptanceTester $I
 	 * @return void
+	 * @throws \Exception
 	 */
 	public function ActionGroupWithPassedArgumentAndStringSelectorParam(AcceptanceTester $I)
 	{
diff --git a/dev/tests/verification/Resources/ActionGroupWithPersistedData.txt b/dev/tests/verification/Resources/ActionGroupWithPersistedData.txt
@@ -49,6 +49,7 @@ class ActionGroupWithPersistedDataCest
 	 * @Parameter(name = "AcceptanceTester", value="$I")
 	 * @param AcceptanceTester $I
 	 * @return void
+	 * @throws \Exception
 	 */
 	public function ActionGroupWithPersistedData(AcceptanceTester $I)
 	{
diff --git a/dev/tests/verification/Resources/ActionGroupWithSingleParameterSelectorFromDefaultArgument.txt b/dev/tests/verification/Resources/ActionGroupWithSingleParameterSelectorFromDefaultArgument.txt
@@ -25,6 +25,7 @@ class ActionGroupWithSingleParameterSelectorFromDefaultArgumentCest
 	 * @Parameter(name = "AcceptanceTester", value="$I")
 	 * @param AcceptanceTester $I
 	 * @return void
+	 * @throws \Exception
 	 */
 	public function ActionGroupWithSingleParameterSelectorFromDefaultArgument(AcceptanceTester $I)
 	{
diff --git a/dev/tests/verification/Resources/ActionGroupWithSingleParameterSelectorFromPassedArgument.txt b/dev/tests/verification/Resources/ActionGroupWithSingleParameterSelectorFromPassedArgument.txt
@@ -25,6 +25,7 @@ class ActionGroupWithSingleParameterSelectorFromPassedArgumentCest
 	 * @Parameter(name = "AcceptanceTester", value="$I")
 	 * @param AcceptanceTester $I
 	 * @return void
+	 * @throws \Exception
 	 */
 	public function ActionGroupWithSingleParameterSelectorFromPassedArgument(AcceptanceTester $I)
 	{
diff --git a/dev/tests/verification/Resources/ActionGroupWithTopLevelPersistedData.txt b/dev/tests/verification/Resources/ActionGroupWithTopLevelPersistedData.txt
@@ -49,6 +49,7 @@ class ActionGroupWithTopLevelPersistedDataCest
 	 * @Parameter(name = "AcceptanceTester", value="$I")
 	 * @param AcceptanceTester $I
 	 * @return void
+	 * @throws \Exception
 	 */
 	public function ActionGroupWithTopLevelPersistedData(AcceptanceTester $I)
 	{
diff --git a/dev/tests/verification/Resources/ArgumentWithSameNameAsElement.txt b/dev/tests/verification/Resources/ArgumentWithSameNameAsElement.txt
@@ -49,6 +49,7 @@ class ArgumentWithSameNameAsElementCest
 	 * @Parameter(name = "AcceptanceTester", value="$I")
 	 * @param AcceptanceTester $I
 	 * @return void
+	 * @throws \Exception
 	 */
 	public function ArgumentWithSameNameAsElement(AcceptanceTester $I)
 	{
diff --git a/dev/tests/verification/Resources/AssertTest.txt b/dev/tests/verification/Resources/AssertTest.txt
@@ -36,6 +36,7 @@ class AssertTestCest
 	 * @Parameter(name = "AcceptanceTester", value="$I")
 	 * @param AcceptanceTester $I
 	 * @return void
+	 * @throws \Exception
 	 */
 	public function AssertTest(AcceptanceTester $I)
 	{
diff --git a/dev/tests/verification/Resources/BasicActionGroupTest.txt b/dev/tests/verification/Resources/BasicActionGroupTest.txt
@@ -43,6 +43,7 @@ class BasicActionGroupTestCest
 	 * @Parameter(name = "AcceptanceTester", value="$I")
 	 * @param AcceptanceTester $I
 	 * @return void
+	 * @throws \Exception
 	 */
 	public function BasicActionGroupTest(AcceptanceTester $I)
 	{
diff --git a/dev/tests/verification/Resources/BasicFunctionalTest.txt b/dev/tests/verification/Resources/BasicFunctionalTest.txt
@@ -38,6 +38,7 @@ class BasicFunctionalTestCest
 	 * @Parameter(name = "AcceptanceTester", value="$I")
 	 * @param AcceptanceTester $I
 	 * @return void
+	 * @throws \Exception
 	 */
 	public function BasicFunctionalTest(AcceptanceTester $I)
 	{
diff --git a/dev/tests/verification/Resources/DataReplacementTest.txt b/dev/tests/verification/Resources/DataReplacementTest.txt
@@ -23,6 +23,7 @@ class DataReplacementTestCest
 	 * @Parameter(name = "AcceptanceTester", value="$I")
 	 * @param AcceptanceTester $I
 	 * @return void
+	 * @throws \Exception
 	 */
 	public function DataReplacementTest(AcceptanceTester $I)
 	{
diff --git a/dev/tests/verification/Resources/LocatorFunctionTest.txt b/dev/tests/verification/Resources/LocatorFunctionTest.txt
@@ -23,6 +23,7 @@ class LocatorFunctionTestCest
 	 * @Parameter(name = "AcceptanceTester", value="$I")
 	 * @param AcceptanceTester $I
 	 * @return void
+	 * @throws \Exception
 	 */
 	public function LocatorFunctionTest(AcceptanceTester $I)
 	{
diff --git a/dev/tests/verification/Resources/MergeFunctionalTest.txt b/dev/tests/verification/Resources/MergeFunctionalTest.txt
@@ -39,6 +39,7 @@ class MergeFunctionalTestCest
 	 * @Parameter(name = "AcceptanceTester", value="$I")
 	 * @param AcceptanceTester $I
 	 * @return void
+	 * @throws \Exception
 	 */
 	public function BasicMergeTest(AcceptanceTester $I)
 	{
@@ -61,6 +62,7 @@ class MergeFunctionalTestCest
 	 * @Parameter(name = "AcceptanceTester", value="$I")
 	 * @param AcceptanceTester $I
 	 * @return void
+	 * @throws \Exception
 	 */
 	public function MergedReferencesTest(AcceptanceTester $I)
 	{
diff --git a/dev/tests/verification/Resources/MergedActionGroupTest.txt b/dev/tests/verification/Resources/MergedActionGroupTest.txt
@@ -49,6 +49,7 @@ class MergedActionGroupTestCest
 	 * @Parameter(name = "AcceptanceTester", value="$I")
 	 * @param AcceptanceTester $I
 	 * @return void
+	 * @throws \Exception
 	 */
 	public function MergedActionGroupTest(AcceptanceTester $I)
 	{
diff --git a/dev/tests/verification/Resources/MultipleActionGroupsTest.txt b/dev/tests/verification/Resources/MultipleActionGroupsTest.txt
@@ -49,6 +49,7 @@ class MultipleActionGroupsTestCest
 	 * @Parameter(name = "AcceptanceTester", value="$I")
 	 * @param AcceptanceTester $I
 	 * @return void
+	 * @throws \Exception
 	 */
 	public function MultipleActionGroupsTest(AcceptanceTester $I)
 	{
diff --git a/dev/tests/verification/Resources/PageReplacementTest.txt b/dev/tests/verification/Resources/PageReplacementTest.txt
@@ -23,6 +23,7 @@ class PageReplacementTestCest
 	 * @Parameter(name = "AcceptanceTester", value="$I")
 	 * @param AcceptanceTester $I
 	 * @return void
+	 * @throws \Exception
 	 */
 	public function PageReplacementTest(AcceptanceTester $I)
 	{
diff --git a/dev/tests/verification/Resources/ParameterArrayTest.txt b/dev/tests/verification/Resources/ParameterArrayTest.txt
@@ -23,6 +23,7 @@ class ParameterArrayTestCest
 	 * @Parameter(name = "AcceptanceTester", value="$I")
 	 * @param AcceptanceTester $I
 	 * @return void
+	 * @throws \Exception
 	 */
 	public function ParameterArrayTest(AcceptanceTester $I)
 	{
diff --git a/dev/tests/verification/Resources/PersistedReplacementTest.txt b/dev/tests/verification/Resources/PersistedReplacementTest.txt
@@ -36,6 +36,7 @@ class PersistedReplacementTestCest
 	 * @Parameter(name = "AcceptanceTester", value="$I")
 	 * @param AcceptanceTester $I
 	 * @return void
+	 * @throws \Exception
 	 */
 	public function PersistedReplacementTest(AcceptanceTester $I)
 	{
diff --git a/dev/tests/verification/Resources/SectionReplacementTest.txt b/dev/tests/verification/Resources/SectionReplacementTest.txt
@@ -23,6 +23,7 @@ class SectionReplacementTestCest
 	 * @Parameter(name = "AcceptanceTester", value="$I")
 	 * @param AcceptanceTester $I
 	 * @return void
+	 * @throws \Exception
 	 */
 	public function SectionReplacementTest(AcceptanceTester $I)
 	{
diff --git a/dev/tests/verification/Tests/ActionGroupGenerationTest.php b/dev/tests/verification/Tests/ActionGroupGenerationTest.php
@@ -15,6 +15,9 @@ class ActionGroupGenerationTest extends TestCase
 
     /**
      * Tests flat generation of a hardcoded test file with no external references.
+     *
+     * @throws \Exception
+     * @throws \Magento\FunctionalTestingFramework\Exceptions\TestReferenceException
      */
     private function validateGenerateAndContents($testName)
     {
@@ -30,6 +33,9 @@ private function validateGenerateAndContents($testName)
 
     /**
      * Test generation of a test referencing an action group with no arguments
+     *
+     * @throws \Exception
+     * @throws \Magento\FunctionalTestingFramework\Exceptions\TestReferenceException
      */
     public function testActionGroupWithNoArguments()
     {
@@ -38,6 +44,9 @@ public function testActionGroupWithNoArguments()
 
     /**
      * Test generation of a test referencing an action group with default arguments and string selector
+     *
+     * @throws \Exception
+     * @throws \Magento\FunctionalTestingFramework\Exceptions\TestReferenceException
      */
     public function testActionGroupWithDefaultArgumentAndStringSelectorParam()
     {
@@ -46,6 +55,9 @@ public function testActionGroupWithDefaultArgumentAndStringSelectorParam()
 
     /**
      * Test generation of a test referencing an action group with passed arguments
+     *
+     * @throws \Exception
+     * @throws \Magento\FunctionalTestingFramework\Exceptions\TestReferenceException
      */
     public function testActionGroupWithPassedArgumentAndStringSelectorParam()
     {
@@ -54,6 +66,9 @@ public function testActionGroupWithPassedArgumentAndStringSelectorParam()
 
     /**
      * Test generation of a test referencing an action group with single parameter selector and default arguments
+     *
+     * @throws \Exception
+     * @throws \Magento\FunctionalTestingFramework\Exceptions\TestReferenceException
      */
     public function testActionGroupWithSingleParameterSelectorFromDefaultArgument()
     {
@@ -62,6 +77,9 @@ public function testActionGroupWithSingleParameterSelectorFromDefaultArgument()
 
     /**
      * Test generation of test referencing an action group with single parameter from a passed arguemnt
+     *
+     * @throws \Exception
+     * @throws \Magento\FunctionalTestingFramework\Exceptions\TestReferenceException
      */
     public function testActionGroupWithSingleParameterSelectorFromPassedArgument()
     {
@@ -70,6 +88,9 @@ public function testActionGroupWithSingleParameterSelectorFromPassedArgument()
 
     /**
      * Test generation of a test referencing an action group with multiple parameter selectors and default arguments
+     *
+     * @throws \Exception
+     * @throws \Magento\FunctionalTestingFramework\Exceptions\TestReferenceException
      */
     public function testActionGroupWithMultipleParameterSelectorsFromDefaultArgument()
     {
diff --git a/dev/tests/verification/Tests/ActionGroupMergeGenerationTest.php b/dev/tests/verification/Tests/ActionGroupMergeGenerationTest.php
@@ -16,6 +16,9 @@ class ActionGroupMergeGenerationTest extends TestCase
 
     /**
      * Tests flat generation of a hardcoded test file with no external references.
+     *
+     * @throws \Exception
+     * @throws \Magento\FunctionalTestingFramework\Exceptions\TestReferenceException
      */
     public function testBasicActionGroup()
     {
@@ -24,6 +27,9 @@ public function testBasicActionGroup()
 
     /**
      * Test an ordinary action group with data
+     *
+     * @throws \Exception
+     * @throws \Magento\FunctionalTestingFramework\Exceptions\TestReferenceException
      */
     public function testActionGroupWithData()
     {
@@ -32,6 +38,9 @@ public function testActionGroupWithData()
 
     /**
      * Test an action group with data overridden in arguments
+     *
+     * @throws \Exception
+     * @throws \Magento\FunctionalTestingFramework\Exceptions\TestReferenceException
      */
     public function testActionGroupWithDataOverride()
     {
@@ -40,6 +49,9 @@ public function testActionGroupWithDataOverride()
 
     /**
      * Test an action group with no default data
+     *
+     * @throws \Exception
+     * @throws \Magento\FunctionalTestingFramework\Exceptions\TestReferenceException
      */
     public function testActionGroupWithNoDefault()
     {
@@ -48,6 +60,9 @@ public function testActionGroupWithNoDefault()
 
     /**
      * Test an action group with persisted data
+     *
+     * @throws \Exception
+     * @throws \Magento\FunctionalTestingFramework\Exceptions\TestReferenceException
      */
     public function testActionGroupWithPersistedData()
     {
@@ -56,6 +71,9 @@ public function testActionGroupWithPersistedData()
 
     /**
      * Test an action group with top level persisted data
+     *
+     * @throws \Exception
+     * @throws \Magento\FunctionalTestingFramework\Exceptions\TestReferenceException
      */
     public function testActionGroupWithTopLevelPersistedData()
     {
@@ -64,6 +82,9 @@ public function testActionGroupWithTopLevelPersistedData()
 
     /**
      * Test an action group called multiple times
+     *
+     * @throws \Exception
+     * @throws \Magento\FunctionalTestingFramework\Exceptions\TestReferenceException
      */
     public function testMultipleActionGroups()
     {
@@ -72,6 +93,9 @@ public function testMultipleActionGroups()
 
     /**
      * Test an action group with a merge counterpart
+     *
+     * @throws \Exception
+     * @throws \Magento\FunctionalTestingFramework\Exceptions\TestReferenceException
      */
     public function testMergedActionGroup()
     {
@@ -80,6 +104,9 @@ public function testMergedActionGroup()
 
     /**
      * Test an action group with arguments named similarly to elements
+     *
+     * @throws \Exception
+     * @throws \Magento\FunctionalTestingFramework\Exceptions\TestReferenceException
      */
     public function testArgumentWithSameNameAsElement()
     {
@@ -90,6 +117,8 @@ public function testArgumentWithSameNameAsElement()
      * Generate a Test by name and assert that it equals the corresponding .txt source of truth
      *
      * @param string $testName
+     * @throws \Exception
+     * @throws \Magento\FunctionalTestingFramework\Exceptions\TestReferenceException
      */
     private function runComparisonTest($testName)
     {
diff --git a/dev/tests/verification/Tests/AssertGenerationTest.php b/dev/tests/verification/Tests/AssertGenerationTest.php
@@ -16,6 +16,9 @@ class AssertGenerationTest extends TestCase
 
     /**
      * Tests assert generation.
+     *
+     * @throws \Exception
+     * @throws \Magento\FunctionalTestingFramework\Exceptions\TestReferenceException
      */
     public function testAssertGeneration()
     {
diff --git a/dev/tests/verification/Tests/BasicCestGenerationTest.php b/dev/tests/verification/Tests/BasicCestGenerationTest.php
@@ -16,6 +16,9 @@ class BasicCestGenerationTest extends TestCase
 
     /**
      * Tests flat generation of a hardcoded test file with no external references.
+     *
+     * @throws \Exception
+     * @throws \Magento\FunctionalTestingFramework\Exceptions\TestReferenceException
      */
     public function testBasicGeneration()
     {
diff --git a/dev/tests/verification/Tests/LocatorFunctionGenerationTest.php b/dev/tests/verification/Tests/LocatorFunctionGenerationTest.php
@@ -16,6 +16,9 @@ class LocatorFunctionGenerationTest extends TestCase
 
     /**
      * Tests generation of actions using elements that have a LocatorFunction.
+     *
+     * @throws \Exception
+     * @throws \Magento\FunctionalTestingFramework\Exceptions\TestReferenceException
      */
     public function testLocatorFunctionGeneration()
     {
diff --git a/dev/tests/verification/Tests/ParameterArrayTest.php b/dev/tests/verification/Tests/ParameterArrayTest.php
diff --git a/dev/tests/verification/Tests/ReferenceReplacementGenerationTest.php b/dev/tests/verification/Tests/ReferenceReplacementGenerationTest.php
diff --git a/etc/di.xml b/etc/di.xml
diff --git a/src/Magento/FunctionalTestingFramework/Module/MagentoWebDriver.php b/src/Magento/FunctionalTestingFramework/Module/MagentoWebDriver.php
diff --git a/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd b/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd
diff --git a/src/Magento/FunctionalTestingFramework/Util/TestGenerator.php b/src/Magento/FunctionalTestingFramework/Util/TestGenerator.php

Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,7 @@ class ActionGroupWithDataOverrideTestCest`
`49`	`49`	`* @Parameter(name = "AcceptanceTester", value="$I")`
`50`	`50`	`* @param AcceptanceTester $I`
`51`	`51`	`* @return void`
	`52`	`+ * @throws \Exception`
`52`	`53`	`*/`
`53`	`54`	`public function ActionGroupWithDataOverrideTest(AcceptanceTester $I)`
`54`	`55`	`{`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@ class ActionGroupWithDefaultArgumentAndStringSelectorParamCest`
`25`	`25`	`* @Parameter(name = "AcceptanceTester", value="$I")`
`26`	`26`	`* @param AcceptanceTester $I`
`27`	`27`	`* @return void`
	`28`	`+ * @throws \Exception`
`28`	`29`	`*/`
`29`	`30`	`public function ActionGroupWithDefaultArgumentAndStringSelectorParam(AcceptanceTester $I)`
`30`	`31`	`{`