-
Notifications
You must be signed in to change notification settings - Fork 90
Improve CovariantEquals for kotlin
#765
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
Merged
Merged
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
92979dd
Fix CSA kotlin issue
Laurens-W 6117816
Update copyright year in CovariantEqualsTest.java
Laurens-W 81a4773
Clean it up
Laurens-W c09778c
Update src/test/java/org/openrewrite/staticanalysis/kotlin/CovariantE…
Laurens-W 1b3d73e
Merge branch 'main' into covarient-equals-kotlin
Laurens-W 9c03717
Fix build
Laurens-W a46092f
Merge branch 'main' into covarient-equals-kotlin
timtebeek 36d5350
Apply suggestions from code review
timtebeek 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 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
175 changes: 175 additions & 0 deletions
175
src/test/java/org/openrewrite/staticanalysis/kotlin/CovariantEqualsTest.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,175 @@ | ||
| /* | ||
| * Copyright 2025 the original author or authors. | ||
| * <p> | ||
| * Licensed under the Moderne Source Available License (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * <p> | ||
| * https://docs.moderne.io/licensing/moderne-source-available-license | ||
| * <p> | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.openrewrite.staticanalysis.kotlin; | ||
|
|
||
| import org.junit.jupiter.api.Test; | ||
| import org.openrewrite.Issue; | ||
| import org.openrewrite.staticanalysis.CovariantEquals; | ||
| import org.openrewrite.test.RecipeSpec; | ||
| import org.openrewrite.test.RewriteTest; | ||
|
|
||
| import static org.openrewrite.kotlin.Assertions.kotlin; | ||
|
|
||
| class CovariantEqualsTest implements RewriteTest { | ||
|
|
||
| @Override | ||
| public void defaults(RecipeSpec spec) { | ||
| spec.recipe(new CovariantEquals()); | ||
| } | ||
|
|
||
| @Test | ||
| void topLevelFunctionDoesNotCrash() { | ||
| // This test verifies that the recipe doesn't crash when encountering a top-level Kotlin function | ||
| // Top-level functions don't have a class parent, which was causing the dropParentUntil error | ||
| rewriteRun( | ||
| kotlin( | ||
| """ | ||
| // Top-level equals function - should not cause a crash | ||
| fun equals(other: String): Boolean { | ||
| return false | ||
| } | ||
|
|
||
| fun main() { | ||
| println("Test") | ||
| } | ||
| """ | ||
| ) | ||
| ); | ||
| } | ||
|
|
||
| @Test | ||
| void kotlinClassWithCovariantEquals() { | ||
| // Test that Kotlin classes with covariant equals are left unchanged | ||
| // (Kotlin has its own mechanisms for handling equals) | ||
| rewriteRun( | ||
| kotlin( | ||
| """ | ||
| class Test { | ||
| var n: Int = 0 | ||
|
|
||
| fun equals(other: Test): Boolean { | ||
| return n == other.n | ||
| } | ||
| } | ||
| """ | ||
| ) | ||
| ); | ||
| } | ||
|
|
||
| @Test | ||
| void kotlinDataClassUnchanged() { | ||
| // Data classes have compiler-generated equals methods | ||
| rewriteRun( | ||
| kotlin( | ||
| """ | ||
| data class Person(val name: String, val age: Int) | ||
| """ | ||
| ) | ||
| ); | ||
| } | ||
|
|
||
| @Test | ||
| void kotlinInterfaceWithEquals() { | ||
| // Test that interfaces with equals methods don't cause crashes | ||
| rewriteRun( | ||
| kotlin( | ||
| """ | ||
| interface TestInterface { | ||
| fun equals(other: TestInterface): Boolean | ||
| } | ||
|
|
||
| class TestImpl : TestInterface { | ||
| override fun equals(other: TestInterface): Boolean { | ||
| return true | ||
| } | ||
| } | ||
| """ | ||
| ) | ||
| ); | ||
| } | ||
|
|
||
| @Test | ||
| void kotlinObjectDeclaration() { | ||
| // Test that object declarations (singletons) don't cause crashes | ||
| rewriteRun( | ||
| kotlin( | ||
| """ | ||
| object Singleton { | ||
| fun equals(other: Singleton): Boolean { | ||
| return true | ||
| } | ||
| } | ||
| """ | ||
| ) | ||
| ); | ||
| } | ||
|
|
||
| @Test | ||
| void kotlinEnumWithEquals() { | ||
| // Test that enum classes with equals methods don't cause crashes | ||
| rewriteRun( | ||
| kotlin( | ||
| """ | ||
| enum class Color { | ||
| RED, GREEN, BLUE; | ||
|
|
||
| fun equals(other: Color): Boolean { | ||
| return this == other | ||
| } | ||
| } | ||
| """ | ||
| ) | ||
| ); | ||
| } | ||
|
|
||
| @Test | ||
| void kotlinNestedClassWithEquals() { | ||
| // Test nested classes with equals methods | ||
| rewriteRun( | ||
| kotlin( | ||
| """ | ||
| class Outer { | ||
| class Inner { | ||
| var value: Int = 0 | ||
|
|
||
| fun equals(other: Inner): Boolean { | ||
| return value == other.value | ||
| } | ||
| } | ||
| } | ||
| """ | ||
| ) | ||
| ); | ||
| } | ||
|
|
||
| @Test | ||
| void kotlinCompanionObjectWithEquals() { | ||
| // Test companion objects with equals methods | ||
| rewriteRun( | ||
| kotlin( | ||
| """ | ||
| class MyClass { | ||
| companion object { | ||
| fun equals(other: MyClass): Boolean { | ||
| return false | ||
| } | ||
| } | ||
| } | ||
| """ | ||
| ) | ||
| ); | ||
| } | ||
| } | ||
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.
Uh oh!
There was an error while loading. Please reload this page.