From d5c44c3dd872763c6609ecd2aca0855ab9a42f95 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Thu, 23 Aug 2012 20:41:05 +0400 Subject: [PATCH] Test data moved --- .../{ => forIterator}/MultiDeclFor.kt | 0 .../MultiDeclForComponentExtensions.kt | 0 .../MultiDeclForComponentMemberExtensions.kt | 0 ...nentMemberExtensionsInExtensionFunction.kt | 0 .../MultiDeclForValCaptured.kt | 0 .../jet/codegen/MultiDeclTestGenerated.java | 64 +++++++++++-------- 6 files changed, 39 insertions(+), 25 deletions(-) rename compiler/testData/codegen/multiDecl/{ => forIterator}/MultiDeclFor.kt (100%) rename compiler/testData/codegen/multiDecl/{ => forIterator}/MultiDeclForComponentExtensions.kt (100%) rename compiler/testData/codegen/multiDecl/{ => forIterator}/MultiDeclForComponentMemberExtensions.kt (100%) rename compiler/testData/codegen/multiDecl/{ => forIterator}/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt (100%) rename compiler/testData/codegen/multiDecl/{ => forIterator}/MultiDeclForValCaptured.kt (100%) diff --git a/compiler/testData/codegen/multiDecl/MultiDeclFor.kt b/compiler/testData/codegen/multiDecl/forIterator/MultiDeclFor.kt similarity index 100% rename from compiler/testData/codegen/multiDecl/MultiDeclFor.kt rename to compiler/testData/codegen/multiDecl/forIterator/MultiDeclFor.kt diff --git a/compiler/testData/codegen/multiDecl/MultiDeclForComponentExtensions.kt b/compiler/testData/codegen/multiDecl/forIterator/MultiDeclForComponentExtensions.kt similarity index 100% rename from compiler/testData/codegen/multiDecl/MultiDeclForComponentExtensions.kt rename to compiler/testData/codegen/multiDecl/forIterator/MultiDeclForComponentExtensions.kt diff --git a/compiler/testData/codegen/multiDecl/MultiDeclForComponentMemberExtensions.kt b/compiler/testData/codegen/multiDecl/forIterator/MultiDeclForComponentMemberExtensions.kt similarity index 100% rename from compiler/testData/codegen/multiDecl/MultiDeclForComponentMemberExtensions.kt rename to compiler/testData/codegen/multiDecl/forIterator/MultiDeclForComponentMemberExtensions.kt diff --git a/compiler/testData/codegen/multiDecl/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt b/compiler/testData/codegen/multiDecl/forIterator/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt similarity index 100% rename from compiler/testData/codegen/multiDecl/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt rename to compiler/testData/codegen/multiDecl/forIterator/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt diff --git a/compiler/testData/codegen/multiDecl/MultiDeclForValCaptured.kt b/compiler/testData/codegen/multiDecl/forIterator/MultiDeclForValCaptured.kt similarity index 100% rename from compiler/testData/codegen/multiDecl/MultiDeclForValCaptured.kt rename to compiler/testData/codegen/multiDecl/forIterator/MultiDeclForValCaptured.kt diff --git a/compiler/tests/org/jetbrains/jet/codegen/MultiDeclTestGenerated.java b/compiler/tests/org/jetbrains/jet/codegen/MultiDeclTestGenerated.java index 9938984b076..8028f7cec6b 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/MultiDeclTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/codegen/MultiDeclTestGenerated.java @@ -37,31 +37,6 @@ public class MultiDeclTestGenerated extends AbstractMultiDeclTestCase { blackBoxFileByFullPath("compiler/testData/codegen/multiDecl/ComplexInitializer.kt"); } - @TestMetadata("MultiDeclFor.kt") - public void testMultiDeclFor() throws Exception { - blackBoxFileByFullPath("compiler/testData/codegen/multiDecl/MultiDeclFor.kt"); - } - - @TestMetadata("MultiDeclForComponentExtensions.kt") - public void testMultiDeclForComponentExtensions() throws Exception { - blackBoxFileByFullPath("compiler/testData/codegen/multiDecl/MultiDeclForComponentExtensions.kt"); - } - - @TestMetadata("MultiDeclForComponentMemberExtensions.kt") - public void testMultiDeclForComponentMemberExtensions() throws Exception { - blackBoxFileByFullPath("compiler/testData/codegen/multiDecl/MultiDeclForComponentMemberExtensions.kt"); - } - - @TestMetadata("MultiDeclForComponentMemberExtensionsInExtensionFunction.kt") - public void testMultiDeclForComponentMemberExtensionsInExtensionFunction() throws Exception { - blackBoxFileByFullPath("compiler/testData/codegen/multiDecl/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt"); - } - - @TestMetadata("MultiDeclForValCaptured.kt") - public void testMultiDeclForValCaptured() throws Exception { - blackBoxFileByFullPath("compiler/testData/codegen/multiDecl/MultiDeclForValCaptured.kt"); - } - @TestMetadata("SimpleVals.kt") public void testSimpleVals() throws Exception { blackBoxFileByFullPath("compiler/testData/codegen/multiDecl/SimpleVals.kt"); @@ -107,4 +82,43 @@ public class MultiDeclTestGenerated extends AbstractMultiDeclTestCase { blackBoxFileByFullPath("compiler/testData/codegen/multiDecl/VarCapturedInObjectLiteral.kt"); } + @TestMetadata("compiler/testData/codegen/multiDecl/forIterator") + public static class ForIterator extends AbstractMultiDeclTestCase { + public void testAllFilesPresentInForIterator() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.codegen.AbstractMultiDeclTestCase", new File("compiler/testData/codegen/multiDecl/forIterator"), "kt", false); + } + + @TestMetadata("MultiDeclFor.kt") + public void testMultiDeclFor() throws Exception { + blackBoxFileByFullPath("compiler/testData/codegen/multiDecl/forIterator/MultiDeclFor.kt"); + } + + @TestMetadata("MultiDeclForComponentExtensions.kt") + public void testMultiDeclForComponentExtensions() throws Exception { + blackBoxFileByFullPath("compiler/testData/codegen/multiDecl/forIterator/MultiDeclForComponentExtensions.kt"); + } + + @TestMetadata("MultiDeclForComponentMemberExtensions.kt") + public void testMultiDeclForComponentMemberExtensions() throws Exception { + blackBoxFileByFullPath("compiler/testData/codegen/multiDecl/forIterator/MultiDeclForComponentMemberExtensions.kt"); + } + + @TestMetadata("MultiDeclForComponentMemberExtensionsInExtensionFunction.kt") + public void testMultiDeclForComponentMemberExtensionsInExtensionFunction() throws Exception { + blackBoxFileByFullPath("compiler/testData/codegen/multiDecl/forIterator/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt"); + } + + @TestMetadata("MultiDeclForValCaptured.kt") + public void testMultiDeclForValCaptured() throws Exception { + blackBoxFileByFullPath("compiler/testData/codegen/multiDecl/forIterator/MultiDeclForValCaptured.kt"); + } + + } + + public static Test suite() { + TestSuite suite = new TestSuite("MultiDeclTestGenerated"); + suite.addTestSuite(MultiDeclTestGenerated.class); + suite.addTestSuite(ForIterator.class); + return suite; + } }