From 2c1bf4dbd987a1d5e1d3b403caa4db39b677f60d Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Fri, 18 Dec 2015 13:47:49 +0300 Subject: [PATCH] Remove filenameStartsLowerCase flag and clean warnings --- .../kotlin/generators/tests/GenerateTests.kt | 17 +++++---- .../tests/generateTestDataForReservedWords.kt | 7 ++-- .../tests/generator/SimpleTestClassModel.java | 38 ++----------------- .../generator/SimpleTestMethodModel.java | 4 +- .../tests/generator/TestGenerator.java | 4 +- .../tests/generator/TestGeneratorUtil.java | 4 -- .../IdeCompiledLightClassTestGenerated.java | 24 ------------ 7 files changed, 20 insertions(+), 78 deletions(-) diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt index 880cc310fe9..dd046acf288 100644 --- a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt +++ b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt @@ -19,7 +19,10 @@ package org.jetbrains.kotlin.generators.tests import junit.framework.TestCase import org.jetbrains.kotlin.AbstractDataFlowValueRenderingTest import org.jetbrains.kotlin.addImport.AbstractAddImportTest -import org.jetbrains.kotlin.android.* +import org.jetbrains.kotlin.android.AbstractAndroidCompletionTest +import org.jetbrains.kotlin.android.AbstractAndroidFindUsagesTest +import org.jetbrains.kotlin.android.AbstractAndroidGotoTest +import org.jetbrains.kotlin.android.AbstractAndroidRenameTest import org.jetbrains.kotlin.annotation.AbstractAnnotationProcessorBoxTest import org.jetbrains.kotlin.asJava.AbstractCompilerLightClassTest import org.jetbrains.kotlin.cfg.AbstractControlFlowTest @@ -38,7 +41,6 @@ import org.jetbrains.kotlin.formatter.AbstractFormatterTest import org.jetbrains.kotlin.formatter.AbstractTypingIndentationTestBase import org.jetbrains.kotlin.generators.tests.generator.* import org.jetbrains.kotlin.generators.tests.generator.TestGenerator.TargetBackend -import org.jetbrains.kotlin.generators.tests.reservedWords.generateTestDataForReservedWords import org.jetbrains.kotlin.idea.AbstractExpressionSelectionTest import org.jetbrains.kotlin.idea.AbstractSmartSelectionTest import org.jetbrains.kotlin.idea.actions.AbstractGotoTestOrCodeActionTest @@ -96,6 +98,7 @@ import org.jetbrains.kotlin.idea.refactoring.move.AbstractMoveTest import org.jetbrains.kotlin.idea.refactoring.pullUp.AbstractPullUpTest import org.jetbrains.kotlin.idea.refactoring.pushDown.AbstractPushDownTest import org.jetbrains.kotlin.idea.refactoring.rename.AbstractRenameTest +import org.jetbrains.kotlin.idea.refactoring.safeDelete.AbstractSafeDeleteTest import org.jetbrains.kotlin.idea.resolve.* import org.jetbrains.kotlin.idea.structureView.AbstractKotlinFileStructureTest import org.jetbrains.kotlin.idea.stubs.AbstractMultiFileHighlightingTest @@ -127,7 +130,6 @@ import org.jetbrains.kotlin.resolve.calls.AbstractResolvedCallsTest import org.jetbrains.kotlin.resolve.calls.AbstractResolvedConstructorDelegationCallsTests import org.jetbrains.kotlin.resolve.constants.evaluate.AbstractCompileTimeConstantEvaluatorTest import org.jetbrains.kotlin.resolve.constraintSystem.AbstractConstraintSystemTest -import org.jetbrains.kotlin.idea.refactoring.safeDelete.AbstractSafeDeleteTest import org.jetbrains.kotlin.serialization.AbstractLocalClassProtoTest import org.jetbrains.kotlin.shortenRefs.AbstractShortenRefsTest import org.jetbrains.kotlin.types.AbstractTypeBindingTest @@ -787,7 +789,7 @@ fun main(args: Array) { } testClass { - model("asJava/lightClasses", pattern = """^([^\.]+)\.kt$""", withTestRootMethod = true) + model("asJava/lightClasses", pattern = """^([^\.]+)\.kt$""") } } @@ -1097,8 +1099,7 @@ private class TestGroup(val testsRoot: String, val testDataRoot: String) { testClassName: String? = null, targetBackend: TargetBackend = TargetBackend.ANY, excludeDirs: List = listOf(), - filenameStartsLowerCase: Boolean? = null, - withTestRootMethod: Boolean = false + filenameStartsLowerCase: Boolean? = null ) { val rootFile = File(testDataRoot + "/" + relativeRootPath) val compiledPattern = Pattern.compile(pattern) @@ -1111,7 +1112,7 @@ private class TestGroup(val testsRoot: String, val testDataRoot: String) { else { SimpleTestClassModel(rootFile, recursive, excludeParentDirs, compiledPattern, filenameStartsLowerCase, testMethod, className, - targetBackend, excludeDirs, withTestRootMethod) + targetBackend, excludeDirs) } ) } @@ -1128,5 +1129,5 @@ private fun getDefaultSuiteTestClass(baseTestClass:Class<*>): String { if (!baseName.startsWith("Abstract")) { throw IllegalArgumentException("Doesn't start with \"Abstract\": $baseName") } - return baseName.substring("Abstract".length()) + "Generated" + return baseName.substring("Abstract".length) + "Generated" } diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/generateTestDataForReservedWords.kt b/generators/src/org/jetbrains/kotlin/generators/tests/generateTestDataForReservedWords.kt index d74f4a8cfa5..dad245643ea 100644 --- a/generators/src/org/jetbrains/kotlin/generators/tests/generateTestDataForReservedWords.kt +++ b/generators/src/org/jetbrains/kotlin/generators/tests/generateTestDataForReservedWords.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.generators.tests.reservedWords +package org.jetbrains.kotlin.generators.tests import com.google.dart.compiler.backend.js.ast.JsFunctionScope import org.jetbrains.kotlin.generators.util.GeneratorsFileUtil @@ -158,7 +158,7 @@ fun box(): String { ) { case("val", "val $KEYWORD_MARKER", "", testNotRenamedByName) case("var", "var $KEYWORD_MARKER", "", testNotRenamedByName) - case("param", "$KEYWORD_MARKER", "", testRenamedByName, ignore = true) + case("param", "$KEYWORD_MARKER", "", testRenamedByName, ignore = true) } // ------------------------- @@ -333,7 +333,6 @@ class TestDataBuilder() { shouldBeEscapedFile.writeText("$PREAMBLE_MESSAGE\n${SHOULD_BE_ESCAPED.joinToString("\n")}") shouldNotBeEscapedFile.writeText("$PREAMBLE_MESSAGE\n${SHOULD_NOT_BE_ESCAPED.joinToString("\n")}") casesFile.writeText("$PREAMBLE_MESSAGE\n${cases.joinToString("\n")}") - } } } @@ -389,7 +388,7 @@ class CyclicSequence(val c: List) : Sequence { val iterator = object : Iterator { override fun next(): T { - i = if (i >= c.size()) 0 else i + i = if (i >= c.size) 0 else i return c[i++] } override fun hasNext(): Boolean = true diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/generator/SimpleTestClassModel.java b/generators/src/org/jetbrains/kotlin/generators/tests/generator/SimpleTestClassModel.java index 8ba68e7dcab..1800e9ead1b 100644 --- a/generators/src/org/jetbrains/kotlin/generators/tests/generator/SimpleTestClassModel.java +++ b/generators/src/org/jetbrains/kotlin/generators/tests/generator/SimpleTestClassModel.java @@ -46,7 +46,6 @@ public class SimpleTestClassModel implements TestClassModel { private final Pattern filenamePattern; @Nullable private final Boolean checkFilenameStartsLowerCase; - private final boolean withTestRootMethod; @NotNull private final String doTestMethodName; @NotNull @@ -69,8 +68,7 @@ public class SimpleTestClassModel implements TestClassModel { @NotNull String doTestMethodName, @NotNull String testClassName, @NotNull TargetBackend targetBackend, - @NotNull Collection excludeDirs, - boolean withTestRootMethod + @NotNull Collection excludeDirs ) { this.rootFile = rootFile; this.recursive = recursive; @@ -80,7 +78,6 @@ public class SimpleTestClassModel implements TestClassModel { this.testClassName = testClassName; this.targetBackend = targetBackend; this.checkFilenameStartsLowerCase = checkFilenameStartsLowerCase; - this.withTestRootMethod = withTestRootMethod; this.excludeDirs = excludeDirs.isEmpty() ? Collections.emptySet() : new LinkedHashSet(excludeDirs); } @@ -100,8 +97,7 @@ public class SimpleTestClassModel implements TestClassModel { String innerTestClassName = TestGeneratorUtil.fileNameToJavaIdentifier(file); children.add(new SimpleTestClassModel( file, true, excludeParentDirs, filenamePattern, checkFilenameStartsLowerCase, - doTestMethodName, innerTestClassName, targetBackend, excludesStripOneDirectory(file.getName()), - withTestRootMethod) + doTestMethodName, innerTestClassName, targetBackend, excludesStripOneDirectory(file.getName())) ); } } @@ -178,10 +174,6 @@ public class SimpleTestClassModel implements TestClassModel { } Collections.sort(result, BY_NAME); - if (withTestRootMethod) { - result.add(new TestRootsMethodModel()); - } - testMethods = result; } } @@ -190,7 +182,7 @@ public class SimpleTestClassModel implements TestClassModel { @Override public boolean isEmpty() { - boolean noTestMethods = withTestRootMethod ? getMethods().size() == 2 : getMethods().size() == 1; + boolean noTestMethods = getMethods().size() == 1; return noTestMethods && getInnerTestClasses().isEmpty(); } @@ -211,30 +203,6 @@ public class SimpleTestClassModel implements TestClassModel { return testClassName; } - private class TestRootsMethodModel implements MethodModel { - @NotNull - @Override - public String getName() { - return "getTestsRoot"; - } - - @Override - public void generateBody(@NotNull Printer p) { - p.println(String.format("return \"%s\";", KotlinTestUtils.getFilePath(rootFile))); - } - - @Override - public void generateSignature(@NotNull Printer p) { - p.print(String.format("public String %s()", getName())); - } - - @Nullable - @Override - public String getDataString() { - return null; - } - } - private class TestAllFilesPresentMethodModel implements TestMethodModel { @NotNull @Override diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/generator/SimpleTestMethodModel.java b/generators/src/org/jetbrains/kotlin/generators/tests/generator/SimpleTestMethodModel.java index 7f274e08673..68f6b489323 100644 --- a/generators/src/org/jetbrains/kotlin/generators/tests/generator/SimpleTestMethodModel.java +++ b/generators/src/org/jetbrains/kotlin/generators/tests/generator/SimpleTestMethodModel.java @@ -80,7 +80,9 @@ public class SimpleTestMethodModel implements TestMethodModel { @Override public String getDataString() { - return KotlinTestUtils.getFilePath(new File(FileUtil.getRelativePath(rootDir, file))); + String path = FileUtil.getRelativePath(rootDir, file); + assert path != null; + return KotlinTestUtils.getFilePath(new File(path)); } private boolean isIgnored() { diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/generator/TestGenerator.java b/generators/src/org/jetbrains/kotlin/generators/tests/generator/TestGenerator.java index f468ceee270..1cfbbb0b13b 100644 --- a/generators/src/org/jetbrains/kotlin/generators/tests/generator/TestGenerator.java +++ b/generators/src/org/jetbrains/kotlin/generators/tests/generator/TestGenerator.java @@ -40,9 +40,9 @@ import static kotlin.CollectionsKt.single; public class TestGenerator { - public static enum TargetBackend { + public enum TargetBackend { ANY, - JVM, + @SuppressWarnings("unused") JVM, JS } diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/generator/TestGeneratorUtil.java b/generators/src/org/jetbrains/kotlin/generators/tests/generator/TestGeneratorUtil.java index 5209760f296..d7ebfc91e2e 100644 --- a/generators/src/org/jetbrains/kotlin/generators/tests/generator/TestGeneratorUtil.java +++ b/generators/src/org/jetbrains/kotlin/generators/tests/generator/TestGeneratorUtil.java @@ -18,7 +18,6 @@ package org.jetbrains.kotlin.generators.tests.generator; import com.intellij.openapi.util.text.StringUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; import java.io.File; @@ -44,7 +43,4 @@ public class TestGeneratorUtil { public static String fileNameToJavaIdentifier(@NotNull File file) { return StringUtil.capitalize(escapeForJavaIdentifier(file.getName())); } - - public static void checkCase(@NotNull File file, @Nullable Boolean shouldStartLowerCase) { - } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/IdeCompiledLightClassTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/IdeCompiledLightClassTestGenerated.java index ef9231d8576..3a7969c7d1f 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/IdeCompiledLightClassTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/IdeCompiledLightClassTestGenerated.java @@ -47,10 +47,6 @@ public class IdeCompiledLightClassTestGenerated extends AbstractIdeCompiledLight doTest(fileName); } - public String getTestsRoot() { - return "compiler/testData/asJava/lightClasses"; - } - @TestMetadata("compiler/testData/asJava/lightClasses/delegation") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) @@ -70,10 +66,6 @@ public class IdeCompiledLightClassTestGenerated extends AbstractIdeCompiledLight String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/delegation/Property.kt"); doTest(fileName); } - - public String getTestsRoot() { - return "compiler/testData/asJava/lightClasses/delegation"; - } } @TestMetadata("compiler/testData/asJava/lightClasses/facades") @@ -95,10 +87,6 @@ public class IdeCompiledLightClassTestGenerated extends AbstractIdeCompiledLight String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/facades/SingleJvmClassName.kt"); doTest(fileName); } - - public String getTestsRoot() { - return "compiler/testData/asJava/lightClasses/facades"; - } } @TestMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations") @@ -216,10 +204,6 @@ public class IdeCompiledLightClassTestGenerated extends AbstractIdeCompiledLight String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/VoidReturn.kt"); doTest(fileName); } - - public String getTestsRoot() { - return "compiler/testData/asJava/lightClasses/nullabilityAnnotations"; - } } @TestMetadata("compiler/testData/asJava/lightClasses/object") @@ -235,10 +219,6 @@ public class IdeCompiledLightClassTestGenerated extends AbstractIdeCompiledLight String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/object/SimpleObject.kt"); doTest(fileName); } - - public String getTestsRoot() { - return "compiler/testData/asJava/lightClasses/object"; - } } @TestMetadata("compiler/testData/asJava/lightClasses/publicField") @@ -260,9 +240,5 @@ public class IdeCompiledLightClassTestGenerated extends AbstractIdeCompiledLight String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/publicField/Simple.kt"); doTest(fileName); } - - public String getTestsRoot() { - return "compiler/testData/asJava/lightClasses/publicField"; - } } }