Ft/better dot notation (#113)

* fix: timestamp issue with dot notation

Author: brian-mulier

tzatziki-common/src/main/java/com/decathlon/tzatziki/utils/Asserts.java

@@ -112,10 +112,15 @@ private static void equals(String actual, String expected) {
             case "is" -> Mapper.read(actual, TypeParser.parse(stripped(expected)));
             case "ignore" -> {} // ignore the value
             default -> {
-                if (actual.matches("^\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}(?:\\.?|\\.\\d*)Z?$")) {
-                    if (actual.endsWith("Z")) assertEquals(Instant.parse(expected), Instant.parse(actual));
-                    else assertEquals(Instant.parse(expected + "Z"), Instant.parse(actual + "Z"));
-                } else {assertEquals(expected, actual);}
+                Matcher instantMatcher = Pattern.compile("^\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}(?:\\.\\d*)?(\\+\\d+:\\d+|Z)?$").matcher(actual);
+
+                if (instantMatcher.matches()) {
+                    if (instantMatcher.group(1) == null){
+                        expected += "Z";
+                        actual += "Z";
+                    }
+                    assertEquals(Instant.parse(expected), Instant.parse(actual));
+                } else assertEquals(expected, actual);
             }
         }
     }

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

@@ -931,6 +931,16 @@ Feature: to interact with objects in the context
       message: another message
     """
 
+  Scenario: dot notation should not take dot from timestamp into account
+    Given that object is:
+    """
+    timestamp: '2021-08-01T12:30:00.000+02:00'
+    """
+    Then object is equal to:
+    """
+    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.)
     Given that aList is a List<Map>:
     """

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 + "([^.:]+)\\.([\\S ]+:" + matchOnlyIfNonRegexFlag + "[^\\n]*)\\n?";
             while ((line = lines.get(idx)).matches(captureDotNotation)) {
                 String rootObjectIndent = line.replaceAll(captureDotNotation, "$1").replace("-", " ");
                 String subObjectIndent = "  " + rootObjectIndent;