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

[SLC] rename test classes according to new directories

Browse Source
This commit is contained in:
Dmitrii Gridin
2022-12-22 21:19:21 +01:00
committed by teamcity
parent 251a4363f5
commit 6db0aaef35
11 changed files with 37 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesTest.kt → analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesByFqNameTest.kt
+1 -1
View File
@@ -12,7 +12,7 @@ import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.model.TestModule
import java.nio.file.Path import java.nio.file.Path
abstract class AbstractSymbolLightClassesTest( abstract class AbstractSymbolLightClassesByFqNameTest(
configurator: AnalysisApiTestConfigurator, configurator: AnalysisApiTestConfigurator,
override val currentExtension: String, override val currentExtension: String,
override val stopIfCompilationErrorDirectivePresent: Boolean, override val stopIfCompilationErrorDirectivePresent: Boolean,
analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesLoadingTest.kt → analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesByPsiTest.kt
+4 -3
View File
@@ -9,19 +9,20 @@ import com.intellij.openapi.project.Project
import com.intellij.psi.PsiClass import com.intellij.psi.PsiClass
import com.intellij.psi.SyntaxTraverser import com.intellij.psi.SyntaxTraverser
import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisApiTestConfigurator import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisApiTestConfigurator
import org.jetbrains.kotlin.asJava.* import org.jetbrains.kotlin.asJava.LightClassTestCommon
import org.jetbrains.kotlin.asJava.renderClass
import org.jetbrains.kotlin.asJava.toLightElements
import org.jetbrains.kotlin.light.classes.symbol.base.service.withExtendedTypeRenderer import org.jetbrains.kotlin.light.classes.symbol.base.service.withExtendedTypeRenderer
import org.jetbrains.kotlin.psi.KtClassOrObject import org.jetbrains.kotlin.psi.KtClassOrObject
import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.model.TestModule
import java.nio.file.Path import java.nio.file.Path
abstract class AbstractSymbolLightClassesLoadingTest( abstract class AbstractSymbolLightClassesByPsiTest(
configurator: AnalysisApiTestConfigurator, configurator: AnalysisApiTestConfigurator,
override val currentExtension: String, override val currentExtension: String,
override val stopIfCompilationErrorDirectivePresent: Boolean, override val stopIfCompilationErrorDirectivePresent: Boolean,
) : AbstractSymbolLightClassesTestBase(configurator) { ) : AbstractSymbolLightClassesTestBase(configurator) {
override fun getRenderResult(ktFile: KtFile, ktFiles: List<KtFile>, testDataFile: Path, module: TestModule, project: Project): String { override fun getRenderResult(ktFile: KtFile, ktFiles: List<KtFile>, testDataFile: Path, module: TestModule, project: Project): String {
val lightClasses = ktFiles.flatMap { getLightClassesFromFile(it) } val lightClasses = ktFiles.flatMap { getLightClassesFromFile(it) }
if (lightClasses.isEmpty()) return LightClassTestCommon.NOT_GENERATED_DIRECTIVE if (lightClasses.isEmpty()) return LightClassTestCommon.NOT_GENERATED_DIRECTIVE
analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/AbstractSymbolLightClassesLoadingForLibraryTest.kt → analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/AbstractSymbolLightClassesByFqNameForLibraryTest.kt
+6 -7
View File
@@ -5,12 +5,11 @@
package org.jetbrains.kotlin.light.classes.symbol.decompiled package org.jetbrains.kotlin.light.classes.symbol.decompiled
import org.jetbrains.kotlin.light.classes.symbol.base.AbstractSymbolLightClassesLoadingTest import org.jetbrains.kotlin.light.classes.symbol.base.AbstractSymbolLightClassesByFqNameTest
import org.jetbrains.kotlin.light.classes.symbol.decompiled.test.configurators.AnalysisApiSymbolLightClassesDecompiledTestConfigurator import org.jetbrains.kotlin.light.classes.symbol.decompiled.test.configurators.AnalysisApiSymbolLightClassesDecompiledTestConfigurator
abstract class AbstractSymbolLightClassesLoadingForLibraryTest : abstract class AbstractSymbolLightClassesByFqNameForLibraryTest : AbstractSymbolLightClassesByFqNameTest(
AbstractSymbolLightClassesLoadingTest( AnalysisApiSymbolLightClassesDecompiledTestConfigurator,
AnalysisApiSymbolLightClassesDecompiledTestConfigurator, EXTENSIONS.LIB_JAVA,
EXTENSIONS.LIB_JAVA, stopIfCompilationErrorDirectivePresent = true,
stopIfCompilationErrorDirectivePresent = true )
)
analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/AbstractSymbolLightClassesForLibraryTest.kt → analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/AbstractSymbolLightClassesByPsiForLibraryTest.kt
+6 -7
View File
@@ -5,12 +5,11 @@
package org.jetbrains.kotlin.light.classes.symbol.decompiled package org.jetbrains.kotlin.light.classes.symbol.decompiled
import org.jetbrains.kotlin.light.classes.symbol.base.AbstractSymbolLightClassesTest import org.jetbrains.kotlin.light.classes.symbol.base.AbstractSymbolLightClassesByPsiTest
import org.jetbrains.kotlin.light.classes.symbol.decompiled.test.configurators.AnalysisApiSymbolLightClassesDecompiledTestConfigurator import org.jetbrains.kotlin.light.classes.symbol.decompiled.test.configurators.AnalysisApiSymbolLightClassesDecompiledTestConfigurator
abstract class AbstractSymbolLightClassesForLibraryTest : abstract class AbstractSymbolLightClassesByPsiForLibraryTest : AbstractSymbolLightClassesByPsiTest(
AbstractSymbolLightClassesTest( AnalysisApiSymbolLightClassesDecompiledTestConfigurator,
AnalysisApiSymbolLightClassesDecompiledTestConfigurator, EXTENSIONS.LIB_JAVA,
EXTENSIONS.LIB_JAVA, stopIfCompilationErrorDirectivePresent = true,
stopIfCompilationErrorDirectivePresent = true )
)
analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesForLibraryTestGenerated.java → analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesByFqNameForLibraryTestGenerated.java
Generated
+1 -1
View File
@@ -18,7 +18,7 @@ import java.util.regex.Pattern;
@SuppressWarnings("all") @SuppressWarnings("all")
@TestMetadata("compiler/testData/asJava/lightClasses/lightClassByFqName") @TestMetadata("compiler/testData/asJava/lightClasses/lightClassByFqName")
@TestDataPath("$PROJECT_ROOT") @TestDataPath("$PROJECT_ROOT")
public class SymbolLightClassesForLibraryTestGenerated extends AbstractSymbolLightClassesForLibraryTest { public class SymbolLightClassesByFqNameForLibraryTestGenerated extends AbstractSymbolLightClassesByFqNameForLibraryTest {
@Test @Test
public void testAllFilesPresentInLightClassByFqName() throws Exception { public void testAllFilesPresentInLightClassByFqName() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/lightClassByFqName"), Pattern.compile("^([^.]+)\\.kt$"), null, true, "compilationErrors"); KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/lightClassByFqName"), Pattern.compile("^([^.]+)\\.kt$"), null, true, "compilationErrors");
analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesLoadingForLibraryTestGenerated.java → analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/decompiled/SymbolLightClassesByPsiForLibraryTestGenerated.java
Generated
+1 -1
View File
@@ -18,7 +18,7 @@ import java.util.regex.Pattern;
@SuppressWarnings("all") @SuppressWarnings("all")
@TestMetadata("compiler/testData/asJava/lightClasses/lightClassByPsi") @TestMetadata("compiler/testData/asJava/lightClasses/lightClassByPsi")
@TestDataPath("$PROJECT_ROOT") @TestDataPath("$PROJECT_ROOT")
public class SymbolLightClassesLoadingForLibraryTestGenerated extends AbstractSymbolLightClassesLoadingForLibraryTest { public class SymbolLightClassesByPsiForLibraryTestGenerated extends AbstractSymbolLightClassesByPsiForLibraryTest {
@Test @Test
public void testAllFilesPresentInLightClassByPsi() throws Exception { public void testAllFilesPresentInLightClassByPsi() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/lightClassByPsi"), Pattern.compile("^(.+)\\.(kt|kts)$"), null, true); KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/lightClassByPsi"), Pattern.compile("^(.+)\\.(kt|kts)$"), null, true);
analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/AbstractSymbolLightClassesLoadingForSourceTest.kt → analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/AbstractSymbolLightClassesByFqNameForSourceTest.kt
+6 -7
View File
@@ -6,11 +6,10 @@
package org.jetbrains.kotlin.light.classes.symbol.source package org.jetbrains.kotlin.light.classes.symbol.source
import org.jetbrains.kotlin.analysis.low.level.api.fir.test.configurators.AnalysisApiFirSourceTestConfigurator import org.jetbrains.kotlin.analysis.low.level.api.fir.test.configurators.AnalysisApiFirSourceTestConfigurator
import org.jetbrains.kotlin.light.classes.symbol.base.AbstractSymbolLightClassesLoadingTest import org.jetbrains.kotlin.light.classes.symbol.base.AbstractSymbolLightClassesByFqNameTest
abstract class AbstractSymbolLightClassesLoadingForSourceTest : abstract class AbstractSymbolLightClassesByFqNameForSourceTest : AbstractSymbolLightClassesByFqNameTest(
AbstractSymbolLightClassesLoadingTest( AnalysisApiFirSourceTestConfigurator(analyseInDependentSession = false),
AnalysisApiFirSourceTestConfigurator(analyseInDependentSession = false), EXTENSIONS.FIR_JAVA,
EXTENSIONS.FIR_JAVA, stopIfCompilationErrorDirectivePresent = false,
stopIfCompilationErrorDirectivePresent = false )
)
analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/AbstractSymbolLightClassesForSourceTest.kt → analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/AbstractSymbolLightClassesByPsiForSourceTest.kt
+6 -7
View File
@@ -6,11 +6,10 @@
package org.jetbrains.kotlin.light.classes.symbol.source package org.jetbrains.kotlin.light.classes.symbol.source
import org.jetbrains.kotlin.analysis.low.level.api.fir.test.configurators.AnalysisApiFirSourceTestConfigurator import org.jetbrains.kotlin.analysis.low.level.api.fir.test.configurators.AnalysisApiFirSourceTestConfigurator
import org.jetbrains.kotlin.light.classes.symbol.base.AbstractSymbolLightClassesTest import org.jetbrains.kotlin.light.classes.symbol.base.AbstractSymbolLightClassesByPsiTest
abstract class AbstractSymbolLightClassesForSourceTest : abstract class AbstractSymbolLightClassesByPsiForSourceTest : AbstractSymbolLightClassesByPsiTest(
AbstractSymbolLightClassesTest( AnalysisApiFirSourceTestConfigurator(analyseInDependentSession = false),
AnalysisApiFirSourceTestConfigurator(analyseInDependentSession = false), EXTENSIONS.FIR_JAVA,
EXTENSIONS.FIR_JAVA, stopIfCompilationErrorDirectivePresent = false,
stopIfCompilationErrorDirectivePresent = false )
)
analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesForSourceTestGenerated.java → analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesByFqNameForSourceTestGenerated.java
Generated
+1 -1
View File
@@ -18,7 +18,7 @@ import java.util.regex.Pattern;
@SuppressWarnings("all") @SuppressWarnings("all")
@TestMetadata("compiler/testData/asJava/lightClasses/lightClassByFqName") @TestMetadata("compiler/testData/asJava/lightClasses/lightClassByFqName")
@TestDataPath("$PROJECT_ROOT") @TestDataPath("$PROJECT_ROOT")
public class SymbolLightClassesForSourceTestGenerated extends AbstractSymbolLightClassesForSourceTest { public class SymbolLightClassesByFqNameForSourceTestGenerated extends AbstractSymbolLightClassesByFqNameForSourceTest {
@Test @Test
public void testAllFilesPresentInLightClassByFqName() throws Exception { public void testAllFilesPresentInLightClassByFqName() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/lightClassByFqName"), Pattern.compile("^([^.]+)\\.kt$"), null, true); KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/lightClassByFqName"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesLoadingForSourceTestGenerated.java → analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesByPsiForSourceTestGenerated.java
Generated
+1 -1
View File
@@ -18,7 +18,7 @@ import java.util.regex.Pattern;
@SuppressWarnings("all") @SuppressWarnings("all")
@TestMetadata("compiler/testData/asJava/lightClasses/lightClassByPsi") @TestMetadata("compiler/testData/asJava/lightClasses/lightClassByPsi")
@TestDataPath("$PROJECT_ROOT") @TestDataPath("$PROJECT_ROOT")
public class SymbolLightClassesLoadingForSourceTestGenerated extends AbstractSymbolLightClassesLoadingForSourceTest { public class SymbolLightClassesByPsiForSourceTestGenerated extends AbstractSymbolLightClassesByPsiForSourceTest {
@Test @Test
public void testAllFilesPresentInLightClassByPsi() throws Exception { public void testAllFilesPresentInLightClassByPsi() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/lightClassByPsi"), Pattern.compile("^(.+)\\.(kt|kts)$"), null, true); KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/asJava/lightClasses/lightClassByPsi"), Pattern.compile("^(.+)\\.(kt|kts)$"), null, true);
generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/lightClasses.kt
+4 -4
View File
@@ -16,14 +16,14 @@ internal fun TestGroupSuite.generateSymbolLightClassesTests() {
"compiler/testData", "compiler/testData",
) { ) {
run { run {
testClass<AbstractSymbolLightClassesForSourceTest> { testClass<AbstractSymbolLightClassesByFqNameForSourceTest> {
model( model(
"asJava/lightClasses/lightClassByFqName", "asJava/lightClasses/lightClassByFqName",
pattern = TestGeneratorUtil.KT_WITHOUT_DOTS_IN_NAME pattern = TestGeneratorUtil.KT_WITHOUT_DOTS_IN_NAME
) )
} }
testClass<AbstractSymbolLightClassesForLibraryTest> { testClass<AbstractSymbolLightClassesByFqNameForLibraryTest> {
model( model(
"asJava/lightClasses/lightClassByFqName", "asJava/lightClasses/lightClassByFqName",
excludeDirs = listOf("compilationErrors"), excludeDirs = listOf("compilationErrors"),
@@ -48,11 +48,11 @@ internal fun TestGroupSuite.generateSymbolLightClassesTests() {
} }
run { run {
testClass<AbstractSymbolLightClassesLoadingForSourceTest> { testClass<AbstractSymbolLightClassesByPsiForSourceTest> {
model("asJava/lightClasses/lightClassByPsi", pattern = TestGeneratorUtil.KT_OR_KTS) model("asJava/lightClasses/lightClassByPsi", pattern = TestGeneratorUtil.KT_OR_KTS)
} }
testClass<AbstractSymbolLightClassesLoadingForLibraryTest> { testClass<AbstractSymbolLightClassesByPsiForLibraryTest> {
model("asJava/lightClasses/lightClassByPsi", pattern = TestGeneratorUtil.KT_OR_KTS) model("asJava/lightClasses/lightClassByPsi", pattern = TestGeneratorUtil.KT_OR_KTS)
} }
} }