Added configuration tests

Author: slu-it

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

@@ -218,7 +218,7 @@ public Browser build() {
             if (customConfiguration != null) {
                 configuration = customConfiguration;
             } else {
-                configuration = DefaultConfigurationBuilder.create();
+                configuration = new DefaultConfigurationBuilder().build();
             }
             return new WebDriverBrowser(configuration, webDriver);
         }

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

@@ -68,7 +68,7 @@ public boolean isEventSystemEnabled() {
     }
 
     @Override
-    public Configuration setEventSystem(boolean enabled) {
+    public Configuration setEventSystemEnabled(boolean enabled) {
         return setProperty(key(NamedProperties.EVENTS), enabled);
     }
 
@@ -118,7 +118,7 @@ public boolean isMarkingsEnabled() {
     }
 
     @Override
-    public BaseConfiguration setMarkings(boolean activated) {
+    public BaseConfiguration setMarkingsEnabled(boolean activated) {
         return setProperty(key(NamedProperties.MARKINGS), activated);
     }
 
@@ -129,7 +129,7 @@ public Color getMarkingsColorUsedBackground() {
 
     @Override
     public BaseConfiguration setMarkingsColorUsedBackground(Color color) {
-        return setProperty(key(NamedProperties.MARKINGS_USED_BACKGROUND), color.toString());
+        return setProperty(key(NamedProperties.MARKINGS_USED_BACKGROUND), color.asHex());
     }
 
     @Override
@@ -139,7 +139,7 @@ public Color getMarkingsColorUsedOutline() {
 
     @Override
     public BaseConfiguration setMarkingsColorUsedOutline(Color color) {
-        return setProperty(key(NamedProperties.MARKINGS_USED_OUTLINE), color.toString());
+        return setProperty(key(NamedProperties.MARKINGS_USED_OUTLINE), color.asHex());
     }
 
     @Override
@@ -149,7 +149,7 @@ public Color getMarkingsColorReadBackground() {
 
     @Override
     public Configuration setMarkingsColorReadBackground(Color color) {
-        return setProperty(key(NamedProperties.MARKINGS_READ_BACKGROUND), color.toString());
+        return setProperty(key(NamedProperties.MARKINGS_READ_BACKGROUND), color.asHex());
     }
 
     @Override
@@ -159,7 +159,7 @@ public Color getMarkingsColorReadOutline() {
 
     @Override
     public Configuration setMarkingsColorReadOutline(Color color) {
-        return setProperty(key(NamedProperties.MARKINGS_READ_OUTLINE), color.toString());
+        return setProperty(key(NamedProperties.MARKINGS_READ_OUTLINE), color.asHex());
     }
 
     @Override

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

@@ -84,7 +84,7 @@ public interface Configuration {
      * @see EventSystem
      * @since 2.0
      */
-    Configuration setEventSystem(boolean active);
+    Configuration setEventSystemEnabled(boolean active);
 
     /**
      * Returns the default entry point of the application under test if set.
@@ -177,7 +177,7 @@ public interface Configuration {
      * @return the same configuration for fluent API
      * @since 2.0
      */
-    Configuration setMarkings(boolean activated);
+    Configuration setMarkingsEnabled(boolean activated);
 
     /**
      * Returns the color to use for the background of elements marked as 'used' on a page.

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

@@ -1,6 +1,5 @@
 package info.novatec.testit.webtester.config.adapters;
 
-import java.io.File;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.net.URL;
@@ -21,10 +20,6 @@
  */
 public abstract class AbstractPropertiesConfigurationAdapter implements ConfigurationAdapter {
 
-    protected void loadPropertiesFromResource(File resource, Properties properties) throws IOException {
-        loadPropertiesFromResource(resource.toURI().toURL(), properties);
-    }
-
     protected void loadPropertiesFromResource(URL resource, Properties properties) throws IOException {
         try(InputStreamReader isr = new InputStreamReader(resource.openStream(), Charsets.UTF_8)) {
             properties.load(isr);

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

@@ -4,8 +4,7 @@
 import java.net.URL;
 import java.util.Properties;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
 
 import info.novatec.testit.webtester.config.Configuration;
 import info.novatec.testit.webtester.config.ConfigurationAdapter;
@@ -21,10 +20,9 @@
  * @see AbstractPropertiesConfigurationAdapter
  * @since 2.0
  */
+@Slf4j
 public class ClasspathPropertiesFileConfigurationAdapter extends AbstractPropertiesConfigurationAdapter {
 
-    private static final Logger logger = LoggerFactory.getLogger(ClasspathPropertiesFileConfigurationAdapter.class);
-
     private String propertyFilePath;
 
     public ClasspathPropertiesFileConfigurationAdapter(String propertyFilePath) {
@@ -34,11 +32,11 @@ public ClasspathPropertiesFileConfigurationAdapter(String propertyFilePath) {
     @Override
     public boolean adapt(Configuration configuration) {
 
-        logger.debug("loading properties from classpath resource: {}", propertyFilePath);
+        log.debug("loading properties from classpath resource: {}", propertyFilePath);
 
         URL resource = getClass().getClassLoader().getResource(propertyFilePath);
         if (resource == null) {
-            logger.warn("Could not load configuration file! {} file is not on the classpath.", propertyFilePath);
+            log.warn("Could not load configuration file! {} file is not on the classpath.", propertyFilePath);
             return false;
         }
 
@@ -47,13 +45,13 @@ public boolean adapt(Configuration configuration) {
         try {
             loadPropertiesFromResource(resource, properties);
         } catch (IOException e) {
-            logger.error("exception while loading property file " + propertyFilePath, e);
+            log.error("exception while loading property file " + propertyFilePath, e);
             return false;
         }
 
-        logger.debug("...merging with current configuration...");
+        log.debug("...merging with current configuration...");
         copyInto(properties, configuration);
-        logger.debug("finished loading properties from classpath resource: {}", propertyFilePath);
+        log.debug("finished loading properties from classpath resource: {}", propertyFilePath);
 
         return true;
 

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

@@ -31,10 +31,6 @@
  */
 public class DefaultConfigurationBuilder extends BaseConfigurationBuilder {
 
-    public static Configuration create() {
-        return new DefaultConfigurationBuilder().build();
-    }
-
     public DefaultConfigurationBuilder() {
         withAdapter(new DefaultFileConfigurationAdapter());
         withAdapter(new GlobalFileConfigurationAdapter());

webtester-core/src/test/java/features/DebugMarkingsFeatureTest.java

@@ -21,12 +21,12 @@ public class DebugMarkingsFeatureTest extends BaseIntegrationTest {
     public void openPage() {
         open("html/features/debug-markings.html");
         markingsWere = browser().configuration().isMarkingsEnabled();
-        browser().configuration().setMarkings(true);
+        browser().configuration().setMarkingsEnabled(true);
     }
 
     @After
     public void deactivateMarkings() {
-        browser().configuration().setMarkings(markingsWere);
+        browser().configuration().setMarkingsEnabled(markingsWere);
     }
 
     @Test