Merged in COM-19 (pull request #3)

COM-19 Approved-by: Stanislav Doroshin <stanislav.doroshin@bsc-ideas.com>
BSC-RUS · Nov 1, 2017 · d32c27e · d32c27e
2 parents 065b360 + 0a6c824
commit d32c27e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/main/java/ru/bsc/test/at/executor/service/AtExecutor.java b/src/main/java/ru/bsc/test/at/executor/service/AtExecutor.java
@@ -258,6 +258,10 @@ private void executeTestStep(WireMockAdmin wireMockAdmin, Connection connection,
         // 4.1 Проверить сохраненные значения
         for(Map.Entry<String, String> entry: step.getSavedValuesCheck().entrySet()) {
             String valueExpected = entry.getValue() == null ? "" : entry.getValue();
+            for (Map.Entry<String, String> savedVal : savedValues.entrySet()) {
+                String key = String.format("%%%s%%", savedVal.getKey());
+                valueExpected = valueExpected.replaceAll(key, savedVal.getValue());
+            }
             String valueActual = savedValues.get(entry.getKey());
             if (!valueExpected.equals(valueActual)) {
                 throw new Exception("Saved value " + entry.getKey() + " = " + valueActual + ". Expected: " + valueExpected);

diff --git a/src/main/java/ru/bsc/test/at/executor/validation/IgnoringComparator.java b/src/main/java/ru/bsc/test/at/executor/validation/IgnoringComparator.java
@@ -1,7 +1,6 @@
 package ru.bsc.test.at.executor.validation;
 
 import org.json.JSONException;
-import org.json.JSONObject;
 import org.skyscreamer.jsonassert.JSONCompareMode;
 import org.skyscreamer.jsonassert.JSONCompareResult;
 import org.skyscreamer.jsonassert.comparator.DefaultComparator;