-
Notifications
You must be signed in to change notification settings - Fork 215
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.
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
Improve jdeps tracking and add test cases #1115
Open
Bencodes
wants to merge
7
commits into
master
Choose a base branch
from
improve-jdeps-tracking-and-add-test-cases
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
fc4158c
Improve jdeps tracking and add test cases
Bencodes e7ca30b
EOL
Bencodes 41e3ce6
Revert
Bencodes 6af0035
Upstream some of the patches from Olivier
Bencodes ac8570f
Expand java annotation test cases
Bencodes 27eddde
EOL
Bencodes 59078a1
Imports
Bencodes File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -221,6 +221,87 @@ class KotlinBuilderJvmJdepsTest(private val enableK2Compiler: Boolean) { | |
assertIncomplete(jdeps).isEmpty() | ||
} | ||
|
||
@Test | ||
fun `java annotation on class is an explict dep`() { | ||
val dependingTarget = runJdepsCompileTask { c: KotlinJvmTestBuilder.TaskBuilder -> | ||
c.addSource( | ||
"AnotherClass.kt", | ||
""" | ||
package something | ||
|
||
@JavaAnnotation | ||
class AnotherClass { | ||
} | ||
""" | ||
) | ||
c.addDirectDependencies(TEST_FIXTURES_DEP) | ||
} | ||
val jdeps = depsProto(dependingTarget) | ||
|
||
assertThat(jdeps.ruleLabel).isEqualTo(dependingTarget.label()) | ||
|
||
assertExplicit(jdeps).contains(TEST_FIXTURES_DEP.singleCompileJar()) | ||
assertImplicit(jdeps).isEmpty() | ||
assertUnused(jdeps).isEmpty() | ||
assertIncomplete(jdeps).isEmpty() | ||
} | ||
|
||
@Test | ||
fun `java sealed classes`() { | ||
val dependingTarget = runJdepsCompileTask { c: KotlinJvmTestBuilder.TaskBuilder -> | ||
c.addSource( | ||
"AnotherClass.kt", | ||
""" | ||
package something | ||
|
||
import pkg.assertion.ExampleException | ||
|
||
sealed class SomeClass { | ||
companion object { | ||
fun mapExceptions(exception: Exception) = when (exception) { | ||
is ExampleException -> exception | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This test case demonstrates how it fails to track |
||
else -> exception | ||
} | ||
} | ||
} | ||
""" | ||
) | ||
c.addDirectDependencies(TEST_FIXTURES_DEP) | ||
} | ||
val jdeps = depsProto(dependingTarget) | ||
|
||
assertThat(jdeps.ruleLabel).isEqualTo(dependingTarget.label()) | ||
|
||
assertExplicit(jdeps).contains(TEST_FIXTURES_DEP.singleCompileJar()) | ||
assertImplicit(jdeps).isEmpty() | ||
assertUnused(jdeps).isEmpty() | ||
assertIncomplete(jdeps).isEmpty() | ||
} | ||
|
||
@Test | ||
fun `java classes with inheritance`() { | ||
val dependingTarget = runJdepsCompileTask { c: KotlinJvmTestBuilder.TaskBuilder -> | ||
c.addSource( | ||
"AnotherClass.kt", | ||
""" | ||
package something | ||
|
||
class SomeClass : SomeClassWithInheritance.BaseClassCallback { | ||
} | ||
""" | ||
) | ||
c.addDirectDependencies(TEST_FIXTURES_DEP) | ||
} | ||
val jdeps = depsProto(dependingTarget) | ||
|
||
assertThat(jdeps.ruleLabel).isEqualTo(dependingTarget.label()) | ||
|
||
assertExplicit(jdeps).contains(TEST_FIXTURES_DEP.singleCompileJar()) | ||
assertImplicit(jdeps).isEmpty() | ||
assertUnused(jdeps).isEmpty() | ||
assertIncomplete(jdeps).isEmpty() | ||
} | ||
|
||
@Test | ||
fun `java annotation on property is an explict dep`() { | ||
val dependingTarget = runJdepsCompileTask { c: KotlinJvmTestBuilder.TaskBuilder -> | ||
|
4 changes: 4 additions & 0 deletions
4
src/test/kotlin/io/bazel/kotlin/builder/tasks/testFixtures/BaseClass.java
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
package something; | ||
|
||
public abstract class BaseClass { | ||
} |
5 changes: 5 additions & 0 deletions
5
src/test/kotlin/io/bazel/kotlin/builder/tasks/testFixtures/ExampleException.java
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
package pkg.assertion; | ||
|
||
public class ExampleException extends RuntimeException { | ||
|
||
} |
9 changes: 9 additions & 0 deletions
9
src/test/kotlin/io/bazel/kotlin/builder/tasks/testFixtures/SomeClassWithInheritance.java
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
package something; | ||
|
||
public class SomeClassWithInheritance extends BaseClass { | ||
|
||
|
||
interface BaseClassCallback { | ||
|
||
} | ||
} |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This test case demonstrates how it fails to track runtime class annotations as a used type.