Do not generate long lines and simplify merge in generated tests

Original commit: 8ea9d39e98
This commit is contained in:
Nikolay Krasko
2015-02-16 14:46:55 +03:00
parent 7076fe6eb1
commit 0b7c9870a6
@@ -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 */ /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all") @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) @RunWith(JUnit3RunnerWithInners.class)
public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest {
@TestMetadata("jps-plugin/testData/incremental/multiModule") @TestMetadata("jps-plugin/testData/incremental/multiModule")
@TestDataPath("$PROJECT_ROOT") @TestDataPath("$PROJECT_ROOT")
@InnerTestClasses({}) @InnerTestClasses({
})
@RunWith(JUnit3RunnerWithInners.class) @RunWith(JUnit3RunnerWithInners.class)
public static class MultiModule extends AbstractIncrementalJpsTest { public static class MultiModule extends AbstractIncrementalJpsTest {
public void testAllFilesPresentInMultiModule() throws Exception { public void testAllFilesPresentInMultiModule() throws Exception {
@@ -104,7 +109,8 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest {
@TestMetadata("jps-plugin/testData/incremental/pureKotlin") @TestMetadata("jps-plugin/testData/incremental/pureKotlin")
@TestDataPath("$PROJECT_ROOT") @TestDataPath("$PROJECT_ROOT")
@InnerTestClasses({}) @InnerTestClasses({
})
@RunWith(JUnit3RunnerWithInners.class) @RunWith(JUnit3RunnerWithInners.class)
public static class PureKotlin extends AbstractIncrementalJpsTest { public static class PureKotlin extends AbstractIncrementalJpsTest {
@TestMetadata("accessingFunctionsViaPackagePart") @TestMetadata("accessingFunctionsViaPackagePart")
@@ -433,7 +439,11 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest {
@TestMetadata("jps-plugin/testData/incremental/withJava") @TestMetadata("jps-plugin/testData/incremental/withJava")
@TestDataPath("$PROJECT_ROOT") @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) @RunWith(JUnit3RunnerWithInners.class)
public static class WithJava extends AbstractIncrementalJpsTest { public static class WithJava extends AbstractIncrementalJpsTest {
public void testAllFilesPresentInWithJava() throws Exception { public void testAllFilesPresentInWithJava() throws Exception {
@@ -442,7 +452,8 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest {
@TestMetadata("jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin") @TestMetadata("jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin")
@TestDataPath("$PROJECT_ROOT") @TestDataPath("$PROJECT_ROOT")
@InnerTestClasses({}) @InnerTestClasses({
})
@RunWith(JUnit3RunnerWithInners.class) @RunWith(JUnit3RunnerWithInners.class)
public static class ConvertBetweenJavaAndKotlin extends AbstractIncrementalJpsTest { public static class ConvertBetweenJavaAndKotlin extends AbstractIncrementalJpsTest {
public void testAllFilesPresentInConvertBetweenJavaAndKotlin() throws Exception { public void testAllFilesPresentInConvertBetweenJavaAndKotlin() throws Exception {
@@ -477,7 +488,9 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest {
@TestMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin") @TestMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin")
@TestDataPath("$PROJECT_ROOT") @TestDataPath("$PROJECT_ROOT")
@InnerTestClasses({JavaUsedInKotlin.SamConversions.class}) @InnerTestClasses({
JavaUsedInKotlin.SamConversions.class,
})
@RunWith(JUnit3RunnerWithInners.class) @RunWith(JUnit3RunnerWithInners.class)
public static class JavaUsedInKotlin extends AbstractIncrementalJpsTest { public static class JavaUsedInKotlin extends AbstractIncrementalJpsTest {
public void testAllFilesPresentInJavaUsedInKotlin() throws Exception { public void testAllFilesPresentInJavaUsedInKotlin() throws Exception {
@@ -534,7 +547,8 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest {
@TestMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions") @TestMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions")
@TestDataPath("$PROJECT_ROOT") @TestDataPath("$PROJECT_ROOT")
@InnerTestClasses({}) @InnerTestClasses({
})
@RunWith(JUnit3RunnerWithInners.class) @RunWith(JUnit3RunnerWithInners.class)
public static class SamConversions extends AbstractIncrementalJpsTest { public static class SamConversions extends AbstractIncrementalJpsTest {
public void testAllFilesPresentInSamConversions() throws Exception { public void testAllFilesPresentInSamConversions() throws Exception {
@@ -558,7 +572,8 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest {
@TestMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava") @TestMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava")
@TestDataPath("$PROJECT_ROOT") @TestDataPath("$PROJECT_ROOT")
@InnerTestClasses({}) @InnerTestClasses({
})
@RunWith(JUnit3RunnerWithInners.class) @RunWith(JUnit3RunnerWithInners.class)
public static class KotlinUsedInJava extends AbstractIncrementalJpsTest { public static class KotlinUsedInJava extends AbstractIncrementalJpsTest {
public void testAllFilesPresentInKotlinUsedInJava() throws Exception { public void testAllFilesPresentInKotlinUsedInJava() throws Exception {