Merge pull request #269 from CBIIT/chaudhryma

PLATFORM BUS APP - Regression updates for Etracking, GCP and GDC Apps

src/test/java/ServiceNow/PlatformBusinessApps/ETracking/Constants/EtrackAssetsRecords_NativeView_Constants.java

@@ -1,5 +1,7 @@
 package ServiceNow.PlatformBusinessApps.ETracking.Constants;
 
+import com.nci.automation.web.CommonUtils;
+
 public class EtrackAssetsRecords_NativeView_Constants {
 
     /* ETRACKING USER NAME */
@@ -12,7 +14,7 @@ public class EtrackAssetsRecords_NativeView_Constants {
     public static final String ETRACKING_NATIVE_VIEW_ASSETS_ALL_RECORD_SEARCH_DROP_DOWN = "barcode";
 
     /* ETRACKING ASSETS NEW RECORD DECAL NUMBER TEXT BOX */
-    public static final String ETRACKING_ASSETS_NEW_RECORD_DECAL_NUMBER_TEXT_BOX  = "New Decal Number 123 Test";
+    public static final String ETRACKING_ASSETS_NEW_RECORD_DECAL_NUMBER_TEXT_BOX  = "New Decal Number 123 Test " + CommonUtils.lastNameRandomizer();
 
     /* ETRACKING ASSETS NEW RECORD MODEL TEXT BOX */
     public static final String ETRACKING_ASSETS_NEW_RECORD_MODEL_TEXT_BOX  = "Tarp";
@@ -35,8 +37,8 @@ public class EtrackAssetsRecords_NativeView_Constants {
     /* ETRACKING ASSETS NEW RECORD ASSET INFORMATION TEXT BOX */
     public static final String ETRACKING_ASSETS_NEW_RECORD_ASSET_INFORMATION_TEXT_BOX  = "Test Asset Information";
 
- /* ETRACKING ASSETS NEW RECORD ASSET INFORMATION TEXT BOX EXPECTED LENGTH */
- public static final String ETRACKING_ASSETS_NEW_RECORD_ASSET_INFORMATION_TEXT_BOX_EXPECTED_LENGTH  = "1100";
+    /* ETRACKING ASSETS NEW RECORD ASSET INFORMATION TEXT BOX EXPECTED LENGTH */
+    public static final String ETRACKING_ASSETS_NEW_RECORD_ASSET_INFORMATION_TEXT_BOX_EXPECTED_LENGTH  = "1100";
 
     /* ETRACKING ASSETS NEW RECORD STATUS DROP DOWN */
     public static final String ETRACKING_ASSETS_NEW_RECORD_STATUS_DROP_DOWN  = "Checked out";
@@ -46,5 +48,4 @@ public class EtrackAssetsRecords_NativeView_Constants {
 
     /* ETRACKING ASSETS MODEL RECORD DESCRIPTION TEXT BOX */
     public static final String ETRACKING_ASSETS_MODEL_RECORD_DESCRIPTION_TEXT_BOX  = "ASSETS MODEL RECORD DESCRIPTION TEXT BOX ";
-
-}
+}

src/test/java/ServiceNow/ServiceNowRunners/RunETrackingProgressionTest.java → src/test/java/ServiceNow/PlatformBusinessApps/ETracking/ETracking_Runners/RunETrackingProgressionTest.java

@@ -1,4 +1,4 @@
-package ServiceNow.ServiceNowRunners;
+package ServiceNow.PlatformBusinessApps.ETracking.ETracking_Runners;
 
 import io.cucumber.testng.AbstractTestNGCucumberTests;
 import io.cucumber.testng.CucumberOptions;
@@ -7,13 +7,14 @@
 		"json:target/cucumber.json", "rerun:target/failed.txt",
 		"pretty", "com.aventstack.extentreports.cucumber.adapter.ExtentCucumberAdapter:"},
 		features = "src/test/java/ServiceNow/PlatformBusinessApps/ETracking/Features",
-		glue = "ServiceNow.PlatformBusinessApps.ETracking.Steps",
+		glue ={ "ServiceNow.PlatformBusinessApps.ETracking.Steps", "Hooks"},
 		tags = "@Progression",
 		dryRun = false
 )
+
 /**
- * 
+ * This class is annotated with @RunWith(Cucumber.class) and it will run cucumber feature(s).
  * @author sohilz2
  */
 public class RunETrackingProgressionTest extends AbstractTestNGCucumberTests{
-}
+}

src/test/java/ServiceNow/ServiceNowRunners/RunETrackingRegressionTest.java → src/test/java/ServiceNow/PlatformBusinessApps/ETracking/ETracking_Runners/RunETrackingRegressionTest.java

@@ -1,4 +1,4 @@
-package ServiceNow.ServiceNowRunners;
+package ServiceNow.PlatformBusinessApps.ETracking.ETracking_Runners;
 
 import io.cucumber.testng.AbstractTestNGCucumberTests;
 import io.cucumber.testng.CucumberOptions;
@@ -11,9 +11,9 @@
         , tags="@Regression"
         , dryRun = false
 )
-/**
-*  @author sohilz2
-*/
 
+/**
+ * This class is annotated with @RunWith(Cucumber.class) and it will run cucumber feature(s).
+ */
 public class RunETrackingRegressionTest extends AbstractTestNGCucumberTests{
-}
+}

src/test/java/ServiceNow/PlatformBusinessApps/ETracking/Steps/EtrackAssetsRecords_NativeViewSteps.java

@@ -2,15 +2,14 @@
 
 import ServiceNow.PlatformBusinessApps.ETracking.StepsImplementation.EtrackAssetsRecords_NativeViewStepImplimentation;
 import appsCommon.PageInitializers.PageInitializer;
-import com.nci.automation.xceptions.TestingException;
 import io.cucumber.java.en.Given;
 import io.cucumber.java.en.Then;
 import io.cucumber.java.en.When;
 
 public class EtrackAssetsRecords_NativeViewSteps extends PageInitializer {
 
     @Given("a eTracking user opens an Asset record")
-    public void a_e_tracking_user_opens_an_asset_record() throws TestingException{
+    public void a_e_tracking_user_opens_an_asset_record(){
         EtrackAssetsRecords_NativeViewStepImplimentation.aEtrackingUserOpensAnAssetRecord();
     }
 
@@ -30,7 +29,7 @@ public void the_record_is_deleted() {
     }
 
     @Given("an eTracking user is on an Asset record")
-    public void an_e_tracking_user_is_on_an_asset_record() throws TestingException {
+    public void an_e_tracking_user_is_on_an_asset_record() {
        EtrackAssetsRecords_NativeViewStepImplimentation.anEtrackingUserIsOnAnAssetRecord();
     }
 

src/test/java/ServiceNow/PlatformBusinessApps/ETracking/StepsImplementation/EtrackAssetsRecords_NativeViewStepImplimentation.java

@@ -9,15 +9,14 @@
 import com.nci.automation.utils.MiscUtils;
 import com.nci.automation.web.CommonUtils;
 import com.nci.automation.web.JavascriptUtils;
-import com.nci.automation.xceptions.TestingException;
 import org.openqa.selenium.Keys;
 
 public class EtrackAssetsRecords_NativeViewStepImplimentation extends PageInitializer {
 
     /**
      * All Etracking Asset methods needs Screenshots once the issues is resolved
      */
-    public static void aEtrackingUserOpensAnAssetRecord() throws TestingException {
+    public static void aEtrackingUserOpensAnAssetRecord() {
         ServiceNow_Login_Methods.nativeViewSideDoorLogin();
         ServiceNow_Common_Methods.impersonateAnyUser("Jeffrey Alderdice");
         ServiceNow_Common_Methods.filterNavigatorSearch("Assets");

src/test/java/ServiceNow/PlatformBusinessApps/GCP/Constants/GCPNotifications_NativeView_Constants.java

@@ -27,13 +27,13 @@ public class GCPNotifications_NativeView_Constants {
     public static final String NATIVE_VIEW_GCP_SEARCH_TEXT_BOX_GCP_MANAGER_APPROVAL_NOTIFICATION = "GCP Manager Approval Notification";
 
     /* NATIVE VIEW GCP SEARCH TEXT BOX GCP EMPLOYEE TRAINING PAST DUE*/
-    public static final String NATIVE_VIEW_GCP_SEARCH_TEXT_BOX_GCP_EMPLOYEE_TRAINING_PAST_DUE = "GCP Employee training past due";
+    public static final String NATIVE_VIEW_GCP_SEARCH_TEXT_BOX_GCP_EMPLOYEE_TRAINING_PAST_DUE = "GCP Employee Training Past Due";
 
     /* NATIVE VIEW GCP SEARCH TEXT BOX GCP EMPLOYEE TRAINING NOTIFICATION*/
     public static final String NATIVE_VIEW_GCP_SEARCH_TEXT_BOX_GCP_EMPLOYEE_TRAINING_NOTIFICATION = "GCP Employee Training Notification";
 
     /* NATIVE VIEW GCP SEARCH TEXT BOX GCP EMPLOYEE TRAINING EXPIRED IN A MONTH*/
-    public static final String NATIVE_VIEW_GCP_SEARCH_TEXT_BOX_GCP_EMPLOYEE_TRAINING_EXPIRED_IN_A_MONTH = "GCP Employee Training expired in a Month";
+    public static final String NATIVE_VIEW_GCP_SEARCH_TEXT_BOX_GCP_EMPLOYEE_TRAINING_EXPIRED_IN_A_MONTH = "GCP Employee Training expires in a Month";
 
     /* NATIVE VIEW GCP EMPLOYEE TRAINING EXPIRED NOTIFICATION CONTENT */
     public static final String NATIVE_VIEW_GCP_EMPLOYEE_TRAINING_EXPIRED_NOTIFICATION_CONTENT = "Hello Rebecca Ferrer, \n" +
@@ -105,4 +105,4 @@ public class GCPNotifications_NativeView_Constants {
             "General questions or concerns about this training should be directed to your supervisor / Project Officer. If you need technical assistance or have questions regarding the training, please contact the appropriate help desk associated with the training you have selected to complete. If you need technical assistance with uploading your document(s), please contact: NCI GCP Web Admin\n" +
             "Once you have completed your training, please go to Training Certificate Repository to upload your completed certificate(s). For best results, please use \"Print to PDF\" when completing training to output a pdf to upload to this site or you may scan the printed certificate and save as a pdf to upload.\n" +
             " Note: If you have more than one certificate (i.e. the course provides individual certificates for each section of their course), you must combine those into one pdf document prior to uploading. A pdf Adobe Portfolio is not permitted for this upload.";
-}
+}

src/test/java/ServiceNow/PlatformBusinessApps/GCP/Features/GCPNotifications_NativeView.feature

@@ -1,36 +1,36 @@
 Feature: GCP Notifications Test Scenarios
 
-  @GCP-15 @GCP-20 @chaudhryma @Regression
+  @GCP-15 @GCP-20 @chaudhryma @selenium @Regression
   Scenario: Test Update GCP Employee Training Expired Notification - UAT Remediation
     Given a user with an Admin rights go to Notifications under System Notification in the Native View
     And searches GCP Employee Training expired for the Name filter
     When the User clicks on a Preview Notification button for the GCP Employee Training expired record
     Then the User verifies that the GCP Employee Training expired Notification record content is same as the given in Acceptance Criteria
 
-  @GCP-16 @GCP-21 @chaudhryma @Regression @notificationNotFoundinNV
+  @GCP-16 @GCP-21 @chaudhryma @selenium @Regression
   Scenario: Test Update GCP Manager Approval Notification - UAT Remediation
     Given a user with an Admin rights go to Notifications under System Notification in the Native View
     And searches GCP Manager Approval Notification for the Name filter
     When the User clicks on a Preview Notification button for the GCP Manager Approval Notification record
     Then verify the GCP Manager Approval Notification content is same as the given in Acceptance Criteria
 
-  @GCP-17 @GCP-22 @chaudhryma @Regression
+  @GCP-17 @GCP-22 @chaudhryma  @selenium @Regression
   Scenario: Test Update GCP Employee Training Past Due Notification - UAT Remediation
     Given a user with an Admin rights go to Notifications under System Notification in the Native View
     And searches GCP Employee Training Past Due for the Name filter
     When the User clicks on a Preview Notification button for the GCP Employee Training Past Due Notification record
     Then verify the GCP Employee Training Past Due Notification content is same as the given in Acceptance Criteria
 
-  @GCP-18 @GCP-23 @chaudhryma @Regression @notificationNotFoundinNV
+  @GCP-18 @GCP-23 @chaudhryma  @selenium @Regression
   Scenario: Test Update GCP Employee Training Notification - UAT Remediation
     Given a user with an Admin rights go to Notifications under System Notification in the Native View
     When searches GCP Employee Training Notification for the Name filter
     And the User clicks on a Preview Notification button for the GCP Employee Training Notification record
     Then verify the GCP Employee Training Notification content is same as the given in Acceptance Criteria
 
-  @GCP-19 @GCP-24 @chaudhryma @Regression
+  @GCP-19 @GCP-24 @chaudhryma  @selenium @Regression
   Scenario: Test Update Your GCP expires in a month Notification - UAT Remediation
     Given a user with an Admin rights go to Notifications under System Notification in the Native View
     When searches GCP Employee Training expires in a month for the Name filter
     And the User clicks on a Preview Notification button for the GCP Employee Training expires in a month Notification record
-    Then verify the GCP Employee Training expires in a month Notification content is same as the given in Acceptance Criteria
+    Then verify the GCP Employee Training expires in a month Notification content is same as the given in Acceptance Criteria

src/test/java/ServiceNow/ServiceNowRunners/RunGCPProgressionTest.java → src/test/java/ServiceNow/PlatformBusinessApps/GCP/GCP_Runners/RunGCPProgressionTest.java

@@ -1,13 +1,13 @@
-package ServiceNow.ServiceNowRunners;
+package ServiceNow.PlatformBusinessApps.GCP.GCP_Runners;
 
 import io.cucumber.testng.AbstractTestNGCucumberTests;
 import io.cucumber.testng.CucumberOptions;
 
-@CucumberOptions(plugin = {"html:target/html-reports/cucumber-default-report", "json:target/cucumber.json",
-        "junit:target/cucumber.xml", "rerun:target/failed.txt",
+@CucumberOptions(plugin = {"html:target/gcp-progression-reports/gcp-progression-report.html",
+        "json:target/cucumber.json", "rerun:target/failed.txt",
         "pretty", "com.aventstack.extentreports.cucumber.adapter.ExtentCucumberAdapter:"},
         features = "src/test/java/ServiceNow/PlatformBusinessApps/GCP/Features",
-        glue = "ServiceNow.PlatformBusinessApps.GCP.Steps",
+        glue = {"ServiceNow.PlatformBusinessApps.GCP.Steps", "Hooks"},
         tags = "@Progression",
         dryRun = false
 )

src/test/java/ServiceNow/ServiceNowRunners/RunGCPRegressionTest.java → src/test/java/ServiceNow/PlatformBusinessApps/GCP/GCP_Runners/RunGCPRegressionTest.java

@@ -1,13 +1,13 @@
-package ServiceNow.ServiceNowRunners;
+package ServiceNow.PlatformBusinessApps.GCP.GCP_Runners;
 
 import io.cucumber.testng.AbstractTestNGCucumberTests;
 import io.cucumber.testng.CucumberOptions;
 
-@CucumberOptions(plugin= {"html:target/html-reports/cucumber-default-report", "json:target/cucumber.json",
-        "junit:target/cucumber.xml", "rerun:target/failed.txt",
+@CucumberOptions(plugin= {"html:target/gcp-regression-reports/gcp-regression-report.html",
+        "json:target/cucumber.json", "rerun:target/failed.txt",
         "pretty", "com.aventstack.extentreports.cucumber.adapter.ExtentCucumberAdapter:"}
         , features="src/test/java/ServiceNow/PlatformBusinessApps/GCP/Features"
-        , glue="ServiceNow.PlatformBusinessApps.GCP.Steps"
+        , glue={"ServiceNow.PlatformBusinessApps.GCP.Steps", "Hooks"}
         , tags="@Regression"
         , dryRun = false
 )

src/test/java/ServiceNow/PlatformBusinessApps/GCP/Pages/GCPNotifications_NativeViewPage.java

@@ -72,4 +72,4 @@ public WebElement nVRecordName(String value) {
     /** Native View GCP Notification Body Content */
     @FindBy(xpath = "//*[@id='simulated_body']")
     public WebElement nVGCPNotificationBodyContent;
-}
+}

src/test/java/ServiceNow/PlatformBusinessApps/GCP/Steps/GCPNotifications_NativeViewSteps.java

@@ -87,4 +87,4 @@ public void the_user_clicks_on_a_preview_notification_button_for_the_gcp_employe
     public void verify_the_gcp_employee_training_expires_in_a_month_notification_content_is_same_as_the_given_in_acceptance_criteria() {
         GCPNotifications_NativeViewStepImpl.theContentOfTheGCPEmployeeTrainingExpiresInaMonthNotification();
     }
-}
+}