Support four types of json comparisons: compatible-structure, exact-s…

…tructure, compatible and exact
intact-software-systems · Dec 23, 2022 · fb35098 · fb35098
1 parent 9accba7
commit fb35098
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/src/compareJson.js b/src/compareJson.js
@@ -216,39 +216,39 @@ function isJsonStructureCompatible(expected, actual) {
         : isCompatibleObjects(expected, actual, false, false)
 }
 
-function isJsonStructureExact(expected, actual) {
-    return Array.isArray(expected)
-        ? isCompatibleArrays(expected, actual, false, true)
-        : isCompatibleObjects(expected, actual, false, true)
-}
-
 function isJsonCompatible(expected, actual) {
     return Array.isArray(expected)
         ? isCompatibleArrays(expected, actual, true, false)
         : isCompatibleObjects(expected, actual, true, false)
 }
 
+function isJsonStructureExact(expected, actual) {
+    return Array.isArray(expected)
+        ? isCompatibleArrays(expected, actual, false, true)
+        : isCompatibleObjects(expected, actual, false, true)
+}
+
 function isJsonIdentical(expected, actual) {
     return Array.isArray(expected)
         ? isCompatibleArrays(expected, actual, true, true)
         : isCompatibleObjects(expected, actual, true, true)
 }
 
 export const COMPARISON = {
-    STRUCTURE: 'structure',
-    EXACT_STRUCTURE: 'exact-structure',
+    COMPATIBLE_STRUCTURE: 'compatible-structure',
     COMPATIBLE: 'compatible',
+    EXACT_STRUCTURE: 'exact-structure',
     EXACT: 'exact'
 }
 
 export function compareJson(expected, actual, comparison) {
     switch (comparison.toLowerCase()) {
-        case COMPARISON.STRUCTURE:
+        case COMPARISON.COMPATIBLE_STRUCTURE:
             return isJsonStructureCompatible(expected, actual)
-        case COMPARISON.EXACT_STRUCTURE:
-            return isJsonStructureExact(expected, actual)
         case COMPARISON.COMPATIBLE:
             return isJsonCompatible(expected, actual)
+        case COMPARISON.EXACT_STRUCTURE:
+            return isJsonStructureExact(expected, actual)
         case COMPARISON.EXACT:
             return isJsonIdentical(expected, actual)
         default:

diff --git a/src/execute-black-box.js b/src/execute-black-box.js
@@ -208,7 +208,7 @@ function executeInteraction(interactionWithConfig) {
 export function executeBlackBox(interactions, index) {
     const executeNext = interactionData => {
         const data = {
-            [interactionData.name + '-' + index]: interactionData
+            [interactionData.name + '-' + (index + 1)]: interactionData
         }
 
         if (interactionData.status === FAILURE) {