diff --git a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java index b899aec85f4..7742f2fa262 100644 --- a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java @@ -15,22 +15,19 @@ */ package org.jetbrains.jet.checkers; -import junit.framework.Assert; import junit.framework.Test; import junit.framework.TestSuite; - -import java.io.File; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; -import org.jetbrains.jet.checkers.AbstractDiagnosticsTestWithEagerResolve; +import java.io.File; /** This class is generated by {@link org.jetbrains.jet.checkers.AbstractDiagnosticsTestWithEagerResolve}. DO NOT MODIFY MANUALLY */ -@InnerTestClasses({JetDiagnosticsTestGenerated.Tests.class, JetDiagnosticsTestGenerated.Script.class, }) +@InnerTestClasses({JetDiagnosticsTestGenerated.Tests.class, JetDiagnosticsTestGenerated.Script.class}) public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEagerResolve { @TestMetadata("compiler/testData/diagnostics/tests") - @InnerTestClasses({Tests.Annotations.class, Tests.BackingField.class, Tests.Cast.class, Tests.CheckArguments.class, Tests.ControlFlowAnalysis.class, Tests.ControlStructures.class, Tests.DataFlow.class, Tests.DataFlowInfoTraversal.class, Tests.DeclarationChecks.class, Tests.Enum.class, Tests.Extensions.class, Tests.Generics.class, Tests.IncompleteCode.class, Tests.Inference.class, Tests.Infos.class, Tests.J_k.class, Tests.Jdk_annotations.class, Tests.Library.class, Tests.NullabilityAndAutoCasts.class, Tests.Objects.class, Tests.OperatorsOverloading.class, Tests.Overload.class, Tests.Override.class, Tests.Redeclarations.class, Tests.Regressions.class, Tests.Scopes.class, Tests.Shadowing.class, Tests.Substitutions.class, Tests.Subtyping.class, Tests.Tuples.class, Tests.Varargs.class, }) + @InnerTestClasses({Tests.Annotations.class, Tests.BackingField.class, Tests.Cast.class, Tests.CheckArguments.class, Tests.ControlFlowAnalysis.class, Tests.ControlStructures.class, Tests.DataFlow.class, Tests.DataFlowInfoTraversal.class, Tests.DeclarationChecks.class, Tests.Enum.class, Tests.Extensions.class, Tests.Generics.class, Tests.IncompleteCode.class, Tests.Inference.class, Tests.Infos.class, Tests.J_k.class, Tests.Jdk_annotations.class, Tests.Library.class, Tests.NullabilityAndAutoCasts.class, Tests.Objects.class, Tests.OperatorsOverloading.class, Tests.Overload.class, Tests.Override.class, Tests.Redeclarations.class, Tests.Regressions.class, Tests.Scopes.class, Tests.Shadowing.class, Tests.Substitutions.class, Tests.Subtyping.class, Tests.Tuples.class, Tests.Varargs.class}) public static class Tests extends AbstractDiagnosticsTestWithEagerResolve { @TestMetadata("Abstract.kt") public void testAbstract() throws Exception { @@ -1076,7 +1073,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage } @TestMetadata("compiler/testData/diagnostics/tests/declarationChecks") - @InnerTestClasses({DeclarationChecks.MultiDeclarations.class, }) + @InnerTestClasses({DeclarationChecks.MultiDeclarations.class}) public static class DeclarationChecks extends AbstractDiagnosticsTestWithEagerResolve { public void testAllFilesPresentInDeclarationChecks() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.checkers.AbstractDiagnosticsTestWithEagerResolve", new File("compiler/testData/diagnostics/tests/declarationChecks"), "kt", true); @@ -1353,7 +1350,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage } @TestMetadata("compiler/testData/diagnostics/tests/incompleteCode") - @InnerTestClasses({IncompleteCode.DiagnosticWithSyntaxError.class, }) + @InnerTestClasses({IncompleteCode.DiagnosticWithSyntaxError.class}) public static class IncompleteCode extends AbstractDiagnosticsTestWithEagerResolve { public void testAllFilesPresentInIncompleteCode() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.checkers.AbstractDiagnosticsTestWithEagerResolve", new File("compiler/testData/diagnostics/tests/incompleteCode"), "kt", true); @@ -1451,7 +1448,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage } @TestMetadata("compiler/testData/diagnostics/tests/inference") - @InnerTestClasses({Inference.Regressions.class, }) + @InnerTestClasses({Inference.Regressions.class}) public static class Inference extends AbstractDiagnosticsTestWithEagerResolve { public void testAllFilesPresentInInference() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.checkers.AbstractDiagnosticsTestWithEagerResolve", new File("compiler/testData/diagnostics/tests/inference"), "kt", true); diff --git a/compiler/tests/org/jetbrains/jet/codegen/MultiDeclTestGenerated.java b/compiler/tests/org/jetbrains/jet/codegen/MultiDeclTestGenerated.java index d28ede2c8fb..91cacc24974 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/MultiDeclTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/codegen/MultiDeclTestGenerated.java @@ -28,7 +28,7 @@ import org.jetbrains.jet.codegen.AbstractMultiDeclTestCase; /** This class is generated by {@link org.jetbrains.jet.codegen.AbstractMultiDeclTestCase}. DO NOT MODIFY MANUALLY */ @TestMetadata("compiler/testData/codegen/multiDecl") -@InnerTestClasses({MultiDeclTestGenerated.ForArray.class, MultiDeclTestGenerated.ForIterator.class, MultiDeclTestGenerated.ForRange.class, }) +@InnerTestClasses({MultiDeclTestGenerated.ForArray.class, MultiDeclTestGenerated.ForIterator.class, MultiDeclTestGenerated.ForRange.class}) public class MultiDeclTestGenerated extends AbstractMultiDeclTestCase { public void testAllFilesPresentInMultiDecl() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.codegen.AbstractMultiDeclTestCase", new File("compiler/testData/codegen/multiDecl"), "kt", true); @@ -90,7 +90,7 @@ public class MultiDeclTestGenerated extends AbstractMultiDeclTestCase { } @TestMetadata("compiler/testData/codegen/multiDecl/forArray") - @InnerTestClasses({ForArray.Int.class, ForArray.Long.class, }) + @InnerTestClasses({ForArray.Int.class, ForArray.Long.class}) public static class ForArray extends AbstractMultiDeclTestCase { public void testAllFilesPresentInForArray() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.codegen.AbstractMultiDeclTestCase", new File("compiler/testData/codegen/multiDecl/forArray"), "kt", true); @@ -187,7 +187,7 @@ public class MultiDeclTestGenerated extends AbstractMultiDeclTestCase { } @TestMetadata("compiler/testData/codegen/multiDecl/forIterator") - @InnerTestClasses({ForIterator.LongIterator.class, }) + @InnerTestClasses({ForIterator.LongIterator.class}) 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", true); @@ -255,7 +255,7 @@ public class MultiDeclTestGenerated extends AbstractMultiDeclTestCase { } @TestMetadata("compiler/testData/codegen/multiDecl/forRange") - @InnerTestClasses({ForRange.ExplicitRangeTo.class, ForRange.ExplicitRangeToWithDot.class, ForRange.Int.class, ForRange.Long.class, }) + @InnerTestClasses({ForRange.ExplicitRangeTo.class, ForRange.ExplicitRangeToWithDot.class, ForRange.Int.class, ForRange.Long.class}) public static class ForRange extends AbstractMultiDeclTestCase { public void testAllFilesPresentInForRange() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.codegen.AbstractMultiDeclTestCase", new File("compiler/testData/codegen/multiDecl/forRange"), "kt", true); @@ -287,7 +287,7 @@ public class MultiDeclTestGenerated extends AbstractMultiDeclTestCase { } @TestMetadata("compiler/testData/codegen/multiDecl/forRange/explicitRangeTo") - @InnerTestClasses({ExplicitRangeTo.Int.class, ExplicitRangeTo.Long.class, }) + @InnerTestClasses({ExplicitRangeTo.Int.class, ExplicitRangeTo.Long.class}) public static class ExplicitRangeTo extends AbstractMultiDeclTestCase { public void testAllFilesPresentInExplicitRangeTo() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.codegen.AbstractMultiDeclTestCase", new File("compiler/testData/codegen/multiDecl/forRange/explicitRangeTo"), "kt", true); @@ -384,7 +384,7 @@ public class MultiDeclTestGenerated extends AbstractMultiDeclTestCase { } @TestMetadata("compiler/testData/codegen/multiDecl/forRange/explicitRangeToWithDot") - @InnerTestClasses({ExplicitRangeToWithDot.Int.class, ExplicitRangeToWithDot.Long.class, }) + @InnerTestClasses({ExplicitRangeToWithDot.Int.class, ExplicitRangeToWithDot.Long.class}) public static class ExplicitRangeToWithDot extends AbstractMultiDeclTestCase { public void testAllFilesPresentInExplicitRangeToWithDot() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.codegen.AbstractMultiDeclTestCase", new File("compiler/testData/codegen/multiDecl/forRange/explicitRangeToWithDot"), "kt", true); diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java index bdda4fc32d8..715196ce9f0 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java @@ -28,7 +28,7 @@ import org.jetbrains.jet.jvm.compiler.AbstractLoadJavaTest; /** This class is generated by {@link org.jetbrains.jet.jvm.compiler.AbstractLoadJavaTest}. DO NOT MODIFY MANUALLY */ @TestMetadata("compiler/testData/loadJava") -@InnerTestClasses({LoadJavaTestGenerated.Annotation.class, LoadJavaTestGenerated.Constructor.class, LoadJavaTestGenerated.JavaBean.class, LoadJavaTestGenerated.KotlinSignature.class, LoadJavaTestGenerated.Library.class, LoadJavaTestGenerated.Modality.class, LoadJavaTestGenerated.NotNull.class, LoadJavaTestGenerated.Vararg.class, }) +@InnerTestClasses({LoadJavaTestGenerated.Annotation.class, LoadJavaTestGenerated.Constructor.class, LoadJavaTestGenerated.JavaBean.class, LoadJavaTestGenerated.KotlinSignature.class, LoadJavaTestGenerated.Library.class, LoadJavaTestGenerated.Modality.class, LoadJavaTestGenerated.NotNull.class, LoadJavaTestGenerated.Vararg.class}) public class LoadJavaTestGenerated extends AbstractLoadJavaTest { public void testAllFilesPresentInLoadJava() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.jvm.compiler.AbstractLoadJavaTest", new File("compiler/testData/loadJava"), "java", true); @@ -234,7 +234,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { } @TestMetadata("compiler/testData/loadJava/kotlinSignature") - @InnerTestClasses({KotlinSignature.Error.class, }) + @InnerTestClasses({KotlinSignature.Error.class}) public static class KotlinSignature extends AbstractLoadJavaTest { public void testAllFilesPresentInKotlinSignature() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.jvm.compiler.AbstractLoadJavaTest", new File("compiler/testData/loadJava/kotlinSignature"), "java", true); diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveDescriptorRendererTestGenerated.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveDescriptorRendererTestGenerated.java index eec089d738a..6cf6fc2fc57 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveDescriptorRendererTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveDescriptorRendererTestGenerated.java @@ -27,7 +27,7 @@ import org.jetbrains.jet.test.TestMetadata; import org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveDescriptorRendererTest; /** This class is generated by {@link org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveDescriptorRendererTest}. DO NOT MODIFY MANUALLY */ -@InnerTestClasses({LazyResolveDescriptorRendererTestGenerated.Renderer.class, LazyResolveDescriptorRendererTestGenerated.DescriptorRenderer.class, }) +@InnerTestClasses({LazyResolveDescriptorRendererTestGenerated.Renderer.class, LazyResolveDescriptorRendererTestGenerated.DescriptorRenderer.class}) public class LazyResolveDescriptorRendererTestGenerated extends AbstractLazyResolveDescriptorRendererTest { @TestMetadata("compiler/testData/renderer") public static class Renderer extends AbstractLazyResolveDescriptorRendererTest { diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java index f903ddf828c..e4273687c8e 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java @@ -27,10 +27,10 @@ import org.jetbrains.jet.test.TestMetadata; import org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest; /** This class is generated by {@link org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest}. DO NOT MODIFY MANUALLY */ -@InnerTestClasses({LazyResolveNamespaceComparingTestGenerated.LoadKotlin.class, LazyResolveNamespaceComparingTestGenerated.LoadJava.class, LazyResolveNamespaceComparingTestGenerated.NamespaceComparator.class, }) +@InnerTestClasses({LazyResolveNamespaceComparingTestGenerated.LoadKotlin.class, LazyResolveNamespaceComparingTestGenerated.LoadJava.class, LazyResolveNamespaceComparingTestGenerated.NamespaceComparator.class}) public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyResolveNamespaceComparingTest { @TestMetadata("compiler/testData/loadKotlin") - @InnerTestClasses({LoadKotlin.Class.class, LoadKotlin.ClassFun.class, LoadKotlin.ClassObject.class, LoadKotlin.Constructor.class, LoadKotlin.Fun.class, LoadKotlin.Prop.class, LoadKotlin.Type.class, LoadKotlin.Visibility.class, }) + @InnerTestClasses({LoadKotlin.Class.class, LoadKotlin.ClassFun.class, LoadKotlin.ClassObject.class, LoadKotlin.Constructor.class, LoadKotlin.Fun.class, LoadKotlin.Prop.class, LoadKotlin.Type.class, LoadKotlin.Visibility.class}) public static class LoadKotlin extends AbstractLazyResolveNamespaceComparingTest { public void testAllFilesPresentInLoadKotlin() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/loadKotlin"), "kt", true); @@ -269,7 +269,7 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso } @TestMetadata("compiler/testData/loadKotlin/fun") - @InnerTestClasses({Fun.GenericWithTypeVariables.class, Fun.GenericWithoutTypeVariables.class, Fun.NonGeneric.class, }) + @InnerTestClasses({Fun.GenericWithTypeVariables.class, Fun.GenericWithoutTypeVariables.class, Fun.NonGeneric.class}) public static class Fun extends AbstractLazyResolveNamespaceComparingTest { public void testAllFilesPresentInFun() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/loadKotlin/fun"), "kt", true); @@ -859,7 +859,7 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso } @TestMetadata("compiler/testData/loadJava") - @InnerTestClasses({LoadJava.Annotation.class, LoadJava.Constructor.class, LoadJava.JavaBean.class, LoadJava.KotlinSignature.class, LoadJava.Library.class, LoadJava.Modality.class, LoadJava.NotNull.class, LoadJava.Vararg.class, }) + @InnerTestClasses({LoadJava.Annotation.class, LoadJava.Constructor.class, LoadJava.JavaBean.class, LoadJava.KotlinSignature.class, LoadJava.Library.class, LoadJava.Modality.class, LoadJava.NotNull.class, LoadJava.Vararg.class}) public static class LoadJava extends AbstractLazyResolveNamespaceComparingTest { public void testAllFilesPresentInLoadJava() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/loadJava"), "kt", true); @@ -1065,7 +1065,7 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso } @TestMetadata("compiler/testData/loadJava/kotlinSignature") - @InnerTestClasses({KotlinSignature.Error.class, }) + @InnerTestClasses({KotlinSignature.Error.class}) public static class KotlinSignature extends AbstractLazyResolveNamespaceComparingTest { public void testAllFilesPresentInKotlinSignature() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/loadJava/kotlinSignature"), "kt", true); diff --git a/compiler/tests/org/jetbrains/jet/test/generator/TestGenerator.java b/compiler/tests/org/jetbrains/jet/test/generator/TestGenerator.java index dd0eee492e3..c2237ab4efe 100644 --- a/compiler/tests/org/jetbrains/jet/test/generator/TestGenerator.java +++ b/compiler/tests/org/jetbrains/jet/test/generator/TestGenerator.java @@ -211,9 +211,13 @@ public class TestGenerator { Collection innerTestClasses = testClassModel.getInnerTestClasses(); if (innerTestClasses.isEmpty()) return; p.print("@InnerTestClasses({"); - for (TestClassModel innerTestClass : innerTestClasses) { + for (Iterator iterator = innerTestClasses.iterator(); iterator.hasNext(); ) { + TestClassModel innerTestClass = iterator.next(); if (!innerTestClass.isEmpty()) { - p.printWithNoIndent(testClassModel.getName(), ".", innerTestClass.getName(), ".class, "); + p.printWithNoIndent(testClassModel.getName(), ".", innerTestClass.getName(), ".class"); + if (iterator.hasNext()) { + p.printWithNoIndent(", "); + } } } p.printlnWithNoIndent("})"); diff --git a/idea/tests/org/jetbrains/jet/checkers/JetPsiCheckerTestGenerated.java b/idea/tests/org/jetbrains/jet/checkers/JetPsiCheckerTestGenerated.java index 34b48b2f1e3..0641103c32c 100644 --- a/idea/tests/org/jetbrains/jet/checkers/JetPsiCheckerTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/checkers/JetPsiCheckerTestGenerated.java @@ -15,16 +15,19 @@ */ package org.jetbrains.jet.checkers; +import junit.framework.Assert; import junit.framework.Test; import junit.framework.TestSuite; + +import java.io.File; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; -import java.io.File; +import org.jetbrains.jet.checkers.AbstractJetPsiCheckerTest; /** This class is generated by {@link org.jetbrains.jet.checkers.AbstractJetPsiCheckerTest}. DO NOT MODIFY MANUALLY */ -@InnerTestClasses({JetPsiCheckerTestGenerated.Checker.class, JetPsiCheckerTestGenerated.Regression.class, JetPsiCheckerTestGenerated.Infos.class, }) +@InnerTestClasses({JetPsiCheckerTestGenerated.Checker.class, JetPsiCheckerTestGenerated.Regression.class, JetPsiCheckerTestGenerated.Infos.class}) public class JetPsiCheckerTestGenerated extends AbstractJetPsiCheckerTest { @TestMetadata("idea/testData/checker") public static class Checker extends AbstractJetPsiCheckerTest { @@ -34,8 +37,7 @@ public class JetPsiCheckerTestGenerated extends AbstractJetPsiCheckerTest { } public void testAllFilesPresentInChecker() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.checkers.AbstractJetPsiCheckerTest", - new File("idea/testData/checker"), "jet", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.checkers.AbstractJetPsiCheckerTest", new File("idea/testData/checker"), "jet", false); } @TestMetadata("AnonymousInitializers.jet")