Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
112 commits
Select commit Hold shift + click to select a range
9fcf5c0
UTBotFamily
denis-fokin Oct 5, 2022
eee8f85
Add CodeGenLanguage.id
tamarinvs19 Oct 5, 2022
08ccb65
Update Renderers
tamarinvs19 Oct 5, 2022
301f2d5
Move codeGenLanguage to CgRenderContext
tamarinvs19 Oct 5, 2022
ddc57d9
Add init to CodeLanguage
tamarinvs19 Oct 5, 2022
8086a63
UTBotFamily
denis-fokin Oct 5, 2022
0708155
Fix after merge bugs
tamarinvs19 Oct 5, 2022
64ade72
Fix bug with variableConstructors and remove ExecutionStateAnalyzer from
tamarinvs19 Oct 6, 2022
50c9a57
Update generated_tests__dicts
tamarinvs19 Oct 6, 2022
6a6a337
Change targetCompatibility verstion
tamarinvs19 Oct 6, 2022
9e9725c
Refactor js
tamarinvs19 Oct 6, 2022
8a53d09
Fix PycharmUltimate code and uncomment js
tamarinvs19 Oct 6, 2022
8abe0b7
Fix Windows symbols problem
tamarinvs19 Oct 6, 2022
542aeae
Disable runIde tasks in modules where we need only Idea sdk dependencies
denis-fokin Oct 6, 2022
ee45191
Merge actual UTBot Go, set up and fix its CLI
GlebSolovev Oct 4, 2022
e44813d
Improve requirements description for UTBot Go
GlebSolovev Oct 4, 2022
a3ad833
Merge UTBot Go IntelliJ plugin support
tamarinvs19 Oct 7, 2022
a7b8d25
Fix Go
tamarinvs19 Oct 7, 2022
8def007
New file chooser in Python plugin
tochilinak Oct 7, 2022
0af38e8
Fixed bug in Python cli
tochilinak Oct 7, 2022
14ff580
Refactored Slava's CodegenLanguage
zishkaz Oct 7, 2022
d8328e2
disable go runIde
Markoutte Oct 10, 2022
8a91164
Change "\\" to File.separator
tamarinvs19 Oct 10, 2022
14ccaf6
Add relation sys.path support
tamarinvs19 Oct 10, 2022
894707b
Change cli result output
tamarinvs19 Oct 10, 2022
78e8f9d
[WIP] Linux cmd possible fix
rudolf101 Oct 11, 2022
99c5d8b
[WIP] universal JsCmdExec implementation
zishkaz Oct 14, 2022
e6b0168
Moved OsProvider for a wider access scope
zishkaz Oct 14, 2022
299452d
Getting node and npm from IDEA settings
zishkaz Oct 14, 2022
ba23868
JsDynamicSettings added
zishkaz Oct 14, 2022
4b3fb14
[WIP] Added nyc path field to dialog window
rudolf101 Oct 14, 2022
079e8d0
New js coverage algo implementation
zishkaz Oct 16, 2022
319bc54
Added nyc path field into dialog window
rudolf101 Oct 17, 2022
54f079c
Update samples
tamarinvs19 Oct 17, 2022
ff1b093
Added replace separator in Nyc validation
rudolf101 Oct 18, 2022
9ed03f0
Added new options to js CLI and fixed exports managers
zishkaz Oct 18, 2022
074d0d1
Fix after rebase problems
tamarinvs19 Oct 19, 2022
b11718f
Fixed js samples and help tips in js CLI
zishkaz Oct 19, 2022
18f514f
Fixed js exports managers regexes
zishkaz Oct 19, 2022
eae8efe
Move language-specific UtModels to utbo-<lang> and remove CodegenLang…
tamarinvs19 Oct 20, 2022
d99deb9
Fix cli bug
tamarinvs19 Oct 20, 2022
e74317f
Simle style fix
tamarinvs19 Oct 20, 2022
3887c93
Moved test directory chooser to ui-commons and fixed graal error
zishkaz Oct 20, 2022
1247455
Removing go from pr branch
zishkaz Oct 24, 2022
037098f
Added gitignore file for js samples
zishkaz Oct 24, 2022
97f4d6a
Fix changes
tamarinvs19 Oct 24, 2022
7688990
Fix testClassName bug
tamarinvs19 Oct 25, 2022
29180b9
Rebase FileUtil.kt onto main
tamarinvs19 Oct 26, 2022
3129d70
Rebase files onto main
tamarinvs19 Oct 26, 2022
0152df5
Remove internal UtilMethodProvider
tamarinvs19 Oct 26, 2022
84ec8fc
Rebase onto main
tamarinvs19 Oct 26, 2022
b24caf9
Update language settings
tamarinvs19 Oct 26, 2022
fc52711
Merge branch 'main' into tamarinvs19/UnitTestBot_Family_PR
tamarinvs19 Oct 26, 2022
52085ec
Update gradle files
tamarinvs19 Oct 26, 2022
eba7d57
Fix js npm path and nyc validator for linux
tamarinvs19 Oct 26, 2022
be1adc7
Add conditions for ideType
tamarinvs19 Oct 26, 2022
f997039
Merge branch 'main' into tamarinvs19/UnitTestBot_Family_PR
tamarinvs19 Oct 26, 2022
9e0b25a
Update ide settings
tamarinvs19 Oct 26, 2022
83a9dcd
Add docs page about IDE
tamarinvs19 Oct 26, 2022
fcca3bf
Add docs link
tamarinvs19 Oct 26, 2022
f21a1cb
Fix Coverage error
tamarinvs19 Oct 26, 2022
2d7d817
Merge branch 'main' into tamarinvs19/UnitTestBot_Family_PR
tamarinvs19 Oct 26, 2022
05af2c5
Rebase onto main
tamarinvs19 Oct 26, 2022
68c5d7d
Merge branch 'main' into tamarinvs19/UnitTestBot_Family_PR
tamarinvs19 Oct 26, 2022
92f6f72
Rebase onto main
tamarinvs19 Oct 26, 2022
55c278b
Merge branch 'main' into tamarinvs19/UnitTestBot_Family_PR
tamarinvs19 Oct 27, 2022
1f1b016
Rebase onto main
tamarinvs19 Oct 27, 2022
1d5b379
Make GgGetClass sealed
tamarinvs19 Oct 27, 2022
3d98f82
Fix deprecated showYesNoDialog and ProjectFileIndex.SERVICE
tamarinvs19 Oct 27, 2022
dc242fe
Change IU to IC
tamarinvs19 Oct 27, 2022
bdd4442
Remove open from ClassId.elementClassId
tamarinvs19 Oct 27, 2022
c7b69a1
Code style refactoring
tamarinvs19 Oct 27, 2022
4432359
Add file with changes description
tamarinvs19 Oct 27, 2022
284928b
Update gitignores
tamarinvs19 Oct 27, 2022
7ee92d1
Remove com.jetbrains.intellij.idea:ideaIC dependency
tamarinvs19 Oct 27, 2022
67b9fe0
Change IU to IC
tamarinvs19 Oct 27, 2022
6d9522a
Added coverage mode buttons | JS
rudolf101 Oct 27, 2022
54faab1
Update CLI docs
rudolf101 Oct 28, 2022
5a50a55
Fixed JS basic coverage service algo
zishkaz Oct 28, 2022
60e96e9
Fixes JsConstantsModelProvider after master merge
zishkaz Oct 28, 2022
972607e
Removed unnecessary check for Mocha framework that failed in built pl…
zishkaz Oct 28, 2022
05d7b4e
Removed lateinit modifier
zishkaz Oct 28, 2022
f578890
Removed export statements from js samples
zishkaz Oct 28, 2022
f8f064a
Merge branch 'tamarinvs19/UnitTestBot_Family_PR' of https://github.co…
zishkaz Oct 28, 2022
aa4c1a8
Fix in Python CLI
tochilinak Oct 28, 2022
3409678
JS cli naming fix
zishkaz Oct 31, 2022
289b6b9
Rename python cli class
tamarinvs19 Oct 31, 2022
5f205e3
Move comment line in CodeGeneratorResult
tamarinvs19 Oct 31, 2022
ec8f1dd
Remove jClass from python/js branch
tamarinvs19 Oct 31, 2022
d66c1ba
Merge branch 'main' into tamarinvs19/UnitTestBot_Family_PR
tamarinvs19 Oct 31, 2022
6295f85
Reworked text annotations in Mocha object
zishkaz Oct 31, 2022
1781fa8
Merge remote-tracking branch 'origin/tamarinvs19/UnitTestBot_Family_P…
zishkaz Oct 31, 2022
d53325b
Remove soot dependency from utbot-python and implement new CgRender m…
tamarinvs19 Oct 31, 2022
18acd32
Merge remote-tracking branch 'origin/tamarinvs19/UnitTestBot_Family_P…
tamarinvs19 Oct 31, 2022
2385dc6
Used withUtContext in JsTestGenerator and reworked Mocha TestFramewor…
zishkaz Oct 31, 2022
20e416a
Locally fixed explicit File.separator replacements
zishkaz Oct 31, 2022
6dff767
Removed unnecessary catch
rudolf101 Nov 1, 2022
766616c
Fix weak comments
rudolf101 Nov 1, 2022
58415b3
Removed unnecessary try catch
rudolf101 Nov 1, 2022
f73d3fd
Merge branch 'main' into tamarinvs19/UnitTestBot_Family_PR
tamarinvs19 Nov 2, 2022
5c9e7fb
Fix CgRenderer bugs after merge
tamarinvs19 Nov 2, 2022
a8d4d92
Merge branch 'main' into tamarinvs19/UnitTestBot_Family_PR
tamarinvs19 Nov 2, 2022
0b66cab
Add README.md to utbot-python-cli
tamarinvs19 Nov 2, 2022
7a8893c
Merge branch 'main' into tamarinvs19/UnitTestBot_Family_PR
tamarinvs19 Nov 3, 2022
98ac84a
JS code refactoring
zishkaz Nov 3, 2022
d0815c8
Merge remote-tracking branch 'origin/tamarinvs19/UnitTestBot_Family_P…
zishkaz Nov 3, 2022
7e16b66
Removed unnecessary JS file parsing
zishkaz Nov 7, 2022
dcfa7eb
Refactor utbot-intellij-python
tamarinvs19 Nov 7, 2022
a781aa9
Refactor utbot-python
tamarinvs19 Nov 7, 2022
9074ed2
Fix "Language <> is disabled" problem from Issue #1329
tamarinvs19 Nov 9, 2022
f9698b3
Merge branch 'main' into tamarinvs19/UnitTestBot_Family_PR
tamarinvs19 Nov 9, 2022
37c9564
Change GenerateTestsModel to BaseTestsModel
tamarinvs19 Nov 9, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Move language-specific UtModels to utbo-<lang> and remove CodegenLang…
…uage.Python and CodegenLanguage.JS
  • Loading branch information
tamarinvs19 committed Oct 20, 2022
commit eae8efef734138f0e9dcc97bb019b5741a15291e
Original file line number Diff line number Diff line change
Expand Up @@ -1248,9 +1248,7 @@ enum class CodegenLanguage(
@Suppress("unused") override val description: String = "Generate unit tests in $displayName"
) : CodeGenerationSettingItem {
JAVA(id = "Java", displayName = "Java"),
KOTLIN(id = "Kotlin", displayName = "Kotlin (experimental)"),
JS(id = "JavaScript", displayName = "JavaScript"),
PYTHON(id = "Python", displayName = "Python");
KOTLIN(id = "Kotlin", displayName = "Kotlin (experimental)");

enum class OperatingSystem {
WINDOWS,
Expand All @@ -1275,21 +1273,18 @@ enum class CodegenLanguage(
get() = when (this) {
JAVA -> listOf(System.getenv("JAVA_HOME"), "bin", "javac")
KOTLIN -> listOf(System.getenv("KOTLIN_HOME"), "bin", kotlinCompiler)
else -> throw UnsupportedOperationException()
}.joinToString(File.separator)

val extension: String
get() = when (this) {
JAVA -> ".java"
KOTLIN -> ".kt"
else -> throw UnsupportedOperationException()
}

val executorInvokeCommand: String
get() = when (this) {
JAVA -> listOf(System.getenv("JAVA_HOME"), "bin", "java")
KOTLIN -> listOf(System.getenv("JAVA_HOME"), "bin", "java")
else -> throw UnsupportedOperationException()
}.joinToString(File.separator)

override fun toString(): String = id
Expand All @@ -1303,7 +1298,6 @@ enum class CodegenLanguage(
).plus(sourcesFiles)

KOTLIN -> listOf("-d", buildDirectory, "-jvm-target", jvmTarget, "-cp", classPath).plus(sourcesFiles)
else -> throw UnsupportedOperationException()
}
if (this == KOTLIN && System.getenv("KOTLIN_HOME") == null) {
throw RuntimeException("'KOTLIN_HOME' environment variable is not defined. Standard location is {IDEA installation dir}/plugins/Kotlin/kotlinc")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,6 @@ abstract class CgAbstractRenderer(
protected open val regionStart: String = "///region"
protected open val regionEnd: String = "///endregion"

protected abstract val language: CodegenLanguage

protected abstract val langPackage: String

// We may render array elements in initializer in one line or in separate lines:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ import org.utbot.framework.codegen.model.util.CgPrinter
import org.utbot.framework.codegen.model.util.CgPrinterImpl
import org.utbot.framework.codegen.model.util.nullLiteral
import org.utbot.framework.plugin.api.ClassId
import org.utbot.framework.plugin.api.CodegenLanguage
import org.utbot.framework.plugin.api.TypeParameters
import org.utbot.framework.plugin.api.util.wrapperByPrimitive

Expand All @@ -56,8 +55,6 @@ internal class CgJavaRenderer(context: CgRendererContext, printer: CgPrinter = C
override val logicalOr: String
get() = "||"

override val language: CodegenLanguage = CodegenLanguage.JAVA

override val langPackage: String = "java.lang"

override fun visit(element: AbstractCgClass<*>) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ import org.utbot.framework.codegen.model.util.CgPrinterImpl
import org.utbot.framework.codegen.model.util.nullLiteral
import org.utbot.framework.plugin.api.BuiltinClassId
import org.utbot.framework.plugin.api.ClassId
import org.utbot.framework.plugin.api.CodegenLanguage
import org.utbot.framework.plugin.api.TypeParameters
import org.utbot.framework.plugin.api.WildcardTypeParameter
import org.utbot.framework.plugin.api.util.id
Expand All @@ -69,8 +68,6 @@ internal class CgKotlinRenderer(context: CgRendererContext, printer: CgPrinter =
override val logicalOr: String
get() = "or"

override val language: CodegenLanguage = CodegenLanguage.KOTLIN

override val langPackage: String = "kotlin"

override fun visit(element: AbstractCgClass<*>) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,6 @@ import kotlin.reflect.KClass
import org.mockito.Mockito
import org.mockito.stubbing.Answer
import org.objectweb.asm.Type
import org.utbot.common.withAccessibility
import org.utbot.framework.plugin.api.go.GoUtModel
import org.utbot.framework.plugin.api.js.JsUtModel
import org.utbot.framework.plugin.api.python.PythonModel
import org.utbot.engine.util.lambda.CapturedArgument
import org.utbot.engine.util.lambda.constructLambda
import org.utbot.engine.util.lambda.constructStaticLambda
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@ package org.utbot.framework.minimization

import org.utbot.framework.UtSettings
import org.utbot.framework.plugin.api.EnvironmentModels
import org.utbot.framework.plugin.api.go.GoUtModel
import org.utbot.framework.plugin.api.js.JsUtModel
import org.utbot.framework.plugin.api.python.PythonModel
import org.utbot.framework.plugin.api.UtArrayModel
import org.utbot.framework.plugin.api.UtAssembleModel
import org.utbot.framework.plugin.api.UtClassRefModel
Expand Down Expand Up @@ -229,9 +226,6 @@ private fun UtModel.calculateSize(used: MutableSet<UtModel> = mutableSetOf()): I
1 + instantiationCall.calculateSize(used) + modificationsChain.sumOf { it.calculateSize(used) }
}
is UtCompositeModel -> 1 + fields.values.sumOf { it.calculateSize(used) }
is PythonModel -> TODO()
is GoUtModel -> TODO()
is JsUtModel -> TODO()
is UtLambdaModel -> 1 + capturedValues.sumOf { it.calculateSize(used) }
// PythonModel, GoUtModel, JsUtModel may go here
else -> 0
Expand Down
2 changes: 1 addition & 1 deletion utbot-go/src/main/kotlin/org/utbot/go/api/GoTypesApi.kt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.utbot.go.api

import org.utbot.framework.plugin.api.go.GoClassId
import org.utbot.go.framework.api.go.GoClassId

/**
* Represents real Go type.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.utbot.go.api

import org.utbot.framework.plugin.api.go.GoUtModel
import org.utbot.go.framework.api.go.GoUtModel

interface GoUtExecutionResult

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.utbot.go.api

import org.utbot.framework.plugin.api.go.GoClassId
import org.utbot.go.framework.api.go.GoClassId
import org.utbot.fuzzer.FuzzedConcreteValue
import org.utbot.fuzzer.FuzzedMethodDescription
import org.utbot.fuzzer.FuzzedValue
Expand Down
2 changes: 1 addition & 1 deletion utbot-go/src/main/kotlin/org/utbot/go/api/GoUtModelsApi.kt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

package org.utbot.go.api

import org.utbot.framework.plugin.api.go.GoUtModel
import org.utbot.go.framework.api.go.GoUtModel
import org.utbot.go.api.util.goFloat64TypeId
import org.utbot.go.api.util.neverRequiresExplicitCast

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.utbot.go.api.util

import org.utbot.framework.plugin.api.go.GoClassId
import org.utbot.go.framework.api.go.GoClassId
import org.utbot.go.api.GoTypeId
import kotlin.reflect.KClass

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.utbot.go.api.util

import org.utbot.framework.plugin.api.go.GoUtModel
import org.utbot.go.framework.api.go.GoUtModel
import org.utbot.go.api.*

fun getExplicitCastModeForFloatModel(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.utbot.framework.plugin.api.go
package org.utbot.go.framework.api.go

import org.utbot.framework.plugin.api.*

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package org.utbot.go.simplecodegeneration

import org.utbot.framework.plugin.api.*
import org.utbot.framework.plugin.api.go.GoUtModel
import org.utbot.go.framework.api.go.GoUtModel
import org.utbot.go.api.*
import org.utbot.go.api.util.*
import org.utbot.go.util.goRequiredImports
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.utbot.go.util

import org.utbot.framework.plugin.api.go.GoUtModel
import org.utbot.go.framework.api.go.GoUtModel
import org.utbot.fuzzer.FuzzedValue

val FuzzedValue.goRequiredImports get() = (this.model as GoUtModel).requiredImports
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import com.intellij.util.IncorrectOperationException
import com.intellij.util.ui.JBUI
import framework.codegen.JsCgLanguageAssistant
import framework.codegen.Mocha
import org.jetbrains.kotlin.config.TestSourceKotlinRootType
import org.utbot.framework.plugin.api.CodeGenerationSettingItem
import org.utbot.framework.plugin.api.CodegenLanguage
import org.utbot.intellij.plugin.ui.components.TestFolderComboWithBrowseButton
Expand Down Expand Up @@ -229,7 +230,7 @@ class JsDialogWindow(val model: JsTestsModel) : DialogWrapper(model.project) {
contentEntry.addSourceRootIfAbsent(
modifiableModel,
testSourceRoot.url,
CodegenLanguage.JS.testRootType()
TestSourceKotlinRootType
)
return true
} finally {
Expand Down
10 changes: 5 additions & 5 deletions utbot-js/src/main/kotlin/api/JsTestGenerator.kt
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ import org.utbot.framework.plugin.api.UtExecutionResult
import org.utbot.framework.plugin.api.UtExecutionSuccess
import org.utbot.framework.plugin.api.UtExplicitlyThrownException
import org.utbot.framework.plugin.api.UtModel
import org.utbot.framework.plugin.api.js.JsClassId
import org.utbot.framework.plugin.api.js.JsMethodId
import org.utbot.framework.plugin.api.js.JsMultipleClassId
import org.utbot.framework.plugin.api.js.util.isJsBasic
import org.utbot.framework.plugin.api.js.util.jsErrorClassId
import framework.api.js.JsClassId
import framework.api.js.JsMethodId
import framework.api.js.JsMultipleClassId
import framework.api.js.util.isJsBasic
import framework.api.js.util.jsErrorClassId
import org.utbot.framework.plugin.api.util.isStatic
import org.utbot.framework.plugin.api.util.voidClassId
import org.utbot.fuzzer.FuzzedConcreteValue
Expand Down
14 changes: 7 additions & 7 deletions utbot-js/src/main/kotlin/api/JsUtModelConstructor.kt
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ import org.utbot.framework.plugin.api.UtAssembleModel
import org.utbot.framework.plugin.api.UtExecutableCallModel
import org.utbot.framework.plugin.api.UtModel
import org.utbot.framework.plugin.api.UtStatementModel
import org.utbot.framework.plugin.api.js.JsClassId
import org.utbot.framework.plugin.api.js.JsEmptyClassId
import org.utbot.framework.plugin.api.js.JsNullModel
import org.utbot.framework.plugin.api.js.JsPrimitiveModel
import org.utbot.framework.plugin.api.js.JsUndefinedModel
import org.utbot.framework.plugin.api.js.util.jsErrorClassId
import org.utbot.framework.plugin.api.js.util.jsUndefinedClassId
import framework.api.js.JsClassId
import framework.api.js.JsEmptyClassId
import framework.api.js.JsNullModel
import framework.api.js.JsPrimitiveModel
import framework.api.js.JsUndefinedModel
import framework.api.js.util.jsErrorClassId
import framework.api.js.util.jsUndefinedClassId

class JsUtModelConstructor : UtModelConstructorInterface {

Expand Down
4 changes: 2 additions & 2 deletions utbot-js/src/main/kotlin/codegen/JsCodeGenerator.kt
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import org.utbot.framework.codegen.model.visitor.CgAbstractRenderer
import org.utbot.framework.plugin.api.CodegenLanguage
import org.utbot.framework.plugin.api.ExecutableId
import org.utbot.framework.plugin.api.MockFramework
import org.utbot.framework.plugin.api.js.JsClassId
import framework.api.js.JsClassId
import settings.JsTestGenerationSettings.fileUnderTestAliases

class JsCodeGenerator(
Expand All @@ -37,7 +37,7 @@ class JsCodeGenerator(
paramNames = paramNames,
testFramework = testFramework,
mockFramework = MockFramework.MOCKITO,
codegenLanguage = CodegenLanguage.JS,
codegenLanguage = CodegenLanguage.defaultItem,
cgLanguageAssistant = JsCgLanguageAssistant,
parametrizedTestSource = ParametrizedTestSource.defaultItem,
staticsMocking = StaticsMocking.defaultItem,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package org.utbot.framework.plugin.api.js
package framework.api.js

import java.lang.reflect.Modifier
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 org.utbot.framework.plugin.api.js.util.toJsClassId
import framework.api.js.util.toJsClassId
import org.utbot.framework.plugin.api.primitiveModelValueToClassId

open class JsClassId(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package org.utbot.framework.plugin.api.js.util
package framework.api.js.util

import org.utbot.framework.plugin.api.ClassId
import org.utbot.framework.plugin.api.js.JsClassId
import framework.api.js.JsClassId
import org.utbot.framework.plugin.api.util.booleanClassId
import org.utbot.framework.plugin.api.util.byteClassId
import org.utbot.framework.plugin.api.util.doubleClassId
Expand Down
6 changes: 3 additions & 3 deletions utbot-js/src/main/kotlin/framework/codegen/JsDomain.kt
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import org.utbot.framework.codegen.TestFramework
import org.utbot.framework.plugin.api.BuiltinClassId
import org.utbot.framework.plugin.api.BuiltinMethodId
import org.utbot.framework.plugin.api.ClassId
import org.utbot.framework.plugin.api.js.JsClassId
import org.utbot.framework.plugin.api.js.util.jsErrorClassId
import org.utbot.framework.plugin.api.js.util.jsUndefinedClassId
import framework.api.js.JsClassId
import framework.api.js.util.jsErrorClassId
import framework.api.js.util.jsUndefinedClassId


object Mocha : TestFramework(id = "Mocha", displayName = "Mocha") {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import org.utbot.framework.plugin.api.ConstructorId
import org.utbot.framework.plugin.api.ExecutableId
import org.utbot.framework.plugin.api.MethodId
import org.utbot.framework.plugin.api.UtExecution
import org.utbot.framework.plugin.api.js.JsClassId
import framework.api.js.JsClassId
import org.utbot.framework.plugin.api.onFailure
import org.utbot.framework.plugin.api.onSuccess
import org.utbot.framework.plugin.api.util.voidClassId
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import org.utbot.framework.plugin.api.UtAssembleModel
import org.utbot.framework.plugin.api.UtCompositeModel
import org.utbot.framework.plugin.api.UtModel
import org.utbot.framework.plugin.api.UtReferenceModel
import org.utbot.framework.plugin.api.js.JsPrimitiveModel
import framework.api.js.JsPrimitiveModel

class JsCgVariableConstructor(ctx: CgContext) : CgVariableConstructor(ctx) {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import org.utbot.framework.codegen.model.visitor.CgAbstractRenderer
import org.utbot.framework.codegen.model.visitor.CgRendererContext
import org.utbot.framework.plugin.api.BuiltinMethodId
import org.utbot.framework.plugin.api.ClassId
import org.utbot.framework.plugin.api.CodegenLanguage
import org.utbot.framework.plugin.api.TypeParameters
import org.utbot.framework.plugin.api.util.isStatic
import settings.JsTestGenerationSettings.fileUnderTestAliases
Expand All @@ -27,8 +26,6 @@ internal class CgJsRenderer(context: CgRendererContext, printer: CgPrinter = CgP
override val logicalOr: String
get() = "||"

override val language: CodegenLanguage = CodegenLanguage.JS

override val langPackage: String = "js"

override fun visit(element: CgErrorWrapper) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package fuzzer.providers

import org.utbot.framework.plugin.api.js.JsClassId
import org.utbot.framework.plugin.api.js.JsPrimitiveModel
import org.utbot.framework.plugin.api.js.util.isJsPrimitive
import org.utbot.framework.plugin.api.js.util.jsUndefinedClassId
import framework.api.js.JsClassId
import framework.api.js.JsPrimitiveModel
import framework.api.js.util.isJsPrimitive
import framework.api.js.util.jsUndefinedClassId
import org.utbot.fuzzer.FuzzedMethodDescription
import org.utbot.fuzzer.FuzzedOp
import org.utbot.fuzzer.FuzzedParameter
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ import fuzzer.providers.JsPrimitivesModelProvider.matchClassId
import fuzzer.providers.JsPrimitivesModelProvider.primitivesForString
import fuzzer.providers.JsStringModelProvider.mutate
import fuzzer.providers.JsStringModelProvider.random
import org.utbot.framework.plugin.api.js.JsClassId
import org.utbot.framework.plugin.api.js.JsMultipleClassId
import org.utbot.framework.plugin.api.js.JsPrimitiveModel
import org.utbot.framework.plugin.api.js.util.isJsPrimitive
import org.utbot.framework.plugin.api.js.util.jsStringClassId
import org.utbot.framework.plugin.api.js.util.toJsClassId
import framework.api.js.JsClassId
import framework.api.js.JsMultipleClassId
import framework.api.js.JsPrimitiveModel
import framework.api.js.util.isJsPrimitive
import framework.api.js.util.jsStringClassId
import framework.api.js.util.toJsClassId
import org.utbot.fuzzer.FuzzedMethodDescription
import org.utbot.fuzzer.FuzzedOp
import org.utbot.fuzzer.FuzzedParameter
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package fuzzer.providers
import org.utbot.framework.plugin.api.ConstructorId
import org.utbot.framework.plugin.api.UtAssembleModel
import org.utbot.framework.plugin.api.UtExecutableCallModel
import org.utbot.framework.plugin.api.js.JsClassId
import org.utbot.framework.plugin.api.js.JsConstructorId
import org.utbot.framework.plugin.api.js.util.isJsBasic
import framework.api.js.JsClassId
import framework.api.js.JsConstructorId
import framework.api.js.util.isJsBasic
import org.utbot.fuzzer.FuzzedMethodDescription
import org.utbot.fuzzer.FuzzedParameter
import org.utbot.fuzzer.FuzzedValue
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package fuzzer.providers

import org.utbot.framework.plugin.api.js.JsClassId
import org.utbot.framework.plugin.api.js.JsPrimitiveModel
import org.utbot.framework.plugin.api.js.util.jsBooleanClassId
import org.utbot.framework.plugin.api.js.util.jsDoubleClassId
import org.utbot.framework.plugin.api.js.util.jsNumberClassId
import org.utbot.framework.plugin.api.js.util.jsStringClassId
import framework.api.js.JsClassId
import framework.api.js.JsPrimitiveModel
import framework.api.js.util.jsBooleanClassId
import framework.api.js.util.jsDoubleClassId
import framework.api.js.util.jsNumberClassId
import framework.api.js.util.jsStringClassId
import org.utbot.fuzzer.FuzzedMethodDescription
import org.utbot.fuzzer.FuzzedParameter
import org.utbot.fuzzer.FuzzedValue
Expand Down
Loading