Merge pull request #10 from slu-it/test-optimization

Test optimization

Author: slu-it

webtester-core/src/main/java/info/novatec/testit/webtester/WebTesterException.java

@@ -12,10 +12,6 @@ protected WebTesterException(String message) {
         super(message);
     }
 
-    protected WebTesterException(Throwable cause) {
-        super(cause);
-    }
-
     protected WebTesterException(String message, Throwable cause) {
         super(message, cause);
     }

webtester-core/src/main/java/info/novatec/testit/webtester/browser/WebDriverBrowser.java

@@ -5,22 +5,22 @@
 
 import lombok.extern.slf4j.Slf4j;
 
+import info.novatec.testit.webtester.adhoc.AdHocFinder;
 import info.novatec.testit.webtester.browser.operations.AlertHandler;
+import info.novatec.testit.webtester.browser.operations.CurrentWindow;
 import info.novatec.testit.webtester.browser.operations.FocusSetter;
 import info.novatec.testit.webtester.browser.operations.JavaScriptExecutor;
 import info.novatec.testit.webtester.browser.operations.Navigator;
-import info.novatec.testit.webtester.browser.operations.UrlOpener;
 import info.novatec.testit.webtester.browser.operations.PageSourceSaver;
 import info.novatec.testit.webtester.browser.operations.ScreenshotTaker;
-import info.novatec.testit.webtester.browser.operations.CurrentWindow;
+import info.novatec.testit.webtester.browser.operations.UrlOpener;
 import info.novatec.testit.webtester.config.Configuration;
 import info.novatec.testit.webtester.config.builders.DefaultConfigurationBuilder;
 import info.novatec.testit.webtester.events.EventSystem;
 import info.novatec.testit.webtester.events.EventSystemImpl;
 import info.novatec.testit.webtester.events.browser.ClosedBrowserEvent;
 import info.novatec.testit.webtester.internal.PageFactory;
 import info.novatec.testit.webtester.pages.Page;
-import info.novatec.testit.webtester.adhoc.AdHocFinder;
 
 
 /**
@@ -44,7 +44,6 @@
 public final class WebDriverBrowser implements Browser {
 
     private final Configuration configuration;
-
     private final WebDriver webDriver;
 
     private final UrlOpener open;
@@ -54,11 +53,12 @@ public final class WebDriverBrowser implements Browser {
     private final ScreenshotTaker screenshot;
     private final PageSourceSaver pageSource;
     private final JavaScriptExecutor javaScript;
+    private final FocusSetter focus;
     private final EventSystem eventSystem;
+
     private final AdHocFinder adHocFinder;
     private final PageFactory pageFactory;
 
-    private final FocusSetter focus;
     private boolean closed;
 
     private WebDriverBrowser(Configuration configuration, WebDriver webDriver) {
@@ -75,6 +75,7 @@ private WebDriverBrowser(Configuration configuration, WebDriver webDriver) {
         this.javaScript = new JavaScriptExecutor(this);
         this.focus = new FocusSetter(this);
         this.eventSystem = new EventSystemImpl(this);
+
         this.adHocFinder = new AdHocFinder(this);
         this.pageFactory = new PageFactory(this);
 
@@ -89,15 +90,9 @@ public <T extends Page> T create(Class<T> pageClass) {
     public void close() {
         if (!closed) {
             log.debug("closing browser {}", this);
-            try {
-                EventSystem events = events();
-                if(events.isEnabled()) {
-                    events.fireEvent(new ClosedBrowserEvent());
-                }
-            } finally {
-                webDriver().quit();
-                closed = true;
-            }
+            events().fireEvent(new ClosedBrowserEvent());
+            webDriver().quit();
+            closed = true;
         } else {
             log.debug("browser {} already closed - ignoring call to close", this);
         }

webtester-core/src/main/java/info/novatec/testit/webtester/browser/operations/AlertHandler.java

@@ -1,5 +1,7 @@
 package info.novatec.testit.webtester.browser.operations;
 
+import java.util.Optional;
+
 import org.openqa.selenium.Alert;
 import org.openqa.selenium.Beta;
 import org.openqa.selenium.NoAlertPresentException;
@@ -149,11 +151,22 @@ public void decline() throws NoAlertPresentException {
      * @since 2.0
      */
     public boolean isPresent() {
+        return get().isPresent();
+    }
+
+    /**
+     * Returns the Selenium {@link Alert} instance as an optional.
+     *
+     * @return optional of the alert - if no alert is present the optional will be empty.
+     * @see Alert
+     * @see WebDriver.TargetLocator#alert()
+     * @since 2.0
+     */
+    public Optional<Alert> get() {
         try {
-            webDriver().switchTo().alert();
-            return true;
+            return Optional.of(webDriver().switchTo().alert());
         } catch (NoAlertPresentException e) {
-            return false;
+            return Optional.empty();
         }
     }
 

webtester-core/src/main/java/info/novatec/testit/webtester/browser/operations/JavaScriptExecutor.java

@@ -49,6 +49,7 @@ public void execute(String script, PageFragment fragment, Object... parameters)
      * @param script the JavaScript code to be executed on the current page
      * @param fragment the target {@link PageFragment}
      * @param parameters any of Boolean, Long, String, List, WebElement or null.
+     * @param <T> the expected type of the return value
      * @return the return value of the JavaScript
      * @see JavascriptExecutor#executeScript(String, Object...)
      * @since 2.0
@@ -79,6 +80,7 @@ public void execute(String script, Object... parameters) {
      *
      * @param script the JavaScript code to be executed on the current page
      * @param parameters any of Boolean, Long, String, List, WebElement or null.
+     * @param <T> the type of the return value is cast to before returning
      * @return the return value of the JavaScript
      * @see JavascriptExecutor#executeScript(String, Object...)
      * @since 2.0

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

@@ -33,7 +33,7 @@ private boolean isXhtmlReadOnly(String value) {
 
     @Override
     public String toString() {
-        return "read-only";
+        return "read only";
     }
 
 }

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

@@ -2,9 +2,8 @@
 
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.stream.Collectors;
+import java.util.LinkedList;
+import java.util.List;
 
 import org.apache.commons.lang.StringUtils;
 
@@ -23,7 +22,7 @@
  */
 public class SelectedTexts implements Condition<MultiSelect> {
 
-    private final Set<String> expectedTexts = new HashSet<>();
+    private final List<String> expectedTexts = new LinkedList<>();
 
     public SelectedTexts(String text) {
         this.expectedTexts.add(text);
@@ -39,7 +38,8 @@ public SelectedTexts(Collection<String> texts) {
 
     @Override
     public boolean test(MultiSelect select) {
-        return expectedTexts.equals(select.streamSelectionTexts().collect(Collectors.toSet()));
+        List<String> selectionTexts = select.getSelectionTexts();
+        return expectedTexts.containsAll(selectionTexts) && selectionTexts.containsAll(expectedTexts);
     }
 
     @Override

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

@@ -2,9 +2,8 @@
 
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.stream.Collectors;
+import java.util.LinkedList;
+import java.util.List;
 
 import org.apache.commons.lang.StringUtils;
 
@@ -23,7 +22,7 @@
  */
 public class SelectedValues implements Condition<MultiSelect> {
 
-    private final Set<String> expectedValues = new HashSet<>();
+    private final List<String> expectedValues = new LinkedList<>();
 
     public SelectedValues(String value) {
         this.expectedValues.add(value);
@@ -39,7 +38,8 @@ public SelectedValues(Collection<String> values) {
 
     @Override
     public boolean test(MultiSelect select) {
-        return expectedValues.equals(select.streamSelectionValues().collect(Collectors.toSet()));
+        List<String> selectionValues = select.getSelectionValues();
+        return expectedValues.containsAll(selectionValues) && selectionValues.containsAll(expectedValues);
     }
 
     @Override

webtester-core/src/main/java/info/novatec/testit/webtester/config/ConfigurationException.java

@@ -14,8 +14,4 @@ protected ConfigurationException(String message) {
         super(message);
     }
 
-    protected ConfigurationException(Throwable cause) {
-        super(cause);
-    }
-
 }

webtester-core/src/main/java/info/novatec/testit/webtester/config/adapters/TestItHomeFileConfigurationAdapter.java

@@ -10,7 +10,7 @@
 import info.novatec.testit.webtester.pagefragments.PageFragment;
 
 @Slf4j
-public class StyleChangerImpl implements StyleChanger {
+public class DefaultStyleChanger implements StyleChanger {
 
     @Override
     public boolean changeStyleInformation(PageFragment pageFragment, String property, String value) {

webtester-core/src/main/java/info/novatec/testit/webtester/css/StyleChangerImpl.java renamed to webtester-core/src/main/java/info/novatec/testit/webtester/css/DefaultStyleChanger.java

@@ -11,10 +11,11 @@
 @Slf4j
 public class EventSystemImpl implements EventSystem {
 
-    private final List<EventListener> listeners = new LinkedList<>();
+    private final List<EventListener> listeners;
     private final Browser browser;
 
     public EventSystemImpl(Browser browser) {
+        this.listeners = new LinkedList<>();
         this.browser = browser;
     }
 
@@ -38,7 +39,7 @@ public void clearListeners() {
 
     @Override
     public void fireEvent(Event event) {
-        if(isEnabled()) {
+        if (isEnabled() || event instanceof ExceptionEvent) {
             doFireEvent(event);
         } else {
             log.warn("tried to fire event '{}' but event system is disabled", event);

webtester-core/src/main/java/info/novatec/testit/webtester/events/EventSystemImpl.java

@@ -26,7 +26,7 @@ public ExceptionEvent(Throwable exception) {
 
     @Override
     public String describe() {
-        return "exception occurred: " + exception.getMessage();
+        return "exception occurred: '" + exception.getMessage() + "'";
     }
 
 }

webtester-core/src/main/java/info/novatec/testit/webtester/events/ExceptionEvent.java

@@ -23,8 +23,8 @@
  * @see AlertHandler#acceptIfPresent()
  * @since 2.0
  */
-@SuppressWarnings("serial")
 @Getter
+@SuppressWarnings("serial")
 public class AcceptedAlertEvent extends AbstractEvent {
 
     private final String alertMessage;
@@ -35,7 +35,7 @@ public AcceptedAlertEvent(String alertMessage) {
 
     @Override
     public String describe() {
-        return format("accepted an alert message with message: %s", alertMessage);
+        return format("accepted an alert with message: '%s'", alertMessage);
     }
 
 }

webtester-core/src/main/java/info/novatec/testit/webtester/events/browser/AcceptedAlertEvent.java

@@ -35,7 +35,7 @@ public DeclinedAlertEvent(String alertMessage) {
 
     @Override
     public String describe() {
-        return format("declined an alert message with message: %s", alertMessage);
+        return format("declined an alert with message: '%s'", alertMessage);
     }
 
 }

webtester-core/src/main/java/info/novatec/testit/webtester/events/browser/DeclinedAlertEvent.java

@@ -29,8 +29,8 @@
  * @see UrlOpener#defaultEntryPoint(Class)
  * @since 2.0
  */
-@SuppressWarnings("serial")
 @Getter
+@SuppressWarnings("serial")
 public class OpenedUrlEvent extends AbstractEvent {
 
     private final String url;
@@ -41,7 +41,7 @@ public OpenedUrlEvent(String url) {
 
     @Override
     public String describe() {
-        return format("opened url %s", url);
+        return format("opened url: '%s'", url);
     }
 
 }

webtester-core/src/main/java/info/novatec/testit/webtester/events/browser/OpenedUrlEvent.java

@@ -8,10 +8,10 @@
 import lombok.Getter;
 
 import info.novatec.testit.webtester.browser.operations.PageSourceSaver;
+import info.novatec.testit.webtester.events.AbstractEvent;
 import info.novatec.testit.webtester.events.Event;
 import info.novatec.testit.webtester.events.EventListener;
 import info.novatec.testit.webtester.events.EventSystem;
-import info.novatec.testit.webtester.events.AbstractEvent;
 
 
 /**
@@ -31,8 +31,8 @@
  * @see PageSourceSaver#save(File)
  * @since 2.0
  */
-@SuppressWarnings("serial")
 @Getter
+@SuppressWarnings("serial")
 public class SavedSourceCodeEvent extends AbstractEvent {
 
     private final File pageSource;
@@ -43,7 +43,7 @@ public SavedSourceCodeEvent(File pageSource) {
 
     @Override
     public String describe() {
-        return format("saved page source and saved it as: %s", pageSource);
+        return format("saved page source and stored it as: '%s'", pageSource);
     }
 
 }