From 3b6cdb071f582ccb7cb64bd7a3c05c910c180972 Mon Sep 17 00:00:00 2001 From: Stanislav Erokhin Date: Sun, 3 Oct 2021 03:27:53 +0200 Subject: [PATCH] [CHERRY PICKED FROM IJ] [testdata] Fix testdata for IncrementalJvmJpsTestGenerated.WithJava.JavaUsedInKotlin#testConstantChanged Previously, because the package in java file was used, generated test runner file was incorrect GitOrigin-RevId: 3fcf599a26a0789154c550e6ac4aafe0829ce0d1 Original commit: https://github.com/JetBrains/intellij-community/commit/cbe50ad2423fbdb6e18541ecb040bdb0c67af7fd --- .../constantChanged/{org/jetbrains => }/JavaClass.java | 2 -- .../constantChanged/{org/jetbrains => }/JavaClass.java.new | 2 -- .../withJava/javaUsedInKotlin/constantChanged/build.log | 2 +- .../withJava/javaUsedInKotlin/constantChanged/usage.kt | 2 +- 4 files changed, 2 insertions(+), 6 deletions(-) rename jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/{org/jetbrains => }/JavaClass.java (81%) rename jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/{org/jetbrains => }/JavaClass.java.new (81%) diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/org/jetbrains/JavaClass.java b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/JavaClass.java similarity index 81% rename from jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/org/jetbrains/JavaClass.java rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/JavaClass.java index fa6c7f29eea..d0fda426b81 100644 --- a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/org/jetbrains/JavaClass.java +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/JavaClass.java @@ -1,5 +1,3 @@ -package org.jetbrains; - public class JavaClass { public class Inner { public static final String CONST = "A"; diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/org/jetbrains/JavaClass.java.new b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/JavaClass.java.new similarity index 81% rename from jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/org/jetbrains/JavaClass.java.new rename to jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/JavaClass.java.new index 159ba67b7c0..7cb5ca220d2 100644 --- a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/org/jetbrains/JavaClass.java.new +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/JavaClass.java.new @@ -1,5 +1,3 @@ -package org.jetbrains; - public class JavaClass { public class Inner { public static final String CONST = "B"; diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/build.log index d63dd1871e0..551eb3388b1 100644 --- a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/build.log @@ -8,7 +8,7 @@ End of files Exit code: NOTHING_DONE ------------------------------------------ Compiling files: - src/org/jetbrains/JavaClass.java + src/JavaClass.java End of files Cleaning output files: out/production/module/META-INF/module.kotlin_module diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/usage.kt b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/usage.kt index e29c3fa0f42..36e9a2b02f2 100644 --- a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/usage.kt +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/usage.kt @@ -1,4 +1,4 @@ -import org.jetbrains.JavaClass.Inner.CONST +import JavaClass.Inner.CONST fun main() { val myKotlinConst = CONST