Let engine utContext.classLoader fallback to UtBot own class path
#2556
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
IlyaMuravjov
added
comp-infrastructure
|
|
||
| override fun getResource(name: String): URL? { | ||
| var res: URL? = commonParent.getResource(name) | ||
| if (res === null) { |
There was a problem hiding this comment.
Minor:
Why do you use === here? Previously, you used ==.
There was a problem hiding this comment.
Intellij IDEA reports a warning when equals (==) is used for URL saying it may perform a DNS lookup, using reference equality helps to avoid the warning.
| // - Finally, if all else fails we try to load class/resource from UtBot classpath | ||
| // - at this step we load classes from UtBot project and its dependencies (e.g. Mockito if user doesn't have it, see #2545) | ||
| UtContext.setUtContext(UtContext( | ||
| FallbackClassLoader( |
There was a problem hiding this comment.
Minor:
Extract it to variable
| UtContext.setUtContext(UtContext( | ||
| FallbackClassLoader( | ||
| urls = params.classpathForUrlsClassloader.map { File(it).toURI().toURL() }.toTypedArray(), | ||
| fallback = ClassLoader.getSystemClassLoader(), |
There was a problem hiding this comment.
Minor:
Extract it to variable
sergeypospelov
approved these changes
Aug 28, 2023
EgorkaKulikov
approved these changes
Aug 28, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description
Fixes #2523 by utilizing child first class loader.
Additional context
#2523 is a regression caused by #2479, however we can't revert #2479, because otherwise UtBot classpath would be prioritized over user's classpath, causing issues when user and UtBot use different versions of same library. This PR makes it so UtBot classpath is still used, but only if the class is not found on the user classpath.
How to test
Manual tests
Scenario from issue should no longer reproduce
Self-check list