Fix JS tests

JetBrains · Dec 19, 2023 · 8c471fd · 8c471fd
1 parent 9102345
commit 8c471fd
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/src/main/kotlin/com/compiler/server/compiler/components/CliUtils.kt b/src/main/kotlin/com/compiler/server/compiler/components/CliUtils.kt
@@ -73,7 +73,7 @@ fun <T> CLICompiler<*>.tryCompilation(inputDirectory: Path, inputFiles: List<Pat
       val messageSeverity: ProjectSeveriry = when (severity) {
         EXCEPTION, ERROR -> ProjectSeveriry.ERROR
         STRONG_WARNING, WARNING -> ProjectSeveriry.WARNING
-        INFO, LOGGING, OUTPUT -> ProjectSeveriry.INFO
+        INFO, LOGGING, OUTPUT -> return ""
       }
       val errorFilePath = location?.path?.let(::Path)?.outputFilePathString() ?: defaultFileName
 

diff --git a/src/main/kotlin/com/compiler/server/model/ExecutionResult.kt b/src/main/kotlin/com/compiler/server/model/ExecutionResult.kt
@@ -60,6 +60,7 @@ abstract class TranslationResultWithJsCode(
 data class TranslationJSResult(
   override val jsCode: String? = null,
   override var exception: ExceptionDescriptor? = null,
+  @field:JsonProperty("errors")
   override var compilerDiagnostics: CompilerDiagnostics = CompilerDiagnostics()
 ) : TranslationResultWithJsCode(jsCode, compilerDiagnostics, exception)
 
@@ -69,13 +70,15 @@ data class TranslationWasmResult(
   val wasm: ByteArray,
   val wat: String?,
   override var exception: ExceptionDescriptor? = null,
+  @field:JsonProperty("errors")
   override var compilerDiagnostics: CompilerDiagnostics = CompilerDiagnostics()
 ) : TranslationResultWithJsCode(jsCode, compilerDiagnostics, exception)
 
 @JsonInclude(JsonInclude.Include.NON_EMPTY)
 class JunitExecutionResult(
   val testResults: Map<String, List<TestDescription>> = emptyMap(),
   override var exception: ExceptionDescriptor? = null,
+  @field:JsonProperty("errors")
   override var compilerDiagnostics: CompilerDiagnostics = CompilerDiagnostics()
 ) : ExecutionResult(compilerDiagnostics, exception)
 

diff --git a/src/main/kotlin/com/compiler/server/service/KotlinProjectExecutor.kt b/src/main/kotlin/com/compiler/server/service/KotlinProjectExecutor.kt
@@ -63,10 +63,6 @@ class KotlinProjectExecutor(
       }
     }
   }
-
-  private fun CompilerDiagnostics.withoutInfoDiagnostics() = CompilerDiagnostics(
-    map.mapValues { (_, l) -> l.filter { it.severity != ProjectSeveriry.INFO } }.filterValues { it.isNotEmpty() }
-  )
 
   fun highlight(project: Project): CompilerDiagnostics = try {
     when (project.confType) {
@@ -77,7 +73,7 @@ class KotlinProjectExecutor(
   } catch (e: Exception) {
     log.warn("Exception in getting highlight. Project: $project", e)
     CompilerDiagnostics(emptyMap())
-  }.withoutInfoDiagnostics()
+  }
 
   fun getVersion() = version