Skip to content

First adoption of JCDB #669

New issue

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

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

Already on GitHub? # to your account

Closed
wants to merge 54 commits into from
Closed

First adoption of JCDB #669

wants to merge 54 commits into from

Conversation

lehvolk
Copy link
Collaborator

@lehvolk lehvolk commented Aug 4, 2022

Description

First steps in adoption of jcdb library. Moving ClassId. FieldId, MethodId to jcdb library.

relates to #349

Type of Change

  • Refactoring (typos and non-functional changes)

How Has This Been Tested?

Automated Testing

Specify tests that help to verify the change automatically.

Manual Scenario

Smoke tests should be run for all products: plugin, cli etc

Checklist (remove irrelevant options):

This is the author self-check list

  • The change followed the style guidelines of the UTBot project
  • Self-review of the code is passed
  • The change contains enough commentaries, particularly in hard-to-understand areas
  • New documentation is provided or existed one is altered
  • No new warnings
  • New tests have been added
  • All tests pass locally with my changes

viktoriia-fomina and others added 17 commits August 2, 2022 11:22
# Conflicts:
#	utbot-framework-api/src/main/kotlin/org/utbot/framework/plugin/api/Api.kt
#	utbot-framework/src/main/kotlin/org/utbot/engine/Extensions.kt
#	utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/CodeGenerator.kt
#	utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/constructor/context/CgContext.kt
#	utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/constructor/name/CgNameGenerator.kt
#	utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/constructor/tree/CgMethodConstructor.kt
#	utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/constructor/tree/CgTestClassConstructor.kt
#	utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/constructor/tree/CgVariableConstructor.kt
#	utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/constructor/util/CgStatementConstructor.kt
#	utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/constructor/util/ConstructorUtils.kt
#	utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/tree/CgElement.kt
#	utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/visitor/CgAbstractRenderer.kt
#	utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/visitor/CgJavaRenderer.kt
#	utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/visitor/CgKotlinRenderer.kt
#	utbot-framework/src/test/kotlin/org/utbot/examples/UtModelTestCaseChecker.kt
#	utbot-fuzzers/src/main/kotlin/org/utbot/fuzzer/providers/ObjectModelProvider.kt
# Conflicts:
#	utbot-framework-api/src/main/kotlin/org/utbot/framework/plugin/api/util/IdUtil.kt
#	utbot-framework/src/main/kotlin/org/utbot/engine/Extensions.kt
#	utbot-framework/src/main/kotlin/org/utbot/engine/Resolver.kt
#	utbot-framework/src/main/kotlin/org/utbot/engine/Traverser.kt
#	utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/constructor/tree/CgMethodConstructor.kt
- some tests are green

#349
# Conflicts:
#	utbot-cli/src/main/kotlin/org/utbot/cli/GenerateTestsAbstractCommand.kt
#	utbot-framework-api/src/main/kotlin/org/utbot/framework/plugin/api/Api.kt
#	utbot-framework-api/src/main/kotlin/org/utbot/framework/plugin/api/impl/FieldIdStrategies.kt
#	utbot-framework-api/src/main/kotlin/org/utbot/framework/plugin/api/util/IdUtil.kt
#	utbot-framework/src/main/kotlin/org/utbot/engine/ArrayObjectWrappers.kt
#	utbot-framework/src/main/kotlin/org/utbot/engine/CollectionWrappers.kt
#	utbot-framework/src/main/kotlin/org/utbot/engine/Memory.kt
#	utbot-framework/src/main/kotlin/org/utbot/engine/Resolver.kt
#	utbot-framework/src/main/kotlin/org/utbot/engine/Traverser.kt
#	utbot-framework/src/main/kotlin/org/utbot/engine/UtBotSymbolicEngine.kt
#	utbot-framework/src/main/kotlin/org/utbot/engine/util/statics/concrete/EnumConcreteUtils.kt
#	utbot-framework/src/main/kotlin/org/utbot/external/api/UtModelFactory.kt
#	utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/CodeGenerator.kt
#	utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/constructor/context/CgContext.kt
#	utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/constructor/tree/CgMethodConstructor.kt
#	utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/constructor/tree/CgVariableConstructor.kt
#	utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/constructor/tree/TestFrameworkManager.kt
#	utbot-framework/src/main/kotlin/org/utbot/framework/concrete/MockValueConstructor.kt
#	utbot-framework/src/main/kotlin/org/utbot/framework/concrete/UtExecutionInstrumentation.kt
#	utbot-framework/src/main/kotlin/org/utbot/framework/plugin/api/TestCaseGenerator.kt
#	utbot-framework/src/main/kotlin/org/utbot/fuzzer/FallbackModelProvider.kt
#	utbot-framework/src/test/kotlin/org/utbot/examples/UtModelTestCaseChecker.kt
#	utbot-framework/src/test/kotlin/org/utbot/examples/enums/ClassWithEnumTest.kt
#	utbot-fuzzers/src/main/kotlin/org/utbot/fuzzer/providers/EnumModelProvider.kt
#	utbot-fuzzers/src/main/kotlin/org/utbot/fuzzer/providers/ObjectModelProvider.kt
#	utbot-fuzzers/src/test/kotlin/org/utbot/framework/plugin/api/ModelProviderTest.kt
#	utbot-instrumentation-tests/src/test/kotlin/org/utbot/examples/et/TestStaticsUsage.kt
#	utbot-instrumentation/src/main/kotlin/org/utbot/instrumentation/instrumentation/InvokeWithStaticsInstrumentation.kt
compile(project(':utbot-instrumentation'))
api(project(':utbot-instrumentation'))

implementation group: 'com.github.haifengl', name: 'smile-kotlin', version: '2.6.0'
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

make update here, it's removed outdated dependencies

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change is from Denis update-gradle-version branch.

lehvolk and others added 7 commits August 5, 2022 15:25
- introduce scope for calling reflection api

#349
- fix some tests

#349
# Conflicts:
#	.github/workflows/build-and-run-tests-from-branch.yml
#	.github/workflows/publish-plugin-and-cli-from-branch.yml
#	build.gradle
#	gradle.properties
#	utbot-analytics/build.gradle
#	utbot-framework-api/src/main/kotlin/org/utbot/framework/plugin/api/Api.kt
#	utbot-framework-api/src/main/kotlin/org/utbot/framework/plugin/api/util/IdUtil.kt
#	utbot-framework/build.gradle
#	utbot-framework/src/main/kotlin/org/utbot/engine/Extensions.kt
#	utbot-framework/src/main/kotlin/org/utbot/engine/Resolver.kt
#	utbot-framework/src/main/kotlin/org/utbot/engine/Traverser.kt
#	utbot-framework/src/main/kotlin/org/utbot/engine/UtBotSymbolicEngine.kt
#	utbot-framework/src/main/kotlin/org/utbot/engine/ValueConstructor.kt
#	utbot-framework/src/main/kotlin/org/utbot/external/api/UtBotJavaApi.kt
#	utbot-framework/src/main/kotlin/org/utbot/framework/codegen/Domain.kt
#	utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/CodeGenerator.kt
#	utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/constructor/CgMethodTestSet.kt
#	utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/constructor/context/CgContext.kt
#	utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/constructor/tree/CgCallableAccessManager.kt
#	utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/constructor/tree/CgFieldStateManager.kt
#	utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/constructor/tree/CgMethodConstructor.kt
#	utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/constructor/tree/CgTestClassConstructor.kt
#	utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/constructor/tree/TestFrameworkManager.kt
#	utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/constructor/util/CgStatementConstructor.kt
#	utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/constructor/util/ConstructorUtils.kt
#	utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/tree/CgElement.kt
#	utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/visitor/CgAbstractRenderer.kt
#	utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/visitor/UtilMethods.kt
#	utbot-framework/src/main/kotlin/org/utbot/framework/fields/ExecutionStateAnalyzer.kt
#	utbot-framework/src/main/kotlin/org/utbot/framework/util/EngineUtils.kt
#	utbot-framework/src/test/java/org/utbot/examples/manual/UtBotJavaApiTest.java
#	utbot-framework/src/test/kotlin/org/utbot/examples/UtValueTestCaseChecker.kt
#	utbot-framework/src/test/kotlin/org/utbot/examples/arrays/IntArrayBasicsTest.kt
#	utbot-framework/src/test/kotlin/org/utbot/examples/collections/ListIteratorsTest.kt
#	utbot-fuzzers/build.gradle
#	utbot-instrumentation/src/main/kotlin/org/utbot/instrumentation/ConcreteExecutor.kt
#	utbot-instrumentation/src/main/kotlin/org/utbot/instrumentation/process/ChildProcessRunner.kt
#	utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/generator/CodeGenerationController.kt
#	utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/models/GenerateTestsModel.kt
#	utbot-junit-contest/src/main/kotlin/org/utbot/contest/Contest.kt
#	utbot-summary-tests/build.gradle
#	utbot-summary/build.gradle
# Conflicts:
#	utbot-framework/src/main/kotlin/org/utbot/engine/Resolver.kt
#	utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/constructor/tree/CgMethodConstructor.kt
#	utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/util/ClassIdUtil.kt
#	utbot-framework/src/main/kotlin/org/utbot/framework/concrete/UtExecutionInstrumentation.kt
@lehvolk lehvolk closed this Aug 23, 2022
@Damtev Damtev deleted the feature-kotlin17-with-jclass branch March 20, 2023 16:02
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants