Merge remote-tracking branch 'origin/get_configuration_dynamically' i…

…nto get_configuration_dynamically # Conflicts: # src/main/kotlin/com/featurevisor/testRunner/TestExecuter.kt # src/main/kotlin/com/featurevisor/testRunner/TestSegment.kt
featurevisor · Aug 5, 2024 · a9da128 · a9da128
2 parents 9116ace + b96d9a5
commit a9da128
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/main/kotlin/com/featurevisor/testRunner/TestExecuter.kt b/src/main/kotlin/com/featurevisor/testRunner/TestExecuter.kt
@@ -45,12 +45,12 @@ fun startTest(option: TestProjectOption) {
                                 continue
                             }
 
-                        if (executionResult.passed) {
-                            passedTestsCount++
-                        } else {
-                            hasError = true
-                            failedTestsCount++
-                        }
+                    if (executionResult.passed) {
+                        passedTestsCount++
+                    } else {
+                        hasError = true
+                        failedTestsCount++
+                    }
 
                         passedAssertionsCount += executionResult.assertionsCount.passed
                         failedAssertionsCount += executionResult.assertionsCount.failed

diff --git a/src/main/kotlin/com/featurevisor/testRunner/TestSegment.kt b/src/main/kotlin/com/featurevisor/testRunner/TestSegment.kt
@@ -34,8 +34,8 @@ fun testSegment(testSegment: TestSegment,configuration: Configuration,option: Te
             }
 
             val yamlSegment = parseYamlSegment("${configuration.segmentsDirectoryPath}/$segmentKey.yml")
-            val expected = assertion.expectedToMatch
-            val actual = segmentIsMatched(yamlSegment!!, assertion.context)
+            val expected = it.expectedToMatch
+            val actual = segmentIsMatched(yamlSegment!!, it.context)
             val passed = actual == expected
 
             if (!passed) {