Merge pull request #239 from eliasnogueira/refactor

Refactor

Author: eliasnogueira

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.eliasnogueira</groupId>
     <artifactId>selenium-java-lean-test-architecture</artifactId>
-    <version>3.3.8</version>
+    <version>3.3.9</version>
 
     <scm>
         <connection>scm:[email protected]:eliasnogueira/selenium-java-lean-test-architecture.git</connection>
@@ -35,7 +35,7 @@
         <allure.cmd.download.url>
             https://repo.maven.apache.org/maven2/io/qameta/allure/allure-commandline
         </allure.cmd.download.url>
-        <testcontainers.selenium.version>1.19.3</testcontainers.selenium.version>
+        <testcontainers.selenium.version>1.19.4</testcontainers.selenium.version>
 
         <!-- security libraries override -->
         <jackson-databind.version>2.16.1</jackson-databind.version>

src/main/java/com/eliasnogueira/config/Configuration.java

@@ -32,7 +32,6 @@
 @Config.Sources({
     "system:properties",
     "classpath:general.properties",
-    "classpath:local.properties",
     "classpath:selenium-grid.properties"})
 public interface Configuration extends Config {
 

src/main/java/com/eliasnogueira/enums/Target.java

@@ -33,7 +33,8 @@
 
 public enum Target {
 
-    LOCAL("local"), LOCAL_SUITE("local-suite"), SELENIUM_GRID("selenium-grid"), TESTCONTAINERS("testcontainers");
+    LOCAL("local"), LOCAL_SUITE("local-suite"), SELENIUM_GRID("selenium-grid"),
+    TESTCONTAINERS("testcontainers");
 
     private final String value;
     private static final Map<String, Target> ENUM_MAP;
@@ -43,12 +44,15 @@ public enum Target {
     }
 
     static {
-        Map<String, Target> map = stream(Target.values()).collect(toMap(
-                instance -> instance.value.toLowerCase(), instance -> instance, (a, b) -> b, ConcurrentHashMap::new));
+        Map<String, Target> map = stream(Target.values())
+                .collect(toMap(instance -> instance.value.toLowerCase(), instance -> instance, (a, b) -> b, ConcurrentHashMap::new));
         ENUM_MAP = Collections.unmodifiableMap(map);
     }
 
     public static Target get(String value) {
+        if (!ENUM_MAP.containsKey(value.toLowerCase()))
+            throw new IllegalArgumentException(String.format("Value %s not valid. Use one of the TARGET enum values", value));
+
         return ENUM_MAP.get(value.toLowerCase());
     }
 }

src/test/resources/general.properties

@@ -5,7 +5,7 @@ target = local
 browser = chrome
 
 # initial URL
-url.base = http://eliasnogueira.com/external/selenium-java-architecture/
+url.base = https://eliasnogueira.com/external/selenium-java-architecture/
 
 # global test timeout
 timeout = 3