From 448b3f6195a63f3b05c672b88a877f451560ae29 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Fri, 24 Apr 2015 19:54:26 +0300 Subject: [PATCH] Rename testData/codegen/boxWithStdlib/{jdkAnnotations -> jdk} --- .../{jdkAnnotations => jdk}/arrayList.kt | 0 .../{jdkAnnotations => jdk}/hashMap.kt | 0 .../iteratingOverHashMap.kt | 0 .../{jdkAnnotations => jdk}/kt1397.kt | 0 .../BlackBoxWithStdlibCodegenTestGenerated.java | 16 ++++++++-------- 5 files changed, 8 insertions(+), 8 deletions(-) rename compiler/testData/codegen/boxWithStdlib/{jdkAnnotations => jdk}/arrayList.kt (100%) rename compiler/testData/codegen/boxWithStdlib/{jdkAnnotations => jdk}/hashMap.kt (100%) rename compiler/testData/codegen/boxWithStdlib/{jdkAnnotations => jdk}/iteratingOverHashMap.kt (100%) rename compiler/testData/codegen/boxWithStdlib/{jdkAnnotations => jdk}/kt1397.kt (100%) diff --git a/compiler/testData/codegen/boxWithStdlib/jdkAnnotations/arrayList.kt b/compiler/testData/codegen/boxWithStdlib/jdk/arrayList.kt similarity index 100% rename from compiler/testData/codegen/boxWithStdlib/jdkAnnotations/arrayList.kt rename to compiler/testData/codegen/boxWithStdlib/jdk/arrayList.kt diff --git a/compiler/testData/codegen/boxWithStdlib/jdkAnnotations/hashMap.kt b/compiler/testData/codegen/boxWithStdlib/jdk/hashMap.kt similarity index 100% rename from compiler/testData/codegen/boxWithStdlib/jdkAnnotations/hashMap.kt rename to compiler/testData/codegen/boxWithStdlib/jdk/hashMap.kt diff --git a/compiler/testData/codegen/boxWithStdlib/jdkAnnotations/iteratingOverHashMap.kt b/compiler/testData/codegen/boxWithStdlib/jdk/iteratingOverHashMap.kt similarity index 100% rename from compiler/testData/codegen/boxWithStdlib/jdkAnnotations/iteratingOverHashMap.kt rename to compiler/testData/codegen/boxWithStdlib/jdk/iteratingOverHashMap.kt diff --git a/compiler/testData/codegen/boxWithStdlib/jdkAnnotations/kt1397.kt b/compiler/testData/codegen/boxWithStdlib/jdk/kt1397.kt similarity index 100% rename from compiler/testData/codegen/boxWithStdlib/jdkAnnotations/kt1397.kt rename to compiler/testData/codegen/boxWithStdlib/jdk/kt1397.kt diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithStdlibCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithStdlibCodegenTestGenerated.java index 66cb6551baf..220c14c798c 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithStdlibCodegenTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithStdlibCodegenTestGenerated.java @@ -1973,35 +1973,35 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode } } - @TestMetadata("compiler/testData/codegen/boxWithStdlib/jdkAnnotations") + @TestMetadata("compiler/testData/codegen/boxWithStdlib/jdk") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class JdkAnnotations extends AbstractBlackBoxCodegenTest { - public void testAllFilesPresentInJdkAnnotations() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/jdkAnnotations"), Pattern.compile("^(.+)\\.kt$"), true); + public static class Jdk extends AbstractBlackBoxCodegenTest { + public void testAllFilesPresentInJdk() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/jdk"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("arrayList.kt") public void testArrayList() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jdkAnnotations/arrayList.kt"); + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jdk/arrayList.kt"); doTestWithStdlib(fileName); } @TestMetadata("hashMap.kt") public void testHashMap() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jdkAnnotations/hashMap.kt"); + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jdk/hashMap.kt"); doTestWithStdlib(fileName); } @TestMetadata("iteratingOverHashMap.kt") public void testIteratingOverHashMap() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jdkAnnotations/iteratingOverHashMap.kt"); + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jdk/iteratingOverHashMap.kt"); doTestWithStdlib(fileName); } @TestMetadata("kt1397.kt") public void testKt1397() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jdkAnnotations/kt1397.kt"); + String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jdk/kt1397.kt"); doTestWithStdlib(fileName); } }