Merge branch 'main' into Vassiliy-Kudryashov/330-svg-logo-contains-inaccurate-holes

Vassiliy-Kudryashov · web-flow · commit 373f04a280dd · 2022-07-05T18:15:06.000+03:00
diff --git a/utbot-framework-api/src/main/kotlin/org/utbot/framework/plugin/api/Api.kt b/utbot-framework-api/src/main/kotlin/org/utbot/framework/plugin/api/Api.kt
@@ -1044,7 +1044,7 @@ enum class MockStrategyApi(
     override val displayName: String,
     override val description: String
 ) : CodeGenerationSettingItem {
-    NO_MOCKS("No mocks", "Do not use Mock frameworks at all"),
+    NO_MOCKS("No mocks", "Do not use mock frameworks at all"),
     OTHER_PACKAGES(
         "Other packages: $MOCKITO",
         "Mock all classes outside the current package except system ones"
@@ -1105,7 +1105,7 @@ enum class MockFramework(
 
 enum class CodegenLanguage(
     override val displayName: String,
-    @Suppress("unused") override val description: String = "Generating unit tests in $displayName"
+    @Suppress("unused") override val description: String = "Generate unit tests in $displayName"
 ) : CodeGenerationSettingItem {
     JAVA(displayName = "Java"),
     KOTLIN(displayName = "Kotlin");
diff --git a/utbot-framework/src/main/kotlin/org/utbot/framework/codegen/Domain.kt b/utbot-framework/src/main/kotlin/org/utbot/framework/codegen/Domain.kt
@@ -115,7 +115,7 @@ sealed class StaticsMocking(
 
 object NoStaticMocking : StaticsMocking(
     displayName = "No static mocking",
-    description = "Don't use additional settings to mock static fields"
+    description = "Do not use additional settings to mock static fields"
 )
 
 object MockitoStaticMocking : StaticsMocking(displayName = "Mockito static mocking") {
@@ -551,7 +551,7 @@ enum class ParametrizedTestSource(
 ) : CodeGenerationSettingItem {
     DO_NOT_PARAMETRIZE(
         displayName = "Not parametrized",
-        description = "Don't generate parametrized tests"
+        description = "Do not generate parametrized tests"
     ),
     PARAMETRIZE(
         displayName = "Parametrized",
diff --git a/utbot-framework/src/main/kotlin/org/utbot/fuzzer/FallbackModelProvider.kt b/utbot-framework/src/main/kotlin/org/utbot/fuzzer/FallbackModelProvider.kt
@@ -21,7 +21,6 @@ import org.utbot.framework.plugin.api.util.kClass
 import org.utbot.fuzzer.providers.AbstractModelProvider
 import java.util.*
 import java.util.function.IntSupplier
-import kotlin.collections.ArrayDeque
 import kotlin.collections.ArrayList
 import kotlin.collections.HashMap
 import kotlin.reflect.KClass
@@ -58,12 +57,13 @@ open class FallbackModelProvider(
                     mutableMapOf()
                 )
             classId.isIterable -> {
+                @Suppress("RemoveRedundantQualifierName") // ArrayDeque must be taken from java, not from kotlin
                 val defaultInstance = when {
                     defaultConstructor != null -> defaultConstructor.newInstance()
                     classId.jClass.isAssignableFrom(java.util.ArrayList::class.java) -> ArrayList<Any>()
                     classId.jClass.isAssignableFrom(java.util.TreeSet::class.java) -> TreeSet<Any>()
                     classId.jClass.isAssignableFrom(java.util.HashMap::class.java) -> HashMap<Any, Any>()
-                    classId.jClass.isAssignableFrom(java.util.ArrayDeque::class.java) -> ArrayDeque<Any>()
+                    classId.jClass.isAssignableFrom(java.util.ArrayDeque::class.java) -> java.util.ArrayDeque<Any>()
                     classId.jClass.isAssignableFrom(java.util.BitSet::class.java) -> BitSet()
                     else -> null
                 }
@@ -103,4 +103,4 @@ open class FallbackModelProvider(
             )
         }
     }
-}
+}
diff --git a/utbot-junit-contest/build.gradle b/utbot-junit-contest/build.gradle
@@ -2,6 +2,10 @@ apply from: "${rootProject.projectDir}/gradle/include/jvm-project.gradle"
 
 apply plugin: 'jacoco'
 
+configurations {
+    fetchInstrumentationJar
+}
+
 compileJava {
     options.compilerArgs << '-XDignore.symbol.file'
 }
@@ -50,8 +54,6 @@ dependencies {
     api project(":utbot-framework")
     api project(":utbot-analytics")
 
-    api project(":utbot-instrumentation")
-
     implementation "com.github.UnitTestBot:soot:${soot_commit_hash}"
     implementation group: 'org.apache.commons', name: 'commons-exec', version: '1.2'
     implementation group: 'commons-io', name: 'commons-io', version: commons_io_version
@@ -64,6 +66,13 @@ dependencies {
     testImplementation group: 'org.mockito', name: 'mockito-core', version: '4.2.0'
     testImplementation group: 'org.mockito', name: 'mockito-inline', version: '4.2.0'
     testImplementation 'junit:junit:4.13.2'
+    fetchInstrumentationJar project(path: ':utbot-instrumentation', configuration:'instrumentationArchive')
+}
+
+processResources {
+    from(configurations.fetchInstrumentationJar) {
+        into "lib"
+    }
 }
 
 jar { dependsOn classes
diff --git a/utbot-junit-contest/src/main/kotlin/org/utbot/contest/ContestEstimator.kt b/utbot-junit-contest/src/main/kotlin/org/utbot/contest/ContestEstimator.kt
@@ -38,7 +38,6 @@ import org.utbot.framework.JdkPathService
 import org.utbot.predictors.StateRewardPredictorFactoryImpl
 import org.utbot.framework.PathSelectorType
 import org.utbot.framework.UtSettings
-import org.utbot.predictors.NNStateRewardPredictorBase
 
 private val logger = KotlinLogging.logger {}
 

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,6 @@ import org.utbot.framework.plugin.api.util.kClass`
`21`	`21`	`import org.utbot.fuzzer.providers.AbstractModelProvider`
`22`	`22`	`import java.util.*`
`23`	`23`	`import java.util.function.IntSupplier`
`24`		`-import kotlin.collections.ArrayDeque`
`25`	`24`	`import kotlin.collections.ArrayList`
`26`	`25`	`import kotlin.collections.HashMap`
`27`	`26`	`import kotlin.reflect.KClass`
`@@ -58,12 +57,13 @@ open class FallbackModelProvider(`
`58`	`57`	`mutableMapOf()`
`59`	`58`	`)`
`60`	`59`	`classId.isIterable -> {`
	`60`	`+ @Suppress("RemoveRedundantQualifierName") // ArrayDeque must be taken from java, not from kotlin`
`61`	`61`	`val defaultInstance = when {`
`62`	`62`	`defaultConstructor != null -> defaultConstructor.newInstance()`
`63`	`63`	`classId.jClass.isAssignableFrom(java.util.ArrayList::class.java) -> ArrayList<Any>()`
`64`	`64`	`classId.jClass.isAssignableFrom(java.util.TreeSet::class.java) -> TreeSet<Any>()`
`65`	`65`	`classId.jClass.isAssignableFrom(java.util.HashMap::class.java) -> HashMap<Any, Any>()`
`66`		`- classId.jClass.isAssignableFrom(java.util.ArrayDeque::class.java) -> ArrayDeque<Any>()`
	`66`	`+ classId.jClass.isAssignableFrom(java.util.ArrayDeque::class.java) -> java.util.ArrayDeque<Any>()`
`67`	`67`	`classId.jClass.isAssignableFrom(java.util.BitSet::class.java) -> BitSet()`
`68`	`68`	`else -> null`
`69`	`69`	`}`
`@@ -103,4 +103,4 @@ open class FallbackModelProvider(`
`103`	`103`	`)`
`104`	`104`	`}`
`105`	`105`	`}`
`106`		`-}`
	`106`	`+}`