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

JUnit Runner Tests and Missing Hamcrest Documentation

Author: slu-it

documentation/chapters/support-junit4.md

@@ -98,7 +98,7 @@ public class DifferentBrowserFactoriesTest {
 
 ## @EntryPoint
 In order for a `Browser` to be automatically navigated to an applications entry point before each test,
-the `@EntryPoint` annotation can used. The navigation at the beginning of each test is done weather or not a `Browser` is static!
+the `@EntryPoint` annotation can used. The navigation at the beginning of each test is done whether or not a `Browser` is static!
 
 ### Example
 ```java

webtester-core/src/main/java/info/novatec/testit/webtester/adhoc/AdHocFinder.java

@@ -61,7 +61,7 @@ public AdHocFinder(Browser browser) {
      * @since 2.0
      */
     public AdHocFinder(PageFragment parent) {
-        this.factory = new PageFragmentFactory(parent.getBrowser());
+        this.factory = new PageFragmentFactory(parent.browser());
         this.searchContext = parent.webElement();
     }
 

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

@@ -24,7 +24,7 @@ public boolean changeStyleInformation(PageFragment pageFragment, Map<String, Str
 
     private boolean changeStyleWithScript(PageFragment fragment, String script) {
         try {
-            fragment.getBrowser().javaScript().execute(script, fragment);
+            fragment.browser().javaScript().execute(script, fragment);
             return true;
         } catch (WebDriverException e) {
             log.warn("Exception while changing the style information of an page object: {}", e.getMessage());

webtester-core/src/main/java/info/novatec/testit/webtester/internal/ActionTemplate.java

@@ -104,7 +104,7 @@ public static class PageFragmentAction<T extends PageFragment> extends Action<T,
         private Marker marker;
 
         public PageFragmentAction(T subject) {
-            super(subject, subject.getBrowser());
+            super(subject, subject.browser());
             marker = new Marker(new DefaultStyleChanger());
         }
 
@@ -133,7 +133,7 @@ public static class PageFragmentsAction<T extends PageFragment> extends BiAction
         private Marker marker;
 
         public PageFragmentsAction(T subject1, T subject2) {
-            super(subject1, subject2, subject1.getBrowser());
+            super(subject1, subject2, subject1.browser());
             marker = new Marker(new DefaultStyleChanger());
         }
 

webtester-core/src/main/java/info/novatec/testit/webtester/internal/OffersBrowserGetter.java

@@ -14,6 +14,6 @@ public interface OffersBrowserGetter {
      * @since 2.0
      */
     @ReturnsBrowser
-    Browser getBrowser();
+    Browser browser();
 
 }

webtester-core/src/main/java/info/novatec/testit/webtester/internal/TestItHome.java

@@ -6,7 +6,7 @@
 
 public enum NamedProperties {
 
-    @Documentation("Weather or not the events should be fired.")
+    @Documentation("Whether or not the events should be fired.")
     @TypeDefinition(Constants.BOOLEAN)
     @DefaultValue("true")
     EVENTS("events.enabled"),

webtester-core/src/main/java/info/novatec/testit/webtester/internal/configuration/NamedProperties.java

@@ -35,7 +35,7 @@
 import info.novatec.testit.webtester.internal.proxies.impls.WebElementReturningImpl;
 import info.novatec.testit.webtester.pagefragments.PageFragment;
 import info.novatec.testit.webtester.pagefragments.mapping.MappingValidator;
-import info.novatec.testit.webtester.pagefragments.mapping.MappingValidatorImpl;
+import info.novatec.testit.webtester.pagefragments.mapping.DefaultMappingValidator;
 
 
 @Builder
@@ -103,7 +103,7 @@ public static PageFragmentProxyHandler fromModel(PageFragmentModel model) {
 
         Browser browser = model.getBrowser();
         Class<? extends PageFragment> pageFragmentClass = model.getType();
-        MappingValidator validator = new MappingValidatorImpl(pageFragmentClass);
+        MappingValidator validator = new DefaultMappingValidator(pageFragmentClass);
         Supplier<WebElement> webElementSupplier = () -> {
             SearchContext searchContext = model.getSearchContextSupplier().get();
             By by = model.getBy();
@@ -129,7 +129,7 @@ public static PageFragmentProxyHandler fromModel(PageFragmentModel model) {
     public static PageFragmentProxyHandler forWebElement(Browser browser, WebElement webElement,
         Class<? extends PageFragment> pageFragmentClass) {
 
-        MappingValidator validator = new MappingValidatorImpl(pageFragmentClass);
+        MappingValidator validator = new DefaultMappingValidator(pageFragmentClass);
         Supplier<WebElement> webElementSupplier = () -> webElement;
         EventProducingImplementationDecorator eventDecorator =
             new EventProducingImplementationDecorator(browser, webElementSupplier);

webtester-core/src/main/java/info/novatec/testit/webtester/internal/proxies/PageFragmentProxyHandler.java

@@ -39,7 +39,7 @@ public Marker(StyleChanger styleChanger) {
      * @since 2.0
      */
     public void markAsRead(PageFragment fragment) {
-        Configuration configuration = fragment.getBrowser().configuration();
+        Configuration configuration = fragment.browser().configuration();
         if (configuration.isMarkingsEnabled()) {
             Color backgroundColor = configuration.getMarkingsColorReadBackground();
             Color outlineColor = configuration.getMarkingsColorReadOutline();
@@ -58,7 +58,7 @@ public void markAsRead(PageFragment fragment) {
      * @since 2.0
      */
     public void markAsUsed(PageFragment pageFragment) {
-        Configuration configuration = pageFragment.getBrowser().configuration();
+        Configuration configuration = pageFragment.browser().configuration();
         if (configuration.isMarkingsEnabled()) {
             Color backgroundColor = configuration.getMarkingsColorUsedBackground();
             Color outlineColor = configuration.getMarkingsColorUsedOutline();

webtester-core/src/main/java/info/novatec/testit/webtester/markings/Marker.java

@@ -0,0 +1,79 @@
+package info.novatec.testit.webtester.mouse;
+
+import static info.novatec.testit.webtester.conditions.Conditions.visible;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.function.BiFunction;
+
+import org.openqa.selenium.TimeoutException;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.interactions.Actions;
+
+import info.novatec.testit.webtester.events.pagefragments.ClickedEvent;
+import info.novatec.testit.webtester.events.pagefragments.ContextClickedEvent;
+import info.novatec.testit.webtester.events.pagefragments.DoubleClickedEvent;
+import info.novatec.testit.webtester.internal.ActionTemplate;
+import info.novatec.testit.webtester.pagefragments.PageFragment;
+import info.novatec.testit.webtester.waiting.Wait;
+
+
+/**
+ * The default implementation of a {@link MouseDriver}.
+ *
+ * @since 2.0
+ */
+public class DefaultMouseDriver implements MouseDriver {
+
+    @Override
+    public void click(PageFragment fragment) {
+        ActionTemplate.pageFragment(fragment)
+            .execute((f) -> perform(f, Actions::click))
+            .fireEvent(ClickedEvent::new)
+            .markAsUsed();
+    }
+
+    @Override
+    public void doubleClick(PageFragment fragment) {
+        ActionTemplate.pageFragment(fragment)
+            .execute((f) -> perform(f, Actions::doubleClick))
+            .fireEvent(DoubleClickedEvent::new)
+            .markAsUsed();
+    }
+
+    @Override
+    public void contextClick(PageFragment fragment) {
+        ActionTemplate.pageFragment(fragment)
+            .execute((f) -> perform(f, Actions::contextClick))
+            .fireEvent(ContextClickedEvent::new)
+            .markAsUsed();
+    }
+
+    @Override
+    public void moveToEach(PageFragment fragment, PageFragment... fragments) throws TimeoutException {
+        moveTo(fragment);
+        moveToEach(Arrays.asList(fragments));
+    }
+
+    @Override
+    public void moveToEach(Collection<PageFragment> fragments) throws TimeoutException {
+        fragments.forEach(this::moveTo);
+    }
+
+    @Override
+    public void moveTo(PageFragment fragment) throws TimeoutException {
+        ActionTemplate.pageFragment(fragment).execute((f) -> {
+            Wait.until(f).is(visible());
+            perform(f, Actions::moveToElement);
+        });
+    }
+
+    private void perform(PageFragment fragment, BiFunction<Actions, WebElement, Actions> biConsumer) {
+        biConsumer.apply(sequenceFor(fragment), fragment.webElement()).perform();
+    }
+
+    private Actions sequenceFor(PageFragment fragment) {
+        return new Actions(fragment.browser().webDriver());
+    }
+
+}