Do not generate long lines and simplify merge in generated tests

This commit is contained in:
Nikolay Krasko
2015-02-16 14:46:55 +03:00
parent 768a67d1f1
commit 8ea9d39e98
72 changed files with 1718 additions and 282 deletions
@@ -28,12 +28,78 @@ import java.util.regex.Pattern;
/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
@InnerTestClasses({JetDiagnosticsTestGenerated.Tests.class, JetDiagnosticsTestGenerated.Script.class, JetDiagnosticsTestGenerated.Diagnostics.class})
@InnerTestClasses({
JetDiagnosticsTestGenerated.Tests.class,
JetDiagnosticsTestGenerated.Script.class,
JetDiagnosticsTestGenerated.Diagnostics.class,
})
@RunWith(JUnit3RunnerWithInners.class)
public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
@TestMetadata("compiler/testData/diagnostics/tests")
@TestDataPath("$PROJECT_ROOT")
@InnerTestClasses({Tests.Annotations.class, Tests.BackingField.class, Tests.Cast.class, Tests.CheckArguments.class, Tests.ClassObjects.class, Tests.ControlFlowAnalysis.class, Tests.ControlStructures.class, Tests.CyclicHierarchy.class, Tests.DataClasses.class, Tests.DataFlow.class, Tests.DataFlowInfoTraversal.class, Tests.DeclarationChecks.class, Tests.DelegatedProperty.class, Tests.Delegation.class, Tests.Deparenthesize.class, Tests.DuplicateJvmSignature.class, Tests.DynamicTypes.class, Tests.Enum.class, Tests.Evaluate.class, Tests.Extensions.class, Tests.FunctionLiterals.class, Tests.Generics.class, Tests.Imports.class, Tests.IncompleteCode.class, Tests.Inference.class, Tests.Infos.class, Tests.Inline.class, Tests.Inner.class, Tests.J_k.class, Tests.Jdk_annotations.class, Tests.Labels.class, Tests.Library.class, Tests.Modifiers.class, Tests.Multimodule.class, Tests.NamedArguments.class, Tests.NullabilityAndSmartCasts.class, Tests.NullableTypes.class, Tests.Numbers.class, Tests.Objects.class, Tests.OperatorsOverloading.class, Tests.Overload.class, Tests.Override.class, Tests.PlatformTypes.class, Tests.Recovery.class, Tests.Redeclarations.class, Tests.Regressions.class, Tests.Resolve.class, Tests.Scopes.class, Tests.SenselessComparison.class, Tests.Shadowing.class, Tests.SmartCasts.class, Tests.Substitutions.class, Tests.Subtyping.class, Tests.Suppress.class, Tests.ThisAndSuper.class, Tests.TraitWithRequired.class, Tests.Typedefs.class, Tests.Unit.class, Tests.Varargs.class, Tests.Variance.class, Tests.When.class})
@InnerTestClasses({
Tests.Annotations.class,
Tests.BackingField.class,
Tests.Cast.class,
Tests.CheckArguments.class,
Tests.ClassObjects.class,
Tests.ControlFlowAnalysis.class,
Tests.ControlStructures.class,
Tests.CyclicHierarchy.class,
Tests.DataClasses.class,
Tests.DataFlow.class,
Tests.DataFlowInfoTraversal.class,
Tests.DeclarationChecks.class,
Tests.DelegatedProperty.class,
Tests.Delegation.class,
Tests.Deparenthesize.class,
Tests.DuplicateJvmSignature.class,
Tests.DynamicTypes.class,
Tests.Enum.class,
Tests.Evaluate.class,
Tests.Extensions.class,
Tests.FunctionLiterals.class,
Tests.Generics.class,
Tests.Imports.class,
Tests.IncompleteCode.class,
Tests.Inference.class,
Tests.Infos.class,
Tests.Inline.class,
Tests.Inner.class,
Tests.J_k.class,
Tests.Jdk_annotations.class,
Tests.Labels.class,
Tests.Library.class,
Tests.Modifiers.class,
Tests.Multimodule.class,
Tests.NamedArguments.class,
Tests.NullabilityAndSmartCasts.class,
Tests.NullableTypes.class,
Tests.Numbers.class,
Tests.Objects.class,
Tests.OperatorsOverloading.class,
Tests.Overload.class,
Tests.Override.class,
Tests.PlatformTypes.class,
Tests.Recovery.class,
Tests.Redeclarations.class,
Tests.Regressions.class,
Tests.Resolve.class,
Tests.Scopes.class,
Tests.SenselessComparison.class,
Tests.Shadowing.class,
Tests.SmartCasts.class,
Tests.Substitutions.class,
Tests.Subtyping.class,
Tests.Suppress.class,
Tests.ThisAndSuper.class,
Tests.TraitWithRequired.class,
Tests.Typedefs.class,
Tests.Unit.class,
Tests.Varargs.class,
Tests.Variance.class,
Tests.When.class,
})
@RunWith(JUnit3RunnerWithInners.class)
public static class Tests extends AbstractJetDiagnosticsTest {
@TestMetadata("Abstract.kt")
@@ -564,7 +630,9 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
@TestMetadata("compiler/testData/diagnostics/tests/annotations")
@TestDataPath("$PROJECT_ROOT")
@InnerTestClasses({Annotations.AnnotationParameterMustBeConstant.class})
@InnerTestClasses({
Annotations.AnnotationParameterMustBeConstant.class,
})
@RunWith(JUnit3RunnerWithInners.class)
public static class Annotations extends AbstractJetDiagnosticsTest {
public void testAllFilesPresentInAnnotations() throws Exception {
@@ -946,7 +1014,10 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
@TestMetadata("compiler/testData/diagnostics/tests/cast")
@TestDataPath("$PROJECT_ROOT")
@InnerTestClasses({Cast.Bare.class, Cast.NeverSucceeds.class})
@InnerTestClasses({
Cast.Bare.class,
Cast.NeverSucceeds.class,
})
@RunWith(JUnit3RunnerWithInners.class)
public static class Cast extends AbstractJetDiagnosticsTest {
public void testAllFilesPresentInCast() throws Exception {
@@ -1496,7 +1567,10 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
@TestMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis")
@TestDataPath("$PROJECT_ROOT")
@InnerTestClasses({ControlFlowAnalysis.DeadCode.class, ControlFlowAnalysis.DefiniteReturn.class})
@InnerTestClasses({
ControlFlowAnalysis.DeadCode.class,
ControlFlowAnalysis.DefiniteReturn.class,
})
@RunWith(JUnit3RunnerWithInners.class)
public static class ControlFlowAnalysis extends AbstractJetDiagnosticsTest {
public void testAllFilesPresentInControlFlowAnalysis() throws Exception {
@@ -2277,7 +2351,10 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
@TestMetadata("compiler/testData/diagnostics/tests/dataFlow")
@TestDataPath("$PROJECT_ROOT")
@InnerTestClasses({DataFlow.Assignment.class, DataFlow.Local.class})
@InnerTestClasses({
DataFlow.Assignment.class,
DataFlow.Local.class,
})
@RunWith(JUnit3RunnerWithInners.class)
public static class DataFlow extends AbstractJetDiagnosticsTest {
public void testAllFilesPresentInDataFlow() throws Exception {
@@ -2431,7 +2508,9 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
@TestMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal")
@TestDataPath("$PROJECT_ROOT")
@InnerTestClasses({DataFlowInfoTraversal.Smartcasts.class})
@InnerTestClasses({
DataFlowInfoTraversal.Smartcasts.class,
})
@RunWith(JUnit3RunnerWithInners.class)
public static class DataFlowInfoTraversal extends AbstractJetDiagnosticsTest {
public void testAllFilesPresentInDataFlowInfoTraversal() throws Exception {
@@ -2774,7 +2853,9 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
@TestMetadata("compiler/testData/diagnostics/tests/declarationChecks")
@TestDataPath("$PROJECT_ROOT")
@InnerTestClasses({DeclarationChecks.MultiDeclarations.class})
@InnerTestClasses({
DeclarationChecks.MultiDeclarations.class,
})
@RunWith(JUnit3RunnerWithInners.class)
public static class DeclarationChecks extends AbstractJetDiagnosticsTest {
public void testAllFilesPresentInDeclarationChecks() throws Exception {
@@ -2991,7 +3072,9 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
@TestMetadata("compiler/testData/diagnostics/tests/delegatedProperty")
@TestDataPath("$PROJECT_ROOT")
@InnerTestClasses({DelegatedProperty.Inference.class})
@InnerTestClasses({
DelegatedProperty.Inference.class,
})
@RunWith(JUnit3RunnerWithInners.class)
public static class DelegatedProperty extends AbstractJetDiagnosticsTest {
@TestMetadata("absentErrorAboutInitializer.kt")
@@ -3382,7 +3465,15 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
@TestMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature")
@TestDataPath("$PROJECT_ROOT")
@InnerTestClasses({DuplicateJvmSignature.AccidentalOverrides.class, DuplicateJvmSignature.Bridges.class, DuplicateJvmSignature.Erasure.class, DuplicateJvmSignature.FunctionAndProperty.class, DuplicateJvmSignature.SpecialNames.class, DuplicateJvmSignature.Synthesized.class, DuplicateJvmSignature.TraitImpl.class})
@InnerTestClasses({
DuplicateJvmSignature.AccidentalOverrides.class,
DuplicateJvmSignature.Bridges.class,
DuplicateJvmSignature.Erasure.class,
DuplicateJvmSignature.FunctionAndProperty.class,
DuplicateJvmSignature.SpecialNames.class,
DuplicateJvmSignature.Synthesized.class,
DuplicateJvmSignature.TraitImpl.class,
})
@RunWith(JUnit3RunnerWithInners.class)
public static class DuplicateJvmSignature extends AbstractJetDiagnosticsTest {
public void testAllFilesPresentInDuplicateJvmSignature() throws Exception {
@@ -3908,7 +3999,9 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
@TestMetadata("compiler/testData/diagnostics/tests/enum")
@TestDataPath("$PROJECT_ROOT")
@InnerTestClasses({Enum.Inner.class})
@InnerTestClasses({
Enum.Inner.class,
})
@RunWith(JUnit3RunnerWithInners.class)
public static class Enum extends AbstractJetDiagnosticsTest {
@TestMetadata("AbstractEnum.kt")
@@ -4413,7 +4506,9 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
@TestMetadata("compiler/testData/diagnostics/tests/functionLiterals")
@TestDataPath("$PROJECT_ROOT")
@InnerTestClasses({FunctionLiterals.Return.class})
@InnerTestClasses({
FunctionLiterals.Return.class,
})
@RunWith(JUnit3RunnerWithInners.class)
public static class FunctionLiterals extends AbstractJetDiagnosticsTest {
public void testAllFilesPresentInFunctionLiterals() throws Exception {
@@ -4588,7 +4683,11 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
@TestMetadata("compiler/testData/diagnostics/tests/generics")
@TestDataPath("$PROJECT_ROOT")
@InnerTestClasses({Generics.StarProjections.class, Generics.TpAsReified.class, Generics.VarProjection.class})
@InnerTestClasses({
Generics.StarProjections.class,
Generics.TpAsReified.class,
Generics.VarProjection.class,
})
@RunWith(JUnit3RunnerWithInners.class)
public static class Generics extends AbstractJetDiagnosticsTest {
public void testAllFilesPresentInGenerics() throws Exception {
@@ -5000,7 +5099,9 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
@TestMetadata("compiler/testData/diagnostics/tests/incompleteCode")
@TestDataPath("$PROJECT_ROOT")
@InnerTestClasses({IncompleteCode.DiagnosticWithSyntaxError.class})
@InnerTestClasses({
IncompleteCode.DiagnosticWithSyntaxError.class,
})
@RunWith(JUnit3RunnerWithInners.class)
public static class IncompleteCode extends AbstractJetDiagnosticsTest {
public void testAllFilesPresentInIncompleteCode() throws Exception {
@@ -5205,7 +5306,15 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
@TestMetadata("compiler/testData/diagnostics/tests/inference")
@TestDataPath("$PROJECT_ROOT")
@InnerTestClasses({Inference.CapturedTypes.class, Inference.Constraints.class, Inference.NestedCalls.class, Inference.Regressions.class, Inference.ReportingImprovements.class, Inference.Substitutions.class, Inference.UpperBounds.class})
@InnerTestClasses({
Inference.CapturedTypes.class,
Inference.Constraints.class,
Inference.NestedCalls.class,
Inference.Regressions.class,
Inference.ReportingImprovements.class,
Inference.Substitutions.class,
Inference.UpperBounds.class,
})
@RunWith(JUnit3RunnerWithInners.class)
public static class Inference extends AbstractJetDiagnosticsTest {
public void testAllFilesPresentInInference() throws Exception {
@@ -6019,7 +6128,13 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
@TestMetadata("compiler/testData/diagnostics/tests/inline")
@TestDataPath("$PROJECT_ROOT")
@InnerTestClasses({Inline.BinaryExpressions.class, Inline.NonLocalReturns.class, Inline.NonPublicMember.class, Inline.Regressions.class, Inline.UnaryExpressions.class})
@InnerTestClasses({
Inline.BinaryExpressions.class,
Inline.NonLocalReturns.class,
Inline.NonPublicMember.class,
Inline.Regressions.class,
Inline.UnaryExpressions.class,
})
@RunWith(JUnit3RunnerWithInners.class)
public static class Inline extends AbstractJetDiagnosticsTest {
public void testAllFilesPresentInInline() throws Exception {
@@ -6434,7 +6549,9 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
@TestMetadata("compiler/testData/diagnostics/tests/inner")
@TestDataPath("$PROJECT_ROOT")
@InnerTestClasses({Inner.QualifiedExpression.class})
@InnerTestClasses({
Inner.QualifiedExpression.class,
})
@RunWith(JUnit3RunnerWithInners.class)
public static class Inner extends AbstractJetDiagnosticsTest {
public void testAllFilesPresentInInner() throws Exception {
@@ -6948,7 +7065,9 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
@TestMetadata("compiler/testData/diagnostics/tests/jdk-annotations")
@TestDataPath("$PROJECT_ROOT")
@InnerTestClasses({Jdk_annotations.Sql.class})
@InnerTestClasses({
Jdk_annotations.Sql.class,
})
@RunWith(JUnit3RunnerWithInners.class)
public static class Jdk_annotations extends AbstractJetDiagnosticsTest {
public void testAllFilesPresentInJdk_annotations() throws Exception {
@@ -7120,7 +7239,11 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
@TestMetadata("compiler/testData/diagnostics/tests/multimodule")
@TestDataPath("$PROJECT_ROOT")
@InnerTestClasses({Multimodule.DuplicateClass.class, Multimodule.DuplicateMethod.class, Multimodule.DuplicateSuper.class})
@InnerTestClasses({
Multimodule.DuplicateClass.class,
Multimodule.DuplicateMethod.class,
Multimodule.DuplicateSuper.class,
})
@RunWith(JUnit3RunnerWithInners.class)
public static class Multimodule extends AbstractJetDiagnosticsTest {
public void testAllFilesPresentInMultimodule() throws Exception {
@@ -7964,7 +8087,9 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
@TestMetadata("compiler/testData/diagnostics/tests/override")
@TestDataPath("$PROJECT_ROOT")
@InnerTestClasses({Override.ParameterNames.class})
@InnerTestClasses({
Override.ParameterNames.class,
})
@RunWith(JUnit3RunnerWithInners.class)
public static class Override extends AbstractJetDiagnosticsTest {
@TestMetadata("AbstractFunImplemented.kt")
@@ -8325,7 +8450,12 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
@TestMetadata("compiler/testData/diagnostics/tests/platformTypes")
@TestDataPath("$PROJECT_ROOT")
@InnerTestClasses({PlatformTypes.CommonSupertype.class, PlatformTypes.Intersection.class, PlatformTypes.MethodCall.class, PlatformTypes.NullabilityWarnings.class})
@InnerTestClasses({
PlatformTypes.CommonSupertype.class,
PlatformTypes.Intersection.class,
PlatformTypes.MethodCall.class,
PlatformTypes.NullabilityWarnings.class,
})
@RunWith(JUnit3RunnerWithInners.class)
public static class PlatformTypes extends AbstractJetDiagnosticsTest {
public void testAllFilesPresentInPlatformTypes() throws Exception {
@@ -9544,7 +9674,11 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
@TestMetadata("compiler/testData/diagnostics/tests/resolve")
@TestDataPath("$PROJECT_ROOT")
@InnerTestClasses({Resolve.Invoke.class, Resolve.NestedCalls.class, Resolve.SpecialConstructions.class})
@InnerTestClasses({
Resolve.Invoke.class,
Resolve.NestedCalls.class,
Resolve.SpecialConstructions.class,
})
@RunWith(JUnit3RunnerWithInners.class)
public static class Resolve extends AbstractJetDiagnosticsTest {
public void testAllFilesPresentInResolve() throws Exception {
@@ -9613,7 +9747,9 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
@TestMetadata("compiler/testData/diagnostics/tests/resolve/invoke")
@TestDataPath("$PROJECT_ROOT")
@InnerTestClasses({Invoke.Errors.class})
@InnerTestClasses({
Invoke.Errors.class,
})
@RunWith(JUnit3RunnerWithInners.class)
public static class Invoke extends AbstractJetDiagnosticsTest {
public void testAllFilesPresentInInvoke() throws Exception {
@@ -10128,7 +10264,9 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
@TestMetadata("compiler/testData/diagnostics/tests/smartCasts")
@TestDataPath("$PROJECT_ROOT")
@InnerTestClasses({SmartCasts.Inference.class})
@InnerTestClasses({
SmartCasts.Inference.class,
})
@RunWith(JUnit3RunnerWithInners.class)
public static class SmartCasts extends AbstractJetDiagnosticsTest {
@TestMetadata("afterBinaryExpr.kt")
@@ -10399,7 +10537,11 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
@TestMetadata("compiler/testData/diagnostics/tests/suppress")
@TestDataPath("$PROJECT_ROOT")
@InnerTestClasses({Suppress.AllWarnings.class, Suppress.ManyWarnings.class, Suppress.OneWarning.class})
@InnerTestClasses({
Suppress.AllWarnings.class,
Suppress.ManyWarnings.class,
Suppress.OneWarning.class,
})
@RunWith(JUnit3RunnerWithInners.class)
public static class Suppress extends AbstractJetDiagnosticsTest {
public void testAllFilesPresentInSuppress() throws Exception {
@@ -10883,7 +11025,9 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
@TestMetadata("compiler/testData/diagnostics/tests/variance")
@TestDataPath("$PROJECT_ROOT")
@InnerTestClasses({Variance.PrivateToThis.class})
@InnerTestClasses({
Variance.PrivateToThis.class,
})
@RunWith(JUnit3RunnerWithInners.class)
public static class Variance extends AbstractJetDiagnosticsTest {
public void testAllFilesPresentInVariance() throws Exception {
@@ -11107,7 +11251,10 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
@TestMetadata("compiler/testData/codegen/box/diagnostics")
@TestDataPath("$PROJECT_ROOT")
@InnerTestClasses({Diagnostics.Functions.class, Diagnostics.Vararg.class})
@InnerTestClasses({
Diagnostics.Functions.class,
Diagnostics.Vararg.class,
})
@RunWith(JUnit3RunnerWithInners.class)
public static class Diagnostics extends AbstractJetDiagnosticsTest {
public void testAllFilesPresentInDiagnostics() throws Exception {
@@ -11116,7 +11263,11 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
@TestMetadata("compiler/testData/codegen/box/diagnostics/functions")
@TestDataPath("$PROJECT_ROOT")
@InnerTestClasses({Functions.Inference.class, Functions.Invoke.class, Functions.TailRecursion.class})
@InnerTestClasses({
Functions.Inference.class,
Functions.Invoke.class,
Functions.TailRecursion.class,
})
@RunWith(JUnit3RunnerWithInners.class)
public static class Functions extends AbstractJetDiagnosticsTest {
public void testAllFilesPresentInFunctions() throws Exception {
@@ -11140,7 +11291,9 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
@TestMetadata("compiler/testData/codegen/box/diagnostics/functions/invoke")
@TestDataPath("$PROJECT_ROOT")
@InnerTestClasses({Invoke.OnObjects.class})
@InnerTestClasses({
Invoke.OnObjects.class,
})
@RunWith(JUnit3RunnerWithInners.class)
public static class Invoke extends AbstractJetDiagnosticsTest {
public void testAllFilesPresentInInvoke() throws Exception {