GeezerVison

Original file line number	Diff line number	Diff line change
Expand Up		@@ -148,7 +148,6 @@ import java.lang.reflect.ParameterizedType
		private const val DEEP_EQUALS_MAX_DEPTH = 5 // TODO move it to plugin settings?

		internal class CgMethodConstructor(val context: CgContext) : CgContextOwner by context,
		CgFieldStateManager by CgComponents.getFieldStateManagerBy(context),
		CgCallableAccessManager by CgComponents.getCallableAccessManagerBy(context),
		CgStatementConstructor by CgComponents.getStatementConstructorBy(context) {

Expand Down Expand Up		@@ -1275,6 +1274,7 @@ internal class CgMethodConstructor(val context: CgContext) : CgContextOwner by c
		rememberInitialStaticFields(statics)
		val stateAnalyzer = ExecutionStateAnalyzer(execution)
		val modificationInfo = stateAnalyzer.findModifiedFields()
		val fieldStateManager = CgFieldStateManagerImpl(context)
		// TODO: move such methods to another class and leave only 2 public methods: remember initial and final states
		val mainBody = {
		substituteStaticFields(statics)
Expand All		@@ -1288,10 +1288,10 @@ internal class CgMethodConstructor(val context: CgContext) : CgContextOwner by c
		val name = paramNames[executableId]?.get(index)
		methodArguments += variableConstructor.getOrCreateVariable(param, name)
		}
		rememberInitialEnvironmentState(modificationInfo)
		fieldStateManager.rememberInitialEnvironmentState(modificationInfo)
		recordActualResult()
		generateResultAssertions()
		rememberFinalEnvironmentState(modificationInfo)
		fieldStateManager.rememberFinalEnvironmentState(modificationInfo)
		generateFieldStateAssertions()
		}

Expand Down

7 changes: 1 addition & 6 deletions 7 ...mework/src/main/kotlin/org/utbot/framework/codegen/model/constructor/util/CgComponents.kt

Show comments

View file

Open in desktop

Original file line number	Diff line number	Diff line change
Expand Up		@@ -35,11 +35,7 @@ internal object CgComponents {
		is TestNg -> testFrameworkManagers.getOrPut(context) { TestNgManager(context) }
		}

		fun getMockFrameworkManagerBy(context: CgContext) =
		mockFrameworkManagers.getOrPut(context) { MockFrameworkManager(context) }

		fun getFieldStateManagerBy(context: CgContext) =
		fieldStateManagers.getOrPut(context) { CgFieldStateManagerImpl(context) }
		fun getMockFrameworkManagerBy(context: CgContext) = mockFrameworkManagers.getOrPut(context) { MockFrameworkManager(context) }

		fun getVariableConstructorBy(context: CgContext) = variableConstructors.getOrPut(context) { CgVariableConstructor(context) }

Expand All		@@ -51,7 +47,6 @@ internal object CgComponents {
		private val callableAccessManagers: MutableMap<CgContext, CgCallableAccessManager> = mutableMapOf()
		private val testFrameworkManagers: MutableMap<CgContext, TestFrameworkManager> = mutableMapOf()
		private val mockFrameworkManagers: MutableMap<CgContext, MockFrameworkManager> = mutableMapOf()
		private val fieldStateManagers: MutableMap<CgContext, CgFieldStateManager> = mutableMapOf()

		private val variableConstructors: MutableMap<CgContext, CgVariableConstructor> = mutableMapOf()
		private val methodConstructors: MutableMap<CgContext, CgMethodConstructor> = mutableMapOf()
Expand Down

Add this suggestion to a batch that can be applied as a single commit. This suggestion is invalid because no changes were made to the code. Suggestions cannot be applied while the pull request is closed. Suggestions cannot be applied while viewing a subset of changes. Only one suggestion per line can be applied in a batch. Add this suggestion to a batch that can be applied as a single commit. Applying suggestions on deleted lines is not supported. You must change the existing code in this line in order to create a valid suggestion. Outdated suggestions cannot be applied. This suggestion has been applied or marked resolved. Suggestions cannot be applied from pending reviews. Suggestions cannot be applied on multi-line comments. Suggestions cannot be applied while the pull request is queued to merge. Suggestion cannot be applied right now. Please check back later.

You are visitor 01402520 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.