From d53d5dddc51dacb8fc8eb0ba0167a6ad89652924 Mon Sep 17 00:00:00 2001 From: Brian Norman Date: Mon, 26 Feb 2024 11:38:21 -0600 Subject: [PATCH] [PowerAssert] Add tests to recreate KT-65810 --- .../DispatchInfixComplexReceiver.box.txt | 6 +++++ .../infix/DispatchInfixComplexReceiver.kt | 12 ++++++++++ .../DispatchNonInfixComplexReceiver.box.txt | 6 +++++ .../infix/DispatchNonInfixComplexReceiver.kt | 12 ++++++++++ .../ExtensionInfixComplexReceiver.box.txt | 5 ++++ .../infix/ExtensionInfixComplexReceiver.kt | 7 ++++++ .../ExtensionNonInfixComplexReceiver.box.txt | 5 ++++ .../infix/ExtensionNonInfixComplexReceiver.kt | 7 ++++++ ...BoxCodegenTestForPowerAssertGenerated.java | 24 +++++++++++++++++++ ...BoxCodegenTestForPowerAssertGenerated.java | 24 +++++++++++++++++++ 10 files changed, 108 insertions(+) create mode 100644 plugins/power-assert/testData/codegen/infix/DispatchInfixComplexReceiver.box.txt create mode 100644 plugins/power-assert/testData/codegen/infix/DispatchInfixComplexReceiver.kt create mode 100644 plugins/power-assert/testData/codegen/infix/DispatchNonInfixComplexReceiver.box.txt create mode 100644 plugins/power-assert/testData/codegen/infix/DispatchNonInfixComplexReceiver.kt create mode 100644 plugins/power-assert/testData/codegen/infix/ExtensionInfixComplexReceiver.box.txt create mode 100644 plugins/power-assert/testData/codegen/infix/ExtensionInfixComplexReceiver.kt create mode 100644 plugins/power-assert/testData/codegen/infix/ExtensionNonInfixComplexReceiver.box.txt create mode 100644 plugins/power-assert/testData/codegen/infix/ExtensionNonInfixComplexReceiver.kt diff --git a/plugins/power-assert/testData/codegen/infix/DispatchInfixComplexReceiver.box.txt b/plugins/power-assert/testData/codegen/infix/DispatchInfixComplexReceiver.box.txt new file mode 100644 index 00000000000..1b112ff538e --- /dev/null +++ b/plugins/power-assert/testData/codegen/infix/DispatchInfixComplexReceiver.box.txt @@ -0,0 +1,6 @@ +wrapper mustEqual "world".length + | | | + | | 5 + | Wrapper + Holder(wrapper=Wrapper) +Complex \ No newline at end of file diff --git a/plugins/power-assert/testData/codegen/infix/DispatchInfixComplexReceiver.kt b/plugins/power-assert/testData/codegen/infix/DispatchInfixComplexReceiver.kt new file mode 100644 index 00000000000..72c499d4595 --- /dev/null +++ b/plugins/power-assert/testData/codegen/infix/DispatchInfixComplexReceiver.kt @@ -0,0 +1,12 @@ +// FUNCTION: infix.dispatch.Wrapper.mustEqual + +import infix.dispatch.* + +data class Holder(val wrapper: Wrapper) +data object Complex { + val holder = Holder(Wrapper(3)) +} + +fun box() = expectThrowableMessage { + Complex.holder.wrapper mustEqual "world".length +} diff --git a/plugins/power-assert/testData/codegen/infix/DispatchNonInfixComplexReceiver.box.txt b/plugins/power-assert/testData/codegen/infix/DispatchNonInfixComplexReceiver.box.txt new file mode 100644 index 00000000000..da9429cf882 --- /dev/null +++ b/plugins/power-assert/testData/codegen/infix/DispatchNonInfixComplexReceiver.box.txt @@ -0,0 +1,6 @@ +wrapper.mustEqual("world".length) + | | | + | | 5 + | Wrapper + Holder(wrapper=Wrapper) +Complex \ No newline at end of file diff --git a/plugins/power-assert/testData/codegen/infix/DispatchNonInfixComplexReceiver.kt b/plugins/power-assert/testData/codegen/infix/DispatchNonInfixComplexReceiver.kt new file mode 100644 index 00000000000..bc6e89f3e90 --- /dev/null +++ b/plugins/power-assert/testData/codegen/infix/DispatchNonInfixComplexReceiver.kt @@ -0,0 +1,12 @@ +// FUNCTION: infix.dispatch.Wrapper.mustEqual + +import infix.dispatch.* + +data class Holder(val wrapper: Wrapper) +data object Complex { + val holder = Holder(Wrapper(3)) +} + +fun box() = expectThrowableMessage { + Complex.holder.wrapper.mustEqual("world".length) +} diff --git a/plugins/power-assert/testData/codegen/infix/ExtensionInfixComplexReceiver.box.txt b/plugins/power-assert/testData/codegen/infix/ExtensionInfixComplexReceiver.box.txt new file mode 100644 index 00000000000..f5b90126f6b --- /dev/null +++ b/plugins/power-assert/testData/codegen/infix/ExtensionInfixComplexReceiver.box.txt @@ -0,0 +1,5 @@ +length mustEqual "world".length + | | + | 5 + 3 +ell \ No newline at end of file diff --git a/plugins/power-assert/testData/codegen/infix/ExtensionInfixComplexReceiver.kt b/plugins/power-assert/testData/codegen/infix/ExtensionInfixComplexReceiver.kt new file mode 100644 index 00000000000..472642e957c --- /dev/null +++ b/plugins/power-assert/testData/codegen/infix/ExtensionInfixComplexReceiver.kt @@ -0,0 +1,7 @@ +// FUNCTION: infix.extension.mustEqual + +import infix.extension.* + +fun box() = expectThrowableMessage { + "hello".substring(1, 4).length mustEqual "world".length +} diff --git a/plugins/power-assert/testData/codegen/infix/ExtensionNonInfixComplexReceiver.box.txt b/plugins/power-assert/testData/codegen/infix/ExtensionNonInfixComplexReceiver.box.txt new file mode 100644 index 00000000000..457f1d789f8 --- /dev/null +++ b/plugins/power-assert/testData/codegen/infix/ExtensionNonInfixComplexReceiver.box.txt @@ -0,0 +1,5 @@ +length.mustEqual("world".length) + | | + | 5 + 3 +ell \ No newline at end of file diff --git a/plugins/power-assert/testData/codegen/infix/ExtensionNonInfixComplexReceiver.kt b/plugins/power-assert/testData/codegen/infix/ExtensionNonInfixComplexReceiver.kt new file mode 100644 index 00000000000..b34efa46f21 --- /dev/null +++ b/plugins/power-assert/testData/codegen/infix/ExtensionNonInfixComplexReceiver.kt @@ -0,0 +1,7 @@ +// FUNCTION: infix.extension.mustEqual + +import infix.extension.* + +fun box() = expectThrowableMessage { + "hello".substring(1, 4).length.mustEqual("world".length) +} diff --git a/plugins/power-assert/tests-gen/org/jetbrains/kotlin/powerassert/FirLightTreeBlackBoxCodegenTestForPowerAssertGenerated.java b/plugins/power-assert/tests-gen/org/jetbrains/kotlin/powerassert/FirLightTreeBlackBoxCodegenTestForPowerAssertGenerated.java index f53456b844e..c1caa284318 100644 --- a/plugins/power-assert/tests-gen/org/jetbrains/kotlin/powerassert/FirLightTreeBlackBoxCodegenTestForPowerAssertGenerated.java +++ b/plugins/power-assert/tests-gen/org/jetbrains/kotlin/powerassert/FirLightTreeBlackBoxCodegenTestForPowerAssertGenerated.java @@ -272,6 +272,12 @@ public class FirLightTreeBlackBoxCodegenTestForPowerAssertGenerated extends Abst runTest("plugins/power-assert/testData/codegen/infix/DispatchInfix.kt"); } + @Test + @TestMetadata("DispatchInfixComplexReceiver.kt") + public void testDispatchInfixComplexReceiver() { + runTest("plugins/power-assert/testData/codegen/infix/DispatchInfixComplexReceiver.kt"); + } + @Test @TestMetadata("DispatchInfixConstantParameter.kt") public void testDispatchInfixConstantParameter() { @@ -296,6 +302,12 @@ public class FirLightTreeBlackBoxCodegenTestForPowerAssertGenerated extends Abst runTest("plugins/power-assert/testData/codegen/infix/DispatchNonInfix.kt"); } + @Test + @TestMetadata("DispatchNonInfixComplexReceiver.kt") + public void testDispatchNonInfixComplexReceiver() { + runTest("plugins/power-assert/testData/codegen/infix/DispatchNonInfixComplexReceiver.kt"); + } + @Test @TestMetadata("DispatchNonInfixConstantParameter.kt") public void testDispatchNonInfixConstantParameter() { @@ -320,6 +332,12 @@ public class FirLightTreeBlackBoxCodegenTestForPowerAssertGenerated extends Abst runTest("plugins/power-assert/testData/codegen/infix/ExtensionInfix.kt"); } + @Test + @TestMetadata("ExtensionInfixComplexReceiver.kt") + public void testExtensionInfixComplexReceiver() { + runTest("plugins/power-assert/testData/codegen/infix/ExtensionInfixComplexReceiver.kt"); + } + @Test @TestMetadata("ExtensionInfixConstantParameter.kt") public void testExtensionInfixConstantParameter() { @@ -344,6 +362,12 @@ public class FirLightTreeBlackBoxCodegenTestForPowerAssertGenerated extends Abst runTest("plugins/power-assert/testData/codegen/infix/ExtensionNonInfix.kt"); } + @Test + @TestMetadata("ExtensionNonInfixComplexReceiver.kt") + public void testExtensionNonInfixComplexReceiver() { + runTest("plugins/power-assert/testData/codegen/infix/ExtensionNonInfixComplexReceiver.kt"); + } + @Test @TestMetadata("ExtensionNonInfixConstantParameter.kt") public void testExtensionNonInfixConstantParameter() { diff --git a/plugins/power-assert/tests-gen/org/jetbrains/kotlin/powerassert/IrBlackBoxCodegenTestForPowerAssertGenerated.java b/plugins/power-assert/tests-gen/org/jetbrains/kotlin/powerassert/IrBlackBoxCodegenTestForPowerAssertGenerated.java index c06ecf85efe..a50fe5157a6 100644 --- a/plugins/power-assert/tests-gen/org/jetbrains/kotlin/powerassert/IrBlackBoxCodegenTestForPowerAssertGenerated.java +++ b/plugins/power-assert/tests-gen/org/jetbrains/kotlin/powerassert/IrBlackBoxCodegenTestForPowerAssertGenerated.java @@ -272,6 +272,12 @@ public class IrBlackBoxCodegenTestForPowerAssertGenerated extends AbstractIrBlac runTest("plugins/power-assert/testData/codegen/infix/DispatchInfix.kt"); } + @Test + @TestMetadata("DispatchInfixComplexReceiver.kt") + public void testDispatchInfixComplexReceiver() { + runTest("plugins/power-assert/testData/codegen/infix/DispatchInfixComplexReceiver.kt"); + } + @Test @TestMetadata("DispatchInfixConstantParameter.kt") public void testDispatchInfixConstantParameter() { @@ -296,6 +302,12 @@ public class IrBlackBoxCodegenTestForPowerAssertGenerated extends AbstractIrBlac runTest("plugins/power-assert/testData/codegen/infix/DispatchNonInfix.kt"); } + @Test + @TestMetadata("DispatchNonInfixComplexReceiver.kt") + public void testDispatchNonInfixComplexReceiver() { + runTest("plugins/power-assert/testData/codegen/infix/DispatchNonInfixComplexReceiver.kt"); + } + @Test @TestMetadata("DispatchNonInfixConstantParameter.kt") public void testDispatchNonInfixConstantParameter() { @@ -320,6 +332,12 @@ public class IrBlackBoxCodegenTestForPowerAssertGenerated extends AbstractIrBlac runTest("plugins/power-assert/testData/codegen/infix/ExtensionInfix.kt"); } + @Test + @TestMetadata("ExtensionInfixComplexReceiver.kt") + public void testExtensionInfixComplexReceiver() { + runTest("plugins/power-assert/testData/codegen/infix/ExtensionInfixComplexReceiver.kt"); + } + @Test @TestMetadata("ExtensionInfixConstantParameter.kt") public void testExtensionInfixConstantParameter() { @@ -344,6 +362,12 @@ public class IrBlackBoxCodegenTestForPowerAssertGenerated extends AbstractIrBlac runTest("plugins/power-assert/testData/codegen/infix/ExtensionNonInfix.kt"); } + @Test + @TestMetadata("ExtensionNonInfixComplexReceiver.kt") + public void testExtensionNonInfixComplexReceiver() { + runTest("plugins/power-assert/testData/codegen/infix/ExtensionNonInfixComplexReceiver.kt"); + } + @Test @TestMetadata("ExtensionNonInfixConstantParameter.kt") public void testExtensionNonInfixConstantParameter() {