From e99316d22e23c6a744795317a739f7a539f910ae Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Thu, 27 Aug 2015 18:27:57 +0200 Subject: [PATCH] rename tests: defaultObject -> companionObject --- .../after/JavaUsage.java | 0 .../after/toBeRenamed.kt | 0 .../after/usage.kt | 0 .../before/JavaUsage.java | 0 .../before/toBeRenamed.kt | 0 .../before/usage.kt | 0 .../companionObject.test} | 0 .../after/JavaUsage.java | 0 .../after/toBeRenamed.kt | 0 .../after/usage.kt | 0 .../before/JavaUsage.java | 0 .../before/toBeRenamed.kt | 0 .../before/usage.kt | 0 .../companionObject.test} | 0 .../idea/refactoring/rename/RenameTestGenerated.java | 12 ++++++------ 15 files changed, 6 insertions(+), 6 deletions(-) rename idea/testData/refactoring/rename/{defaultObject => companionObject}/after/JavaUsage.java (100%) rename idea/testData/refactoring/rename/{defaultObject => companionObject}/after/toBeRenamed.kt (100%) rename idea/testData/refactoring/rename/{defaultObject => companionObject}/after/usage.kt (100%) rename idea/testData/refactoring/rename/{defaultObject => companionObject}/before/JavaUsage.java (100%) rename idea/testData/refactoring/rename/{defaultObject => companionObject}/before/toBeRenamed.kt (100%) rename idea/testData/refactoring/rename/{defaultObject => companionObject}/before/usage.kt (100%) rename idea/testData/refactoring/rename/{defaultObject/defaultObject.test => companionObject/companionObject.test} (100%) rename idea/testData/refactoring/rename/{defaultObjectWithDefaultName => companionObjectWithDefaultName}/after/JavaUsage.java (100%) rename idea/testData/refactoring/rename/{defaultObjectWithDefaultName => companionObjectWithDefaultName}/after/toBeRenamed.kt (100%) rename idea/testData/refactoring/rename/{defaultObjectWithDefaultName => companionObjectWithDefaultName}/after/usage.kt (100%) rename idea/testData/refactoring/rename/{defaultObjectWithDefaultName => companionObjectWithDefaultName}/before/JavaUsage.java (100%) rename idea/testData/refactoring/rename/{defaultObjectWithDefaultName => companionObjectWithDefaultName}/before/toBeRenamed.kt (100%) rename idea/testData/refactoring/rename/{defaultObjectWithDefaultName => companionObjectWithDefaultName}/before/usage.kt (100%) rename idea/testData/refactoring/rename/{defaultObjectWithDefaultName/defaultObject.test => companionObjectWithDefaultName/companionObject.test} (100%) diff --git a/idea/testData/refactoring/rename/defaultObject/after/JavaUsage.java b/idea/testData/refactoring/rename/companionObject/after/JavaUsage.java similarity index 100% rename from idea/testData/refactoring/rename/defaultObject/after/JavaUsage.java rename to idea/testData/refactoring/rename/companionObject/after/JavaUsage.java diff --git a/idea/testData/refactoring/rename/defaultObject/after/toBeRenamed.kt b/idea/testData/refactoring/rename/companionObject/after/toBeRenamed.kt similarity index 100% rename from idea/testData/refactoring/rename/defaultObject/after/toBeRenamed.kt rename to idea/testData/refactoring/rename/companionObject/after/toBeRenamed.kt diff --git a/idea/testData/refactoring/rename/defaultObject/after/usage.kt b/idea/testData/refactoring/rename/companionObject/after/usage.kt similarity index 100% rename from idea/testData/refactoring/rename/defaultObject/after/usage.kt rename to idea/testData/refactoring/rename/companionObject/after/usage.kt diff --git a/idea/testData/refactoring/rename/defaultObject/before/JavaUsage.java b/idea/testData/refactoring/rename/companionObject/before/JavaUsage.java similarity index 100% rename from idea/testData/refactoring/rename/defaultObject/before/JavaUsage.java rename to idea/testData/refactoring/rename/companionObject/before/JavaUsage.java diff --git a/idea/testData/refactoring/rename/defaultObject/before/toBeRenamed.kt b/idea/testData/refactoring/rename/companionObject/before/toBeRenamed.kt similarity index 100% rename from idea/testData/refactoring/rename/defaultObject/before/toBeRenamed.kt rename to idea/testData/refactoring/rename/companionObject/before/toBeRenamed.kt diff --git a/idea/testData/refactoring/rename/defaultObject/before/usage.kt b/idea/testData/refactoring/rename/companionObject/before/usage.kt similarity index 100% rename from idea/testData/refactoring/rename/defaultObject/before/usage.kt rename to idea/testData/refactoring/rename/companionObject/before/usage.kt diff --git a/idea/testData/refactoring/rename/defaultObject/defaultObject.test b/idea/testData/refactoring/rename/companionObject/companionObject.test similarity index 100% rename from idea/testData/refactoring/rename/defaultObject/defaultObject.test rename to idea/testData/refactoring/rename/companionObject/companionObject.test diff --git a/idea/testData/refactoring/rename/defaultObjectWithDefaultName/after/JavaUsage.java b/idea/testData/refactoring/rename/companionObjectWithDefaultName/after/JavaUsage.java similarity index 100% rename from idea/testData/refactoring/rename/defaultObjectWithDefaultName/after/JavaUsage.java rename to idea/testData/refactoring/rename/companionObjectWithDefaultName/after/JavaUsage.java diff --git a/idea/testData/refactoring/rename/defaultObjectWithDefaultName/after/toBeRenamed.kt b/idea/testData/refactoring/rename/companionObjectWithDefaultName/after/toBeRenamed.kt similarity index 100% rename from idea/testData/refactoring/rename/defaultObjectWithDefaultName/after/toBeRenamed.kt rename to idea/testData/refactoring/rename/companionObjectWithDefaultName/after/toBeRenamed.kt diff --git a/idea/testData/refactoring/rename/defaultObjectWithDefaultName/after/usage.kt b/idea/testData/refactoring/rename/companionObjectWithDefaultName/after/usage.kt similarity index 100% rename from idea/testData/refactoring/rename/defaultObjectWithDefaultName/after/usage.kt rename to idea/testData/refactoring/rename/companionObjectWithDefaultName/after/usage.kt diff --git a/idea/testData/refactoring/rename/defaultObjectWithDefaultName/before/JavaUsage.java b/idea/testData/refactoring/rename/companionObjectWithDefaultName/before/JavaUsage.java similarity index 100% rename from idea/testData/refactoring/rename/defaultObjectWithDefaultName/before/JavaUsage.java rename to idea/testData/refactoring/rename/companionObjectWithDefaultName/before/JavaUsage.java diff --git a/idea/testData/refactoring/rename/defaultObjectWithDefaultName/before/toBeRenamed.kt b/idea/testData/refactoring/rename/companionObjectWithDefaultName/before/toBeRenamed.kt similarity index 100% rename from idea/testData/refactoring/rename/defaultObjectWithDefaultName/before/toBeRenamed.kt rename to idea/testData/refactoring/rename/companionObjectWithDefaultName/before/toBeRenamed.kt diff --git a/idea/testData/refactoring/rename/defaultObjectWithDefaultName/before/usage.kt b/idea/testData/refactoring/rename/companionObjectWithDefaultName/before/usage.kt similarity index 100% rename from idea/testData/refactoring/rename/defaultObjectWithDefaultName/before/usage.kt rename to idea/testData/refactoring/rename/companionObjectWithDefaultName/before/usage.kt diff --git a/idea/testData/refactoring/rename/defaultObjectWithDefaultName/defaultObject.test b/idea/testData/refactoring/rename/companionObjectWithDefaultName/companionObject.test similarity index 100% rename from idea/testData/refactoring/rename/defaultObjectWithDefaultName/defaultObject.test rename to idea/testData/refactoring/rename/companionObjectWithDefaultName/companionObject.test diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/rename/RenameTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/refactoring/rename/RenameTestGenerated.java index 3f498943892..6a1a0572f7d 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/rename/RenameTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/rename/RenameTestGenerated.java @@ -89,15 +89,15 @@ public class RenameTestGenerated extends AbstractRenameTest { doTest(fileName); } - @TestMetadata("defaultObject/defaultObject.test") - public void testDefaultObject_DefaultObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/defaultObject/defaultObject.test"); + @TestMetadata("companionObject/companionObject.test") + public void testCompanionObject_CompanionObject() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/companionObject/companionObject.test"); doTest(fileName); } - @TestMetadata("defaultObjectWithDefaultName/defaultObject.test") - public void testDefaultObjectWithDefaultName_DefaultObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/defaultObjectWithDefaultName/defaultObject.test"); + @TestMetadata("companionObjectWithDefaultName/companionObject.test") + public void testCompanionObjectWithDefaultName_CompanionObject() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/companionObjectWithDefaultName/companionObject.test"); doTest(fileName); }