Skip to content

Commit c37a568

Browse files
EgorkaKulikovEgorkaKulikov
committed
Sens engine type data to engine process via Rd
1 parent ab825cc commit c37a568

File tree

6 files changed

+31
-15
lines changed

6 files changed

+31
-15
lines changed

‎utbot-framework/src/main/kotlin/org/utbot/framework/plugin/api/TestFlow.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import kotlinx.coroutines.flow.flattenConcat
66
import kotlinx.coroutines.flow.flowOf
77
import org.utbot.engine.UtBotSymbolicEngine
88
import org.utbot.framework.UtSettings
9+
import org.utbot.framework.codegen.domain.SymbolicEngineSource
910
import org.utbot.framework.process.generated.GenerateParams
1011

1112
/**
@@ -18,6 +19,7 @@ fun testFlow(block: TestFlow.() -> Unit): UtBotSymbolicEngine.() -> Flow<UtResul
1819
*/
1920
fun defaultTestFlow(timeout: Long) = testFlow {
2021
isSymbolicEngineEnabled = true
22+
symbolicEngineType = SymbolicEngineSource.UnitTestBot
2123
generationTimeout = timeout
2224
isFuzzingEnabled = UtSettings.useFuzzing
2325
if (generationTimeout > 0) {
@@ -41,6 +43,7 @@ class TestFlow internal constructor(block: TestFlow.() -> Unit) {
4143
field = maxOf(0, value)
4244
}
4345
var isSymbolicEngineEnabled = true
46+
var symbolicEngineType = SymbolicEngineSource.UnitTestBot
4447
var isFuzzingEnabled = false
4548
var fuzzingValue: Double = 0.1
4649
set(value) {

‎utbot-framework/src/main/kotlin/org/utbot/framework/process/EngineProcessMain.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import org.utbot.framework.codegen.domain.NoStaticMocking
1212
import org.utbot.framework.codegen.domain.ParametrizedTestSource
1313
import org.utbot.framework.codegen.domain.ProjectType
1414
import org.utbot.framework.codegen.domain.RuntimeExceptionTestsBehaviour
15+
import org.utbot.framework.codegen.domain.SymbolicEngineSource
1516
import org.utbot.framework.codegen.domain.testFrameworkByName
1617
import org.utbot.framework.codegen.generator.AbstractCodeGenerator
1718
import org.utbot.framework.codegen.generator.CodeGeneratorParams
@@ -116,6 +117,7 @@ private fun EngineProcessModel.setup(kryoHelper: KryoHelper, watchdog: IdleWatch
116117
val generateFlow = testFlow {
117118
generationTimeout = params.generationTimeout
118119
isSymbolicEngineEnabled = params.isSymbolicEngineEnabled
120+
symbolicEngineType = SymbolicEngineSource.valueOf(params.symbolicEngineType)
119121
isFuzzingEnabled = params.isFuzzingEnabled
120122
fuzzingValue = params.fuzzingValue
121123
}

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

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ class EngineProcessModel private constructor(
7575
}
7676

7777

78-
const val serializationHash = 7072495177628793247L
78+
const val serializationHash = -6931237043403275202L
7979

8080
}
8181
override val serializersOwner: ISerializersOwner get() = EngineProcessModel
@@ -188,7 +188,7 @@ val IProtocol.engineProcessModel get() = getOrCreateExtension(EngineProcessModel
188188

189189

190190
/**
191-
* #### Generated from [EngineProcessModel.kt:106]
191+
* #### Generated from [EngineProcessModel.kt:107]
192192
*/
193193
data class FindMethodParamNamesArguments (
194194
val classId: ByteArray,
@@ -251,7 +251,7 @@ data class FindMethodParamNamesArguments (
251251

252252

253253
/**
254-
* #### Generated from [EngineProcessModel.kt:110]
254+
* #### Generated from [EngineProcessModel.kt:111]
255255
*/
256256
data class FindMethodParamNamesResult (
257257
val paramNames: ByteArray
@@ -308,7 +308,7 @@ data class FindMethodParamNamesResult (
308308

309309

310310
/**
311-
* #### Generated from [EngineProcessModel.kt:99]
311+
* #### Generated from [EngineProcessModel.kt:100]
312312
*/
313313
data class FindMethodsInClassMatchingSelectedArguments (
314314
val classId: ByteArray,
@@ -371,7 +371,7 @@ data class FindMethodsInClassMatchingSelectedArguments (
371371

372372

373373
/**
374-
* #### Generated from [EngineProcessModel.kt:103]
374+
* #### Generated from [EngineProcessModel.kt:104]
375375
*/
376376
data class FindMethodsInClassMatchingSelectedResult (
377377
val executableIds: ByteArray
@@ -437,6 +437,7 @@ data class GenerateParams (
437437
val timeout: Long,
438438
val generationTimeout: Long,
439439
val isSymbolicEngineEnabled: Boolean,
440+
val symbolicEngineType: String,
440441
val isFuzzingEnabled: Boolean,
441442
val fuzzingValue: Double,
442443
val searchDirectory: String,
@@ -455,11 +456,12 @@ data class GenerateParams (
455456
val timeout = buffer.readLong()
456457
val generationTimeout = buffer.readLong()
457458
val isSymbolicEngineEnabled = buffer.readBool()
459+
val symbolicEngineType = buffer.readString()
458460
val isFuzzingEnabled = buffer.readBool()
459461
val fuzzingValue = buffer.readDouble()
460462
val searchDirectory = buffer.readString()
461463
val taintConfigPath = buffer.readNullable { buffer.readString() }
462-
return GenerateParams(methods, mockStrategy, chosenClassesToMockAlways, timeout, generationTimeout, isSymbolicEngineEnabled, isFuzzingEnabled, fuzzingValue, searchDirectory, taintConfigPath)
464+
return GenerateParams(methods, mockStrategy, chosenClassesToMockAlways, timeout, generationTimeout, isSymbolicEngineEnabled, symbolicEngineType, isFuzzingEnabled, fuzzingValue, searchDirectory, taintConfigPath)
463465
}
464466

465467
override fun write(ctx: SerializationCtx, buffer: AbstractBuffer, value: GenerateParams) {
@@ -469,6 +471,7 @@ data class GenerateParams (
469471
buffer.writeLong(value.timeout)
470472
buffer.writeLong(value.generationTimeout)
471473
buffer.writeBool(value.isSymbolicEngineEnabled)
474+
buffer.writeString(value.symbolicEngineType)
472475
buffer.writeBool(value.isFuzzingEnabled)
473476
buffer.writeDouble(value.fuzzingValue)
474477
buffer.writeString(value.searchDirectory)
@@ -494,6 +497,7 @@ data class GenerateParams (
494497
if (timeout != other.timeout) return false
495498
if (generationTimeout != other.generationTimeout) return false
496499
if (isSymbolicEngineEnabled != other.isSymbolicEngineEnabled) return false
500+
if (symbolicEngineType != other.symbolicEngineType) return false
497501
if (isFuzzingEnabled != other.isFuzzingEnabled) return false
498502
if (fuzzingValue != other.fuzzingValue) return false
499503
if (searchDirectory != other.searchDirectory) return false
@@ -510,6 +514,7 @@ data class GenerateParams (
510514
__r = __r*31 + timeout.hashCode()
511515
__r = __r*31 + generationTimeout.hashCode()
512516
__r = __r*31 + isSymbolicEngineEnabled.hashCode()
517+
__r = __r*31 + symbolicEngineType.hashCode()
513518
__r = __r*31 + isFuzzingEnabled.hashCode()
514519
__r = __r*31 + fuzzingValue.hashCode()
515520
__r = __r*31 + searchDirectory.hashCode()
@@ -526,6 +531,7 @@ data class GenerateParams (
526531
print("timeout = "); timeout.print(printer); println()
527532
print("generationTimeout = "); generationTimeout.print(printer); println()
528533
print("isSymbolicEngineEnabled = "); isSymbolicEngineEnabled.print(printer); println()
534+
print("symbolicEngineType = "); symbolicEngineType.print(printer); println()
529535
print("isFuzzingEnabled = "); isFuzzingEnabled.print(printer); println()
530536
print("fuzzingValue = "); fuzzingValue.print(printer); println()
531537
print("searchDirectory = "); searchDirectory.print(printer); println()
@@ -539,7 +545,7 @@ data class GenerateParams (
539545

540546

541547
/**
542-
* #### Generated from [EngineProcessModel.kt:65]
548+
* #### Generated from [EngineProcessModel.kt:66]
543549
*/
544550
data class GenerateResult (
545551
val notEmptyCases: Int,
@@ -602,7 +608,7 @@ data class GenerateResult (
602608

603609

604610
/**
605-
* #### Generated from [EngineProcessModel.kt:118]
611+
* #### Generated from [EngineProcessModel.kt:119]
606612
*/
607613
data class GenerateTestReportArgs (
608614
val eventLogMessage: String?,
@@ -695,7 +701,7 @@ data class GenerateTestReportArgs (
695701

696702

697703
/**
698-
* #### Generated from [EngineProcessModel.kt:127]
704+
* #### Generated from [EngineProcessModel.kt:128]
699705
*/
700706
data class GenerateTestReportResult (
701707
val notifyMessage: String,
@@ -827,7 +833,7 @@ data class JdkInfo (
827833

828834

829835
/**
830-
* #### Generated from [EngineProcessModel.kt:94]
836+
* #### Generated from [EngineProcessModel.kt:95]
831837
*/
832838
data class MethodDescription (
833839
val name: String,
@@ -896,7 +902,7 @@ data class MethodDescription (
896902

897903

898904
/**
899-
* #### Generated from [EngineProcessModel.kt:132]
905+
* #### Generated from [EngineProcessModel.kt:133]
900906
*/
901907
data class PerformParams (
902908
val engineProcessTask: ByteArray
@@ -953,7 +959,7 @@ data class PerformParams (
953959

954960

955961
/**
956-
* #### Generated from [EngineProcessModel.kt:69]
962+
* #### Generated from [EngineProcessModel.kt:70]
957963
*/
958964
data class RenderParams (
959965
val testSetsId: Long,
@@ -1100,7 +1106,7 @@ data class RenderParams (
11001106

11011107

11021108
/**
1103-
* #### Generated from [EngineProcessModel.kt:87]
1109+
* #### Generated from [EngineProcessModel.kt:88]
11041110
*/
11051111
data class RenderResult (
11061112
val generatedCode: String,
@@ -1163,7 +1169,7 @@ data class RenderResult (
11631169

11641170

11651171
/**
1166-
* #### Generated from [EngineProcessModel.kt:91]
1172+
* #### Generated from [EngineProcessModel.kt:92]
11671173
*/
11681174
data class SetupContextParams (
11691175
val classpathForUrlsClassloader: List<String>
@@ -1415,7 +1421,7 @@ data class TestGeneratorParams (
14151421

14161422

14171423
/**
1418-
* #### Generated from [EngineProcessModel.kt:113]
1424+
* #### Generated from [EngineProcessModel.kt:114]
14191425
*/
14201426
data class WriteSarifReportArguments (
14211427
val testSetsId: Long,

‎utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/generator/UtTestsDialogProcessor.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -413,6 +413,7 @@ object UtTestsDialogProcessor {
413413
timeout = model.timeout,
414414
generationTimeout = model.timeout,
415415
isSymbolicEngineEnabled = useEngine,
416+
symbolicEngineSource = model.symbolicEngineSource,
416417
isFuzzingEnabled = useFuzzing,
417418
fuzzingValue = project.service<Settings>().fuzzingValue,
418419
searchDirectory = searchDirectory.pathString,

‎utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/process/EngineProcess.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import kotlinx.coroutines.runBlocking
1515
import mu.KotlinLogging
1616
import org.utbot.common.*
1717
import org.utbot.framework.UtSettings
18+
import org.utbot.framework.codegen.domain.SymbolicEngineSource
1819
import org.utbot.framework.codegen.tree.ututils.UtilClassKind
1920
import org.utbot.framework.context.ApplicationContext
2021
import org.utbot.framework.plugin.api.*
@@ -229,6 +230,7 @@ class EngineProcess private constructor(val project: Project, private val classN
229230
timeout: Long,
230231
generationTimeout: Long,
231232
isSymbolicEngineEnabled: Boolean,
233+
symbolicEngineSource: SymbolicEngineSource,
232234
isFuzzingEnabled: Boolean,
233235
fuzzingValue: Double,
234236
searchDirectory: String,
@@ -242,6 +244,7 @@ class EngineProcess private constructor(val project: Project, private val classN
242244
timeout,
243245
generationTimeout,
244246
isSymbolicEngineEnabled,
247+
symbolicEngineSource.name,
245248
isFuzzingEnabled,
246249
fuzzingValue,
247250
searchDirectory,

‎utbot-rd/src/main/rdgen/org/utbot/rd/models/EngineProcessModel.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ object EngineProcessModel : Ext(EngineProcessRoot) {
5555
// testflow
5656
field("generationTimeout", PredefinedType.long)
5757
field("isSymbolicEngineEnabled", PredefinedType.bool)
58+
field("symbolicEngineType", PredefinedType.string)
5859
field("isFuzzingEnabled", PredefinedType.bool)
5960
field("fuzzingValue", PredefinedType.double)
6061
// method filters

0 commit comments

Comments
 (0)