From 09a7577b0408e5636a6f9eafdfd4cfdc9af78095 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Sun, 30 Jun 2019 15:20:43 +0200 Subject: [PATCH] Cleanup (renaming test data directory to match the language level) GitOrigin-RevId: 2783c4072f4d1a0b35f8f0809b4ba5b920173055 --- .../surroundWith/{java12 => java13}/CaseBlockWithIf.java | 0 .../{java12 => java13}/CaseBlockWithIf_after.java | 0 .../surroundWith/{java12 => java13}/CaseResultWithIf.java | 0 .../{java12 => java13}/CaseResultWithIf_after.java | 0 .../{java12 => java13}/CaseResultWithSynchronized.java | 0 .../{java12 => java13}/CaseResultWithSynchronized_after.java | 0 .../surroundWith/{java12 => java13}/CaseThrowWithBlock.java | 0 .../{java12 => java13}/CaseThrowWithBlock_after.java | 0 .../surroundWith/{java12 => java13}/CaseThrowWithIf.java | 0 .../{java12 => java13}/CaseThrowWithIf_after.java | 0 .../{java12 => java13}/CaseThrowWithTryCatch.java | 0 .../{java12 => java13}/CaseThrowWithTryCatch_after.java | 0 .../surroundWith/{java12 => java13}/CatchBlockWithFor.java | 0 .../{java12 => java13}/CatchBlockWithFor_after.java | 0 .../surroundWith/{java12 => java13}/CatchResultWithFor.java | 0 .../{java12 => java13}/CatchResultWithFor_after.java | 0 .../{java12 => java13}/DefaultBlockWithDoWhile.java | 0 .../{java12 => java13}/DefaultBlockWithDoWhile_after.java | 0 .../{java12 => java13}/DefaultBlockWithTryFinally.java | 0 .../{java12 => java13}/DefaultBlockWithTryFinally_after.java | 0 .../{java12 => java13}/DefaultResultWithRunnable.java | 0 .../{java12 => java13}/DefaultResultWithRunnable_after.java | 0 .../{java12 => java13}/DefaultResultWithTryCatchFinally.java | 0 .../DefaultResultWithTryCatchFinally_after.java | 0 .../{java12 => java13}/DefaultResultWithWhile.java | 0 .../{java12 => java13}/DefaultResultWithWhile_after.java | 0 .../{java12 => java13}/DefaultThrowWithIfElse.java | 0 .../{java12 => java13}/DefaultThrowWithIfElse_after.java | 0 .../generation/surroundWith/JavaSurroundWith12Test.kt | 4 ++-- 29 files changed, 2 insertions(+), 2 deletions(-) rename java/java-tests/testData/codeInsight/generation/surroundWith/{java12 => java13}/CaseBlockWithIf.java (100%) rename java/java-tests/testData/codeInsight/generation/surroundWith/{java12 => java13}/CaseBlockWithIf_after.java (100%) rename java/java-tests/testData/codeInsight/generation/surroundWith/{java12 => java13}/CaseResultWithIf.java (100%) rename java/java-tests/testData/codeInsight/generation/surroundWith/{java12 => java13}/CaseResultWithIf_after.java (100%) rename java/java-tests/testData/codeInsight/generation/surroundWith/{java12 => java13}/CaseResultWithSynchronized.java (100%) rename java/java-tests/testData/codeInsight/generation/surroundWith/{java12 => java13}/CaseResultWithSynchronized_after.java (100%) rename java/java-tests/testData/codeInsight/generation/surroundWith/{java12 => java13}/CaseThrowWithBlock.java (100%) rename java/java-tests/testData/codeInsight/generation/surroundWith/{java12 => java13}/CaseThrowWithBlock_after.java (100%) rename java/java-tests/testData/codeInsight/generation/surroundWith/{java12 => java13}/CaseThrowWithIf.java (100%) rename java/java-tests/testData/codeInsight/generation/surroundWith/{java12 => java13}/CaseThrowWithIf_after.java (100%) rename java/java-tests/testData/codeInsight/generation/surroundWith/{java12 => java13}/CaseThrowWithTryCatch.java (100%) rename java/java-tests/testData/codeInsight/generation/surroundWith/{java12 => java13}/CaseThrowWithTryCatch_after.java (100%) rename java/java-tests/testData/codeInsight/generation/surroundWith/{java12 => java13}/CatchBlockWithFor.java (100%) rename java/java-tests/testData/codeInsight/generation/surroundWith/{java12 => java13}/CatchBlockWithFor_after.java (100%) rename java/java-tests/testData/codeInsight/generation/surroundWith/{java12 => java13}/CatchResultWithFor.java (100%) rename java/java-tests/testData/codeInsight/generation/surroundWith/{java12 => java13}/CatchResultWithFor_after.java (100%) rename java/java-tests/testData/codeInsight/generation/surroundWith/{java12 => java13}/DefaultBlockWithDoWhile.java (100%) rename java/java-tests/testData/codeInsight/generation/surroundWith/{java12 => java13}/DefaultBlockWithDoWhile_after.java (100%) rename java/java-tests/testData/codeInsight/generation/surroundWith/{java12 => java13}/DefaultBlockWithTryFinally.java (100%) rename java/java-tests/testData/codeInsight/generation/surroundWith/{java12 => java13}/DefaultBlockWithTryFinally_after.java (100%) rename java/java-tests/testData/codeInsight/generation/surroundWith/{java12 => java13}/DefaultResultWithRunnable.java (100%) rename java/java-tests/testData/codeInsight/generation/surroundWith/{java12 => java13}/DefaultResultWithRunnable_after.java (100%) rename java/java-tests/testData/codeInsight/generation/surroundWith/{java12 => java13}/DefaultResultWithTryCatchFinally.java (100%) rename java/java-tests/testData/codeInsight/generation/surroundWith/{java12 => java13}/DefaultResultWithTryCatchFinally_after.java (100%) rename java/java-tests/testData/codeInsight/generation/surroundWith/{java12 => java13}/DefaultResultWithWhile.java (100%) rename java/java-tests/testData/codeInsight/generation/surroundWith/{java12 => java13}/DefaultResultWithWhile_after.java (100%) rename java/java-tests/testData/codeInsight/generation/surroundWith/{java12 => java13}/DefaultThrowWithIfElse.java (100%) rename java/java-tests/testData/codeInsight/generation/surroundWith/{java12 => java13}/DefaultThrowWithIfElse_after.java (100%) diff --git a/java/java-tests/testData/codeInsight/generation/surroundWith/java12/CaseBlockWithIf.java b/java/java-tests/testData/codeInsight/generation/surroundWith/java13/CaseBlockWithIf.java similarity index 100% rename from java/java-tests/testData/codeInsight/generation/surroundWith/java12/CaseBlockWithIf.java rename to java/java-tests/testData/codeInsight/generation/surroundWith/java13/CaseBlockWithIf.java diff --git a/java/java-tests/testData/codeInsight/generation/surroundWith/java12/CaseBlockWithIf_after.java b/java/java-tests/testData/codeInsight/generation/surroundWith/java13/CaseBlockWithIf_after.java similarity index 100% rename from java/java-tests/testData/codeInsight/generation/surroundWith/java12/CaseBlockWithIf_after.java rename to java/java-tests/testData/codeInsight/generation/surroundWith/java13/CaseBlockWithIf_after.java diff --git a/java/java-tests/testData/codeInsight/generation/surroundWith/java12/CaseResultWithIf.java b/java/java-tests/testData/codeInsight/generation/surroundWith/java13/CaseResultWithIf.java similarity index 100% rename from java/java-tests/testData/codeInsight/generation/surroundWith/java12/CaseResultWithIf.java rename to java/java-tests/testData/codeInsight/generation/surroundWith/java13/CaseResultWithIf.java diff --git a/java/java-tests/testData/codeInsight/generation/surroundWith/java12/CaseResultWithIf_after.java b/java/java-tests/testData/codeInsight/generation/surroundWith/java13/CaseResultWithIf_after.java similarity index 100% rename from java/java-tests/testData/codeInsight/generation/surroundWith/java12/CaseResultWithIf_after.java rename to java/java-tests/testData/codeInsight/generation/surroundWith/java13/CaseResultWithIf_after.java diff --git a/java/java-tests/testData/codeInsight/generation/surroundWith/java12/CaseResultWithSynchronized.java b/java/java-tests/testData/codeInsight/generation/surroundWith/java13/CaseResultWithSynchronized.java similarity index 100% rename from java/java-tests/testData/codeInsight/generation/surroundWith/java12/CaseResultWithSynchronized.java rename to java/java-tests/testData/codeInsight/generation/surroundWith/java13/CaseResultWithSynchronized.java diff --git a/java/java-tests/testData/codeInsight/generation/surroundWith/java12/CaseResultWithSynchronized_after.java b/java/java-tests/testData/codeInsight/generation/surroundWith/java13/CaseResultWithSynchronized_after.java similarity index 100% rename from java/java-tests/testData/codeInsight/generation/surroundWith/java12/CaseResultWithSynchronized_after.java rename to java/java-tests/testData/codeInsight/generation/surroundWith/java13/CaseResultWithSynchronized_after.java diff --git a/java/java-tests/testData/codeInsight/generation/surroundWith/java12/CaseThrowWithBlock.java b/java/java-tests/testData/codeInsight/generation/surroundWith/java13/CaseThrowWithBlock.java similarity index 100% rename from java/java-tests/testData/codeInsight/generation/surroundWith/java12/CaseThrowWithBlock.java rename to java/java-tests/testData/codeInsight/generation/surroundWith/java13/CaseThrowWithBlock.java diff --git a/java/java-tests/testData/codeInsight/generation/surroundWith/java12/CaseThrowWithBlock_after.java b/java/java-tests/testData/codeInsight/generation/surroundWith/java13/CaseThrowWithBlock_after.java similarity index 100% rename from java/java-tests/testData/codeInsight/generation/surroundWith/java12/CaseThrowWithBlock_after.java rename to java/java-tests/testData/codeInsight/generation/surroundWith/java13/CaseThrowWithBlock_after.java diff --git a/java/java-tests/testData/codeInsight/generation/surroundWith/java12/CaseThrowWithIf.java b/java/java-tests/testData/codeInsight/generation/surroundWith/java13/CaseThrowWithIf.java similarity index 100% rename from java/java-tests/testData/codeInsight/generation/surroundWith/java12/CaseThrowWithIf.java rename to java/java-tests/testData/codeInsight/generation/surroundWith/java13/CaseThrowWithIf.java diff --git a/java/java-tests/testData/codeInsight/generation/surroundWith/java12/CaseThrowWithIf_after.java b/java/java-tests/testData/codeInsight/generation/surroundWith/java13/CaseThrowWithIf_after.java similarity index 100% rename from java/java-tests/testData/codeInsight/generation/surroundWith/java12/CaseThrowWithIf_after.java rename to java/java-tests/testData/codeInsight/generation/surroundWith/java13/CaseThrowWithIf_after.java diff --git a/java/java-tests/testData/codeInsight/generation/surroundWith/java12/CaseThrowWithTryCatch.java b/java/java-tests/testData/codeInsight/generation/surroundWith/java13/CaseThrowWithTryCatch.java similarity index 100% rename from java/java-tests/testData/codeInsight/generation/surroundWith/java12/CaseThrowWithTryCatch.java rename to java/java-tests/testData/codeInsight/generation/surroundWith/java13/CaseThrowWithTryCatch.java diff --git a/java/java-tests/testData/codeInsight/generation/surroundWith/java12/CaseThrowWithTryCatch_after.java b/java/java-tests/testData/codeInsight/generation/surroundWith/java13/CaseThrowWithTryCatch_after.java similarity index 100% rename from java/java-tests/testData/codeInsight/generation/surroundWith/java12/CaseThrowWithTryCatch_after.java rename to java/java-tests/testData/codeInsight/generation/surroundWith/java13/CaseThrowWithTryCatch_after.java diff --git a/java/java-tests/testData/codeInsight/generation/surroundWith/java12/CatchBlockWithFor.java b/java/java-tests/testData/codeInsight/generation/surroundWith/java13/CatchBlockWithFor.java similarity index 100% rename from java/java-tests/testData/codeInsight/generation/surroundWith/java12/CatchBlockWithFor.java rename to java/java-tests/testData/codeInsight/generation/surroundWith/java13/CatchBlockWithFor.java diff --git a/java/java-tests/testData/codeInsight/generation/surroundWith/java12/CatchBlockWithFor_after.java b/java/java-tests/testData/codeInsight/generation/surroundWith/java13/CatchBlockWithFor_after.java similarity index 100% rename from java/java-tests/testData/codeInsight/generation/surroundWith/java12/CatchBlockWithFor_after.java rename to java/java-tests/testData/codeInsight/generation/surroundWith/java13/CatchBlockWithFor_after.java diff --git a/java/java-tests/testData/codeInsight/generation/surroundWith/java12/CatchResultWithFor.java b/java/java-tests/testData/codeInsight/generation/surroundWith/java13/CatchResultWithFor.java similarity index 100% rename from java/java-tests/testData/codeInsight/generation/surroundWith/java12/CatchResultWithFor.java rename to java/java-tests/testData/codeInsight/generation/surroundWith/java13/CatchResultWithFor.java diff --git a/java/java-tests/testData/codeInsight/generation/surroundWith/java12/CatchResultWithFor_after.java b/java/java-tests/testData/codeInsight/generation/surroundWith/java13/CatchResultWithFor_after.java similarity index 100% rename from java/java-tests/testData/codeInsight/generation/surroundWith/java12/CatchResultWithFor_after.java rename to java/java-tests/testData/codeInsight/generation/surroundWith/java13/CatchResultWithFor_after.java diff --git a/java/java-tests/testData/codeInsight/generation/surroundWith/java12/DefaultBlockWithDoWhile.java b/java/java-tests/testData/codeInsight/generation/surroundWith/java13/DefaultBlockWithDoWhile.java similarity index 100% rename from java/java-tests/testData/codeInsight/generation/surroundWith/java12/DefaultBlockWithDoWhile.java rename to java/java-tests/testData/codeInsight/generation/surroundWith/java13/DefaultBlockWithDoWhile.java diff --git a/java/java-tests/testData/codeInsight/generation/surroundWith/java12/DefaultBlockWithDoWhile_after.java b/java/java-tests/testData/codeInsight/generation/surroundWith/java13/DefaultBlockWithDoWhile_after.java similarity index 100% rename from java/java-tests/testData/codeInsight/generation/surroundWith/java12/DefaultBlockWithDoWhile_after.java rename to java/java-tests/testData/codeInsight/generation/surroundWith/java13/DefaultBlockWithDoWhile_after.java diff --git a/java/java-tests/testData/codeInsight/generation/surroundWith/java12/DefaultBlockWithTryFinally.java b/java/java-tests/testData/codeInsight/generation/surroundWith/java13/DefaultBlockWithTryFinally.java similarity index 100% rename from java/java-tests/testData/codeInsight/generation/surroundWith/java12/DefaultBlockWithTryFinally.java rename to java/java-tests/testData/codeInsight/generation/surroundWith/java13/DefaultBlockWithTryFinally.java diff --git a/java/java-tests/testData/codeInsight/generation/surroundWith/java12/DefaultBlockWithTryFinally_after.java b/java/java-tests/testData/codeInsight/generation/surroundWith/java13/DefaultBlockWithTryFinally_after.java similarity index 100% rename from java/java-tests/testData/codeInsight/generation/surroundWith/java12/DefaultBlockWithTryFinally_after.java rename to java/java-tests/testData/codeInsight/generation/surroundWith/java13/DefaultBlockWithTryFinally_after.java diff --git a/java/java-tests/testData/codeInsight/generation/surroundWith/java12/DefaultResultWithRunnable.java b/java/java-tests/testData/codeInsight/generation/surroundWith/java13/DefaultResultWithRunnable.java similarity index 100% rename from java/java-tests/testData/codeInsight/generation/surroundWith/java12/DefaultResultWithRunnable.java rename to java/java-tests/testData/codeInsight/generation/surroundWith/java13/DefaultResultWithRunnable.java diff --git a/java/java-tests/testData/codeInsight/generation/surroundWith/java12/DefaultResultWithRunnable_after.java b/java/java-tests/testData/codeInsight/generation/surroundWith/java13/DefaultResultWithRunnable_after.java similarity index 100% rename from java/java-tests/testData/codeInsight/generation/surroundWith/java12/DefaultResultWithRunnable_after.java rename to java/java-tests/testData/codeInsight/generation/surroundWith/java13/DefaultResultWithRunnable_after.java diff --git a/java/java-tests/testData/codeInsight/generation/surroundWith/java12/DefaultResultWithTryCatchFinally.java b/java/java-tests/testData/codeInsight/generation/surroundWith/java13/DefaultResultWithTryCatchFinally.java similarity index 100% rename from java/java-tests/testData/codeInsight/generation/surroundWith/java12/DefaultResultWithTryCatchFinally.java rename to java/java-tests/testData/codeInsight/generation/surroundWith/java13/DefaultResultWithTryCatchFinally.java diff --git a/java/java-tests/testData/codeInsight/generation/surroundWith/java12/DefaultResultWithTryCatchFinally_after.java b/java/java-tests/testData/codeInsight/generation/surroundWith/java13/DefaultResultWithTryCatchFinally_after.java similarity index 100% rename from java/java-tests/testData/codeInsight/generation/surroundWith/java12/DefaultResultWithTryCatchFinally_after.java rename to java/java-tests/testData/codeInsight/generation/surroundWith/java13/DefaultResultWithTryCatchFinally_after.java diff --git a/java/java-tests/testData/codeInsight/generation/surroundWith/java12/DefaultResultWithWhile.java b/java/java-tests/testData/codeInsight/generation/surroundWith/java13/DefaultResultWithWhile.java similarity index 100% rename from java/java-tests/testData/codeInsight/generation/surroundWith/java12/DefaultResultWithWhile.java rename to java/java-tests/testData/codeInsight/generation/surroundWith/java13/DefaultResultWithWhile.java diff --git a/java/java-tests/testData/codeInsight/generation/surroundWith/java12/DefaultResultWithWhile_after.java b/java/java-tests/testData/codeInsight/generation/surroundWith/java13/DefaultResultWithWhile_after.java similarity index 100% rename from java/java-tests/testData/codeInsight/generation/surroundWith/java12/DefaultResultWithWhile_after.java rename to java/java-tests/testData/codeInsight/generation/surroundWith/java13/DefaultResultWithWhile_after.java diff --git a/java/java-tests/testData/codeInsight/generation/surroundWith/java12/DefaultThrowWithIfElse.java b/java/java-tests/testData/codeInsight/generation/surroundWith/java13/DefaultThrowWithIfElse.java similarity index 100% rename from java/java-tests/testData/codeInsight/generation/surroundWith/java12/DefaultThrowWithIfElse.java rename to java/java-tests/testData/codeInsight/generation/surroundWith/java13/DefaultThrowWithIfElse.java diff --git a/java/java-tests/testData/codeInsight/generation/surroundWith/java12/DefaultThrowWithIfElse_after.java b/java/java-tests/testData/codeInsight/generation/surroundWith/java13/DefaultThrowWithIfElse_after.java similarity index 100% rename from java/java-tests/testData/codeInsight/generation/surroundWith/java12/DefaultThrowWithIfElse_after.java rename to java/java-tests/testData/codeInsight/generation/surroundWith/java13/DefaultThrowWithIfElse_after.java diff --git a/java/java-tests/testSrc/com/intellij/java/codeInsight/generation/surroundWith/JavaSurroundWith12Test.kt b/java/java-tests/testSrc/com/intellij/java/codeInsight/generation/surroundWith/JavaSurroundWith12Test.kt index b3553c90e5d0..cd40ac01ef53 100644 --- a/java/java-tests/testSrc/com/intellij/java/codeInsight/generation/surroundWith/JavaSurroundWith12Test.kt +++ b/java/java-tests/testSrc/com/intellij/java/codeInsight/generation/surroundWith/JavaSurroundWith12Test.kt @@ -10,8 +10,8 @@ import com.intellij.testFramework.LightJavaCodeInsightTestCase import com.intellij.testFramework.LightProjectDescriptor import com.intellij.util.containers.ContainerUtil -class JavaSurroundWith12Test : LightJavaCodeInsightTestCase() { - private val BASE_PATH = "/codeInsight/generation/surroundWith/java12/" +class JavaSurroundWith13Test : LightJavaCodeInsightTestCase() { + private val BASE_PATH = "/codeInsight/generation/surroundWith/java13/" override fun getProjectDescriptor(): LightProjectDescriptor = JavaFoldingTestCase.JAVA_13