azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove dangling commas from generated tests

Browse Source
This commit is contained in:
Nikolay Krasko
2013-02-11 16:08:05 +04:00
parent 9dedc6d2a9
commit 9f1e808255
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/jet/test/generator/TestGenerator.java
+9 -4
View File
@@ -213,13 +213,18 @@ public class TestGenerator {
Collection<TestClassModel> innerTestClasses = testClassModel.getInnerTestClasses();
if (innerTestClasses.isEmpty()) return;
p.print("@InnerTestClasses({");
for (Iterator<TestClassModel> iterator = innerTestClasses.iterator(); iterator.hasNext(); ) {
TestClassModel innerTestClass = iterator.next();
boolean isFirst = true;
for (TestClassModel innerTestClass : innerTestClasses) {
if (!innerTestClass.isEmpty()) {
p.printWithNoIndent(testClassModel.getName(), ".", innerTestClass.getName(), ".class");
if (iterator.hasNext()) {
if (!isFirst) {
p.printWithNoIndent(", ");
}
else {
isFirst = false;
}
p.printWithNoIndent(testClassModel.getName(), ".", innerTestClass.getName(), ".class");
}
}
p.printlnWithNoIndent("})");
idea/tests/org/jetbrains/jet/plugin/quickfix/QuickFixMultiFileTestGenerated.java
+2 -2
View File
@@ -31,7 +31,7 @@ import org.jetbrains.jet.plugin.quickfix.AbstractQuickFixMultiFileTest;
/** This class is generated by {@link org.jetbrains.jet.generators.tests.GenerateTests}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
@TestMetadata("idea/testData/quickfix")
@InnerTestClasses({QuickFixMultiFileTestGenerated.AddStarProjections.class, QuickFixMultiFileTestGenerated.AutoImports.class, QuickFixMultiFileTestGenerated.Modifiers.class, QuickFixMultiFileTestGenerated.TypeImports.class, QuickFixMultiFileTestGenerated.Variables.class, })
@InnerTestClasses({QuickFixMultiFileTestGenerated.AddStarProjections.class, QuickFixMultiFileTestGenerated.AutoImports.class, QuickFixMultiFileTestGenerated.Modifiers.class, QuickFixMultiFileTestGenerated.TypeImports.class, QuickFixMultiFileTestGenerated.Variables.class})
public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTest {
public void testAllFilesPresentInQuickfix() throws Exception {
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/quickfix"), Pattern.compile("^(\\w+)\\.before\\.Main\\.kt$"), true);
@@ -134,7 +134,7 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes
}
@TestMetadata("idea/testData/quickfix/modifiers/finalSupertype/finalJavaSupertype")
@InnerTestClasses({FinalJavaSupertype.JavaCode.class, })
@InnerTestClasses({FinalJavaSupertype.JavaCode.class})
public static class FinalJavaSupertype extends AbstractQuickFixMultiFileTest {
public void testAllFilesPresentInFinalJavaSupertype() throws Exception {
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/quickfix/modifiers/finalSupertype/finalJavaSupertype"), Pattern.compile("^(\\w+)\\.before\\.Main\\.kt$"), true);
idea/tests/org/jetbrains/jet/plugin/quickfix/QuickFixTestGenerated.java
+1 -1
View File
@@ -481,7 +481,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
}
@TestMetadata("idea/testData/quickfix/modifiers/finalSupertype/finalJavaSupertype")
@InnerTestClasses({FinalJavaSupertype.JavaCode.class, })
@InnerTestClasses({FinalJavaSupertype.JavaCode.class})
public static class FinalJavaSupertype extends AbstractQuickFixTest {
public void testAllFilesPresentInFinalJavaSupertype() throws Exception {
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/quickfix/modifiers/finalSupertype/finalJavaSupertype"), Pattern.compile("^before(\\w+)\\.kt$"), true);