Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
硅谷海盗
kotlin
提交
aacf934b
K
kotlin
项目概览
硅谷海盗
/
kotlin
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
K
kotlin
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
aacf934b
编写于
12月 01, 2020
作者:
D
Dmitriy Novozhilov
提交者:
TeamCityServer
12月 10, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[TEST] Drop machinery about experimental coroutines from compiler tests
上级
8c4b7ad1
变更
19
隐藏空白更改
内联
并排
Showing
19 changed file
with
31 addition
and
122 deletion
+31
-122
compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/java/AbstractFirTypeEnhancementTest.kt
...tbrains/kotlin/fir/java/AbstractFirTypeEnhancementTest.kt
+1
-1
compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTest.kt
.../org/jetbrains/kotlin/checkers/AbstractDiagnosticsTest.kt
+5
-20
compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTestWithStdLib.kt
...ains/kotlin/checkers/AbstractDiagnosticsTestWithStdLib.kt
+1
-1
compiler/tests-common/tests/org/jetbrains/kotlin/checkers/KotlinMultiFileTestWithJava.kt
.../jetbrains/kotlin/checkers/KotlinMultiFileTestWithJava.kt
+1
-6
compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractBlackBoxCodegenTest.java
...jetbrains/kotlin/codegen/AbstractBlackBoxCodegenTest.java
+2
-6
compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractBytecodeListingTest.kt
...g/jetbrains/kotlin/codegen/AbstractBytecodeListingTest.kt
+1
-2
compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractDumpDeclarationsTest.kt
.../jetbrains/kotlin/codegen/AbstractDumpDeclarationsTest.kt
+1
-3
compiler/tests-common/tests/org/jetbrains/kotlin/codegen/CodegenTestCase.java
...n/tests/org/jetbrains/kotlin/codegen/CodegenTestCase.java
+2
-13
compiler/tests-common/tests/org/jetbrains/kotlin/fir/AbstractFirDiagnosticTest.kt
...sts/org/jetbrains/kotlin/fir/AbstractFirDiagnosticTest.kt
+1
-8
compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJavaTest.java
...g/jetbrains/kotlin/jvm/compiler/AbstractLoadJavaTest.java
+1
-1
compiler/tests-common/tests/org/jetbrains/kotlin/resolve/ExtensibleResolveTestCase.java
...g/jetbrains/kotlin/resolve/ExtensibleResolveTestCase.java
+1
-1
compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinBaseTest.kt
...-common/tests/org/jetbrains/kotlin/test/KotlinBaseTest.kt
+2
-33
compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java
...mmon/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java
+1
-1
compiler/tests-common/tests/org/jetbrains/kotlin/test/TestFiles.java
...sts-common/tests/org/jetbrains/kotlin/test/TestFiles.java
+5
-12
core/descriptors.runtime/tests/org/jetbrains/kotlin/jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt
...lin/jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt
+1
-2
idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.kt
...ins/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.kt
+1
-1
js/js.tests/test/org/jetbrains/kotlin/js/test/AbstractJsLineNumberTest.kt
.../org/jetbrains/kotlin/js/test/AbstractJsLineNumberTest.kt
+2
-2
js/js.tests/test/org/jetbrains/kotlin/js/test/BasicBoxTest.kt
...s.tests/test/org/jetbrains/kotlin/js/test/BasicBoxTest.kt
+1
-2
js/js.tests/test/org/jetbrains/kotlin/js/test/BasicWasmBoxTest.kt
...sts/test/org/jetbrains/kotlin/js/test/BasicWasmBoxTest.kt
+1
-7
未找到文件。
compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/java/AbstractFirTypeEnhancementTest.kt
浏览文件 @
aacf934b
...
...
@@ -116,7 +116,7 @@ abstract class AbstractFirTypeEnhancementTest : KtUsefulTestCase() {
return
targetFile
}
}
,
""
}
)
environment
=
createEnvironment
(
content
)
val
virtualFiles
=
srcFiles
.
map
{
...
...
compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTest.kt
浏览文件 @
aacf934b
...
...
@@ -17,7 +17,6 @@ import org.jetbrains.kotlin.TestsCompilerError
import
org.jetbrains.kotlin.analyzer.AnalysisResult
import
org.jetbrains.kotlin.analyzer.common.CommonResolverForModuleFactory
import
org.jetbrains.kotlin.asJava.finder.JavaElementFinder
import
org.jetbrains.kotlin.builtins.StandardNames
import
org.jetbrains.kotlin.builtins.jvm.JvmBuiltIns
import
org.jetbrains.kotlin.cli.common.messages.AnalyzerWithCompilerReport
import
org.jetbrains.kotlin.cli.common.messages.GroupingMessageCollector
...
...
@@ -127,15 +126,7 @@ abstract class AbstractDiagnosticsTest : BaseDiagnosticsTest() {
val
oldModule
=
modules
[
testModule
]
!!
val
languageVersionSettings
=
if
(
coroutinesPackage
.
isNotEmpty
())
{
val
isExperimental
=
coroutinesPackage
==
StandardNames
.
COROUTINES_PACKAGE_FQ_NAME_EXPERIMENTAL
.
asString
()
CompilerTestLanguageVersionSettings
(
DEFAULT_DIAGNOSTIC_TESTS_FEATURES
,
if
(
isExperimental
)
ApiVersion
.
KOTLIN_1_2
else
ApiVersion
.
KOTLIN_1_3
,
if
(
isExperimental
)
LanguageVersion
.
KOTLIN_1_2
else
LanguageVersion
.
KOTLIN_1_3
)
}
else
loadLanguageVersionSettings
(
testFilesInModule
)
val
languageVersionSettings
=
loadLanguageVersionSettings
(
testFilesInModule
)
languageVersionSettingsByModule
[
testModule
]
=
languageVersionSettings
...
...
@@ -180,7 +171,7 @@ abstract class AbstractDiagnosticsTest : BaseDiagnosticsTest() {
var
exceptionFromDescriptorValidation
:
Throwable
?
=
null
try
{
val
expectedFile
=
getExpectedDescriptorFile
(
testDataFile
,
files
)
validateAndCompareDescriptorWithFile
(
expectedFile
,
files
,
modules
,
coroutinesPackage
)
validateAndCompareDescriptorWithFile
(
expectedFile
,
files
,
modules
)
}
catch
(
e
:
Throwable
)
{
exceptionFromDescriptorValidation
=
e
}
...
...
@@ -262,9 +253,7 @@ abstract class AbstractDiagnosticsTest : BaseDiagnosticsTest() {
}
protected
open
fun
checkDiagnostics
(
actualText
:
String
,
testDataFile
:
File
)
{
KotlinTestUtils
.
assertEqualsToFile
(
getExpectedDiagnosticsFile
(
testDataFile
),
actualText
)
{
s
->
s
.
replace
(
"COROUTINES_PACKAGE"
,
coroutinesPackage
)
}
KotlinTestUtils
.
assertEqualsToFile
(
getExpectedDiagnosticsFile
(
testDataFile
),
actualText
)
}
private
fun
checkFirTestdata
(
testDataFile
:
File
,
files
:
List
<
TestFile
>)
{
...
...
@@ -289,7 +278,6 @@ abstract class AbstractDiagnosticsTest : BaseDiagnosticsTest() {
val
testRunner
=
object
:
AbstractFirOldFrontendDiagnosticsTest
()
{
init
{
environment
=
this
@AbstractDiagnosticsTest
.
environment
coroutinesPackage
=
this
@AbstractDiagnosticsTest
.
coroutinesPackage
}
}
if
(
testDataFile
.
readText
().
contains
(
"// FIR_IDENTICAL"
))
{
...
...
@@ -529,8 +517,7 @@ abstract class AbstractDiagnosticsTest : BaseDiagnosticsTest() {
private
fun
validateAndCompareDescriptorWithFile
(
expectedFile
:
File
,
testFiles
:
List
<
TestFile
>,
modules
:
Map
<
TestModule
?
,
ModuleDescriptorImpl
>,
coroutinesPackage
:
String
modules
:
Map
<
TestModule
?
,
ModuleDescriptorImpl
>
)
{
if
(
skipDescriptorsValidation
())
return
if
(
testFiles
.
any
{
file
->
InTextDirectivesUtils
.
isDirectiveDefined
(
file
.
expectedText
,
"// SKIP_TXT"
)
})
{
...
...
@@ -591,9 +578,7 @@ abstract class AbstractDiagnosticsTest : BaseDiagnosticsTest() {
"Such tests are hard to maintain, take long time to execute and are subject to sudden unreviewed changes anyway."
}
KotlinTestUtils
.
assertEqualsToFile
(
expectedFile
,
allPackagesText
)
{
s
->
s
.
replace
(
"COROUTINES_PACKAGE"
,
coroutinesPackage
)
}
KotlinTestUtils
.
assertEqualsToFile
(
expectedFile
,
allPackagesText
)
}
...
...
compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTestWithStdLib.kt
浏览文件 @
aacf934b
...
...
@@ -16,6 +16,6 @@ abstract class AbstractDiagnosticsTestWithStdLib : AbstractDiagnosticsTest() {
override
fun
shouldValidateFirTestData
(
testDataFile
:
File
):
Boolean
{
val
path
=
testDataFile
.
absolutePath
return
!
path
.
endsWith
(
".kts"
)
&&
coroutinesPackage
!=
StandardNames
.
COROUTINES_PACKAGE_FQ_NAME_EXPERIMENTAL
.
asString
()
return
!
path
.
endsWith
(
".kts"
)
}
}
compiler/tests-common/tests/org/jetbrains/kotlin/checkers/KotlinMultiFileTestWithJava.kt
浏览文件 @
aacf934b
...
...
@@ -88,11 +88,6 @@ abstract class KotlinMultiFileTestWithJava<M : KotlinBaseTest.TestModule, F : Ko
if
(
InTextDirectivesUtils
.
isDirectiveDefined
(
fileText
,
"STDLIB_JDK8"
))
{
result
.
add
(
ForTestCompileRuntime
.
runtimeJarForTestsWithJdk8
())
}
if
(
StandardNames
.
COROUTINES_PACKAGE_FQ_NAME_EXPERIMENTAL
.
asString
()
==
coroutinesPackage
||
fileText
.
contains
(
StandardNames
.
COROUTINES_PACKAGE_FQ_NAME_EXPERIMENTAL
.
asString
())
)
{
result
.
add
(
ForTestCompileRuntime
.
coroutinesCompatForTests
())
}
return
result
}
...
...
@@ -152,7 +147,7 @@ abstract class KotlinMultiFileTestWithJava<M : KotlinBaseTest.TestModule, F : Ko
KotlinTestUtils
.
mkdirs
(
tmpFile
.
parentFile
)
tmpFile
.
writeText
(
content
,
Charsets
.
UTF_8
)
}
}
,
coroutinesPackage
)
})
}
companion
object
{
...
...
compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractBlackBoxCodegenTest.java
浏览文件 @
aacf934b
...
...
@@ -68,11 +68,7 @@ public abstract class AbstractBlackBoxCodegenTest extends CodegenTestCase {
private
void
doBytecodeListingTest
(
@NotNull
File
wholeFile
)
throws
Exception
{
if
(!
InTextDirectivesUtils
.
isDirectiveDefined
(
FileUtil
.
loadFile
(
wholeFile
),
"CHECK_BYTECODE_LISTING"
))
return
;
String
suffix
=
(
coroutinesPackage
.
equals
(
StandardNames
.
COROUTINES_PACKAGE_FQ_NAME_EXPERIMENTAL
.
asString
())
||
coroutinesPackage
.
isEmpty
())
&&
InTextDirectivesUtils
.
isDirectiveDefined
(
FileUtil
.
loadFile
(
wholeFile
),
"COMMON_COROUTINES_TEST"
)
?
"_1_2"
:
getBackend
().
isIR
()
?
"_ir"
:
""
;
String
suffix
=
getBackend
().
isIR
()
?
"_ir"
:
""
;
File
expectedFile
=
new
File
(
wholeFile
.
getParent
(),
FilesKt
.
getNameWithoutExtension
(
wholeFile
)
+
suffix
+
".txt"
);
String
text
=
...
...
@@ -101,7 +97,7 @@ public abstract class AbstractBlackBoxCodegenTest extends CodegenTestCase {
}
);
assertEqualsToFile
(
expectedFile
,
text
,
s
->
s
.
replace
(
"COROUTINES_PACKAGE"
,
coroutinesPackage
)
);
assertEqualsToFile
(
expectedFile
,
text
);
}
protected
void
blackBox
(
boolean
reportProblems
,
boolean
unexpectedBehaviour
)
{
...
...
compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractBytecodeListingTest.kt
浏览文件 @
aacf934b
...
...
@@ -31,8 +31,7 @@ abstract class AbstractBytecodeListingTest : CodegenTestCase() {
)
val
prefixes
=
when
{
backend
.
isIR
->
listOf
(
"_ir"
,
"_1_3"
,
""
)
coroutinesPackage
==
StandardNames
.
COROUTINES_PACKAGE_FQ_NAME_RELEASE
.
asString
()
->
listOf
(
"_1_3"
,
""
)
backend
.
isIR
->
listOf
(
"_ir"
,
""
)
else
->
listOf
(
""
)
}
...
...
compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractDumpDeclarationsTest.kt
浏览文件 @
aacf934b
...
...
@@ -19,9 +19,7 @@ abstract class AbstractDumpDeclarationsTest : CodegenTestCase() {
dumpToFile
=
KotlinTestUtils
.
tmpDirForTest
(
this
).
resolve
(
"$name.json"
)
compile
(
files
)
classFileFactory
.
generationState
.
destroy
()
KotlinTestUtils
.
assertEqualsToFile
(
expectedResult
,
dumpToFile
.
readText
())
{
it
.
replace
(
"COROUTINES_PACKAGE"
,
coroutinesPackage
)
}
KotlinTestUtils
.
assertEqualsToFile
(
expectedResult
,
dumpToFile
.
readText
())
}
override
fun
updateConfiguration
(
configuration
:
CompilerConfiguration
)
{
...
...
compiler/tests-common/tests/org/jetbrains/kotlin/codegen/CodegenTestCase.java
浏览文件 @
aacf934b
...
...
@@ -607,32 +607,21 @@ public abstract class CodegenTestCase extends KotlinBaseTest<KotlinBaseTest.Test
File
file
=
new
File
(
filePath
);
String
expectedText
=
KotlinTestUtils
.
doLoadFile
(
file
);
if
(!
coroutinesPackage
.
isEmpty
())
{
expectedText
=
expectedText
.
replace
(
"COROUTINES_PACKAGE"
,
coroutinesPackage
);
}
List
<
TestFile
>
testFiles
=
createTestFilesFromFile
(
file
,
expectedText
);
doMultiFileTest
(
file
,
testFiles
);
}
@Override
protected
void
doTestWithCoroutinesPackageReplacement
(
@NotNull
String
filePath
,
@NotNull
String
packageName
)
throws
Exception
{
this
.
coroutinesPackage
=
packageName
;
doTest
(
filePath
);
}
@Override
@NotNull
protected
List
<
TestFile
>
createTestFilesFromFile
(
@NotNull
File
file
,
@NotNull
String
expectedText
)
{
return
createTestFilesFromFile
(
file
,
expectedText
,
coroutinesPackage
,
parseDirectivesPerFiles
(),
getBackend
());
return
createTestFilesFromFile
(
file
,
expectedText
,
parseDirectivesPerFiles
(),
getBackend
());
}
@NotNull
public
static
List
<
TestFile
>
createTestFilesFromFile
(
@NotNull
File
file
,
@NotNull
String
expectedText
,
@NotNull
String
coroutinesPackage
,
boolean
parseDirectivesPerFiles
,
@NotNull
TargetBackend
backend
)
{
...
...
@@ -643,7 +632,7 @@ public abstract class CodegenTestCase extends KotlinBaseTest<KotlinBaseTest.Test
public
TestFile
create
(
@NotNull
String
fileName
,
@NotNull
String
text
,
@NotNull
Directives
directives
)
{
return
new
TestFile
(
fileName
,
text
,
directives
);
}
},
false
,
coroutinesPackage
,
parseDirectivesPerFiles
);
},
false
,
parseDirectivesPerFiles
);
if
(
InTextDirectivesUtils
.
isDirectiveDefined
(
expectedText
,
"WITH_HELPERS"
))
{
testFiles
.
add
(
new
TestFile
(
"CodegenTestHelpers.kt"
,
TestHelperGeneratorKt
.
createTextForCodegenTestHelpers
(
backend
)));
}
...
...
compiler/tests-common/tests/org/jetbrains/kotlin/fir/AbstractFirDiagnosticTest.kt
浏览文件 @
aacf934b
...
...
@@ -64,7 +64,6 @@ import java.io.File
abstract
class
AbstractFirDiagnosticsTest
:
AbstractFirBaseDiagnosticsTest
()
{
companion
object
{
const
val
DUMP_CFG_DIRECTIVE
=
"DUMP_CFG"
const
val
COMMON_COROUTINES_DIRECTIVE
=
"COMMON_COROUTINES_TEST"
private
val
allowedKindsForDebugInfo
=
setOf
(
FirRealSourceElementKind
,
...
...
@@ -74,9 +73,6 @@ abstract class AbstractFirDiagnosticsTest : AbstractFirBaseDiagnosticsTest() {
val
TestFile
.
withDumpCfgDirective
:
Boolean
get
()
=
DUMP_CFG_DIRECTIVE
in
directives
val
TestFile
.
withCommonCoroutinesDirective
:
Boolean
get
()
=
COMMON_COROUTINES_DIRECTIVE
in
directives
val
File
.
cfgDumpFile
:
File
get
()
=
File
(
absolutePath
.
replace
(
".kt"
,
".dot"
))
}
...
...
@@ -136,10 +132,7 @@ abstract class AbstractFirDiagnosticsTest : AbstractFirBaseDiagnosticsTest() {
actualTextBuilder
.
append
(
testFile
.
expectedText
)
}
}
var
actualText
=
actualTextBuilder
.
toString
()
if
(
testFiles
.
any
{
it
.
withCommonCoroutinesDirective
})
{
actualText
=
actualText
.
replace
(
coroutinesPackage
,
"COROUTINES_PACKAGE"
)
}
val
actualText
=
actualTextBuilder
.
toString
()
KotlinTestUtils
.
assertEqualsToFile
(
file
,
actualText
)
}
...
...
compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJavaTest.java
浏览文件 @
aacf934b
...
...
@@ -295,7 +295,7 @@ public abstract class AbstractLoadJavaTest extends TestCaseWithTmpdir {
}
return
targetFile
;
}
}
,
""
);
});
Pair
<
PackageViewDescriptor
,
BindingContext
>
javaPackageAndContext
=
compileJavaAndLoadTestPackageAndBindingContextFromBinary
(
srcFiles
,
compiledDir
,
ConfigurationKind
.
ALL
...
...
compiler/tests-common/tests/org/jetbrains/kotlin/resolve/ExtensibleResolveTestCase.java
浏览文件 @
aacf934b
...
...
@@ -50,7 +50,7 @@ public abstract class ExtensibleResolveTestCase extends KotlinTestWithEnvironmen
public
KtFile
create
(
@NotNull
String
fileName
,
@NotNull
String
text
,
@NotNull
Directives
directives
)
{
return
expectedResolveData
.
createFileFromMarkedUpText
(
fileName
,
text
);
}
}
,
""
);
});
expectedResolveData
.
checkResult
(
ExpectedResolveData
.
analyze
(
files
,
getEnvironment
()));
}
}
compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinBaseTest.kt
浏览文件 @
aacf934b
...
...
@@ -24,29 +24,15 @@ import java.util.*
import
java.util.regex.Pattern
abstract
class
KotlinBaseTest
<
F
:
KotlinBaseTest
.
TestFile
>
:
KtUsefulTestCase
()
{
@JvmField
protected
var
coroutinesPackage
:
String
=
""
@Throws
(
Exception
::
class
)
override
fun
setUp
()
{
coroutinesPackage
=
""
super
.
setUp
()
}
@Throws
(
java
.
lang
.
Exception
::
class
)
protected
open
fun
doTestWithCoroutinesPackageReplacement
(
filePath
:
String
,
coroutinesPackage
:
String
)
{
this
.
coroutinesPackage
=
coroutinesPackage
doTest
(
filePath
)
}
@Throws
(
java
.
lang
.
Exception
::
class
)
protected
open
fun
doTest
(
filePath
:
String
)
{
val
file
=
File
(
filePath
)
var
expectedText
=
KotlinTestUtils
.
doLoadFile
(
file
)
if
(
coroutinesPackage
.
isNotEmpty
())
{
expectedText
=
expectedText
.
replace
(
"COROUTINES_PACKAGE"
,
coroutinesPackage
)
}
val
expectedText
=
KotlinTestUtils
.
doLoadFile
(
file
)
doMultiFileTest
(
file
,
createTestFilesFromFile
(
file
,
expectedText
))
}
...
...
@@ -98,7 +84,6 @@ abstract class KotlinBaseTest<F : KotlinBaseTest.TestFile> : KtUsefulTestCase()
updateConfigurationByDirectivesInTestFiles
(
testFilesWithConfigurationDirectives
,
configuration
,
coroutinesPackage
,
parseDirectivesPerFiles
()
)
updateConfiguration
(
configuration
)
...
...
@@ -203,18 +188,16 @@ abstract class KotlinBaseTest<F : KotlinBaseTest.TestFile> : KtUsefulTestCase()
testFilesWithConfigurationDirectives
:
List
<
TestFile
>,
configuration
:
CompilerConfiguration
)
{
updateConfigurationByDirectivesInTestFiles
(
testFilesWithConfigurationDirectives
,
configuration
,
""
,
false
)
updateConfigurationByDirectivesInTestFiles
(
testFilesWithConfigurationDirectives
,
configuration
,
false
)
}
private
fun
updateConfigurationByDirectivesInTestFiles
(
testFilesWithConfigurationDirectives
:
List
<
TestFile
>,
configuration
:
CompilerConfiguration
,
coroutinesPackage
:
String
,
usePreparsedDirectives
:
Boolean
)
{
var
explicitLanguageVersionSettings
:
LanguageVersionSettings
?
=
null
var
disableReleaseCoroutines
=
false
var
includeCompatExperimentalCoroutines
=
false
val
kotlinConfigurationFlags
:
MutableList
<
String
>
=
ArrayList
(
0
)
for
(
testFile
in
testFilesWithConfigurationDirectives
)
{
...
...
@@ -247,13 +230,6 @@ abstract class KotlinBaseTest<F : KotlinBaseTest.TestFile> : KtUsefulTestCase()
"""
.
trimIndent
()
)
}
if
(
directives
.
contains
(
"COMMON_COROUTINES_TEST"
))
{
assert
(!
directives
.
contains
(
"COROUTINES_PACKAGE"
))
{
"Must replace COROUTINES_PACKAGE prior to tests compilation"
}
if
(
StandardNames
.
COROUTINES_PACKAGE_FQ_NAME_EXPERIMENTAL
.
asString
()
==
coroutinesPackage
)
{
disableReleaseCoroutines
=
true
includeCompatExperimentalCoroutines
=
true
}
}
if
(
content
.
contains
(
StandardNames
.
COROUTINES_PACKAGE_FQ_NAME_EXPERIMENTAL
.
asString
()))
{
includeCompatExperimentalCoroutines
=
true
}
...
...
@@ -263,13 +239,6 @@ abstract class KotlinBaseTest<F : KotlinBaseTest.TestFile> : KtUsefulTestCase()
explicitLanguageVersionSettings
=
fileLanguageVersionSettings
}
}
if
(
disableReleaseCoroutines
)
{
explicitLanguageVersionSettings
=
CompilerTestLanguageVersionSettings
(
Collections
.
singletonMap
(
LanguageFeature
.
ReleaseCoroutines
,
LanguageFeature
.
State
.
DISABLED
),
ApiVersion
.
LATEST_STABLE
,
LanguageVersion
.
LATEST_STABLE
,
emptyMap
()
)
}
if
(
includeCompatExperimentalCoroutines
)
{
configuration
.
addJvmClasspathRoot
(
ForTestCompileRuntime
.
coroutinesCompatForTests
())
}
...
...
compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java
浏览文件 @
aacf934b
...
...
@@ -574,7 +574,7 @@ public class KotlinTestUtils {
int
firstLineEnd
=
text
.
indexOf
(
'\n'
);
return
StringUtil
.
trimTrailing
(
text
.
substring
(
firstLineEnd
+
1
));
}
}
,
""
);
});
Assert
.
assertTrue
(
"Exactly two files expected: "
,
files
.
size
()
==
2
);
...
...
compiler/tests-common/tests/org/jetbrains/kotlin/test/TestFiles.java
浏览文件 @
aacf934b
...
...
@@ -41,23 +41,18 @@ public class TestFiles {
@NotNull
public
static
<
M
extends
KotlinBaseTest
.
TestModule
,
F
>
List
<
F
>
createTestFiles
(
@Nullable
String
testFileName
,
String
expectedText
,
TestFileFactory
<
M
,
F
>
factory
)
{
return
createTestFiles
(
testFileName
,
expectedText
,
factory
,
false
,
""
);
}
@NotNull
public
static
<
M
extends
KotlinBaseTest
.
TestModule
,
F
>
List
<
F
>
createTestFiles
(
@Nullable
String
testFileName
,
String
expectedText
,
TestFileFactory
<
M
,
F
>
factory
,
String
coroutinesPackage
)
{
return
createTestFiles
(
testFileName
,
expectedText
,
factory
,
false
,
coroutinesPackage
);
return
createTestFiles
(
testFileName
,
expectedText
,
factory
,
false
);
}
@NotNull
public
static
<
M
extends
KotlinBaseTest
.
TestModule
,
F
>
List
<
F
>
createTestFiles
(
String
testFileName
,
String
expectedText
,
TestFileFactory
<
M
,
F
>
factory
,
boolean
preserveLocations
,
String
coroutinesPackage
)
{
return
createTestFiles
(
testFileName
,
expectedText
,
factory
,
preserveLocations
,
coroutinesPackage
,
false
);
boolean
preserveLocations
)
{
return
createTestFiles
(
testFileName
,
expectedText
,
factory
,
preserveLocations
,
false
);
}
@NotNull
public
static
<
M
extends
KotlinBaseTest
.
TestModule
,
F
>
List
<
F
>
createTestFiles
(
String
testFileName
,
String
expectedText
,
TestFileFactory
<
M
,
F
>
factory
,
boolean
preserveLocations
,
String
coroutinesPackage
,
boolean
parseDirectivesPerFile
)
{
boolean
preserveLocations
,
boolean
parseDirectivesPerFile
)
{
Map
<
String
,
M
>
modules
=
new
HashMap
<>();
List
<
F
>
testFiles
=
Lists
.
newArrayList
();
Matcher
matcher
=
FILE_OR_MODULE_PATTERN
.
matcher
(
expectedText
);
...
...
@@ -127,9 +122,7 @@ public class TestFiles {
assert
oldValue
==
null
:
"Module with name "
+
supportModule
.
name
+
" already present in file"
;
}
boolean
isReleaseCoroutines
=
!
coroutinesPackage
.
contains
(
"experimental"
)
&&
!
isDirectiveDefined
(
expectedText
,
"!LANGUAGE: -ReleaseCoroutines"
);
boolean
isReleaseCoroutines
=
!
isDirectiveDefined
(
expectedText
,
"!LANGUAGE: -ReleaseCoroutines"
);
boolean
checkStateMachine
=
isDirectiveDefined
(
expectedText
,
"CHECK_STATE_MACHINE"
);
boolean
checkTailCallOptimization
=
isDirectiveDefined
(
expectedText
,
"CHECK_TAIL_CALL_OPTIMIZATION"
);
...
...
core/descriptors.runtime/tests/org/jetbrains/kotlin/jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt
浏览文件 @
aacf934b
...
...
@@ -122,8 +122,7 @@ abstract class AbstractJvmRuntimeDescriptorLoaderTest : TestCaseWithTmpdir() {
targetFile
.
writeText
(
adaptJavaSource
(
text
))
return
targetFile
}
},
""
}
)
LoadDescriptorUtil
.
compileJavaWithAnnotationsJar
(
sources
,
tmpdir
,
emptyList
(),
null
)
}
...
...
idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.kt
浏览文件 @
aacf934b
...
...
@@ -121,7 +121,7 @@ abstract class AbstractQuickFixMultiFileTest : KotlinLightCodeInsightFixtureTest
}
return
TestFile
(
fileName
,
linesWithoutDirectives
.
joinToString
(
separator
=
"\n"
))
}
}
,
""
}
)
val
afterFile
=
subFiles
.
firstOrNull
{
file
->
file
.
path
.
contains
(
".after"
)
}
...
...
js/js.tests/test/org/jetbrains/kotlin/js/test/AbstractJsLineNumberTest.kt
浏览文件 @
aacf934b
...
...
@@ -44,7 +44,7 @@ abstract class AbstractJsLineNumberTest : KotlinTestWithEnvironment() {
val
sourceCode
=
file
.
readText
()
TestFileFactoryImpl
().
use
{
testFactory
->
val
inputFiles
=
TestFiles
.
createTestFiles
(
file
.
name
,
sourceCode
,
testFactory
,
true
,
""
)
val
inputFiles
=
TestFiles
.
createTestFiles
(
file
.
name
,
sourceCode
,
testFactory
,
true
)
val
modules
=
inputFiles
.
map
{
it
.
module
}.
distinct
()
.
associateBy
{
it
.
name
}
...
...
@@ -175,4 +175,4 @@ abstract class AbstractJsLineNumberTest : KotlinTestWithEnvironment() {
private
val
BASE_PATH
=
"${BasicBoxTest.TEST_DATA_DIR_PATH}/$DIR_NAME"
private
val
OUT_PATH
=
"${BasicBoxTest.TEST_DATA_DIR_PATH}/out/$DIR_NAME"
}
}
\ No newline at end of file
}
js/js.tests/test/org/jetbrains/kotlin/js/test/BasicBoxTest.kt
浏览文件 @
aacf934b
...
...
@@ -141,8 +141,7 @@ abstract class BasicBoxTest(
file
.
name
,
fileContent
,
testFactory
,
true
,
coroutinesPackage
true
)
val
modules
=
inputFiles
.
map
{
it
.
module
}.
distinct
()
...
...
js/js.tests/test/org/jetbrains/kotlin/js/test/BasicWasmBoxTest.kt
浏览文件 @
aacf934b
...
...
@@ -6,10 +6,6 @@
package
org.jetbrains.kotlin.js.test
import
com.intellij.openapi.util.io.FileUtil
import
com.intellij.openapi.vfs.StandardFileSystems
import
com.intellij.openapi.vfs.VirtualFileManager
import
com.intellij.psi.PsiManager
import
junit.framework.TestCase
import
org.jetbrains.kotlin.backend.common.phaser.PhaseConfig
import
org.jetbrains.kotlin.backend.common.phaser.toPhaseMap
import
org.jetbrains.kotlin.backend.wasm.compileWasm
...
...
@@ -28,10 +24,8 @@ import org.jetbrains.kotlin.js.test.engines.SpiderMonkeyEngine
import
org.jetbrains.kotlin.library.resolver.impl.KotlinLibraryResolverResultImpl
import
org.jetbrains.kotlin.library.resolver.impl.KotlinResolvedLibraryImpl
import
org.jetbrains.kotlin.name.FqName
import
org.jetbrains.kotlin.psi.KtFile
import
org.jetbrains.kotlin.psi.KtNamedFunction
import
org.jetbrains.kotlin.psi.KtPsiFactory
import
org.jetbrains.kotlin.test.InTextDirectivesUtils
import
org.jetbrains.kotlin.test.Directives
import
org.jetbrains.kotlin.test.KotlinTestUtils
import
org.jetbrains.kotlin.test.KotlinTestWithEnvironment
...
...
@@ -63,7 +57,7 @@ abstract class BasicWasmBoxTest(
val
fileContent
=
KotlinTestUtils
.
doLoadFile
(
file
)
TestFileFactoryImpl
().
use
{
testFactory
->
val
inputFiles
:
MutableList
<
TestFile
>
=
TestFiles
.
createTestFiles
(
file
.
name
,
fileContent
,
testFactory
,
true
,
""
)
val
inputFiles
:
MutableList
<
TestFile
>
=
TestFiles
.
createTestFiles
(
file
.
name
,
fileContent
,
testFactory
,
true
)
val
testPackage
=
testFactory
.
testPackage
val
outputFileBase
=
outputDir
.
absolutePath
+
"/"
+
getTestName
(
true
)
val
outputWatFile
=
outputFileBase
+
".wat"
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录