Add output limits.

cs125-illinois · Sep 14, 2022 · 21e9a08 · 21e9a08
1 parent e4e120f
commit 21e9a08
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 36 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -4,14 +4,14 @@ import java.util.Properties
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 group = "com.github.cs125-illinois"
-version = "2022.9.0"
+version = "2022.9.1"
 
 plugins {
     kotlin("jvm") version "1.7.10"
     java
     `maven-publish`
 
-    id("org.jmailen.kotlinter") version "3.11.1"
+    id("org.jmailen.kotlinter") version "3.12.0"
     checkstyle
     id("com.github.sherter.google-java-format") version "0.9"
 

diff --git a/src/main/kotlin/InputOutput.kt b/src/main/kotlin/InputOutput.kt
@@ -17,6 +17,7 @@ data class CapturedResult(
     val stderr: String,
     val stdin: String,
     val interleavedInputOutput: String,
+    val truncatedLines: Int,
     val tag: Any? = null
 )
 
@@ -94,6 +95,7 @@ fun defaultCaptureOutputControlInput(stdin: List<String> = listOf(), run: () ->
             divertedStdout.stream.toString(),
             divertedStderr.stream.toString(),
             stdinBytes.toByteArray().decodeToString(),
-            ioBytes.toByteArray().decodeToString()
+            ioBytes.toByteArray().decodeToString(),
+            0
         )
     }
diff --git a/src/main/kotlin/Solution.kt b/src/main/kotlin/Solution.kt
@@ -68,6 +68,7 @@ class Solution(val solution: Class<*>) {
                         executable.returnType.getArrayDimension() == 1
                     )
                 )
+
             else -> designError("Unexpected executable type")
         }
     }.toSet()
@@ -284,39 +285,44 @@ class Solution(val solution: Class<*>) {
             } else if (settings.receiverCount != -1) {
                 val methodCount = settings.totalTestCount - (settings.receiverCount * Settings.DEFAULT_RECEIVER_RETRIES)
                 settings.copy(methodCount = methodCount)
-            } else if (settings.methodCount != -1) {
-                val receiverCount = (
-                    (settings.totalTestCount - settings.methodCount).toDouble() /
-                        Settings.DEFAULT_RECEIVER_RETRIES.toDouble()
-                    ).toInt()
-                settings.copy(receiverCount = receiverCount)
             } else {
-                val receiverCount = if (skipReceiver) {
-                    0
-                } else if (fauxStatic) {
-                    1
+                if (settings.methodCount != -1) {
+                    val receiverCount = (
+                        (settings.totalTestCount - settings.methodCount).toDouble() /
+                            Settings.DEFAULT_RECEIVER_RETRIES.toDouble()
+                        ).toInt()
+                    settings.copy(receiverCount = receiverCount)
                 } else {
-                    (
-                        (defaultReceiverCount.toDouble() / defaultTotalCount.toDouble()) *
-                            settings.totalTestCount
-                        ).toInt().coerceAtLeast(
-                        if (testingEquals) {
-                            defaultReceiverCount
-                        } else {
-                            2
-                        }
-                    )
-                }
-                val methodCount =
-                    (settings.totalTestCount - (receiverCount * Settings.DEFAULT_RECEIVER_RETRIES)).coerceAtLeast(
-                        settings.totalTestCount / 2
-                    )
-                settings.copy(methodCount = methodCount, receiverCount = receiverCount)
-            }.let {
-                if (it.totalTestCount == -1) {
-                    it.copy(totalTestCount = it.methodCount + (it.receiverCount * Settings.DEFAULT_RECEIVER_RETRIES))
-                } else {
-                    it
+                    val receiverCount = if (skipReceiver) {
+                        0
+                    } else if (fauxStatic) {
+                        1
+                    } else {
+                        (
+                            (defaultReceiverCount.toDouble() / defaultTotalCount.toDouble()) *
+                                settings.totalTestCount
+                            ).toInt().coerceAtLeast(
+                            if (testingEquals) {
+                                defaultReceiverCount
+                            } else {
+                                2
+                            }
+                        )
+                    }
+                    val methodCount =
+                        (settings.totalTestCount - (receiverCount * Settings.DEFAULT_RECEIVER_RETRIES)).coerceAtLeast(
+                            settings.totalTestCount / 2
+                        )
+                    settings.copy(methodCount = methodCount, receiverCount = receiverCount)
+                }.let {
+                    if (it.totalTestCount == -1) {
+                        it.copy(
+                            totalTestCount =
+                            it.methodCount + (it.receiverCount * Settings.DEFAULT_RECEIVER_RETRIES)
+                        )
+                    } else {
+                        it
+                    }
                 }
             }
         }.also {
@@ -404,7 +410,8 @@ class Solution(val solution: Class<*>) {
                 "Couldn't find field ${field.name} on alternate solution"
             }
 
-            val (firstValue, secondValue) = @Suppress("TooGenericExceptionCaught") try {
+            val (firstValue, secondValue) = @Suppress("TooGenericExceptionCaught")
+            try {
                 Pair(field.get(null), otherField.get(null))
             } catch (e: Exception) {
                 error("Retrieving field ${field.name} failed: $e")
@@ -496,6 +503,7 @@ fun String.toKotlinType() = when {
         }
         name
     }
+
     else -> this
 }
 
@@ -619,8 +627,10 @@ fun compareReturn(
         submissionReturn.isArray &&
         submissionReturn.getArrayType() == submission &&
         solutionReturn.getArrayDimension() == submissionReturn.getArrayDimension() -> true
+
     solutionReturn is TypeVariable<*> && submissionReturn is TypeVariable<*> ->
         solutionReturn.bounds.contentEquals(submissionReturn.bounds)
+
     else -> false
 }
 
@@ -643,6 +653,7 @@ fun compareParameters(
                     submissionType.rawType == solutionType -> {
                     submissionType.actualTypeArguments.all { it is Any }
                 }
+
                 submission.isKotlin() && solutionType is ParameterizedType && submissionType is ParameterizedType &&
                     solutionType.rawType == submissionType.rawType -> {
                     var matches = true
@@ -666,6 +677,7 @@ fun compareParameters(
                     }
                     matches
                 }
+
                 else -> false
             }
         }

diff --git a/src/main/kotlin/Testing.kt b/src/main/kotlin/Testing.kt
@@ -27,6 +27,7 @@ data class Result<T, P : ParameterGroup>(
     @JvmField val stderr: String,
     @JvmField val stdin: String,
     @JvmField val interleavedOutput: String,
+    @JvmField val truncatedLines: Int,
     @JvmField val tag: Any?,
     @JvmField val modifiedParameters: Boolean
 ) {
@@ -43,6 +44,7 @@ data class Result<T, P : ParameterGroup>(
         capturedResult.stderr,
         capturedResult.stdin,
         capturedResult.interleavedInputOutput,
+        capturedResult.truncatedLines,
         capturedResult.tag,
         modifiedParameters
     )

diff --git a/src/main/resources/edu.illinois.cs.cs125.jenisol.core.version b/src/main/resources/edu.illinois.cs.cs125.jenisol.core.version
@@ -1 +1 @@
-version=2022.9.0
+version=2022.9.1