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

Rename: KotlinLightClassTest -> CompilerLightClassTest

Browse Source 
In fact we have very different code in compiler and ide but only one test
This commit is contained in:
Pavel V. Talanov
2015-10-14 16:34:15 +03:00
parent 225e5abc92
commit 35e56993d3
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/kotlin/asJava/AbstractKotlinLightClassTest.java → compiler/tests/org/jetbrains/kotlin/asJava/AbstractCompilerLightClassTest.java
+1 -1
View File
@@ -36,7 +36,7 @@ import java.util.Map;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
public abstract class AbstractKotlinLightClassTest extends KotlinMultiFileTestWithWithJava<Void, Void> { public abstract class AbstractCompilerLightClassTest extends KotlinMultiFileTestWithWithJava<Void, Void> {
private static final Pattern SUBJECT_FQ_NAME_PATTERN = Pattern.compile("^//\\s*(.*)$", Pattern.MULTILINE); private static final Pattern SUBJECT_FQ_NAME_PATTERN = Pattern.compile("^//\\s*(.*)$", Pattern.MULTILINE);
@Override @Override
compiler/tests/org/jetbrains/kotlin/asJava/KotlinLightClassTestGenerated.java → compiler/tests/org/jetbrains/kotlin/asJava/CompilerLightClassTestGenerated.java
+6 -6
View File
@@ -30,7 +30,7 @@ import java.util.regex.Pattern;
@TestMetadata("compiler/testData/asJava/lightClasses") @TestMetadata("compiler/testData/asJava/lightClasses")
@TestDataPath("$PROJECT_ROOT") @TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class) @RunWith(JUnit3RunnerWithInners.class)
public class KotlinLightClassTestGenerated extends AbstractKotlinLightClassTest { public class CompilerLightClassTestGenerated extends AbstractCompilerLightClassTest {
public void testAllFilesPresentInLightClasses() throws Exception { public void testAllFilesPresentInLightClasses() throws Exception {
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses"), Pattern.compile("^(.+)\\.kt$"), true); JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses"), Pattern.compile("^(.+)\\.kt$"), true);
} }
@@ -38,7 +38,7 @@ public class KotlinLightClassTestGenerated extends AbstractKotlinLightClassTest
@TestMetadata("compiler/testData/asJava/lightClasses/delegation") @TestMetadata("compiler/testData/asJava/lightClasses/delegation")
@TestDataPath("$PROJECT_ROOT") @TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class) @RunWith(JUnit3RunnerWithInners.class)
public static class Delegation extends AbstractKotlinLightClassTest { public static class Delegation extends AbstractCompilerLightClassTest {
public void testAllFilesPresentInDelegation() throws Exception { public void testAllFilesPresentInDelegation() throws Exception {
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/delegation"), Pattern.compile("^(.+)\\.kt$"), true); JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/delegation"), Pattern.compile("^(.+)\\.kt$"), true);
} }
@@ -65,7 +65,7 @@ public class KotlinLightClassTestGenerated extends AbstractKotlinLightClassTest
@TestMetadata("compiler/testData/asJava/lightClasses/facades") @TestMetadata("compiler/testData/asJava/lightClasses/facades")
@TestDataPath("$PROJECT_ROOT") @TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class) @RunWith(JUnit3RunnerWithInners.class)
public static class Facades extends AbstractKotlinLightClassTest { public static class Facades extends AbstractCompilerLightClassTest {
public void testAllFilesPresentInFacades() throws Exception { public void testAllFilesPresentInFacades() throws Exception {
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/facades"), Pattern.compile("^(.+)\\.kt$"), true); JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/facades"), Pattern.compile("^(.+)\\.kt$"), true);
} }
@@ -86,7 +86,7 @@ public class KotlinLightClassTestGenerated extends AbstractKotlinLightClassTest
@TestMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations") @TestMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations")
@TestDataPath("$PROJECT_ROOT") @TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class) @RunWith(JUnit3RunnerWithInners.class)
public static class NullabilityAnnotations extends AbstractKotlinLightClassTest { public static class NullabilityAnnotations extends AbstractCompilerLightClassTest {
public void testAllFilesPresentInNullabilityAnnotations() throws Exception { public void testAllFilesPresentInNullabilityAnnotations() throws Exception {
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/nullabilityAnnotations"), Pattern.compile("^(.+)\\.kt$"), true); JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/nullabilityAnnotations"), Pattern.compile("^(.+)\\.kt$"), true);
} }
@@ -215,7 +215,7 @@ public class KotlinLightClassTestGenerated extends AbstractKotlinLightClassTest
@TestMetadata("compiler/testData/asJava/lightClasses/object") @TestMetadata("compiler/testData/asJava/lightClasses/object")
@TestDataPath("$PROJECT_ROOT") @TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class) @RunWith(JUnit3RunnerWithInners.class)
public static class Object extends AbstractKotlinLightClassTest { public static class Object extends AbstractCompilerLightClassTest {
public void testAllFilesPresentInObject() throws Exception { public void testAllFilesPresentInObject() throws Exception {
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/object"), Pattern.compile("^(.+)\\.kt$"), true); JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/object"), Pattern.compile("^(.+)\\.kt$"), true);
} }
@@ -230,7 +230,7 @@ public class KotlinLightClassTestGenerated extends AbstractKotlinLightClassTest
@TestMetadata("compiler/testData/asJava/lightClasses/publicField") @TestMetadata("compiler/testData/asJava/lightClasses/publicField")
@TestDataPath("$PROJECT_ROOT") @TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class) @RunWith(JUnit3RunnerWithInners.class)
public static class PublicField extends AbstractKotlinLightClassTest { public static class PublicField extends AbstractCompilerLightClassTest {
public void testAllFilesPresentInPublicField() throws Exception { public void testAllFilesPresentInPublicField() throws Exception {
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/publicField"), Pattern.compile("^(.+)\\.kt$"), true); JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/publicField"), Pattern.compile("^(.+)\\.kt$"), true);
} }
compiler/tests/org/jetbrains/kotlin/asJava/KotlinAsJavaTestBase.java
+1 -1
View File
@@ -51,7 +51,7 @@ public abstract class KotlinAsJavaTestBase extends KotlinTestWithEnvironment {
protected void setUp() throws Exception { protected void setUp() throws Exception {
super.setUp(); super.setUp();
finder = AbstractKotlinLightClassTest.createFinder(getEnvironment()); finder = AbstractCompilerLightClassTest.createFinder(getEnvironment());
} }
@Override @Override
generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
+2 -2
View File
@@ -21,7 +21,7 @@ import org.jetbrains.kotlin.AbstractDataFlowValueRenderingTest
import org.jetbrains.kotlin.addImport.AbstractAddImportTest import org.jetbrains.kotlin.addImport.AbstractAddImportTest
import org.jetbrains.kotlin.android.* import org.jetbrains.kotlin.android.*
import org.jetbrains.kotlin.annotation.AbstractAnnotationProcessorBoxTest import org.jetbrains.kotlin.annotation.AbstractAnnotationProcessorBoxTest
import org.jetbrains.kotlin.asJava.AbstractKotlinLightClassTest import org.jetbrains.kotlin.asJava.AbstractCompilerLightClassTest
import org.jetbrains.kotlin.cfg.AbstractControlFlowTest import org.jetbrains.kotlin.cfg.AbstractControlFlowTest
import org.jetbrains.kotlin.cfg.AbstractDataFlowTest import org.jetbrains.kotlin.cfg.AbstractDataFlowTest
import org.jetbrains.kotlin.cfg.AbstractPseudoValueTest import org.jetbrains.kotlin.cfg.AbstractPseudoValueTest
@@ -324,7 +324,7 @@ fun main(args: Array<String>) {
model("evaluate/usesVariableAsConstant", testMethod = "doUsesVariableAsConstantTest") model("evaluate/usesVariableAsConstant", testMethod = "doUsesVariableAsConstantTest")
} }
testClass<AbstractKotlinLightClassTest>() { testClass<AbstractCompilerLightClassTest>() {
model("asJava/lightClasses") model("asJava/lightClasses")
} }