Merge pull request #5087 from jdi-testing/4911_radioButtonTestsRefactoring

4911-refactoringRadioButtonTests

Author: pnatashap

jdi-light-angular-tests/src/main/java/io/github/com/StaticSite.java

@@ -10,6 +10,7 @@
 import io.github.com.pages.CheckBoxPage;
 import io.github.com.pages.ProgressBarPage;
 import io.github.com.pages.ProgressSpinnerPage;
+import io.github.com.pages.RadioButtonPage;
 
 @JSite("https://jdi-testing.github.io/jdi-light/angular-page/#/")
 public class StaticSite {
@@ -35,6 +36,9 @@ public class StaticSite {
     @Url("autocompletes")
     public static AutocompletePage autocompletePage;
 
+    @Url("radio_button")
+    public static RadioButtonPage radioButtonPage;
+
     @Url("checkbox")
     public static CheckBoxPage checkBoxPage;
 }

jdi-light-angular-tests/src/main/java/io/github/com/pages/AngularPage.java

@@ -16,7 +16,6 @@ public class AngularPage extends WebPage {
     @UI("#bottom-sheet")
     public static BottomSheet bottomSheet;
     public static Dialog dialog;
-    public static RadioButtonSection radioButtonSection;
     public static ToolbarSection toolbarSection;
     public static SlideToggleSection slideToggleSection;
     public static InputSection inputSection;

jdi-light-angular-tests/src/main/java/io/github/com/pages/CheckBoxPage.java

@@ -1,7 +1,7 @@
 package io.github.com.pages;
 
 import com.epam.jdi.light.angular.elements.common.Checkbox;
-import com.epam.jdi.light.angular.elements.complex.RadioButtons;
+import com.epam.jdi.light.angular.elements.complex.radiobuttons.RadioGroup;
 import com.epam.jdi.light.elements.pageobjects.annotations.locators.UI;
 import com.epam.jdi.light.ui.html.elements.common.Text;
 
@@ -19,7 +19,7 @@ public class CheckBoxPage extends NewAngularPage {
     public static Checkbox resultCheckbox;
 
     @UI(".mat-mdc-radio-group")
-    public static RadioButtons modeRadioGroup;
+    public static RadioGroup modeRadioGroup;
 
     @UI("#checkbox-color1")
     public static Checkbox primaryColorCheckbox;

jdi-light-angular-tests/src/main/java/io/github/com/pages/ProgressBarPage.java

@@ -2,7 +2,7 @@
 
 import com.epam.jdi.light.angular.elements.common.ProgressBar;
 import com.epam.jdi.light.angular.elements.common.Slider;
-import com.epam.jdi.light.angular.elements.complex.RadioButtons;
+import com.epam.jdi.light.angular.elements.complex.radiobuttons.RadioGroup;
 import com.epam.jdi.light.elements.pageobjects.annotations.locators.UI;
 import com.epam.jdi.light.ui.html.elements.common.Button;
 
@@ -22,9 +22,9 @@ public class ProgressBarPage extends NewAngularPage {
     @UI("#mat-progress-bar-configurable")
     public static ProgressBar matProgressBarConfigurable;
     @UI(".example-section:nth-of-type(1) .mat-mdc-radio-group")
-    public static RadioButtons colorRadioButtons;
+    public static RadioGroup colorRadioGroup;
     @UI(".example-section:nth-of-type(2) .mat-mdc-radio-group")
-    public static RadioButtons modeRadioButtons;
+    public static RadioGroup modeRadioGroup;
     @UI("#progress-bars-query-mode-radio")
     public static Button progressBarsQueryModeRadio;
     @UI("#progress-bars-progress-slider")

jdi-light-angular-tests/src/main/java/io/github/com/pages/ProgressSpinnerPage.java

@@ -7,7 +7,9 @@
 
 public class ProgressSpinnerPage extends NewAngularPage {
     public static Button showSpinner;
+    @UI("#basic-progress-spinner")
     public static ProgressSpinner basicProgressSpinner;
+    @UI("#configured-spinner")
     public static ProgressSpinner configuredSpinner;
     @UI("#spinner-color mat-radio-button[value='primary']")
     public static Button progressSpinnerPrimaryColorRadio;

jdi-light-angular-tests/src/main/java/io/github/com/pages/RadioButtonPage.java

@@ -0,0 +1,46 @@
+package io.github.com.pages;
+
+import com.epam.jdi.light.angular.elements.complex.radiobuttons.RadioButton;
+import com.epam.jdi.light.angular.elements.complex.radiobuttons.RadioGroup;
+import com.epam.jdi.light.elements.pageobjects.annotations.locators.UI;
+import com.epam.jdi.light.ui.html.elements.common.Text;
+
+public class RadioButtonPage extends NewAngularPage {
+
+    @UI("(//*[@id='basic-radio-group'])[1]")
+    public static RadioGroup basicRadioGroup;
+
+    @UI("#season-radio-group")
+    public static RadioGroup seasonRadioGroup;
+
+    @UI("#radio-buttons_dialog_color_radio")
+    public static RadioButton primaryRadioButton;
+
+    @UI("#radio-buttons_first-tabbable_color_radio")
+    public static RadioButton accentRadioButton;
+
+    @UI("#radio-buttons_first-heading_color_radio")
+    public static RadioButton warnRadioButton;
+
+    @UI("(//*[@id='basic-radio-group'])[2]")
+    public static RadioGroup elementPositionRadioGroup;
+
+    @UI("#radio-buttons-color_buttons")
+    public static RadioGroup colorRadioGroup;
+
+    @UI("#your-favorite-season-text")
+    public static Text yourFavoriteSeasonText;
+
+    @UI("#basic-radio-group-label-position")
+    public static RadioGroup beforePositionRadioGroup;
+
+    @UI("#basic-radio-group-label-position")
+    public static RadioGroup labelPositionRadioGroup;
+
+    @UI("#basic-radio-group-disabled")
+    public static RadioGroup disabledRadioGroup;
+
+    @UI("(//*[@role='radiogroup'])[9]")
+    public static RadioGroup requiredRadioGroup;
+
+}

jdi-light-angular-tests/src/main/java/io/github/com/pages/sections/RadioButtonSection.java

@@ -1,7 +1,7 @@
 package io.github.com.pages.sections;
 
 import com.epam.jdi.light.angular.elements.common.Checkbox;
-import com.epam.jdi.light.angular.elements.complex.RadioButtons;
+import com.epam.jdi.light.angular.elements.complex.radiobuttons.RadioGroup;
 import com.epam.jdi.light.angular.elements.complex.SideNav;
 import com.epam.jdi.light.elements.common.UIElement;
 import com.epam.jdi.light.elements.composite.Section;
@@ -26,9 +26,9 @@ public class SideNavSection extends Section {
     @UI("#configurable-mode .mat-sidenav-content button")
     public static Button contentToggle;
     @UI("#configurable-mode .mat-sidenav .mat-radio-group")
-    public static RadioButtons sideNavRadioButtons;
+    public static RadioGroup sideNavRadioGroup;
     @UI("#configurable-mode .mat-sidenav-content .mat-radio-group")
-    public static RadioButtons contentRadioButtons;
+    public static RadioGroup contentRadioGroup;
 
     public static SideNav customEscapeBackdrop;
     @UI("#custom-escape-backdrop .mat-sidenav button")

jdi-light-angular-tests/src/main/java/io/github/com/pages/sections/SideNavSection.java

@@ -46,20 +46,16 @@ public void before() {
 
     @Test(description = "Test checks basic buttons attributes")
     public void basicButtonsTest() {
-        Button basicButton = basicButtons.get(rand.nextInt(basicButtons.size()) + 1);
+        Button basicButton = basicButtons.stream().filter(b -> b.text().equalsIgnoreCase("Disabled"))
+                .findAny().orElse(null);
+
         basicButton.is().displayed();
         basicButton.show();
         basicButton.is().visible();
 
         basicButton.has().visualType(BASIC);
 
-        if (basicButton.isEnabled()) {
-            basicButton.click();
-            basicButton.is().focused();
-            basicbuttonLabel.has().text(containsString(basicButton.text()));
-        } else {
-            basicButton.is().disabled();
-        }
+        basicButton.has().text("Disabled").is().disabled();
     }
 
     @Test(description = "Test checks default color button attributes")

jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/common/ButtonsTests.java

@@ -38,7 +38,7 @@ public void checkLabelValueTest() {
     @Test(description = "Test verifies initial checkbox state and selection")
     public void basicCheckboxValidationTest() {
         basicCheckbox.show();
-        basicCheckbox.is().displayed().and().enabled().and().deselected();
+        basicCheckbox.is().displayed().and().enabled().and().notSelected();
         basicCheckbox.check();
         basicCheckbox.is().selected();
         basicCheckbox.uncheck();
@@ -72,6 +72,7 @@ public void alignPositionsCheckboxTest() {
     @Test(description = "Test verifies checkbox feature: required option")
     public void isRequiredCheckboxTest() {
         requiredCheckbox.show();
+        requiredCheckbox.uncheck();
         requiredCheckbox.is().required();
         requiredCheckboxText.has().text("Checkbox should be checked!");
         requiredCheckbox.check();
@@ -84,21 +85,17 @@ public void isRequiredCheckboxTest() {
     @Test(description = "Verifies checkbox colors as Angular colors")
     public void angularColorCheckBoxTest() {
         //Check color for checkboxes with attribute 'color'
-        primaryColorCheckbox.has().angularColor(AngularColors.PRIMARY);
-        accentColorCheckbox.has().angularColor(AngularColors.ACCENT);
-        warnColorCheckbox.has().angularColor(AngularColors.WARN);
-        //Check color for checkbox without attribute 'color'
-        requiredCheckbox.has().angularColor(AngularColors.ACCENT);
-    }
-
-    @Test(description = "Verifies checkbox colors as strings")
-    public void colorCheckBoxTest() {
-        //Check color for checkboxes with attribute 'color'
-        primaryColorCheckbox.has().color("primary");
-        accentColorCheckbox.has().color("accent");
-        warnColorCheckbox.has().color("warn");
+        primaryColorCheckbox.uncheck();
+        primaryColorCheckbox.has().color(AngularColors.UNSELECTED);
+        primaryColorCheckbox.check();
+        primaryColorCheckbox.has().color(AngularColors.PRIMARY);
+        accentColorCheckbox.check();
+        accentColorCheckbox.has().color(AngularColors.ACCENT);
+        warnColorCheckbox.check();
+        warnColorCheckbox.has().color(AngularColors.WARN);
         //Check color for checkbox without attribute 'color'
-        requiredCheckbox.has().color("accent");
+        requiredCheckbox.check();
+        requiredCheckbox.has().color(AngularColors.ACCENT);
     }
 
 }