From ace10f46b24f7054221e62c861160ae268fd243f Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Tue, 4 Oct 2016 17:18:59 +0300 Subject: [PATCH] Minor: move reflection/light/* -> reflection/* --- .../js/test/semantics/BoxJsTestGenerated.java | 47 ++++++++----------- .../box/reflection/{light => }/_common.kt | 0 .../box/reflection/{light => }/jsClass.kt | 0 .../box/reflection/{light => }/jsClassName.kt | 0 .../{light => }/jsClassOnReifiedType.kt | 0 .../{light => }/jsClassSimpleName.kt | 0 6 files changed, 19 insertions(+), 28 deletions(-) rename js/js.translator/testData/box/reflection/{light => }/_common.kt (100%) rename js/js.translator/testData/box/reflection/{light => }/jsClass.kt (100%) rename js/js.translator/testData/box/reflection/{light => }/jsClassName.kt (100%) rename js/js.translator/testData/box/reflection/{light => }/jsClassOnReifiedType.kt (100%) rename js/js.translator/testData/box/reflection/{light => }/jsClassSimpleName.kt (100%) diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/BoxJsTestGenerated.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/BoxJsTestGenerated.java index 16d5c3cfaec..f63b6963971 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/BoxJsTestGenerated.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/BoxJsTestGenerated.java @@ -6229,37 +6229,28 @@ public class BoxJsTestGenerated extends AbstractBoxJsTest { KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("js/js.translator/testData/box/reflection"), Pattern.compile("^([^_](.+))\\.kt$"), true); } - @TestMetadata("js/js.translator/testData/box/reflection/light") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class Light extends AbstractBoxJsTest { - public void testAllFilesPresentInLight() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("js/js.translator/testData/box/reflection/light"), Pattern.compile("^([^_](.+))\\.kt$"), true); - } + @TestMetadata("jsClass.kt") + public void testJsClass() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/box/reflection/jsClass.kt"); + doTest(fileName); + } - @TestMetadata("jsClass.kt") - public void testJsClass() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/box/reflection/light/jsClass.kt"); - doTest(fileName); - } + @TestMetadata("jsClassName.kt") + public void testJsClassName() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/box/reflection/jsClassName.kt"); + doTest(fileName); + } - @TestMetadata("jsClassName.kt") - public void testJsClassName() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/box/reflection/light/jsClassName.kt"); - doTest(fileName); - } + @TestMetadata("jsClassOnReifiedType.kt") + public void testJsClassOnReifiedType() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/box/reflection/jsClassOnReifiedType.kt"); + doTest(fileName); + } - @TestMetadata("jsClassOnReifiedType.kt") - public void testJsClassOnReifiedType() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/box/reflection/light/jsClassOnReifiedType.kt"); - doTest(fileName); - } - - @TestMetadata("jsClassSimpleName.kt") - public void testJsClassSimpleName() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/box/reflection/light/jsClassSimpleName.kt"); - doTest(fileName); - } + @TestMetadata("jsClassSimpleName.kt") + public void testJsClassSimpleName() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/box/reflection/jsClassSimpleName.kt"); + doTest(fileName); } } diff --git a/js/js.translator/testData/box/reflection/light/_common.kt b/js/js.translator/testData/box/reflection/_common.kt similarity index 100% rename from js/js.translator/testData/box/reflection/light/_common.kt rename to js/js.translator/testData/box/reflection/_common.kt diff --git a/js/js.translator/testData/box/reflection/light/jsClass.kt b/js/js.translator/testData/box/reflection/jsClass.kt similarity index 100% rename from js/js.translator/testData/box/reflection/light/jsClass.kt rename to js/js.translator/testData/box/reflection/jsClass.kt diff --git a/js/js.translator/testData/box/reflection/light/jsClassName.kt b/js/js.translator/testData/box/reflection/jsClassName.kt similarity index 100% rename from js/js.translator/testData/box/reflection/light/jsClassName.kt rename to js/js.translator/testData/box/reflection/jsClassName.kt diff --git a/js/js.translator/testData/box/reflection/light/jsClassOnReifiedType.kt b/js/js.translator/testData/box/reflection/jsClassOnReifiedType.kt similarity index 100% rename from js/js.translator/testData/box/reflection/light/jsClassOnReifiedType.kt rename to js/js.translator/testData/box/reflection/jsClassOnReifiedType.kt diff --git a/js/js.translator/testData/box/reflection/light/jsClassSimpleName.kt b/js/js.translator/testData/box/reflection/jsClassSimpleName.kt similarity index 100% rename from js/js.translator/testData/box/reflection/light/jsClassSimpleName.kt rename to js/js.translator/testData/box/reflection/jsClassSimpleName.kt