Added getter to conditions and created conditions factory test

Author: slu-it

webtester-core/src/main/java/info/novatec/testit/webtester/conditions/pagefragments/Attribute.java

@@ -1,5 +1,7 @@
 package info.novatec.testit.webtester.conditions.pagefragments;
 
+import lombok.Getter;
+
 import info.novatec.testit.webtester.conditions.Condition;
 import info.novatec.testit.webtester.pagefragments.PageFragment;
 
@@ -11,27 +13,28 @@
  * @see PageFragment#getAttribute(String)
  * @since 2.0
  */
+@Getter
 public class Attribute implements Condition<PageFragment> {
 
-    private final String attributeName;
+    private final String expectedAttributeName;
 
     /**
      * Creates a new {@link Attribute} condition. Using the given attribute.
      *
-     * @param attributeName the name of the attribute to check
+     * @param expectedAttributeName the name of the attribute to check
      */
-    public Attribute(String attributeName) {
-        this.attributeName = attributeName;
+    public Attribute(String expectedAttributeName) {
+        this.expectedAttributeName = expectedAttributeName;
     }
 
     @Override
     public boolean test(PageFragment pageFragment) {
-        return pageFragment.getAttribute(attributeName).isPresent();
+        return pageFragment.getAttribute(expectedAttributeName).isPresent();
     }
 
     @Override
     public String toString() {
-        return String.format("attribute '%s'", attributeName);
+        return String.format("attribute '%s'", expectedAttributeName);
     }
 
 }

webtester-core/src/main/java/info/novatec/testit/webtester/conditions/pagefragments/AttributeWithValue.java

@@ -2,6 +2,8 @@
 
 import java.util.Objects;
 
+import lombok.Getter;
+
 import info.novatec.testit.webtester.conditions.Condition;
 import info.novatec.testit.webtester.pagefragments.PageFragment;
 
@@ -14,26 +16,27 @@
  * @see PageFragment#getAttribute(String)
  * @since 2.0
  */
+@Getter
 public class AttributeWithValue implements Condition<PageFragment> {
 
-    private final String attributeName;
+    private final String expectedAttributeName;
     private final String expectedValue;
 
     /**
      * Creates a new {@link AttributeWithValue} condition. Using the given attribute name and expected value.
      * The value is an Object and it's toString method will be used to extract the value for the comparison.
      *
-     * @param attributeName the name of the attribute to check
+     * @param expectedAttributeName the name of the attribute to check
      * @param expectedValue the value to check
      */
-    public AttributeWithValue(String attributeName, Object expectedValue) {
-        this.attributeName = attributeName;
+    public AttributeWithValue(String expectedAttributeName, Object expectedValue) {
+        this.expectedAttributeName = expectedAttributeName;
         this.expectedValue = String.valueOf(expectedValue);
     }
 
     @Override
     public boolean test(PageFragment pageFragment) {
-        return pageFragment.getAttribute(attributeName).filter(this::isExpectedValue).isPresent();
+        return pageFragment.getAttribute(expectedAttributeName).filter(this::isExpectedValue).isPresent();
     }
 
     private boolean isExpectedValue(String value) {
@@ -42,7 +45,7 @@ private boolean isExpectedValue(String value) {
 
     @Override
     public String toString() {
-        return String.format("attribute '%s' with value '%s'", attributeName, expectedValue);
+        return String.format("attribute '%s' with value '%s'", expectedAttributeName, expectedValue);
     }
 
 }

webtester-core/src/main/java/info/novatec/testit/webtester/conditions/pagefragments/SelectedIndex.java

@@ -1,5 +1,7 @@
 package info.novatec.testit.webtester.conditions.pagefragments;
 
+import lombok.Getter;
+
 import info.novatec.testit.webtester.conditions.Condition;
 import info.novatec.testit.webtester.pagefragments.SingleSelect;
 
@@ -12,6 +14,7 @@
  * @see SingleSelect#getSelectionIndex()
  * @since 2.0
  */
+@Getter
 public class SelectedIndex implements Condition<SingleSelect> {
 
     private final Integer expectedIndex;

webtester-core/src/main/java/info/novatec/testit/webtester/conditions/pagefragments/SelectedIndices.java

@@ -8,6 +8,8 @@
 
 import org.apache.commons.lang.StringUtils;
 
+import lombok.Getter;
+
 import info.novatec.testit.webtester.conditions.Condition;
 import info.novatec.testit.webtester.pagefragments.MultiSelect;
 
@@ -21,20 +23,21 @@
  * @see MultiSelect#getSelectionIndices()
  * @since 2.0
  */
+@Getter
 public class SelectedIndices implements Condition<MultiSelect> {
 
     private final Set<Integer> expectedIndices = new HashSet<>();
 
-    public SelectedIndices(Integer index) {
-        this.expectedIndices.add(index);
+    public SelectedIndices(Integer expectedIndex) {
+        this.expectedIndices.add(expectedIndex);
     }
 
-    public SelectedIndices(Integer... indices) {
-        this.expectedIndices.addAll(Arrays.asList(indices));
+    public SelectedIndices(Integer... expectedIndices) {
+        this.expectedIndices.addAll(Arrays.asList(expectedIndices));
     }
 
-    public SelectedIndices(Collection<Integer> indices) {
-        this.expectedIndices.addAll(indices);
+    public SelectedIndices(Collection<Integer> expectedIndices) {
+        this.expectedIndices.addAll(expectedIndices);
     }
 
     @Override

webtester-core/src/main/java/info/novatec/testit/webtester/conditions/pagefragments/SelectedText.java

@@ -1,5 +1,7 @@
 package info.novatec.testit.webtester.conditions.pagefragments;
 
+import lombok.Getter;
+
 import info.novatec.testit.webtester.conditions.Condition;
 import info.novatec.testit.webtester.pagefragments.SingleSelect;
 
@@ -12,6 +14,7 @@
  * @see SingleSelect#getSelectionText()
  * @since 2.0
  */
+@Getter
 public class SelectedText implements Condition<SingleSelect> {
 
     private final String expectedText;

webtester-core/src/main/java/info/novatec/testit/webtester/conditions/pagefragments/SelectedTexts.java

@@ -7,6 +7,8 @@
 
 import org.apache.commons.lang.StringUtils;
 
+import lombok.Getter;
+
 import info.novatec.testit.webtester.conditions.Condition;
 import info.novatec.testit.webtester.pagefragments.MultiSelect;
 
@@ -20,20 +22,21 @@
  * @see MultiSelect#getSelectionTexts()
  * @since 2.0
  */
+@Getter
 public class SelectedTexts implements Condition<MultiSelect> {
 
     private final List<String> expectedTexts = new LinkedList<>();
 
-    public SelectedTexts(String text) {
-        this.expectedTexts.add(text);
+    public SelectedTexts(String expectedText) {
+        this.expectedTexts.add(expectedText);
     }
 
-    public SelectedTexts(String... texts) {
-        this.expectedTexts.addAll(Arrays.asList(texts));
+    public SelectedTexts(String... expectedTexts) {
+        this.expectedTexts.addAll(Arrays.asList(expectedTexts));
     }
 
-    public SelectedTexts(Collection<String> texts) {
-        this.expectedTexts.addAll(texts);
+    public SelectedTexts(Collection<String> expectedTexts) {
+        this.expectedTexts.addAll(expectedTexts);
     }
 
     @Override

webtester-core/src/main/java/info/novatec/testit/webtester/conditions/pagefragments/SelectedValue.java

@@ -1,5 +1,7 @@
 package info.novatec.testit.webtester.conditions.pagefragments;
 
+import lombok.Getter;
+
 import info.novatec.testit.webtester.conditions.Condition;
 import info.novatec.testit.webtester.pagefragments.SingleSelect;
 
@@ -12,6 +14,7 @@
  * @see SingleSelect#getSelectionValue()
  * @since 2.0
  */
+@Getter
 public class SelectedValue implements Condition<SingleSelect> {
 
     private final String expectedValue;

webtester-core/src/main/java/info/novatec/testit/webtester/conditions/pagefragments/SelectedValues.java

@@ -7,6 +7,8 @@
 
 import org.apache.commons.lang.StringUtils;
 
+import lombok.Getter;
+
 import info.novatec.testit.webtester.conditions.Condition;
 import info.novatec.testit.webtester.pagefragments.MultiSelect;
 
@@ -20,20 +22,21 @@
  * @see MultiSelect#getSelectionTexts()
  * @since 2.0
  */
+@Getter
 public class SelectedValues implements Condition<MultiSelect> {
 
     private final List<String> expectedValues = new LinkedList<>();
 
-    public SelectedValues(String value) {
-        this.expectedValues.add(value);
+    public SelectedValues(String expectedValue) {
+        this.expectedValues.add(expectedValue);
     }
 
-    public SelectedValues(String... values) {
-        this.expectedValues.addAll(Arrays.asList(values));
+    public SelectedValues(String... expectedValues) {
+        this.expectedValues.addAll(Arrays.asList(expectedValues));
     }
 
-    public SelectedValues(Collection<String> values) {
-        this.expectedValues.addAll(values);
+    public SelectedValues(Collection<String> expectedValues) {
+        this.expectedValues.addAll(expectedValues);
     }
 
     @Override

webtester-core/src/main/java/info/novatec/testit/webtester/conditions/pagefragments/VisibleTextContains.java

@@ -1,5 +1,7 @@
 package info.novatec.testit.webtester.conditions.pagefragments;
 
+import lombok.Getter;
+
 import info.novatec.testit.webtester.conditions.Condition;
 import info.novatec.testit.webtester.pagefragments.PageFragment;
 
@@ -12,22 +14,23 @@
  * @see PageFragment#getVisibleText()
  * @since 2.0
  */
+@Getter
 public class VisibleTextContains implements Condition<PageFragment> {
 
-    private final String partialText;
+    private final String expectedPartialText;
 
-    public VisibleTextContains(String partialText) {
-        this.partialText = partialText;
+    public VisibleTextContains(String expectedPartialText) {
+        this.expectedPartialText = expectedPartialText;
     }
 
     @Override
     public boolean test(PageFragment pageFragment) {
-        return pageFragment.getVisibleText().contains(partialText);
+        return pageFragment.getVisibleText().contains(expectedPartialText);
     }
 
     @Override
     public String toString() {
-        return String.format("visible text contains: %s", partialText);
+        return String.format("visible text contains: %s", expectedPartialText);
     }
 
 }

webtester-core/src/main/java/info/novatec/testit/webtester/conditions/pagefragments/VisibleTextEquals.java

@@ -1,5 +1,7 @@
 package info.novatec.testit.webtester.conditions.pagefragments;
 
+import lombok.Getter;
+
 import info.novatec.testit.webtester.conditions.Condition;
 import info.novatec.testit.webtester.pagefragments.PageFragment;
 
@@ -12,6 +14,7 @@
  * @see PageFragment#getVisibleText()
  * @since 2.0
  */
+@Getter
 public class VisibleTextEquals implements Condition<PageFragment> {
 
     private final String expectedText;