Fix "data object" tests

"data object" is postponed till 1.9

Related commit in kotlin repo:
https://github.com/JetBrains/kotlin/commit/f643cdf90b5c4af9d6988b6167957c9b76f02647

Use `// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects` instead of
`// LANGUAGE_VERSION: 1.8` because it's more reliable and less invasive

(cherry picked from commit 3a15873dc9191b7da4155b321826fe28c90b40a8)

GitOrigin-RevId: 025ea414210241bfc537ebc7bfbf21ce4f07dfb0
This commit is contained in:
Nikita Bobko
2022-09-22 20:16:01 +00:00
committed by intellij-monorepo-bot
parent 969d83b9a8
commit 3f47038ba3
48 changed files with 58 additions and 57 deletions
@@ -3988,14 +3988,14 @@ public abstract class LocalInspectionTestGenerated extends AbstractLocalInspecti
runTest("testData/inspectionsLocal/convertSealedSubClassToObject/convertSubClassWithoutParentheses.kt");
}
@TestMetadata("dataClass17Lv.kt")
public void testDataClass17Lv() throws Exception {
runTest("testData/inspectionsLocal/convertSealedSubClassToObject/dataClass17Lv.kt");
@TestMetadata("dataClass_dataObjectIsDisabled.kt")
public void testDataClass_dataObjectIsDisabled() throws Exception {
runTest("testData/inspectionsLocal/convertSealedSubClassToObject/dataClass_dataObjectIsDisabled.kt");
}
@TestMetadata("dataClass18Lv.kt")
public void testDataClass18Lv() throws Exception {
runTest("testData/inspectionsLocal/convertSealedSubClassToObject/dataClass18Lv.kt");
@TestMetadata("dataClass_dataObjectIsEnabled.kt")
public void testDataClass_dataObjectIsEnabled() throws Exception {
runTest("testData/inspectionsLocal/convertSealedSubClassToObject/dataClass_dataObjectIsEnabled.kt");
}
@TestMetadata("dataObject.kt")
@@ -1,5 +1,5 @@
// PROBLEM: none
// LANGUAGE_VERSION: 1.8
// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects
import java.io.Serializable
data object<caret> Foo : Serializable
@@ -1,5 +1,5 @@
// PROBLEM: none
// LANGUAGE_VERSION: 1.8
// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects
import java.io.Serializable
fun main() {
@@ -1,5 +1,5 @@
// PROBLEM: none
// LANGUAGE_VERSION: 1.8
// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects
import java.io.Serializable
class Foo {
@@ -1,4 +1,4 @@
// LANGUAGE_VERSION: 1.8
// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects
object<caret> Foo {
override fun toString(): String = "Foo"
override fun equals(other: Any?): Boolean = other is Foo
@@ -1,2 +1,2 @@
// LANGUAGE_VERSION: 1.8
// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects
data object Foo
@@ -1,4 +1,4 @@
// LANGUAGE_VERSION: 1.8
// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects
import java.io.Serializable
object<caret> Foo : Serializable {
@@ -1,4 +1,4 @@
// LANGUAGE_VERSION: 1.8
// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects
import java.io.Serializable
data object Foo : Serializable
@@ -1,4 +1,4 @@
// LANGUAGE_VERSION: 1.8
// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects
object<caret> Foo {
override fun toString(): String = "Foo"
override fun hashCode(): Int = 42
@@ -1,2 +1,2 @@
// LANGUAGE_VERSION: 1.8
// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects
data object Foo
@@ -1,4 +1,4 @@
// LANGUAGE_VERSION: 1.8
// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects
object<caret> Foo {
override fun toString(): String = Foo::class.simpleName!!
}
@@ -1,2 +1,2 @@
// LANGUAGE_VERSION: 1.8
// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects
data object Foo
@@ -1,4 +1,4 @@
// LANGUAGE_VERSION: 1.8
// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects
object<caret> Foo {
override fun toString(): String = Foo::class.simpleName ?: throw Exception()
}
@@ -1,2 +1,2 @@
// LANGUAGE_VERSION: 1.8
// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects
data object Foo
@@ -1,4 +1,4 @@
// LANGUAGE_VERSION: 1.8
// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects
object<caret> Foo {
override fun toString(): String = "Foo"
}
@@ -1,2 +1,2 @@
// LANGUAGE_VERSION: 1.8
// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects
data object Foo
@@ -1,4 +1,4 @@
// LANGUAGE_VERSION: 1.8
// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects
object<caret> Foo {
override fun toString(): String = Foo::class.java.simpleName
}
@@ -1,2 +1,2 @@
// LANGUAGE_VERSION: 1.8
// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects
data object Foo
@@ -1,4 +1,4 @@
// LANGUAGE_VERSION: 1.8
// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects
// PROBLEM: none
object<caret> Foo {
override fun toString(): String = "Foo"
@@ -1,4 +1,4 @@
// LANGUAGE_VERSION: 1.8
// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects
// PROBLEM: none
object<caret> Foo {
override fun toString(): String {
@@ -1,4 +1,4 @@
// LANGUAGE_VERSION: 1.8
// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects
// PROBLEM: none
object<caret> Foo {
override fun toString(): String = "Foo"
@@ -1,4 +1,4 @@
// LANGUAGE_VERSION: 1.8
// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects
// PROBLEM: none
object<caret> Foo {
override fun toString(): String {
@@ -1,5 +1,5 @@
// PROBLEM: none
// LANGUAGE_VERSION: 1.8
// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects
object<caret> Foo : Bar()
open class Bar
@@ -1,4 +1,4 @@
// LANGUAGE_VERSION: 1.8
// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects
object<caret> Foo {
override fun toString(): String {
return "Foo"
@@ -1,4 +1,4 @@
// LANGUAGE_VERSION: 1.8
// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects
data object Foo {
fun foo() = 42
@@ -1,4 +1,4 @@
// LANGUAGE_VERSION: 1.8
// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects
object<caret> Foo {
override fun toString(): String = "Foo"
fun readResolve(): Any = Foo
@@ -1,4 +1,4 @@
// LANGUAGE_VERSION: 1.8
// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects
data object<caret> Foo {
fun readResolve(): Any = Foo
}
@@ -1,4 +1,4 @@
// LANGUAGE_VERSION: 1.8
// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects
import java.io.Serializable
object<caret> Foo : Serializable {
@@ -1,4 +1,4 @@
// LANGUAGE_VERSION: 1.8
// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects
import java.io.Serializable
data object Foo : Serializable {
@@ -1,4 +1,4 @@
// LANGUAGE_VERSION: 1.8
// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects
// PROBLEM: none
import java.io.Serializable
@@ -1,4 +1,4 @@
// LANGUAGE_VERSION: 1.8
// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects
sealed class Seal
object<caret> Foo : Seal()
@@ -1,4 +1,4 @@
// LANGUAGE_VERSION: 1.8
// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects
sealed class Seal
data object Foo : Seal()
@@ -1,4 +1,4 @@
// LANGUAGE_VERSION: 1.8
// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects
// PROBLEM: none
sealed class Seal
@@ -1,4 +1,4 @@
// LANGUAGE_VERSION: 1.8
// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects
sealed class Seal
object<caret> Foo : Seal() {
@@ -1,4 +1,4 @@
// LANGUAGE_VERSION: 1.8
// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects
sealed class Seal
data object<caret> Foo : Seal()
@@ -1,4 +1,4 @@
// LANGUAGE_VERSION: 1.8
// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects
// PROBLEM: none
object<caret> Foo : java.io.Serializable {
override fun toString(): String = "FOO"
@@ -1,4 +1,4 @@
// LANGUAGE_VERSION: 1.8
// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects
import java.io.Serializable
object<caret> Foo : Serializable
@@ -1,4 +1,4 @@
// LANGUAGE_VERSION: 1.8
// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects
import java.io.Serializable
data object Foo : Serializable
@@ -1,4 +1,4 @@
// LANGUAGE_VERSION: 1.8
// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects
import java.io.Serializable
object<caret> Foo : Bar()
@@ -1,4 +1,4 @@
// LANGUAGE_VERSION: 1.8
// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects
import java.io.Serializable
data object Foo : Bar()
@@ -1,4 +1,4 @@
// LANGUAGE_VERSION: 1.8
// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects
// DISABLE-ERRORS
sealed class Bar
@@ -1,4 +1,4 @@
// LANGUAGE_VERSION: 1.8
// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects
// DISABLE-ERRORS
sealed class Bar
@@ -1,4 +1,4 @@
// LANGUAGE_VERSION: 1.8
// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects
// FIX: Convert sealed subclass to object
sealed class Sealed
@@ -1,4 +1,4 @@
// LANGUAGE_VERSION: 1.8
// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects
// FIX: Convert sealed subclass to object
sealed class Sealed
@@ -1,4 +1,4 @@
// LANGUAGE_VERSION: 1.8
// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects
enum class <caret>MyEnum() {
FOO, BAR
@@ -1,4 +1,4 @@
// LANGUAGE_VERSION: 1.8
// COMPILER_ARGUMENTS: -XXLanguage:+DataObjects
sealed class MyEnum() {
data object FOO : MyEnum()
@@ -186,14 +186,14 @@ public abstract class Fe10BindingLocalInspectionTestGenerated extends AbstractFe
runTest("../idea/tests/testData/inspectionsLocal/convertSealedSubClassToObject/convertSubClassWithoutParentheses.kt");
}
@TestMetadata("dataClass17Lv.kt")
public void testDataClass17Lv() throws Exception {
runTest("../idea/tests/testData/inspectionsLocal/convertSealedSubClassToObject/dataClass17Lv.kt");
@TestMetadata("dataClass_dataObjectIsDisabled.kt")
public void testDataClass_dataObjectIsDisabled() throws Exception {
runTest("../idea/tests/testData/inspectionsLocal/convertSealedSubClassToObject/dataClass_dataObjectIsDisabled.kt");
}
@TestMetadata("dataClass18Lv.kt")
public void testDataClass18Lv() throws Exception {
runTest("../idea/tests/testData/inspectionsLocal/convertSealedSubClassToObject/dataClass18Lv.kt");
@TestMetadata("dataClass_dataObjectIsEnabled.kt")
public void testDataClass_dataObjectIsEnabled() throws Exception {
runTest("../idea/tests/testData/inspectionsLocal/convertSealedSubClassToObject/dataClass_dataObjectIsEnabled.kt");
}
@TestMetadata("dataObject.kt")