From a27ab2b002dd5ba97680d660eb8af5f2060e88e4 Mon Sep 17 00:00:00 2001 From: Vladislav Kasimov Date: Tue, 17 Jan 2023 15:30:10 +0300 Subject: [PATCH 1/2] Deleted `annotationForOuterClasses` --- .../codegen/model/constructor/tree/JsTestFrameworkManager.kt | 2 -- 1 file changed, 2 deletions(-) diff --git a/utbot-js/src/main/kotlin/framework/codegen/model/constructor/tree/JsTestFrameworkManager.kt b/utbot-js/src/main/kotlin/framework/codegen/model/constructor/tree/JsTestFrameworkManager.kt index a65887abd2..dfdaac38d4 100644 --- a/utbot-js/src/main/kotlin/framework/codegen/model/constructor/tree/JsTestFrameworkManager.kt +++ b/utbot-js/src/main/kotlin/framework/codegen/model/constructor/tree/JsTestFrameworkManager.kt @@ -44,8 +44,6 @@ class MochaManager(context: CgContext) : TestFrameworkManager(context) { get() = TODO("Not yet implemented") override val annotationForNestedClasses: CgAnnotation get() = TODO("Not yet implemented") - override val annotationForOuterClasses: CgAnnotation - get() = TODO("Not yet implemented") override fun assertEquals(expected: CgValue, actual: CgValue) { +assertions[jsAssertEquals](expected, actual) From 193b8122112bc434f4d134ebe672d907ddc20727 Mon Sep 17 00:00:00 2001 From: Vladislav Kasimov Date: Tue, 17 Jan 2023 15:39:13 +0300 Subject: [PATCH 2/2] Fixed `UtContext` error for JS --- utbot-js/src/main/kotlin/framework/api/js/JsApi.kt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/utbot-js/src/main/kotlin/framework/api/js/JsApi.kt b/utbot-js/src/main/kotlin/framework/api/js/JsApi.kt index aca05e313e..0ff3b928cb 100644 --- a/utbot-js/src/main/kotlin/framework/api/js/JsApi.kt +++ b/utbot-js/src/main/kotlin/framework/api/js/JsApi.kt @@ -1,12 +1,12 @@ package framework.api.js -import java.lang.reflect.Modifier +import framework.api.js.util.toJsClassId import org.utbot.framework.plugin.api.ClassId import org.utbot.framework.plugin.api.ConstructorId import org.utbot.framework.plugin.api.MethodId import org.utbot.framework.plugin.api.UtModel -import framework.api.js.util.toJsClassId import org.utbot.framework.plugin.api.primitiveModelValueToClassId +import java.lang.reflect.Modifier open class JsClassId( private val jsName: String, @@ -19,6 +19,9 @@ open class JsClassId( override val simpleName: String get() = jsName + override val simpleNameWithEnclosingClasses: String + get() = jsName + override val allMethods: Sequence get() = methods @@ -119,4 +122,4 @@ data class JsPrimitiveModel( } private fun jsPrimitiveModelValueToClassId(value: Any) = - primitiveModelValueToClassId(value).toJsClassId() \ No newline at end of file + primitiveModelValueToClassId(value).toJsClassId()