From 0b7c9870a674a41a9158d768107ddb656ca0e7c1 Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <Nikolay.Krasko@jetbrains.com>
Date: Mon, 16 Feb 2015 14:46:55 +0300
Subject: [PATCH] Do not generate long lines and simplify merge in generated
 tests

Original commit: 8ea9d39e98f1dce99bb19b626472e73e4a5cc6cd
---
 .../build/IncrementalJpsTestGenerated.java    | 31 ++++++++++++++-----
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java
index d21508ddb34..e2f9ae29c1a 100644
--- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java
+++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java
@@ -28,12 +28,17 @@ import java.util.regex.Pattern;
 
 /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
-@InnerTestClasses({IncrementalJpsTestGenerated.MultiModule.class, IncrementalJpsTestGenerated.PureKotlin.class, IncrementalJpsTestGenerated.WithJava.class})
+@InnerTestClasses({
+        IncrementalJpsTestGenerated.MultiModule.class,
+        IncrementalJpsTestGenerated.PureKotlin.class,
+        IncrementalJpsTestGenerated.WithJava.class,
+})
 @RunWith(JUnit3RunnerWithInners.class)
 public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest {
     @TestMetadata("jps-plugin/testData/incremental/multiModule")
     @TestDataPath("$PROJECT_ROOT")
-    @InnerTestClasses({})
+    @InnerTestClasses({
+    })
     @RunWith(JUnit3RunnerWithInners.class)
     public static class MultiModule extends AbstractIncrementalJpsTest {
         public void testAllFilesPresentInMultiModule() throws Exception {
@@ -104,7 +109,8 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest {
 
     @TestMetadata("jps-plugin/testData/incremental/pureKotlin")
     @TestDataPath("$PROJECT_ROOT")
-    @InnerTestClasses({})
+    @InnerTestClasses({
+    })
     @RunWith(JUnit3RunnerWithInners.class)
     public static class PureKotlin extends AbstractIncrementalJpsTest {
         @TestMetadata("accessingFunctionsViaPackagePart")
@@ -433,7 +439,11 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest {
 
     @TestMetadata("jps-plugin/testData/incremental/withJava")
     @TestDataPath("$PROJECT_ROOT")
-    @InnerTestClasses({WithJava.ConvertBetweenJavaAndKotlin.class, WithJava.JavaUsedInKotlin.class, WithJava.KotlinUsedInJava.class})
+    @InnerTestClasses({
+            WithJava.ConvertBetweenJavaAndKotlin.class,
+            WithJava.JavaUsedInKotlin.class,
+            WithJava.KotlinUsedInJava.class,
+    })
     @RunWith(JUnit3RunnerWithInners.class)
     public static class WithJava extends AbstractIncrementalJpsTest {
         public void testAllFilesPresentInWithJava() throws Exception {
@@ -442,7 +452,8 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest {
 
         @TestMetadata("jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin")
         @TestDataPath("$PROJECT_ROOT")
-        @InnerTestClasses({})
+        @InnerTestClasses({
+        })
         @RunWith(JUnit3RunnerWithInners.class)
         public static class ConvertBetweenJavaAndKotlin extends AbstractIncrementalJpsTest {
             public void testAllFilesPresentInConvertBetweenJavaAndKotlin() throws Exception {
@@ -477,7 +488,9 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest {
 
         @TestMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin")
         @TestDataPath("$PROJECT_ROOT")
-        @InnerTestClasses({JavaUsedInKotlin.SamConversions.class})
+        @InnerTestClasses({
+                JavaUsedInKotlin.SamConversions.class,
+        })
         @RunWith(JUnit3RunnerWithInners.class)
         public static class JavaUsedInKotlin extends AbstractIncrementalJpsTest {
             public void testAllFilesPresentInJavaUsedInKotlin() throws Exception {
@@ -534,7 +547,8 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest {
 
             @TestMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions")
             @TestDataPath("$PROJECT_ROOT")
-            @InnerTestClasses({})
+            @InnerTestClasses({
+            })
             @RunWith(JUnit3RunnerWithInners.class)
             public static class SamConversions extends AbstractIncrementalJpsTest {
                 public void testAllFilesPresentInSamConversions() throws Exception {
@@ -558,7 +572,8 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest {
 
         @TestMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava")
         @TestDataPath("$PROJECT_ROOT")
-        @InnerTestClasses({})
+        @InnerTestClasses({
+        })
         @RunWith(JUnit3RunnerWithInners.class)
         public static class KotlinUsedInJava extends AbstractIncrementalJpsTest {
             public void testAllFilesPresentInKotlinUsedInJava() throws Exception {