From 773eff1de8bdc8bbf215003284f6ba8ab5fa1f0f Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Tue, 12 Sep 2017 12:25:08 +0300 Subject: [PATCH] Update IEEE 754 'equals' tests for LV 1.2 NB IEEE 754 doesn't say anything about nulls. --- .../ieee754/explicitEqualsCall.kt | 1 + .../ieee754/explicitEqualsCall_lv12.kt | 27 +++++++++++++++++++ ...ackBoxAgainstJavaCodegenTestGenerated.java | 6 +++++ 3 files changed, 34 insertions(+) create mode 100644 compiler/testData/codegen/boxAgainstJava/ieee754/explicitEqualsCall_lv12.kt diff --git a/compiler/testData/codegen/boxAgainstJava/ieee754/explicitEqualsCall.kt b/compiler/testData/codegen/boxAgainstJava/ieee754/explicitEqualsCall.kt index d5937b6d5c7..a274e1bf198 100644 --- a/compiler/testData/codegen/boxAgainstJava/ieee754/explicitEqualsCall.kt +++ b/compiler/testData/codegen/boxAgainstJava/ieee754/explicitEqualsCall.kt @@ -1,3 +1,4 @@ +// LANGUAGE_VERSION: 1.1 // FILE: JavaClass.java public class JavaClass { diff --git a/compiler/testData/codegen/boxAgainstJava/ieee754/explicitEqualsCall_lv12.kt b/compiler/testData/codegen/boxAgainstJava/ieee754/explicitEqualsCall_lv12.kt new file mode 100644 index 00000000000..8bbe4d345fe --- /dev/null +++ b/compiler/testData/codegen/boxAgainstJava/ieee754/explicitEqualsCall_lv12.kt @@ -0,0 +1,27 @@ +// LANGUAGE_VERSION: 1.2 +// FILE: JavaClass.java + +public class JavaClass { + + public Double minus0(){ + return -0.0; + } + + public Double plus0(){ + return 0.0; + } + +} + + +// FILE: b.kt + +fun box(): String { + val jClass = JavaClass() + + if (jClass.minus0().equals(jClass.plus0())) return "fail 1" + if (jClass.plus0().equals(jClass.minus0())) return "fail 2" + + return "OK" +} + diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxAgainstJavaCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxAgainstJavaCodegenTestGenerated.java index 9b603310fba..fa034000181 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxAgainstJavaCodegenTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxAgainstJavaCodegenTestGenerated.java @@ -335,6 +335,12 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxAga doTest(fileName); } + @TestMetadata("explicitEqualsCall_lv12.kt") + public void testExplicitEqualsCall_lv12() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/ieee754/explicitEqualsCall_lv12.kt"); + doTest(fileName); + } + @TestMetadata("float.kt") public void testFloat() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/ieee754/float.kt");