config: move java config handler to core (#1369)

Author: MykolaGolubyev

webtau-java-runner/src/main/java/org/testingisdocumenting/webtau/javarunner/cfg/JavaResourceConfigHandler.java renamed to webtau-core/src/main/java/org/testingisdocumenting/webtau/cfg/JavaResourceConfigHandler.java

@@ -15,10 +15,8 @@
  * limitations under the License.
  */
 
-package org.testingisdocumenting.webtau.javarunner.cfg;
+package org.testingisdocumenting.webtau.cfg;
 
-import org.testingisdocumenting.webtau.cfg.WebTauConfig;
-import org.testingisdocumenting.webtau.cfg.WebTauConfigHandler;
 import org.testingisdocumenting.webtau.utils.ResourceUtils;
 
 import java.io.IOException;
@@ -27,6 +25,8 @@
 import java.util.Properties;
 
 public class JavaResourceConfigHandler implements WebTauConfigHandler {
+    static final String WEBTAU_PROPERTIES_KEY = "webtau.properties";
+
     @Override
     public void onBeforeCreate(WebTauConfig cfg) {
     }
@@ -70,6 +70,6 @@ public void onAfterCreate(WebTauConfig cfg) {
     }
 
     private String configResourcePath() {
-        return System.getProperty("webtau.properties", "webtau.properties");
+        return System.getProperty(WEBTAU_PROPERTIES_KEY, WEBTAU_PROPERTIES_KEY);
     }
 }

webtau-core/src/main/resources/META-INF/services/org.testingisdocumenting.webtau.cfg.WebTauConfigHandler

@@ -0,0 +1 @@
+org.testingisdocumenting.webtau.cfg.JavaResourceConfigHandler

webtau-java-runner/src/test/groovy/org/testingisdocumenting/webtau/javarunner/cfg/JavaResourceConfigHandlerTest.groovy renamed to webtau-core/src/test/groovy/org/testingisdocumenting/webtau/cfg/JavaResourceConfigHandlerTest.groovy

@@ -14,12 +14,14 @@
  * limitations under the License.
  */
 
-package org.testingisdocumenting.webtau.javarunner.cfg
+package org.testingisdocumenting.webtau.cfg
 
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
-import org.testingisdocumenting.webtau.cfg.WebTauConfig
+
+import static org.testingisdocumenting.webtau.Matchers.actual
+import static org.testingisdocumenting.webtau.Matchers.equal
 
 class JavaResourceConfigHandlerTest {
     def cfg = WebTauConfig.cfg
@@ -38,14 +40,14 @@ class JavaResourceConfigHandlerTest {
 
         handler.onAfterCreate(cfg)
 
-        cfg.baseUrl.should == 'http://qa'
+        actual(cfg.baseUrl).should(equal('http://server.qa:8080'))
     }
 
     @Test
     void "should allow to override path for config"() {
         System.setProperty("webtau.properties", "webtau.override.properties")
         cfg.triggerConfigHandlers()
 
-        cfg.baseUrl.should == "http://local-override"
+        actual(cfg.baseUrl).should(equal("http://local-override"))
     }
 }

webtau-core/src/test/groovy/org/testingisdocumenting/webtau/cfg/WebTauConfigTest.groovy

@@ -17,18 +17,26 @@
 
 package org.testingisdocumenting.webtau.cfg
 
-import org.junit.After
-import org.junit.Before
+import org.junit.AfterClass
+import org.junit.BeforeClass
 import org.junit.Test
-import org.testingisdocumenting.webtau.console.ConsoleOutput
-import org.testingisdocumenting.webtau.console.ConsoleOutputs
-import org.testingisdocumenting.webtau.console.ansi.IgnoreAnsiString
-import org.testingisdocumenting.webtau.testutils.TestConsoleOutput
 
 import static org.testingisdocumenting.webtau.Matchers.*
-import static org.testingisdocumenting.webtau.testutils.TestConsoleOutput.runAndValidateOutput
+import static org.testingisdocumenting.webtau.cfg.JavaResourceConfigHandler.WEBTAU_PROPERTIES_KEY
+import static org.testingisdocumenting.webtau.testutils.TestConsoleOutput.*
 
 class WebTauConfigTest {
+    @BeforeClass
+    static void disableJavaConfig() {
+        System.setProperty(WEBTAU_PROPERTIES_KEY, "disabled")
+
+    }
+
+    @AfterClass
+    static void enableJavaConfig() {
+        System.setProperty(WEBTAU_PROPERTIES_KEY, WEBTAU_PROPERTIES_KEY)
+    }
+
     @Test
     void "inits config values from env vars and overrides them from system properties"() {
         System.setProperty('url', 'test-base-url')

webtau-java-runner/src/test/resources/webtau.override.properties renamed to webtau-core/src/test/resources/webtau.override.properties

@@ -0,0 +1,2 @@
+url = http://localhost:8080
+environments.qa.url = http://server.qa:8080

webtau-core/src/test/resources/webtau.properties

@@ -0,0 +1 @@
+* Add: Java config is handled when only webtau-core dependency is present. No need for junit specific dependency.