Read and used in page objects

webtester-core/src/main/java/info/novatec/testit/webtester/pageobjects/Button.java

@@ -35,6 +35,7 @@ public class Button extends PageObject implements HasValue<String>, HasLabel {
      */
     @Override
     public String getValue() {
+        this.markAsRead();
         return StringUtils.defaultString(getAttribute("value"));
     }
 

webtester-core/src/main/java/info/novatec/testit/webtester/pageobjects/GenericTextField.java

@@ -158,6 +158,7 @@ public void pressEnter() {
 
             @Override
             public void execute(PageObject pageObject) {
+                pageObject.markAsUsed();
                 pageObject.getWebElement().sendKeys(Keys.ENTER);
             }
 

webtester-core/src/main/java/info/novatec/testit/webtester/pageobjects/MultiSelect.java

@@ -99,6 +99,7 @@ public void execute(PageObject pageObject) {
      * @since 1.2
      */
     public void deselectAll() {
+        this.markAsUsed();
         getSelect().deselectAll();
     }
 
@@ -111,6 +112,7 @@ public void deselectAll() {
      * @since 1.2
      */
     public void deselectByTexts(final String... texts) {
+        this.markAsUsed();
         for (String text : texts) {
             getSelect().deselectByVisibleText(text);
         }
@@ -125,6 +127,7 @@ public void deselectByTexts(final String... texts) {
      *  @since 1.2
      */
     public void deselectByValues(final String... values) {
+        this.markAsUsed();
         for (String value : values) {
             getSelect().deselectByValue(value);
         }
@@ -139,6 +142,7 @@ public void deselectByValues(final String... values) {
      * @since 1.2
      */
     public void deselectByIndices(final Integer... indices) {
+        this.markAsUsed();
         for (Integer index : indices) {
             getSelect().deselectByIndex(index);
         }
@@ -195,6 +199,7 @@ public List<Integer> getAllSelectedIndices() {
 
 
     public List<WebElement> getAllSelectedOptions() {
+        this.markAsRead();
         return getSelect().getAllSelectedOptions();
     }
 

webtester-core/src/main/java/info/novatec/testit/webtester/pageobjects/PageObject.java

@@ -183,6 +183,7 @@ public String getVisibleText() {
 
             @Override
             public String execute(PageObject pageObject) {
+                pageObject.markAsRead();
                 return getWebElement().getText();
             }
 
@@ -506,6 +507,10 @@ protected final void markAsRead() {
         Marker.markAsRead(this);
     }
 
+    protected final void markAsUsed() {
+        Marker.markAsUsed(this);
+    }
+
     /**
      * Creates a new instance for the given {@linkplain PageObject page object}
      * class using the {@linkplain Browser browser's} creation mechanism. This

webtester-core/src/main/java/info/novatec/testit/webtester/pageobjects/Select.java

@@ -367,14 +367,17 @@ private EnhancedSelect getSelect() {
     }
 
     private List<WebElement> getAllOptions() {
+        this.markAsRead();
         return getSelect().getOptions();
     }
 
     private List<WebElement> getAllSelectedOptions() {
+        this.markAsRead();
         return getSelect().getAllSelectedOptions();
     }
 
     private WebElement getFirstSelectedOption() {
+        this.markAsRead();
         return getSelect().getFirstSelectedOption();
     }
 

webtester-core/src/main/java/info/novatec/testit/webtester/pageobjects/SingleSelect.java

@@ -100,7 +100,7 @@ public String getSelectionText() {
         return executeAction(new PageObjectCallbackWithReturnValue<String>() {
 
             @Override
-            public String execute(PageObject arg) {
+            public String execute(PageObject pageObject) {
                 try {
                     String text = getSelectedOption().getText();
                     return text;
@@ -125,7 +125,7 @@ public String getSelectionValue() {
         return executeAction(new PageObjectCallbackWithReturnValue<String>() {
 
             @Override
-            public String execute(PageObject arg) {
+            public String execute(PageObject pageObject) {
                 try {
                     String value = getSelectedOption().getAttribute("value");
                     return value;
@@ -149,7 +149,7 @@ public Integer getSelectionIndex() {
         return executeAction(new PageObjectCallbackWithReturnValue<Integer>() {
 
             @Override
-            public Integer execute(PageObject arg) {
+            public Integer execute(PageObject pageObject) {
                 try {
                     String indexAsString = getSelectedOption().getAttribute("index");
                     return Integer.valueOf(indexAsString);
@@ -162,6 +162,7 @@ public Integer execute(PageObject arg) {
     }
 
     public WebElement getSelectedOption() {
+        this.markAsRead();
         return getSelect().getFirstSelectedOption();
     }
 }