Skip to content

Commit 87567e6

Browse files
committed
[utbot-rd]
merge fixes
1 parent a8ff3af commit 87567e6

File tree

6 files changed

+145
-145
lines changed

6 files changed

+145
-145
lines changed

utbot-framework/src/main/kotlin/org/utbot/framework/process/EngineMain.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ private fun EngineProcessModel.setup(
9797
}
9898
synchronizer.measureExecutionForTermination(createTestGenerator) { params ->
9999
AnalyticsConfigureUtil.configureML()
100-
testGenerator = TestCaseGenerator(buildDir = Paths.get(params.buildDir),
100+
testGenerator = TestCaseGenerator(buildDirs = params.buildDir.map { Paths.get(it) },
101101
classpath = params.classpath,
102102
dependencyPaths = params.dependencyPaths,
103103
jdkInfo = JdkInfo(Paths.get(params.jdkInfo.path), params.jdkInfo.version),

utbot-framework/src/main/kotlin/org/utbot/framework/process/generated/EngineProcessModel.Generated.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ class EngineProcessModel private constructor(
7373
}
7474

7575

76-
const val serializationHash = -4621310507632233825L
76+
const val serializationHash = 4674749231408610997L
7777

7878
}
7979
override val serializersOwner: ISerializersOwner get() = EngineProcessModel
@@ -1158,7 +1158,7 @@ data class Signature (
11581158
* #### Generated from [EngineProcessModel.kt:26]
11591159
*/
11601160
data class TestGeneratorParams (
1161-
val buildDir: String,
1161+
val buildDir: Array<String>,
11621162
val classpath: String?,
11631163
val dependencyPaths: String,
11641164
val jdkInfo: JdkInfo
@@ -1170,15 +1170,15 @@ data class TestGeneratorParams (
11701170

11711171
@Suppress("UNCHECKED_CAST")
11721172
override fun read(ctx: SerializationCtx, buffer: AbstractBuffer): TestGeneratorParams {
1173-
val buildDir = buffer.readString()
1173+
val buildDir = buffer.readArray {buffer.readString()}
11741174
val classpath = buffer.readNullable { buffer.readString() }
11751175
val dependencyPaths = buffer.readString()
11761176
val jdkInfo = JdkInfo.read(ctx, buffer)
11771177
return TestGeneratorParams(buildDir, classpath, dependencyPaths, jdkInfo)
11781178
}
11791179

11801180
override fun write(ctx: SerializationCtx, buffer: AbstractBuffer, value: TestGeneratorParams) {
1181-
buffer.writeString(value.buildDir)
1181+
buffer.writeArray(value.buildDir) { buffer.writeString(it) }
11821182
buffer.writeNullable(value.classpath) { buffer.writeString(it) }
11831183
buffer.writeString(value.dependencyPaths)
11841184
JdkInfo.write(ctx, buffer, value.jdkInfo)
@@ -1197,7 +1197,7 @@ data class TestGeneratorParams (
11971197

11981198
other as TestGeneratorParams
11991199

1200-
if (buildDir != other.buildDir) return false
1200+
if (!(buildDir contentDeepEquals other.buildDir)) return false
12011201
if (classpath != other.classpath) return false
12021202
if (dependencyPaths != other.dependencyPaths) return false
12031203
if (jdkInfo != other.jdkInfo) return false
@@ -1207,7 +1207,7 @@ data class TestGeneratorParams (
12071207
//hash code trait
12081208
override fun hashCode(): Int {
12091209
var __r = 0
1210-
__r = __r*31 + buildDir.hashCode()
1210+
__r = __r*31 + buildDir.contentDeepHashCode()
12111211
__r = __r*31 + if (classpath != null) classpath.hashCode() else 0
12121212
__r = __r*31 + dependencyPaths.hashCode()
12131213
__r = __r*31 + jdkInfo.hashCode()

utbot-instrumentation/src/main/kotlin/org/utbot/instrumentation/Settings.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ object Settings {
3636
* @see runChildProcessWithDebug
3737
* @see org.utbot.intellij.plugin.process.EngineProcess
3838
*/
39-
const val runIdeaProcessWithDebug = true
39+
const val runIdeaProcessWithDebug = false
4040

4141
var defaultConcreteExecutorPoolSize = 10
4242
}

0 commit comments

Comments
 (0)