fix: dynamic file name for file loading and bug on timestamp detected as dot notation (#123)

Author: brian-mulier

tzatziki-core/src/main/java/com/decathlon/tzatziki/steps/ObjectSteps.java

@@ -172,7 +172,7 @@ public class ObjectSteps {
                 value = Time.parse(property.substring(1));
             } else if (property.startsWith("&")) {
                 // this is a file to load
-                value = load(property.substring(1));
+                value = load(getOrSelf(property.substring(1)));
             } else {
                 // let's get the value in the context, or fallback on the name of the property
                 value = getOrSelf(property);
@@ -428,7 +428,7 @@ public void output_in(Guard guard, String sourcePath, Type type, Object sourceVa
                 throw new RuntimeException(e);
             }
             try {
-                Path path = Paths.get(resourcePath.toString(), sourcePath).normalize();
+                Path path = Paths.get(resourcePath.toString(), resolve(sourcePath)).normalize();
                 if (!Paths.get(path.toString()).normalize().startsWith(resourcePath)) {
                     throw new AssertionError("no escape from the resource folder is allowed!");
                 }

tzatziki-core/src/test/resources/com/decathlon/tzatziki/steps/objects.feature

@@ -250,12 +250,16 @@ Feature: to interact with objects in the context
       | test2    | value2 |
 
   Scenario Template: we can write to and read from files
-    Given that we output in "<path>":
+    Given that dateAppendedFilePath is:
+    """
+    <path>-{{{[@now as a formatted date YYYY-MM-dd'T'HH_mm_ss]}}}
+    """
+    Given that we output in "{{{dateAppendedFilePath}}}":
       """yml
       id: 1
       name: bob
       """
-    When bob is "{{{[&<path>]}}}"
+    When bob is "{{{[&dateAppendedFilePath]}}}"
     Then bob is equal to:
       """yml
       id: 1
@@ -931,14 +935,15 @@ Feature: to interact with objects in the context
       message: another message
     """
 
-  Scenario: dot notation should not take dot from timestamp into account
+  Scenario: dot notation should only take dot notation for keys (even if the value contains dots and colons)
     Given that object is:
     """
-    timestamp: '2021-08-01T12:30:00.000+02:00'
+    current_time.timestamp: '2021-08-01T12:30:00.000+02:00'
     """
     Then object is equal to:
     """
-    timestamp: '2021-08-01T10:30:00Z'
+    current_time:
+      timestamp: '2021-08-01T10:30:00Z'
     """
 
   Scenario: contains should work even if an expected with a map is matched against a non-map (empty string for eg.)

tzatziki-mapper/src/main/java/com/decathlon/tzatziki/utils/Mapper.java

@@ -68,7 +68,7 @@ private static String dotNotationToYamlObject(String content) {
         for (int idx = 0; idx < lines.size(); idx++) {
             String line;
             String matchOnlyIfNonRegexFlag = "(?![ \"']*\\?e)";
-            String captureDotNotation = "^(?>([ \\-]*))" + matchOnlyIfNonRegexFlag + "([^.:]+)\\.([\\S ]+:" + matchOnlyIfNonRegexFlag + "[^\\n]*)\\n?";
+            String captureDotNotation = "(?>([ \\-]*))" + matchOnlyIfNonRegexFlag + "([^.:]+)\\.((?>[^:]+)(?<!\\d{4}-\\d{2}-\\d{2}T\\d{2}):" + matchOnlyIfNonRegexFlag + ".*)";
             while ((line = lines.get(idx)).matches(captureDotNotation)) {
                 String rootObjectIndent = line.replaceAll(captureDotNotation, "$1").replace("-", " ");
                 String subObjectIndent = "  " + rootObjectIndent;