Merge pull request #27 from slu-it/merge-fixes-from-1.0.x

Merge fixes from 1.0.x

Author: slu-it

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

@@ -75,7 +75,7 @@ public static Browser lookupBrowser(BrowserIdentification identification) {
         return browser;
     }
 
-    static void logTraceInformationAboutBrowserLookup(BrowserIdentification identification, Browser browser) {
+    private static void logTraceInformationAboutBrowserLookup(BrowserIdentification identification, Browser browser) {
         if (browser != null) {
             logger.trace("looking up browser for identifier: {} - FOUND", identification);
         } else {
@@ -97,7 +97,7 @@ public static void executeForAllBrowsers(BrowserCallback callback) {
         }
     }
 
-    static List<Browser> threadSafelyGetBrowsers() {
+    private static List<Browser> threadSafelyGetBrowsers() {
         return new LinkedList<Browser>(ACTIVE_BROWSER.values());
     }
 

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

@@ -71,31 +71,6 @@ public class WebDriverBrowser implements Browser {
 
     private static final Logger logger = LoggerFactory.getLogger(WebDriverBrowser.class);
 
-    /**
-     * Starts the creation of a new {@link WebDriverBrowser browser} by creating
-     * a {@link WebDriverBrowserBuilder builder} using the given
-     * {@link WebDriver web driver} as a starting point.
-     *
-     * @param webDriver the web driver to use
-     * @return the created builder
-     * @since 0.9.6
-     */
-    public static BrowserBuilder forWebDriver(WebDriver webDriver) {
-        return new WebDriverBrowserBuilder(webDriver);
-    }
-
-    /**
-     * Creates a new {@link WebDriverBrowser browser} using the given
-     * {@link WebDriver web driver}.
-     *
-     * @param webDriver the web driver to use
-     * @return the created browser
-     * @since 0.9.6
-     */
-    public static Browser buildForWebDriver(WebDriver webDriver) {
-        return forWebDriver(webDriver).build();
-    }
-
     private PageObjectFactory pageObjectFactory;
     private Configuration configuration;
 
@@ -594,4 +569,31 @@ public void setConfiguration(Configuration configuration) {
         this.configuration = configuration;
     }
 
+    /* factories */
+
+    /**
+     * Starts the creation of a new {@link WebDriverBrowser browser} by creating
+     * a {@link WebDriverBrowserBuilder builder} using the given
+     * {@link WebDriver web driver} as a starting point.
+     *
+     * @param webDriver the web driver to use
+     * @return the created builder
+     * @since 0.9.6
+     */
+    public static BrowserBuilder forWebDriver(WebDriver webDriver) {
+        return new WebDriverBrowserBuilder(webDriver);
+    }
+
+    /**
+     * Creates a new {@link WebDriverBrowser browser} using the given
+     * {@link WebDriver web driver}.
+     *
+     * @param webDriver the web driver to use
+     * @return the created browser
+     * @since 0.9.6
+     */
+    public static Browser buildForWebDriver(WebDriver webDriver) {
+        return forWebDriver(webDriver).build();
+    }
+
 }

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

@@ -28,7 +28,7 @@
  * @see ConfigurationExporter
  * @since 0.9.7
  */
-public final class DefaultConfigurationBuilder extends BaseConfigurationBuilder {
+public class DefaultConfigurationBuilder extends BaseConfigurationBuilder {
 
     public static Configuration create() {
         return new DefaultConfigurationBuilder().build();

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

@@ -16,33 +16,6 @@
 @Internal
 public class PageObjectModel {
 
-    public static PageObjectModel forPage(Browser browser) {
-        PageObjectModel metaData = new PageObjectModel();
-        metaData.browser = browser;
-        metaData.identification = Identifications.tagName("html");
-        return metaData;
-    }
-
-    public static PageObjectModel forPageFragment(Browser browser, Identification identification) {
-        return forPageFragment(browser, identification, null);
-    }
-
-    public static PageObjectModel forPageFragment(Browser browser, Identification identification, PageObject parent) {
-        PageObjectModel metaData = new PageObjectModel();
-        metaData.browser = browser;
-        metaData.identification = identification;
-        metaData.parent = parent;
-        return metaData;
-    }
-
-    public static PageObjectModel forPageObjectListElement(Browser browser, PageObject parent) {
-        PageObjectModel metaData = new PageObjectModel();
-        metaData.browser = browser;
-        metaData.parent = parent;
-        metaData.partOfList = true;
-        return metaData;
-    }
-
     private Browser browser;
     private Identification identification;
     private PageObject parent;
@@ -105,4 +78,33 @@ public boolean isPartOfList() {
         return partOfList;
     }
 
+    /* factories */
+
+    public static PageObjectModel forPage(Browser browser) {
+        PageObjectModel metaData = new PageObjectModel();
+        metaData.browser = browser;
+        metaData.identification = Identifications.tagName("html");
+        return metaData;
+    }
+
+    public static PageObjectModel forPageFragment(Browser browser, Identification identification) {
+        return forPageFragment(browser, identification, null);
+    }
+
+    public static PageObjectModel forPageFragment(Browser browser, Identification identification, PageObject parent) {
+        PageObjectModel metaData = new PageObjectModel();
+        metaData.browser = browser;
+        metaData.identification = identification;
+        metaData.parent = parent;
+        return metaData;
+    }
+
+    public static PageObjectModel forPageObjectListElement(Browser browser, PageObject parent) {
+        PageObjectModel metaData = new PageObjectModel();
+        metaData.browser = browser;
+        metaData.parent = parent;
+        metaData.partOfList = true;
+        return metaData;
+    }
+
 }

webtester-support-assertj/src/main/java/info/novatec/testit/webtester/support/assertj/WebTesterAssertions.java

@@ -25,7 +25,7 @@
  *
  * @since 0.9.8
  */
-public class WebTesterAssertions extends Assertions {
+public final class WebTesterAssertions extends Assertions {
 
     public static ButtonAssert assertThat(Button actual) {
         return new ButtonAssert(actual);
@@ -79,4 +79,8 @@ public static TextFieldAssert assertThat(TextField actual) {
         return new TextFieldAssert(actual);
     }
 
+    private WebTesterAssertions() {
+        // utility constructor
+    }
+
 }

webtester-support-hamcrest/src/main/java/info/novatec/testit/webtester/support/hamcrest/ButtonMatcher.java

@@ -12,7 +12,7 @@
  *
  * @since 0.9.7
  */
-public class ButtonMatcher extends PageObjectMatcher {
+public final class ButtonMatcher extends PageObjectMatcher {
 
     /**
      * Returns whether the {@link Button button} has a certain value.
@@ -72,7 +72,7 @@ protected void describeMismatchSafely(Button button, Description mismatchDescrip
 
     }
 
-    protected ButtonMatcher() {
+    private ButtonMatcher() {
         // utility constructor
     }
 

webtester-support-hamcrest/src/main/java/info/novatec/testit/webtester/support/hamcrest/CheckboxMatcher.java

@@ -12,7 +12,7 @@
  *
  * @since 0.9.7
  */
-public class CheckboxMatcher extends PageObjectMatcher {
+public final class CheckboxMatcher extends PageObjectMatcher {
 
     /**
      * Returns whether the {@link Checkbox checkbox} is selected.
@@ -41,7 +41,7 @@ protected void describeMismatchSafely(Checkbox item, Description mismatchDescrip
         };
     }
 
-    protected CheckboxMatcher() {
+    private CheckboxMatcher() {
         // utility constructor
     }
 

webtester-support-hamcrest/src/main/java/info/novatec/testit/webtester/support/hamcrest/IFrameMatcher.java

@@ -12,7 +12,7 @@
  *
  * @since 0.9.7
  */
-public class IFrameMatcher extends PageObjectMatcher {
+public final class IFrameMatcher extends PageObjectMatcher {
 
     /**
      * Returns whether the source path of the {@link IFrame} matches the
@@ -44,7 +44,7 @@ protected boolean matchesSafely(IFrame iFrame) {
 
     }
 
-    protected IFrameMatcher() {
+    private IFrameMatcher() {
         // utility constructor
     }
 

webtester-support-hamcrest/src/main/java/info/novatec/testit/webtester/support/hamcrest/ImageMatcher.java

@@ -12,7 +12,7 @@
  *
  * @since 0.9.7
  */
-public class ImageMatcher extends PageObjectMatcher {
+public final class ImageMatcher extends PageObjectMatcher {
 
     /**
      * Returns whether the source path of the {@link Image image} matches the
@@ -70,7 +70,7 @@ protected boolean matchesSafely(Image image) {
         };
     }
 
-    protected ImageMatcher() {
+    private ImageMatcher() {
         // utility constructor
     }
 

webtester-support-hamcrest/src/main/java/info/novatec/testit/webtester/support/hamcrest/ListMatcher.java

@@ -12,7 +12,7 @@
  *
  * @since 0.9.7
  */
-public class ListMatcher extends PageObjectMatcher {
+public final class ListMatcher extends PageObjectMatcher {
 
     /**
      * Returns whether the number of items the {@link List list} contains
@@ -71,7 +71,7 @@ protected void describeMismatchSafely(List list, Description mismatchDescription
 
     }
 
-    protected ListMatcher() {
+    private ListMatcher() {
         // utility constructor
     }