Bump version to 0.0.65.

Fixed exception related to dynamic log directory
znsio · Dec 9, 2021 · 59c6961 · 59c6961
1 parent f7bc436
commit 59c6961
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 9 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,3 +1,5 @@
+import java.text.SimpleDateFormat
+
 plugins {
     id "org.sonarqube" version "3.3"
     id "java"
@@ -7,7 +9,7 @@ plugins {
 }
 
 group = 'com.github.znsio'
-version '0.0.64'
+version '0.0.65'
 project.ext.logDir = "${rootDir}/target"
 
 repositories {
@@ -90,4 +92,31 @@ publishing {
     }
 }
 
-task install(dependsOn: publishToMavenLocal)
+task install(dependsOn: publishToMavenLocal)
+
+static def getCurrentTimestamp ()
+{
+    Date today = new Date ()
+    SimpleDateFormat df = new SimpleDateFormat ("MM-dd-yyyy_HH-mm-ss")
+    return df.format (today)
+}
+
+task run(type: JavaExec) {
+    doFirst {
+        def logDirectory = "target/" + getCurrentTimestamp()
+        println "Using LOG_DIR: $logDirectory"
+        System.setProperty "LOG_DIR", "$logDirectory"
+        environment "PLATFORM", "web"
+
+        def configFile = System.getenv("RUN_IN_CI") ? "./src/test/resources/com/znsio/e2e/features/configs/pcloudy_config.properties" : "./src/test/resources/com/znsio/e2e/features/configs/config.properties"
+        systemProperties = System.properties
+        def runnerArgs = [
+                "${configFile}",
+                "com/znsio/e2e/steps",
+                "./src/test/resources/com/znsio/e2e/features"
+        ]
+        args = runnerArgs
+    }
+    mainClass = "com.znsio.e2e.runner.Runner"
+    classpath = configurations.cucumberRuntime + sourceSets.main.output + sourceSets.test.output
+}
diff --git a/build.gradle.sample b/build.gradle.sample
@@ -3,7 +3,7 @@ import java.text.SimpleDateFormat
 buildscript {
     ext {
         gradleVersion = '7.1'
-        teswizVersion = '0.0.64'
+        teswizVersion = '0.0.65'
     }
     repositories {
         mavenLocal()
@@ -41,16 +41,15 @@ dependencies {
 def getCurrentTimestamp ()
 {
     Date today = new Date ()
-    SimpleDateFormat df = new SimpleDateFormat ("MM-dd-yyyy_HH-mm")
+    SimpleDateFormat df = new SimpleDateFormat ("MM-dd-yyyy_HH-mm-ss")
     return df.format (today)
 }
 
 task run(type: JavaExec) {
     doFirst {
         def logDirectory = "target/" + getCurrentTimestamp()
-        println "LOG_DIR: $logDirectory"
-        environment "LOG_DIR", logDirectory
-        environment "OUTPUT_DIRECTORY", logDirectory
+        println "Using LOG_DIR: $logDirectory"
+        System.setProperty "LOG_DIR", "$logDirectory"
         def configFile = System.getenv("RUN_IN_CI") ? "./configs/pcloudy_config.properties" : "./configs/config.properties"
         systemProperties = System.properties
         def runnerArgs = [

diff --git a/src/main/java/com/znsio/e2e/runner/Runner.java b/src/main/java/com/znsio/e2e/runner/Runner.java
@@ -115,6 +115,8 @@ public static Map getTestDataAsMap(String key) {
     }
 
     public static void main(String[] args) {
+        String logDir = System.getProperty("LOG_DIR");
+        System.setProperty("OUTPUT_DIRECTORY", logDir);
         LOGGER.info("teswiz Runner");
         LOGGER.info("Provided parameters:");
         for(int i = 0; i < args.length; i++) {

diff --git a/src/main/resources/defaultLog4j.properties b/src/main/resources/defaultLog4j.properties
@@ -4,7 +4,7 @@ log4j.rootLogger=INFO,CONSOLE,R
 log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
 log4j.appender.R=org.apache.log4j.RollingFileAppender
 #log file location
-log4j.appender.R.File=./target/testLogs/teswiz.log
+log4j.appender.R.File=${LOG_DIR}/testLogs/teswiz.log
 # layout and pattern
 log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
 log4j.appender.CONSOLE.layout.ConversionPattern=%5p [%t] (%F:%L)- %m%n

diff --git a/src/test/resources/log4j.properties b/src/test/resources/log4j.properties
@@ -4,7 +4,7 @@ log4j.rootLogger=INFO,CONSOLE,R
 log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
 log4j.appender.R=org.apache.log4j.RollingFileAppender
 #log file location
-log4j.appender.R.File=${LOG_DIR}/testLogs/teswizTestLog.log
+log4j.appender.R.File=${LOG_DIR}/testLogs/teswizSampleTestLog.log
 # layout and pattern
 log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
 log4j.appender.CONSOLE.layout.ConversionPattern=%5p [%t] (%F:%L)- %m%n