diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt index b2101742adf..4ac66fc5c42 100755 --- a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt +++ b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt @@ -177,53 +177,53 @@ fun main(args: Array) { testGroup("compiler/tests", "compiler/testData") { - testClass() { + testClass { model("diagnostics/tests") model("diagnostics/tests/script", extension = "kts") model("codegen/box/diagnostics") } - testClass() { + testClass { model("diagnostics/testsWithStdLib") } - testClass() { + testClass { model("diagnostics/testsWithJsStdLib") } - testClass() { + testClass { model("diagnostics/testsWithJsStdLibAndBackendCompilation") } - testClass() { + testClass { model("diagnostics/testWithModifiedMockJdk") } - testClass() { + testClass { model("multiplatform", extension = null, recursive = true, excludeParentDirs = true) } - testClass() { + testClass { model("foreignAnnotations/tests") } - testClass() { + testClass { model("resolve", extension = "resolve") } - testClass() { + testClass { model("resolvedCalls", excludeDirs = listOf("enhancedSignatures")) } - testClass() { + testClass { model("resolveConstructorDelegationCalls") } - testClass() { + testClass { model("constraintSystem", extension = "constraints") } - testClass() { + testClass { model("psi", testMethod = "doParsingTest", pattern = "^(.*)\\.kts?$") model("parseCodeFragment/expression", testMethod = "doExpressionCodeFragmentParsingTest", extension = "kt") model("parseCodeFragment/block", testMethod = "doBlockCodeFragmentParsingTest", extension = "kt") @@ -231,7 +231,7 @@ fun main(args: Array) { GenerateRangesCodegenTestData.main(arrayOf()) - testClass() { + testClass { model("codegen/box", targetBackend = TargetBackend.JVM) } @@ -251,7 +251,7 @@ fun main(args: Array) { model("codegen/boxInline") } - testClass() { + testClass { model("codegen/boxAgainstJava") } @@ -259,47 +259,47 @@ fun main(args: Array) { model("codegen/box/coroutines") } - testClass() { + testClass { model("codegen/script", extension = "kts") } - testClass() { + testClass { model("codegen/bytecodeText") } - testClass() { + testClass { model("ir/irText") } - testClass() { + testClass { model("ir/irCfg") } - testClass() { + testClass { model("codegen/bytecodeListing") } - testClass() { + testClass { model("codegen/topLevelMemberInvocation", extension = null, recursive = false) } - testClass() { + testClass { model("checkLocalVariablesTable") } - testClass() { + testClass { model("writeFlags") } - testClass() { + testClass { model("codegen/defaultArguments/reflection") } - testClass() { + testClass { model("codegen/dumpDeclarations") } - testClass() { + testClass { model("loadJava/compiledJava", extension = "java", testMethod = "doTestCompiledJava") model("loadJava/compiledJavaAndKotlin", extension = "txt", testMethod = "doTestCompiledJavaAndKotlin") model("loadJava/compiledJavaIncludeObjectMethods", extension = "java", testMethod = "doTestCompiledJavaIncludeObjectMethods") @@ -310,89 +310,89 @@ fun main(args: Array) { model("loadJava/sourceJava", extension = "java", testMethod = "doTestSourceJava") } - testClass() { + testClass { model("loadJava/compiledKotlin") } - testClass() { + testClass { model("loadJava/compiledKotlin") model("loadJava/compiledJava", extension = "java", excludeDirs = listOf("sam", "kotlinSignature/propagation")) } - testClass() { + testClass { model("compileJavaAgainstKotlin") } - testClass() { + testClass { model("compileKotlinAgainstKotlin") } - testClass() { + testClass { model("renderer") } - testClass() { + testClass { model("renderFunctionDescriptorInExpression") } - testClass() { + testClass { model("modules.xml", extension = "xml") } - testClass() { + testClass { model("writeSignature") } - testClass() { + testClass { model("cli/jvm", extension = "args", testMethod = "doJvmTest", recursive = false) model("cli/js", extension = "args", testMethod = "doJsTest", recursive = false) } - testClass() { + testClass { model("repl", extension = "repl") } - testClass() { + testClass { model("integration/ant/jvm", extension = null, recursive = false, excludeParentDirs = true) } - testClass() { + testClass { model("cfg") } - testClass() { + testClass { model("cfg-variables") } - testClass() { + testClass { model("cfg") model("cfg-variables") } - testClass() { + testClass { model("resolveAnnotations/parameters") } - testClass() { + testClass { model("evaluate/constant", testMethod = "doConstantTest") model("evaluate/isPure", testMethod = "doIsPureTest") model("evaluate/usesVariableAsConstant", testMethod = "doUsesVariableAsConstantTest") } - testClass() { + testClass { model("asJava/lightClasses", excludeDirs = listOf("local")) } - testClass() { + testClass { model("type/binding") } - testClass() { + testClass { model("lineNumber", recursive = false) model("lineNumber/custom", testMethod = "doTestCustom") } - testClass() { + testClass { model("serialization/local") } @@ -402,7 +402,7 @@ fun main(args: Array) { } testGroup("compiler/tests-ir-jvm/tests", "compiler/testData") { - testClass() { + testClass { model("codegen/box", targetBackend = TargetBackend.JVM) } } @@ -416,7 +416,7 @@ fun main(args: Array) { model("diagnostics/testsWithJava8") } - testClass() { + testClass { model("foreignAnnotationsJava8/tests") } @@ -429,33 +429,33 @@ fun main(args: Array) { model("resolvedCalls/enhancedSignatures") } - testClass() { + testClass { model("loadJava8/compiledJava", extension = "java", excludeDirs = listOf("sam", "kotlinSignature/propagation")) } - testClass() { + testClass { model("codegen/java8/compileKotlinAgainstKotlin") } - testClass() { + testClass { model("codegen/java8/writeSignature") } - testClass() { + testClass { model("codegen/java8/writeFlags") } } testGroup("idea/tests", "idea/testData") { - testClass() { + testClass { model("resolve/additionalLazyResolve") } - testClass() { + testClass { model("resolve/partialBodyResolve") } - testClass() { + testClass { model("checker", recursive = false) model("checker/regression") model("checker/recovery") @@ -465,88 +465,88 @@ fun main(args: Array) { model("checker/infos", testMethod = "doTestWithInfos") } - testClass() { + testClass { model("kotlinAndJavaChecker/javaAgainstKotlin") model("kotlinAndJavaChecker/javaWithKotlin") } - testClass() { + testClass { model("kotlinAndJavaChecker/javaAgainstKotlin") } - testClass() { + testClass { model("unifier") } - testClass() { + testClass { model("checker/codeFragments", extension = "kt", recursive = false) model("checker/codeFragments/imports", testMethod = "doTestWithImport", extension = "kt") } - testClass() { + testClass { model("quickfix.special/codeFragmentAutoImport", extension = "kt", recursive = false) } - testClass() { + testClass { model("checker/js") } - testClass() { + testClass { model("quickfix", pattern = "^([\\w\\-_]+)\\.kt$", filenameStartsLowerCase = true) } - testClass() { + testClass { model("navigation/gotoSuper", extension = "test") } - testClass() { + testClass { model("navigation/gotoTypeDeclaration", extension = "test") } - testClass() { + testClass { model("parameterInfo", recursive = true, excludeDirs = listOf("withLib1/sharedLib", "withLib2/sharedLib", "withLib3/sharedLib")) } - testClass() { + testClass { model("navigation/gotoClass", testMethod = "doClassTest") model("navigation/gotoSymbol", testMethod = "doSymbolTest") } - testClass() { + testClass { model("decompiler/navigation/usercode") model("decompiler/navigation/usercode", testClassName ="UsercodeWithJSModule", testMethod = "doWithJSModuleTest") } - testClass() { + testClass { model("decompiler/navigation/usercode") } - testClass() { + testClass { model("navigation/implementations", recursive = false) } - testClass() { + testClass { model("navigation/gotoTestOrCode", pattern = "^(.+)\\.main\\..+\$") } - testClass() { + testClass { model("quickfix", pattern = """^(\w+)\.((before\.Main\.\w+)|(test))$""", testMethod = "doTestWithExtraFile") } - testClass() { + testClass { model("highlighter") } - testClass() { + testClass { model("usageHighlighter") } - testClass() { + testClass { model("folding/noCollapse") model("folding/checkCollapse", testMethod = "doSettingsFoldingTest") } - testClass() { + testClass { model("codeInsight/surroundWith/if", testMethod = "doTestWithIfSurrounder") model("codeInsight/surroundWith/ifElse", testMethod = "doTestWithIfElseSurrounder") model("codeInsight/surroundWith/not", testMethod = "doTestWithNotSurrounder") @@ -561,19 +561,19 @@ fun main(args: Array) { model("codeInsight/surroundWith/withIfElseExpression", testMethod = "doTestWithSurroundWithIfElseExpression") } - testClass() { + testClass { model("joinLines") } - testClass() { + testClass { model("codeInsight/breadcrumbs") } - testClass() { + testClass { model("intentions", pattern = "^([\\w\\-_]+)\\.kt$") } - testClass() { + testClass { model("intentions/loopToCallChain", pattern = "^([\\w\\-_]+)\\.kt$") } @@ -581,12 +581,12 @@ fun main(args: Array) { model("concatenatedStringGenerator", pattern = "^([\\w\\-_]+)\\.kt$") } - testClass() { + testClass { model("intentions", pattern = "^(inspections\\.test)$", singleClass = true) model("inspections", pattern = "^(inspections\\.test)$", singleClass = true) } - testClass() { + testClass { model("hierarchy/class/type", extension = null, recursive = false, testMethod = "doTypeClassHierarchyTest") model("hierarchy/class/super", extension = null, recursive = false, testMethod = "doSuperClassHierarchyTest") model("hierarchy/class/sub", extension = null, recursive = false, testMethod = "doSubClassHierarchyTest") @@ -596,26 +596,26 @@ fun main(args: Array) { model("hierarchy/overrides", extension = null, recursive = false, testMethod = "doOverrideHierarchyTest") } - testClass() { + testClass { model("hierarchy/withLib", extension = null, recursive = false) } - testClass() { + testClass { model("codeInsight/moveUpDown/classBodyDeclarations", testMethod = "doTestClassBodyDeclaration") model("codeInsight/moveUpDown/closingBraces", testMethod = "doTestExpression") model("codeInsight/moveUpDown/expressions", testMethod = "doTestExpression") model("codeInsight/moveUpDown/parametersAndArguments", testMethod = "doTestExpression") } - testClass() { + testClass { model("codeInsight/moveLeftRight") } - testClass() { + testClass { model("refactoring/inline", pattern = "^(\\w+)\\.kt$") } - testClass() { + testClass { model("codeInsight/unwrapAndRemove/removeExpression", testMethod = "doTestExpressionRemover") model("codeInsight/unwrapAndRemove/unwrapThen", testMethod = "doTestThenUnwrapper") model("codeInsight/unwrapAndRemove/unwrapElse", testMethod = "doTestElseUnwrapper") @@ -629,19 +629,19 @@ fun main(args: Array) { model("codeInsight/unwrapAndRemove/unwrapLambda", testMethod = "doTestLambdaUnwrapper") } - testClass() { + testClass { model("codeInsight/expressionType") } - testClass() { + testClass { model("editor/backspaceHandler") } - testClass() { + testClass { model("editor/quickDoc", pattern = """^([^_]+)\.[^\.]*$""") } - testClass() { + testClass { model("refactoring/safeDelete/deleteClass/kotlinClass", testMethod = "doClassTest") model("refactoring/safeDelete/deleteClass/kotlinClassWithJava", testMethod = "doClassTestWithJava") model("refactoring/safeDelete/deleteClass/javaClassWithKotlin", extension = "java", testMethod = "doJavaClassTest") @@ -658,127 +658,127 @@ fun main(args: Array) { model("refactoring/safeDelete/deleteValueParameter/kotlinValueParameterWithJava", testMethod = "doValueParameterTestWithJava") } - testClass() { + testClass { model("resolve/references", pattern = KT_WITHOUT_DOTS_IN_NAME) } - testClass() { + testClass { model("resolve/referenceInJava/binaryAndSource", extension = "java") model("resolve/referenceInJava/sourceOnly", extension = "java") } - testClass() { + testClass { model("resolve/referenceInJava/binaryAndSource", extension = "java") } - testClass() { + testClass { model("resolve/referenceWithLib", recursive = false) } - testClass() { + testClass { model("resolve/referenceInLib", recursive = false) } - testClass() { + testClass { model("resolve/referenceToJavaWithWrongFileStructure", recursive = false) } - testClass() { + testClass { model("findUsages/kotlin", pattern = """^(.+)\.0\.kt$""") model("findUsages/java", pattern = """^(.+)\.0\.java$""") model("findUsages/propertyFiles", pattern = """^(.+)\.0\.properties$""") } - testClass() { + testClass { model("findUsages/libraryUsages", pattern = """^(.+)\.0\.kt$""") } - testClass() { + testClass { model("refactoring/move", extension = "test", singleClass = true) } - testClass() { + testClass { model("multiFileIntentions", extension = "test", singleClass = true, filenameStartsLowerCase = true) } - testClass() { + testClass { model("multiFileInspections", extension = "test", singleClass = true) } - testClass() { + testClass { model("configuration/gradle", pattern = """(\w+)_before\.gradle$""", testMethod = "doTestGradle") } - testClass() { + testClass { model("formatter", pattern = """^([^\.]+)\.after\.kt.*$""") model("formatter", pattern = """^([^\.]+)\.after\.inv\.kt.*$""", testMethod = "doTestInverted", testClassName = "FormatterInverted") } - testClass() { + testClass { model("indentationOnNewline", pattern = """^([^\.]+)\.after\.kt.*$""", testMethod = "doNewlineTest", testClassName = "DirectSettings") model("indentationOnNewline", pattern = """^([^\.]+)\.after\.inv\.kt.*$""", testMethod = "doNewlineTestWithInvert", testClassName = "InvertedSettings") } - testClass() { + testClass { model("diagnosticMessage", recursive = false) } - testClass() { + testClass { model("diagnosticMessage/js", recursive = false, targetBackend = TargetBackend.JS) } - testClass() { + testClass { model("refactoring/rename", extension = "test", singleClass = true) } - testClass() { + testClass { model("codeInsight/outOfBlock") } - testClass() { + testClass { model("dataFlowValueRendering") } - testClass() { + testClass { model("copyPaste/conversion", pattern = """^([^\.]+)\.java$""") } - testClass() { + testClass { model("copyPaste/plainTextConversion", pattern = """^([^\.]+)\.txt$""") } - testClass() { + testClass { model("copyPaste/imports", pattern = KT_WITHOUT_DOTS_IN_NAME, testMethod = "doTestCopy", testClassName = "Copy", recursive = false) model("copyPaste/imports", pattern = KT_WITHOUT_DOTS_IN_NAME, testMethod = "doTestCut", testClassName = "Cut", recursive = false) } - testClass() { + testClass { model("exitPoints") } - testClass() { + testClass { model("codeInsight/lineMarker") } - testClass() { + testClass { model("shortenRefs", pattern = KT_WITHOUT_DOTS_IN_NAME) } - testClass() { + testClass { model("addImport", pattern = KT_WITHOUT_DOTS_IN_NAME) } - testClass() { + testClass { model("smartSelection", testMethod = "doTestSmartSelection", pattern = KT_WITHOUT_DOTS_IN_NAME) } - testClass() { + testClass { model("structureView/fileStructure", pattern = KT_WITHOUT_DOTS_IN_NAME) } - testClass() { + testClass { model("expressionSelection", testMethod = "doTestExpressionSelection", pattern = KT_WITHOUT_DOTS_IN_NAME) } @@ -798,37 +798,37 @@ fun main(args: Array) { model("decompiler/decompiledTextJs", pattern = """^([^\.]+)$""", targetBackend = TargetBackend.JS) } - testClass() { + testClass { model("decompiler/stubBuilder", extension = null, recursive = false) } - testClass() { + testClass { model("editor/optimizeImports/jvm", pattern = KT_WITHOUT_DOTS_IN_NAME) model("editor/optimizeImports/common", pattern = KT_WITHOUT_DOTS_IN_NAME) } - testClass() { + testClass { model("editor/optimizeImports/js", pattern = KT_WITHOUT_DOTS_IN_NAME) model("editor/optimizeImports/common", pattern = KT_WITHOUT_DOTS_IN_NAME) } - testClass() { + testClass { model("debugger/positionManager", recursive = false, extension = "kt", testClassName = "SingleFile") model("debugger/positionManager", recursive = false, extension = null, testClassName = "MultiFile") } - testClass() { + testClass { model("debugger/exceptionFilter", pattern = """^([^\.]+)$""", recursive = false) } - testClass() { + testClass { model("debugger/smartStepInto") } - testClass() { + testClass { model("debugger/insertBeforeExtractFunction", extension = "kt") } - testClass() { + testClass { model("debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto", pattern = KT_WITHOUT_DOTS_IN_NAME, testMethod = "doStepIntoTest", testClassName = "StepInto") model("debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto", pattern = KT_WITHOUT_DOTS_IN_NAME, testMethod = "doSmartStepIntoTest", testClassName = "SmartStepInto") model("debugger/tinyApp/src/stepping/stepInto", pattern = KT_WITHOUT_DOTS_IN_NAME, testMethod = "doStepIntoTest", testClassName = "StepIntoOnly") @@ -838,20 +838,20 @@ fun main(args: Array) { model("debugger/tinyApp/src/stepping/custom", pattern = KT_WITHOUT_DOTS_IN_NAME, testMethod = "doCustomTest") } - testClass() { + testClass { model("debugger/tinyApp/src/evaluate/singleBreakpoint", testMethod = "doSingleBreakpointTest") model("debugger/tinyApp/src/evaluate/multipleBreakpoints", testMethod = "doMultipleBreakpointsTest") } - testClass() { + testClass { model("stubs", extension = "kt") } - testClass() { + testClass { model("multiFileHighlighting", recursive = false) } - testClass() { + testClass { model("refactoring/introduceVariable", pattern = KT_OR_KTS, testMethod = "doIntroduceVariableTest") model("refactoring/extractFunction", pattern = KT_OR_KTS, testMethod = "doExtractFunctionTest") model("refactoring/introduceProperty", pattern = KT_OR_KTS, testMethod = "doIntroducePropertyTest") @@ -864,28 +864,28 @@ fun main(args: Array) { model("refactoring/extractInterface", pattern = KT_OR_KTS, testMethod = "doExtractInterfaceTest") } - testClass() { + testClass { model("refactoring/pullUp/k2k", extension = "kt", singleClass = true, testClassName = "K2K", testMethod = "doKotlinTest") model("refactoring/pullUp/k2j", extension = "kt", singleClass = true, testClassName = "K2J", testMethod = "doKotlinTest") model("refactoring/pullUp/j2k", extension = "java", singleClass = true, testClassName = "J2K", testMethod = "doJavaTest") } - testClass() { + testClass { model("refactoring/pushDown/k2k", extension = "kt", singleClass = true, testClassName = "K2K", testMethod = "doKotlinTest") model("refactoring/pushDown/k2j", extension = "kt", singleClass = true, testClassName = "K2J", testMethod = "doKotlinTest") model("refactoring/pushDown/j2k", extension = "java", singleClass = true, testClassName = "J2K", testMethod = "doJavaTest") } - testClass() { + testClass { model("debugger/selectExpression", recursive = false) model("debugger/selectExpression/disallowMethodCalls", testMethod = "doTestWoMethodCalls") } - testClass() { + testClass { model("coverage/outputFiles") } - testClass() { + testClass { model("internal/toolWindow", recursive = false, extension = null) } @@ -893,31 +893,31 @@ fun main(args: Array) { model("kdoc/resolve") } - testClass() { + testClass { model("kdoc/highlighting") } - testClass() { + testClass { model("kdoc/typing") } - testClass() { + testClass { model("codeInsight/generate/testFrameworkSupport") } - testClass() { + testClass { model("codeInsight/generate/equalsWithHashCode") } - testClass() { + testClass { model("codeInsight/generate/secondaryConstructors") } - testClass() { + testClass { model("codeInsight/generate/toString") } - testClass() { + testClass { model("repl/completion") } @@ -939,7 +939,7 @@ fun main(args: Array) { } testGroup("idea/idea-maven/test", "idea/idea-maven/testData") { - testClass() { + testClass { model("configurator/jvm", extension = null, recursive = false, testMethod = "doTestWithMaven") model("configurator/js", extension = null, recursive = false, testMethod = "doTestWithJSMaven") } @@ -950,13 +950,13 @@ fun main(args: Array) { } testGroup("idea/tests", "compiler/testData") { - testClass() { + testClass { model("loadJava/compiledKotlin") } } testGroup("idea/tests", "compiler/testData") { - testClass() { + testClass { model("asJava/lightClasses", excludeDirs = listOf("delegation")) } @@ -966,65 +966,65 @@ fun main(args: Array) { } testGroup("idea/idea-completion/tests", "idea/idea-completion/testData") { - testClass() { + testClass { model("injava", extension = "java") } - testClass() { + testClass { model("injava", extension = "java") } - testClass() { + testClass { model("weighers/basic", pattern = KT_WITHOUT_DOTS_IN_NAME) } - testClass() { + testClass { model("weighers/smart", pattern = KT_WITHOUT_DOTS_IN_NAME) } - testClass() { + testClass { model("basic/common") model("basic/js") } - testClass() { + testClass { model("basic/common") model("basic/java") } - testClass() { + testClass { model("smart") } - testClass() { + testClass { model("keywords", recursive = false) } - testClass() { + testClass { model("basic/withLib", recursive = false) } - testClass() { + testClass { model("handlers/basic") } - testClass() { + testClass { model("handlers/smart") } - testClass() { + testClass { model("handlers/keywords") } - testClass() { + testClass { model("handlers/charFilter") } - testClass() { + testClass { model("basic/multifile", extension = null, recursive = false) } - testClass() { + testClass { model("smartMultiFile", extension = null, recursive = false) } @@ -1032,46 +1032,46 @@ fun main(args: Array) { model("kdoc") } - testClass() { + testClass { model("basic/java8") } } //TODO: move these tests into idea-completion module testGroup("idea/tests", "idea/idea-completion/testData") { - testClass() { + testClass { model("handlers/runtimeCast") } - testClass() { + testClass { model("basic/codeFragments", extension = "kt") } } testGroup("j2k/tests", "j2k/testData") { - testClass() { + testClass { model("fileOrElement", extension = "java") } } testGroup("j2k/tests", "j2k/testData") { - testClass() { + testClass { model("multiFile", extension = null, recursive = false) } } testGroup("j2k/tests", "j2k/testData") { - testClass() { + testClass { model("fileOrElement", extension = "java") } } testGroup("jps-plugin/jps-tests/test", "jps-plugin/testData") { - testClass() { + testClass { model("incremental/multiModule", extension = null, excludeParentDirs = true) model("incremental/pureKotlin", extension = null, recursive = false) model("incremental/withJava", extension = null, excludeParentDirs = true) model("incremental/inlineFunCallSite", extension = null, excludeParentDirs = true) } - testClass() { + testClass { model("incremental/lookupTracker", extension = null, recursive = false) } @@ -1085,7 +1085,7 @@ fun main(args: Array) { } testGroup("jps-plugin/jps-tests/test", "jps-plugin/testData") { - testClass() { + testClass { model("incremental/multiModule", extension = null, excludeParentDirs = true) model("incremental/pureKotlin", extension = null, recursive = false) model("incremental/withJava", extension = null, excludeParentDirs = true) @@ -1093,25 +1093,25 @@ fun main(args: Array) { model("incremental/classHierarchyAffected", extension = null, excludeParentDirs = true) } - testClass() { + testClass { model("incremental/lazyKotlinCaches", extension = null, excludeParentDirs = true) } - testClass() { + testClass { model("incremental/cacheVersionChanged", extension = null, excludeParentDirs = true) } - testClass() { + testClass { model("incremental/cacheVersionChanged", extension = null, excludeParentDirs = true) } - testClass() { + testClass { model("incremental/changeIncrementalOption", extension = null, excludeParentDirs = true) } } testGroup("jps-plugin/jps-tests/test", "jps-plugin/testData") { - testClass() { + testClass { model("comparison/classSignatureChange", extension = null, excludeParentDirs = true) model("comparison/classPrivateOnlyChange", extension = null, excludeParentDirs = true) model("comparison/classMembersOnlyChanged", extension = null, excludeParentDirs = true) @@ -1121,32 +1121,32 @@ fun main(args: Array) { } testGroup("plugins/plugins-tests/tests", "plugins/android-extensions/android-extensions-compiler/testData") { - testClass() { + testClass { model("descriptors", recursive = false, extension = null) } - testClass() { + testClass { model("codegen/android", recursive = false, extension = null, testMethod = "doCompileAgainstAndroidSdkTest") model("codegen/android", recursive = false, extension = null, testMethod = "doFakeInvocationTest", testClassName = "Invoke") } - testClass() { + testClass { model("codegen/bytecodeShape", recursive = false, extension = null) } } testGroup("plugins/plugins-tests/tests", "plugins/annotation-collector/testData") { - testClass() { + testClass { model("collectToFile", recursive = false, extension = null) } } testGroup("plugins/plugins-tests/tests", "plugins/annotation-processing/testData") { - testClass() { + testClass { model("wrappers", recursive = true, extension = "kt") } - testClass() { + testClass { model("sourceRetention", extension = "kt") } } @@ -1180,29 +1180,29 @@ fun main(args: Array) { } testGroup("plugins/android-extensions/android-extensions-idea/tests", "plugins/android-extensions/android-extensions-idea/testData") { - testClass() { + testClass { model("android/completion", recursive = false, extension = null) } - testClass() { + testClass { model("android/goto", recursive = false, extension = null) } - testClass() { + testClass { model("android/rename", recursive = false, extension = null) } - testClass() { + testClass { model("android/renameLayout", recursive = false, extension = null) } - testClass() { + testClass { model("android/findUsages", recursive = false, extension = null) } } testGroup("idea/idea-android/tests", "idea/testData") { - testClass() { + testClass { model("configuration/android-gradle", pattern = """(\w+)_before\.gradle$""", testMethod = "doTestAndroidGradle") } @@ -1210,21 +1210,21 @@ fun main(args: Array) { model("android/resourceIntentions", extension = "test", singleClass = true) } - testClass() { + testClass { model("android/quickfix", pattern = """^(\w+)\.((before\.Main\.\w+)|(test))$""", testMethod = "doTestWithExtraFile") } - testClass() { + testClass { model("android/lint", excludeParentDirs = true) } - testClass() { + testClass { model("android/intentions", pattern = "^([\\w\\-_]+)\\.kt$") } } testGroup("plugins/plugins-tests/tests", "plugins/android-extensions/android-extensions-jps/testData") { - testClass() { + testClass { model("android", recursive = false, extension = null) } } @@ -1233,7 +1233,7 @@ fun main(args: Array) { //generateTestDataForReservedWords() testGroup("js/js.tests/test", "js/js.translator/testData") { - testClass() { + testClass { model("box/", pattern = "^([^_](.+))\\.kt$", targetBackend = TargetBackend.JS) } }