4911_radioButtonsTestsRefCommentsFixIncaps

jdi-testing · Nov 17, 2023 · 86d62dd · 86d62dd
1 parent 9af45cb
commit 86d62dd
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 17 deletions.
diff --git a/...r/src/main/java/com/epam/jdi/light/angular/elements/complex/radiobuttons/RadioButton.java b/...r/src/main/java/com/epam/jdi/light/angular/elements/complex/radiobuttons/RadioButton.java
@@ -40,6 +40,11 @@ public AngularColors color() {
         return AngularColors.UNDEFINED;
     }
 
+    @JDIAction("Get radio-button value")
+    public String value() {
+       return find("input").attr("value");
+    }
+
     @JDIAction("'{name}' element label is in before position")
     public boolean hasBeforePosition() {
         return core().find(FORM_FIELD_LOCATOR).hasClass("mdc-form-field--align-end");

diff --git a/...ar/src/main/java/com/epam/jdi/light/angular/elements/complex/radiobuttons/RadioGroup.java b/...ar/src/main/java/com/epam/jdi/light/angular/elements/complex/radiobuttons/RadioGroup.java
@@ -20,29 +20,22 @@ public void click(String value) {
 
     @JDIAction("'{name}' radio button  with value '{0}' is checked")
     public boolean isChecked(String value) {
-        return getRadioButtonByValue(value).attr("class").contains("mat-mdc-radio-checked");
+        return getRadioButtonByValue(value).isChecked();
     }
 
-    @JDIAction("Get radio-button by value {0}")
+    @JDIAction("Get radio-button by value '{0}'")
     public RadioButton getRadioButtonByValue(String value) {
-        RadioButton radioButton = null;
-        for (RadioButton e : radioButtons()) {
-            if (e.find("input").attr("value").equalsIgnoreCase(value)) {
-                radioButton = e;
-            }
-        }
-        return radioButton;
+        return radioButtons().stream()
+                             .filter(radioButton -> radioButton.value().equalsIgnoreCase(value))
+                             .findFirst()
+                             .orElse(null);
     }
-
     @JDIAction("Get '{name}' checked radio-button")
     public RadioButton getCheckedRadioButton() {
-        RadioButton radioButton = null;
-        for (RadioButton e : radioButtons()) {
-            if (e.isChecked()) {
-                radioButton = e;
-            }
-        }
-        return radioButton;
+        return radioButtons().stream()
+                             .filter(RadioButton::isChecked)
+                             .findFirst()
+                             .orElse(null);
     }
 
     public List<RadioButton> radioButtons() {
@@ -56,11 +49,16 @@ public boolean isGroupBeforePosition() {
         return core().attr("labelposition").equalsIgnoreCase("before");
     }
 
+    @Override
     @JDIAction("'{name}' is disabled")
     public boolean isDisabled() {
         return core().hasAttribute("disabled");
     }
 
+    @Override
+    @JDIAction("'{name}' is enabled")
+    public boolean isEnabled() { return  core().hasAttribute("enabled"); }
+
     @JDIAction("'{name}' is required")
     public boolean isRequired() {
         return core().hasAttribute("required");