Skip to content

Modificators processing in AssembleModelGenerator and UtBotFieldModificatorsSearcher corrected #1029

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
EgorkaKulikov merged 6 commits into from
Oct 3, 2022
Merged

Modificators processing in AssembleModelGenerator and UtBotFieldModificatorsSearcher corrected #1029

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b12f7c3
Improve modificators analysis in UtBotFieldModificatorsSearcher and A…
EgorkaKulikov Sep 28, 2022
afc00d9
Apply review comments
EgorkaKulikov Oct 3, 2022
a0300ce
Merge branch 'main' into egor/fms_default_package
EgorkaKulikov Oct 3, 2022
213e6df
Fixed test
EgorkaKulikov Oct 3, 2022
332712c
One more correction for package names
EgorkaKulikov Oct 3, 2022
7f42484
Merge branch 'main' into egor/fms_default_package
EgorkaKulikov Oct 3, 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
Apply review comments
  • Loading branch information
@EgorkaKulikov
EgorkaKulikov committed Oct 3, 2022
commit afc00d922a60eceeffa235c22a0cdef69b31e266
2 changes: 1 addition & 1 deletion ...assemble/arrays/ArrayOfComplexArrays.java → ...amples/assemble/ArrayOfComplexArrays.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.utbot.examples.assemble.arrays;
package org.utbot.examples.assemble;

/**
* A class with array of objects that are arrays of complex fields themselves.
Expand Down
2 changes: 1 addition & 1 deletion ...semble/arrays/ArrayOfPrimitiveArrays.java → ...ples/assemble/ArrayOfPrimitiveArrays.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.utbot.examples.assemble.arrays;
package org.utbot.examples.assemble;

/**
* A class with a two-dimensional array field.
Expand Down
2 changes: 1 addition & 1 deletion ...amples/assemble/arrays/AssignedArray.java → ...tbot/examples/assemble/AssignedArray.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.utbot.examples.assemble.arrays;
package org.utbot.examples.assemble;

/**
* A class with an array with a default value.
Expand Down
2 changes: 1 addition & 1 deletion ...xamples/assemble/arrays/ComplexArray.java → ...utbot/examples/assemble/ComplexArray.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.utbot.examples.assemble.arrays;
package org.utbot.examples.assemble;

import org.utbot.examples.assemble.PrimitiveFields;

Expand Down
2 changes: 1 addition & 1 deletion ...mble/constructors/ComplexConstructor.java → ...examples/assemble/ComplexConstructor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.utbot.examples.assemble.constructors;
package org.utbot.examples.assemble;

/**
* A class without default constructor and with complex one.
Expand Down
2 changes: 1 addition & 1 deletion ...ructors/ComplexConstructorWithSetter.java → ...ssemble/ComplexConstructorWithSetter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.utbot.examples.assemble.constructors;
package org.utbot.examples.assemble;

/**
* A class without default constructor and with complex one,
Expand Down
2 changes: 1 addition & 1 deletion ...structors/ConstructorModifyingStatic.java → .../assemble/ConstructorModifyingStatic.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.utbot.examples.assemble.constructors;
package org.utbot.examples.assemble;

public class ConstructorModifyingStatic {

Expand Down
2 changes: 1 addition & 1 deletion ...mples/assemble/defaults/DefaultField.java → ...utbot/examples/assemble/DefaultField.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.utbot.examples.assemble.defaults;
package org.utbot.examples.assemble;

/**
* A class with a field with default value that is not a default value of type.
Expand Down
2 changes: 1 addition & 1 deletion ...ts/DefaultFieldModifiedInConstructor.java → ...le/DefaultFieldModifiedInConstructor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.utbot.examples.assemble.defaults;
package org.utbot.examples.assemble;

public class DefaultFieldModifiedInConstructor {
public int z;
Expand Down
2 changes: 1 addition & 1 deletion ...aults/DefaultFieldWithDirectAccessor.java → ...emble/DefaultFieldWithDirectAccessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.utbot.examples.assemble.defaults;
package org.utbot.examples.assemble;

/**
* A class with a field with default value that is not a default value of type.
Expand Down
2 changes: 1 addition & 1 deletion ...mble/defaults/DefaultFieldWithSetter.java → ...ples/assemble/DefaultFieldWithSetter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.utbot.examples.assemble.defaults;
package org.utbot.examples.assemble;

/**
* A class with a field with setter default value that is not a default value of type.
Expand Down
2 changes: 1 addition & 1 deletion ...nstructors/InheritComplexConstructor.java → ...s/assemble/InheritComplexConstructor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.utbot.examples.assemble.constructors;
package org.utbot.examples.assemble;

/**
* A class with a primitive constructor that inherits a complex constructor.
Expand Down
2 changes: 1 addition & 1 deletion ...tructors/InheritPrimitiveConstructor.java → ...assemble/InheritPrimitiveConstructor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.utbot.examples.assemble.constructors;
package org.utbot.examples.assemble;

/**
* A class with a primitive constructor that inherits another primitive constructor.
Expand Down
2 changes: 1 addition & 1 deletion ...ples/assemble/arrays/MethodUnderTest.java → ...ot/examples/assemble/MethodUnderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.utbot.examples.assemble.arrays;
package org.utbot.examples.assemble;

/**
* A test class with fake method under test.
Expand Down
2 changes: 1 addition & 1 deletion ...mples/assemble/arrays/PrimitiveArray.java → ...bot/examples/assemble/PrimitiveArray.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.utbot.examples.assemble.arrays;
package org.utbot.examples.assemble;

/**
* A class with an array with elements of primitive type.
Expand Down
2 changes: 1 addition & 1 deletion ...le/constructors/PrimitiveConstructor.java → ...amples/assemble/PrimitiveConstructor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.utbot.examples.assemble.constructors;
package org.utbot.examples.assemble;

/**
* A class without default constructor and with primitive one.
Expand Down
2 changes: 1 addition & 1 deletion ...PrimitiveConstructorWithDefaultField.java → ...PrimitiveConstructorWithDefaultField.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.utbot.examples.assemble.constructors;
package org.utbot.examples.assemble;

/**
* A class without default constructor and with another one with default field
Expand Down
2 changes: 1 addition & 1 deletion ...mble/constructors/PrivateConstructor.java → ...examples/assemble/PrivateConstructor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.utbot.examples.assemble.constructors;
package org.utbot.examples.assemble;

/**
* A class with private constructor.
Expand Down
2 changes: 1 addition & 1 deletion ...onstructors/PseudoComplexConstructor.java → ...es/assemble/PseudoComplexConstructor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.utbot.examples.assemble.constructors;
package org.utbot.examples.assemble;

/**
* A class with a constructor that seems to be complex
Expand Down
2 changes: 1 addition & 1 deletion ...xamples/assemble/statics/StaticField.java → .../utbot/examples/assemble/StaticField.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.utbot.examples.assemble.statics;
package org.utbot.examples.assemble;

/**
* A class with primitive constructor and static field
Expand Down
2 changes: 1 addition & 1 deletion ...rk-test/src/main/java/org/utbot/examples/manual/examples/ArrayOfComplexArraysExample.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.utbot.examples.manual.examples;

import org.utbot.examples.assemble.arrays.ArrayOfComplexArrays;
import org.utbot.examples.assemble.ArrayOfComplexArrays;

public class ArrayOfComplexArraysExample {
public int getValue(ArrayOfComplexArrays a) {
Expand Down
2 changes: 1 addition & 1 deletion ...-test/src/main/java/org/utbot/examples/manual/examples/ArrayOfPrimitiveArraysExample.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.utbot.examples.manual.examples;

import org.utbot.examples.assemble.arrays.ArrayOfPrimitiveArrays;
import org.utbot.examples.assemble.ArrayOfPrimitiveArrays;

public class ArrayOfPrimitiveArraysExample {
int assign10(ArrayOfPrimitiveArrays a) {
Expand Down
2 changes: 1 addition & 1 deletion ...framework-test/src/main/java/org/utbot/examples/manual/examples/AssignedArrayExample.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.utbot.examples.manual.examples;

import org.utbot.examples.assemble.arrays.AssignedArray;
import org.utbot.examples.assemble.AssignedArray;

public class AssignedArrayExample {
public void foo(AssignedArray aa) {
Expand Down
8 changes: 4 additions & 4 deletions utbot-framework-test/src/test/java/org/utbot/examples/manual/UtBotJavaApiTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
import org.utbot.common.PathUtil;
import org.utbot.examples.assemble.DirectAccess;
import org.utbot.examples.assemble.PrimitiveFields;
import org.utbot.examples.assemble.arrays.ArrayOfComplexArrays;
import org.utbot.examples.assemble.arrays.ArrayOfPrimitiveArrays;
import org.utbot.examples.assemble.arrays.AssignedArray;
import org.utbot.examples.assemble.arrays.ComplexArray;
import org.utbot.examples.assemble.ArrayOfComplexArrays;
import org.utbot.examples.assemble.ArrayOfPrimitiveArrays;
import org.utbot.examples.assemble.AssignedArray;
import org.utbot.examples.assemble.ComplexArray;
import org.utbot.examples.manual.examples.*;
import org.utbot.examples.manual.examples.customer.B;
import org.utbot.examples.manual.examples.customer.C;
Expand Down
40 changes: 20 additions & 20 deletions ...ramework-test/src/test/kotlin/org/utbot/framework/assemble/AssembleModelGeneratorTests.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,27 +16,27 @@ import org.utbot.examples.assemble.ListItem
import org.utbot.examples.assemble.NoModifier
import org.utbot.examples.assemble.PackagePrivateFields
import org.utbot.examples.assemble.PrimitiveFields
import org.utbot.examples.assemble.arrays.ArrayOfComplexArrays
import org.utbot.examples.assemble.arrays.ArrayOfPrimitiveArrays
import org.utbot.examples.assemble.arrays.AssignedArray
import org.utbot.examples.assemble.arrays.ComplexArray
import org.utbot.examples.assemble.arrays.MethodUnderTest
import org.utbot.examples.assemble.arrays.PrimitiveArray
import org.utbot.examples.assemble.constructors.ComplexConstructor
import org.utbot.examples.assemble.constructors.ComplexConstructorWithSetter
import org.utbot.examples.assemble.constructors.ConstructorModifyingStatic
import org.utbot.examples.assemble.constructors.InheritComplexConstructor
import org.utbot.examples.assemble.constructors.InheritPrimitiveConstructor
import org.utbot.examples.assemble.constructors.PrimitiveConstructor
import org.utbot.examples.assemble.constructors.PrimitiveConstructorWithDefaultField
import org.utbot.examples.assemble.constructors.PrivateConstructor
import org.utbot.examples.assemble.constructors.PseudoComplexConstructor
import org.utbot.examples.assemble.defaults.DefaultField
import org.utbot.examples.assemble.defaults.DefaultFieldModifiedInConstructor
import org.utbot.examples.assemble.defaults.DefaultFieldWithDirectAccessor
import org.utbot.examples.assemble.defaults.DefaultFieldWithSetter
import org.utbot.examples.assemble.ArrayOfComplexArrays
import org.utbot.examples.assemble.ArrayOfPrimitiveArrays
import org.utbot.examples.assemble.AssignedArray
import org.utbot.examples.assemble.ComplexArray
import org.utbot.examples.assemble.MethodUnderTest
import org.utbot.examples.assemble.PrimitiveArray
import org.utbot.examples.assemble.ComplexConstructor
import org.utbot.examples.assemble.ComplexConstructorWithSetter
import org.utbot.examples.assemble.ConstructorModifyingStatic
import org.utbot.examples.assemble.InheritComplexConstructor
import org.utbot.examples.assemble.InheritPrimitiveConstructor
import org.utbot.examples.assemble.PrimitiveConstructor
import org.utbot.examples.assemble.PrimitiveConstructorWithDefaultField
import org.utbot.examples.assemble.PrivateConstructor
import org.utbot.examples.assemble.PseudoComplexConstructor
import org.utbot.examples.assemble.DefaultField
import org.utbot.examples.assemble.DefaultFieldModifiedInConstructor
import org.utbot.examples.assemble.DefaultFieldWithDirectAccessor
import org.utbot.examples.assemble.DefaultFieldWithSetter
import org.utbot.examples.assemble.DefaultPackagePrivateField
import org.utbot.examples.assemble.statics.StaticField
import org.utbot.examples.assemble.StaticField
import org.utbot.framework.plugin.api.ClassId
import org.utbot.framework.plugin.api.ExecutableId
import org.utbot.framework.plugin.api.FieldId
Expand Down
2 changes: 1 addition & 1 deletion utbot-framework/src/main/kotlin/org/utbot/framework/assemble/AssembleModelGenerator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,7 @@ class AssembleModelGenerator(private val basePackageName: String) {
}

private val ClassId.isVisible : Boolean
get() = this.isPublic || !this.isPrivate && this.packageName.startsWith(basePackageName)
get() = this.isPublic || !this.isPrivate && this.packageName == basePackageName

private val Constructor<*>.isVisible : Boolean
get() = this.isPublic || !this.isPrivate && this.declaringClass.packageName.startsWith(basePackageName)
Expand Down
7 changes: 5 additions & 2 deletions ...work/src/main/kotlin/org/utbot/framework/modifications/UtBotFieldsModificatorsSearcher.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
package org.utbot.framework.modifications

import org.utbot.framework.plugin.api.ClassId
import org.utbot.framework.plugin.api.ExecutableId
import org.utbot.framework.plugin.api.FieldId
import org.utbot.framework.plugin.api.StatementId
import org.utbot.framework.plugin.api.util.isSubtypeOf

Comment thread
EgorkaKulikov marked this conversation as resolved.
class UtBotFieldsModificatorsSearcher {

Expand All @@ -14,6 +12,11 @@ class UtBotFieldsModificatorsSearcher {

fun delete(classIds: Set<ClassId>) = statementsStorage.delete(classIds)

/**
* Finds field modificators.
*
* @param analysisMode represents which type of modificators (e.g. setters) are considered.
*/
fun findModificators(analysisMode: AnalysisMode): Map<FieldId, Set<StatementId>> {
statementsStorage.updateCaches()
return findModificatorsInCache(analysisMode)
Expand Down