Don't look for _examples if we are only validating inline examples

znsio · Sep 18, 2024 · 54de424 · 54de424
1 parent 971ff21
commit 54de424
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/application/src/main/kotlin/application/ExamplesCommand.kt b/application/src/main/kotlin/application/ExamplesCommand.kt
@@ -101,13 +101,7 @@ class ExamplesCommand : Callable<Unit> {
                     exitProcess(1)
                 }
             } else {
-                val examplesDir = contractFile.absoluteFile.parentFile.resolve(contractFile.nameWithoutExtension + "_examples")
-                if (!examplesDir.isDirectory) {
-                    logger.log("$examplesDir does not exist, did not find any files to validate")
-                    exitProcess(1)
-                }
-
-                val (internalResult, externalResults) = ExamplesInteractiveServer.validateAll(contractFile, examplesDir)
+                val (internalResult, externalResults) = ExamplesInteractiveServer.validateAll(contractFile)
 
                 val hasFailures = internalResult is Result.Failure || externalResults?.any { it.value is Result.Failure } == true
 

diff --git a/core/src/main/kotlin/io/specmatic/core/examples/server/ExamplesInteractiveServer.kt b/core/src/main/kotlin/io/specmatic/core/examples/server/ExamplesInteractiveServer.kt
@@ -342,7 +342,7 @@ class ExamplesInteractiveServer(
             return file.absolutePath
         }
 
-        fun validateAll(contractFile: File, examplesDir: File): Pair<Result?, Map<String, Result>?> {
+        fun validateAll(contractFile: File): Pair<Result?, Map<String, Result>?> {
             val feature = parseContractFileToFeature(contractFile)
 
             val (validateInline, validateExternal) = if(!Flags.getBooleanValue("VALIDATE_INLINE_EXAMPLES") && !Flags.getBooleanValue("IGNORE_INLINE_EXAMPLES")) {
@@ -356,8 +356,16 @@ class ExamplesInteractiveServer(
                 validateInlineExamples(feature)
             } else null
 
-            val externalResult = if(validateExternal)
+            val externalResult = if(validateExternal) {
+                val examplesDir =
+                    contractFile.absoluteFile.parentFile.resolve(contractFile.nameWithoutExtension + "_examples")
+                if (!examplesDir.isDirectory) {
+                    logger.log("$examplesDir does not exist, did not find any files to validate")
+                    exitProcess(1)
+                }
+
                 validateExternalExamples(examplesDir, feature)
+            }
             else null
 
             return inlineResult to externalResult