checkstyle improvements

jdi-testing · Jan 15, 2024 · 711be9b · 711be9b
1 parent 9cc8455
commit 711be9b
Showing 1 changed file with 12 additions and 20 deletions.
diff --git a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/Card.java b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/Card.java
@@ -49,7 +49,7 @@ public UIElement getSubtitle() {
     public Image image() {
         core().show();
         if (core().find("//img").isExist()) {
-            return new Image().setCore(Image.class, find("//img"));
+            return new Image().setCore(Image.class, core().find("//img"));
         } else {
             throw runtimeException("Element doesn't have image", this);
         }
@@ -93,38 +93,30 @@ public boolean actionsEndAlign() {
     @JDIAction("Get '{name}' size")
     public CardImageSize cardHeaderImageSize() {
         UIElement image = core().find("//mat-card-header//img");
-        image.show();
-        if (image.hasClass("mat-mdc-card-xl-image")) {
-            return EXTRALARGE;
-        }
-        if (image.hasClass("mat-mdc-card-lg-image")) {
-            return LARGE;
-        }
-        if (image.hasClass("mat-mdc-card-md-image")) {
-            return MEDIUM;
-        }
-        if (image.hasClass("mat-mdc-card-sm-image")) {
-            return SMALL;
-        }
-        return CardImageSize.UNKNOWN;
+        return defineSize(image);
     }
 
     @JDIAction("Get '{name}' size")
     public CardImageSize cardImageSize() {
         UIElement image = core().find("//img");
+        return defineSize(image);
+    }
+
+    public CardImageSize defineSize(UIElement image) {
+        CardImageSize size = CardImageSize.UNKNOWN;
         if (image.hasClass("mat-mdc-card-xl-image")) {
-            return EXTRALARGE;
+            size = EXTRALARGE;
         }
         if (image.hasClass("mat-mdc-card-lg-image")) {
-            return LARGE;
+            size = LARGE;
         }
         if (image.hasClass("mat-mdc-card-md-image")) {
-            return MEDIUM;
+            size = MEDIUM;
         }
         if (image.hasClass("mat-mdc-card-sm-image")) {
-            return SMALL;
+            size = SMALL;
         }
-        return CardImageSize.UNKNOWN;
+        return size;
     }
 
     @Override