Merge pull request #6 from koperagen/test-results

Hack for displaying snippet outputs in dataframe project
devcrocod · May 2, 2023 · 4ff4199 · 4ff4199
2 parents 2dd5d55 + f078a62
commit 4ff4199
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 4 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -6,3 +6,4 @@ kotlin_version=1.8.20
 language_version=1.8
 dokka_version=1.8.10
 pluginPublishVersion=0.15.0
+org.gradle.jvmargs=-Xmx2G
diff --git a/src/main/kotlin/io/github/devcrocod/korro/Korro.kt b/src/main/kotlin/io/github/devcrocod/korro/Korro.kt
@@ -32,7 +32,7 @@ fun KorroContext.korro(inputFile: File): Boolean {
             it + funName
         }
         val newSamplesLines = functionNames.firstNotNullOfOrNull { name -> // TODO: can be improved
-            val text = samplesTransformer(name) ?: groups.firstNotNullOfOrNull { group ->
+            var text = samplesTransformer(name) ?: groups.firstNotNullOfOrNull { group ->
                 group.patterns.mapNotNull { pattern ->
                     samplesTransformer(name + pattern.nameSuffix)?.let {
                         group.beforeSample?.let { pattern.processSubstitutions(it) } + it +
@@ -44,6 +44,12 @@ fun KorroContext.korro(inputFile: File): Boolean {
                     postfix = group.afterGroup ?: ""
                 )
             }
+
+            val output = outputsMap[name]
+            if (text != null && output != null) {
+                text += output.readText()
+            }
+
             text?.split("\n")?.plus(END_SAMPLE) //?: oldSampleLines
         }
         if (newSamplesLines == null) {
@@ -136,6 +142,7 @@ fun KorroContext.korroClean(inputFile: File): Boolean {
                         when(nextDir?.name) {
                             END_DIRECTIVE -> {
                                 oldSampleLines.add(sampleLine)
+                                lines.add(sampleLine)
                                 break
                             }
                             EOF, FUN_DIRECTIVE -> {

diff --git a/src/main/kotlin/io/github/devcrocod/korro/KorroAction.kt b/src/main/kotlin/io/github/devcrocod/korro/KorroAction.kt
@@ -9,6 +9,7 @@ import java.io.File
 interface KorroParameters : WorkParameters {
     var docs: Set<File>
     var samples: Set<File>
+    var outputs: Set<File>
     var groups: List<SamplesGroup>
     var name: String
 }
@@ -20,7 +21,7 @@ abstract class KorroAction : WorkAction<KorroParameters> {
 
     override fun execute() {
         ext.groups.addAll(parameters.groups)
-        val ctx = ext.createContext(parameters.docs, parameters.samples)
+        val ctx = ext.createContext(parameters.docs, parameters.samples, parameters.outputs)
 
         //TODO - check missing files!
 
@@ -41,7 +42,7 @@ abstract class KorroCleanAction : WorkAction<KorroParameters> {
     abstract val ext: KorroExtension
 
     override fun execute() {
-        val ctx = ext.createContext(parameters.docs, parameters.samples)
+        val ctx = ext.createContext(parameters.docs, parameters.samples, parameters.outputs)
 
         if (!ctx.processClean()) {
             val extra = if (ctx.logger.nOutdated > 0)

diff --git a/src/main/kotlin/io/github/devcrocod/korro/KorroContext.kt b/src/main/kotlin/io/github/devcrocod/korro/KorroContext.kt
@@ -7,11 +7,13 @@ class KorroContext(
     val logger: KorroLog,
     docs: Collection<File>,
     samples: Collection<File>,
+    outputs: Collection<File>,
     val groups: List<SamplesGroup>
 ) {
     // state
     val fileQueue = ArrayDeque(docs)
     val sampleSet = HashSet(samples)
+    val outputsMap = outputs.associateBy { it.name }
 }
 
 fun KorroContext.process(): Boolean {

diff --git a/src/main/kotlin/io/github/devcrocod/korro/KorroExtension.kt b/src/main/kotlin/io/github/devcrocod/korro/KorroExtension.kt
@@ -48,6 +48,7 @@ abstract class GroupSamplesApi {
 abstract class KorroExtension {
     var docs: FileCollection? = null
     var samples: FileCollection? = null
+    var outputs: FileCollection? = null
 
     internal val groups = mutableListOf<SamplesGroup>()
 
@@ -61,10 +62,11 @@ abstract class KorroExtension {
         groups.add(group)
     }
 
-    fun createContext(docs: Collection<File>, samples: Collection<File>) = KorroContext(
+    fun createContext(docs: Collection<File>, samples: Collection<File>, outputs: Collection<File>) = KorroContext(
         logger = LoggerLog(),
         docs = docs,
         samples = samples,
+        outputs = outputs,
         groups = groups
     )
 }
diff --git a/src/main/kotlin/io/github/devcrocod/korro/KorroTask.kt b/src/main/kotlin/io/github/devcrocod/korro/KorroTask.kt
@@ -43,6 +43,8 @@ private interface KorroTasksCommon {
 
     var samples: FileCollection
 
+    var outputs: FileCollection
+
     @get:Internal
     val groups: List<SamplesGroup>
 
@@ -53,6 +55,7 @@ private interface KorroTasksCommon {
         workQueue.submit(clazz) {
             it.docs = docs.files
             it.samples = samples.files
+            it.outputs = outputs.files
             it.groups = groups
             it.name = nameReference
         }
@@ -73,6 +76,9 @@ abstract class KorroTask : DefaultTask(), KorroTasksCommon {
         it.include("**/*.kt")
     }
 
+    @InputFiles
+    override var outputs: FileCollection = ext.outputs ?: project.files()
+
     @get:Internal
     override val groups: List<SamplesGroup> = ext.groups
 
@@ -103,6 +109,9 @@ abstract class KorroCleanTask : Delete(), KorroTasksCommon {
         it.include("**/*.kt")
     }
 
+    @InputFiles
+    override var outputs: FileCollection = ext.outputs ?: project.files()
+
     @get:Internal
     override val groups: List<SamplesGroup> = ext.groups