Skip to content

Commit e187f67

Browse files
Moved util functions
1 parent a9eac01 commit e187f67

File tree

9 files changed

+31
-16
lines changed

9 files changed

+31
-16
lines changed

utbot-cli/src/main/kotlin/org/utbot/cli/GenerateTestsCommand.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ import org.utbot.framework.plugin.api.ClassId
1616
import org.utbot.framework.plugin.api.CodegenLanguage
1717
import org.utbot.framework.plugin.api.UtMethodTestSet
1818
import org.utbot.framework.plugin.api.util.UtContext
19+
import org.utbot.framework.plugin.api.util.isAbstract
1920
import org.utbot.framework.plugin.api.util.withUtContext
2021
import org.utbot.framework.util.isKnownSyntheticMethod
2122
import org.utbot.sarif.SarifReport
2223
import org.utbot.sarif.SourceFindingStrategyDefault
23-
import java.lang.reflect.Modifier
2424
import java.nio.file.Files
2525
import java.nio.file.Paths
2626
import java.time.temporal.ChronoUnit
@@ -98,7 +98,7 @@ class GenerateTestsCommand :
9898
val classIdUnderTest = ClassId(targetClassFqn)
9999
val targetMethods = classIdUnderTest.targetMethods()
100100
.filterWhen(UtSettings.skipTestGenerationForSyntheticMethods) { !isKnownSyntheticMethod(it) }
101-
.filterNot { Modifier.isAbstract(it.modifiers) }
101+
.filterNot { it.isAbstract }
102102
val testCaseGenerator = initializeGenerator(workingDirectory)
103103

104104
if (targetMethods.isEmpty()) {

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

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -959,18 +959,6 @@ sealed class ExecutableId : StatementId() {
959959

960960
abstract val modifiers: Int
961961

962-
val isPublic: Boolean
963-
get() = Modifier.isPublic(modifiers)
964-
val isProtected: Boolean
965-
get() = Modifier.isProtected(modifiers)
966-
val isPrivate: Boolean
967-
get() = Modifier.isPrivate(modifiers)
968-
val isStatic: Boolean
969-
get() = Modifier.isStatic(modifiers)
970-
971-
val isPackagePrivate: Boolean
972-
get() = !(isPublic || isProtected || isPrivate)
973-
974962
val signature: String
975963
get() {
976964
val args = parameters.joinToString(separator = "") { it.jvmName }

utbot-framework-api/src/main/kotlin/org/utbot/framework/plugin/api/util/IdUtil.kt

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import java.lang.reflect.Constructor
1414
import java.lang.reflect.Executable
1515
import java.lang.reflect.Field
1616
import java.lang.reflect.Method
17+
import java.lang.reflect.Modifier
1718
import java.lang.reflect.ParameterizedType
1819
import java.lang.reflect.Type
1920
import java.util.concurrent.atomic.AtomicInteger
@@ -433,6 +434,25 @@ val ExecutableId.isMethod: Boolean
433434
val ExecutableId.isConstructor: Boolean
434435
get() = this is ConstructorId
435436

437+
val ExecutableId.isPublic: Boolean
438+
get() = Modifier.isPublic(modifiers)
439+
440+
val ExecutableId.isProtected: Boolean
441+
get() = Modifier.isProtected(modifiers)
442+
443+
val ExecutableId.isPrivate: Boolean
444+
get() = Modifier.isPrivate(modifiers)
445+
446+
val ExecutableId.isStatic: Boolean
447+
get() = Modifier.isStatic(modifiers)
448+
449+
val ExecutableId.isPackagePrivate: Boolean
450+
get() = !(isPublic || isProtected || isPrivate)
451+
452+
val ExecutableId.isAbstract: Boolean
453+
get() = Modifier.isAbstract(modifiers)
454+
455+
436456
/**
437457
* Construct MethodId
438458
*/
@@ -453,4 +473,4 @@ fun builtinMethodId(classId: BuiltinClassId, name: String, returnType: ClassId,
453473

454474
fun builtinStaticMethodId(classId: ClassId, name: String, returnType: ClassId, vararg arguments: ClassId): BuiltinMethodId {
455475
return BuiltinMethodId(classId, name, returnType, arguments.toList(), isStatic = true)
456-
}
476+
}

utbot-framework/src/main/kotlin/org/utbot/engine/UtBotSymbolicEngine.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ import org.utbot.framework.plugin.api.UtNullModel
6060
import org.utbot.framework.plugin.api.UtOverflowFailure
6161
import org.utbot.framework.plugin.api.UtResult
6262
import org.utbot.framework.plugin.api.UtSymbolicExecution
63+
import org.utbot.framework.plugin.api.util.isStatic
6364
import org.utbot.framework.plugin.api.onSuccess
6465
import org.utbot.framework.plugin.api.util.description
6566
import org.utbot.framework.plugin.api.util.id

utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/constructor/tree/CgCallableAccessManager.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ import org.utbot.framework.plugin.api.ExecutableId
4444
import org.utbot.framework.plugin.api.FieldId
4545
import org.utbot.framework.plugin.api.MethodId
4646
import org.utbot.framework.plugin.api.UtExplicitlyThrownException
47+
import org.utbot.framework.plugin.api.util.isStatic
4748
import org.utbot.framework.plugin.api.util.exceptions
4849
import org.utbot.framework.plugin.api.util.id
4950
import org.utbot.framework.plugin.api.util.isArray

utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/constructor/util/ConstructorUtils.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ import org.utbot.framework.plugin.api.UtModel
4747
import org.utbot.framework.plugin.api.UtNullModel
4848
import org.utbot.framework.plugin.api.UtPrimitiveModel
4949
import org.utbot.framework.plugin.api.WildcardTypeParameter
50+
import org.utbot.framework.plugin.api.util.isStatic
5051
import org.utbot.framework.plugin.api.util.arrayLikeName
5152
import org.utbot.framework.plugin.api.util.builtinStaticMethodId
5253
import org.utbot.framework.plugin.api.util.methodId

utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/util/ExecutableIdUtil.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
package org.utbot.framework.codegen.model.util
22

33
import org.utbot.framework.plugin.api.ExecutableId
4+
import org.utbot.framework.plugin.api.util.isPackagePrivate
5+
import org.utbot.framework.plugin.api.util.isProtected
6+
import org.utbot.framework.plugin.api.util.isPublic
47

58
/**
69
* For now we will count executable accessible if it is whether public

utbot-framework/src/main/kotlin/org/utbot/framework/plugin/sarif/TargetClassWrapper.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package org.utbot.framework.plugin.sarif
22

33
import org.utbot.framework.plugin.api.ExecutableId
4+
import org.utbot.framework.plugin.api.util.isPrivate
45
import org.utbot.framework.plugin.api.util.executableId
56
import java.io.File
67
import kotlin.reflect.KClass

utbot-junit-contest/src/main/kotlin/org/utbot/contest/Contest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ fun runGeneration(
391391
private fun prepareClass(javaClazz: Class<*>, methodNameFilter: String?): List<ExecutableId> {
392392
//1. all methods from cut
393393
val methods = javaClazz.declaredMethods
394-
.filterNot { Modifier.isAbstract(it.modifiers) }
394+
.filterNot { it.isAbstract }
395395
.filterNotNull()
396396

397397
//2. all constructors from cut

0 commit comments

Comments
 (0)