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

Minor: rename test

Browse Source
This commit is contained in:
Natalia Ukhorskaya
2015-10-23 13:12:43 +03:00
parent 66a5351cd0
commit b8e649e843
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/kotlin/resolve/constants/evaluate/AbstractEvaluateExpressionTest.kt → compiler/tests/org/jetbrains/kotlin/resolve/constants/evaluate/AbstractCompileTimeConstantEvaluatorTest.kt
+1 -2
View File
@@ -30,9 +30,8 @@ import org.jetbrains.kotlin.test.InTextDirectivesUtils
import org.jetbrains.kotlin.test.JetTestUtils import org.jetbrains.kotlin.test.JetTestUtils
import java.io.File import java.io.File
import java.util.regex.Pattern import java.util.regex.Pattern
import kotlin.test.assertNotNull
public abstract class AbstractEvaluateExpressionTest : AbstractAnnotationDescriptorResolveTest() { public abstract class AbstractCompileTimeConstantEvaluatorTest : AbstractAnnotationDescriptorResolveTest() {
// Test directives should look like [// val testedPropertyName: expectedValue] // Test directives should look like [// val testedPropertyName: expectedValue]
fun doConstantTest(path: String) { fun doConstantTest(path: String) {
compiler/tests/org/jetbrains/kotlin/resolve/constants/evaluate/EvaluateExpressionTestGenerated.java → compiler/tests/org/jetbrains/kotlin/resolve/constants/evaluate/CompileTimeConstantEvaluatorTestGenerated.java
+4 -4
View File
@@ -28,11 +28,11 @@ import java.util.regex.Pattern;
/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all") @SuppressWarnings("all")
@RunWith(JUnit3RunnerWithInners.class) @RunWith(JUnit3RunnerWithInners.class)
public class EvaluateExpressionTestGenerated extends AbstractEvaluateExpressionTest { public class CompileTimeConstantEvaluatorTestGenerated extends AbstractCompileTimeConstantEvaluatorTest {
@TestMetadata("compiler/testData/evaluate/constant") @TestMetadata("compiler/testData/evaluate/constant")
@TestDataPath("$PROJECT_ROOT") @TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class) @RunWith(JUnit3RunnerWithInners.class)
public static class Constant extends AbstractEvaluateExpressionTest { public static class Constant extends AbstractCompileTimeConstantEvaluatorTest {
public void testAllFilesPresentInConstant() throws Exception { public void testAllFilesPresentInConstant() throws Exception {
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/evaluate/constant"), Pattern.compile("^(.+)\\.kt$"), true); JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/evaluate/constant"), Pattern.compile("^(.+)\\.kt$"), true);
} }
@@ -161,7 +161,7 @@ public class EvaluateExpressionTestGenerated extends AbstractEvaluateExpressionT
@TestMetadata("compiler/testData/evaluate/isPure") @TestMetadata("compiler/testData/evaluate/isPure")
@TestDataPath("$PROJECT_ROOT") @TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class) @RunWith(JUnit3RunnerWithInners.class)
public static class IsPure extends AbstractEvaluateExpressionTest { public static class IsPure extends AbstractCompileTimeConstantEvaluatorTest {
public void testAllFilesPresentInIsPure() throws Exception { public void testAllFilesPresentInIsPure() throws Exception {
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/evaluate/isPure"), Pattern.compile("^(.+)\\.kt$"), true); JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/evaluate/isPure"), Pattern.compile("^(.+)\\.kt$"), true);
} }
@@ -200,7 +200,7 @@ public class EvaluateExpressionTestGenerated extends AbstractEvaluateExpressionT
@TestMetadata("compiler/testData/evaluate/usesVariableAsConstant") @TestMetadata("compiler/testData/evaluate/usesVariableAsConstant")
@TestDataPath("$PROJECT_ROOT") @TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class) @RunWith(JUnit3RunnerWithInners.class)
public static class UsesVariableAsConstant extends AbstractEvaluateExpressionTest { public static class UsesVariableAsConstant extends AbstractCompileTimeConstantEvaluatorTest {
public void testAllFilesPresentInUsesVariableAsConstant() throws Exception { public void testAllFilesPresentInUsesVariableAsConstant() throws Exception {
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/evaluate/usesVariableAsConstant"), Pattern.compile("^(.+)\\.kt$"), true); JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/evaluate/usesVariableAsConstant"), Pattern.compile("^(.+)\\.kt$"), true);
} }
generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
+2 -2
View File
@@ -125,7 +125,7 @@ import org.jetbrains.kotlin.resolve.AbstractResolveTest
import org.jetbrains.kotlin.resolve.annotation.AbstractAnnotationParameterTest import org.jetbrains.kotlin.resolve.annotation.AbstractAnnotationParameterTest
import org.jetbrains.kotlin.resolve.calls.AbstractResolvedCallsTest import org.jetbrains.kotlin.resolve.calls.AbstractResolvedCallsTest
import org.jetbrains.kotlin.resolve.calls.AbstractResolvedConstructorDelegationCallsTests import org.jetbrains.kotlin.resolve.calls.AbstractResolvedConstructorDelegationCallsTests
import org.jetbrains.kotlin.resolve.constants.evaluate.AbstractEvaluateExpressionTest import org.jetbrains.kotlin.resolve.constants.evaluate.AbstractCompileTimeConstantEvaluatorTest
import org.jetbrains.kotlin.resolve.constraintSystem.AbstractConstraintSystemTest import org.jetbrains.kotlin.resolve.constraintSystem.AbstractConstraintSystemTest
import org.jetbrains.kotlin.safeDelete.AbstractJetSafeDeleteTest import org.jetbrains.kotlin.safeDelete.AbstractJetSafeDeleteTest
import org.jetbrains.kotlin.serialization.AbstractLocalClassProtoTest import org.jetbrains.kotlin.serialization.AbstractLocalClassProtoTest
@@ -324,7 +324,7 @@ fun main(args: Array<String>) {
model("resolveAnnotations/parameters") model("resolveAnnotations/parameters")
} }
testClass<AbstractEvaluateExpressionTest>() { testClass<AbstractCompileTimeConstantEvaluatorTest>() {
model("evaluate/constant", testMethod = "doConstantTest") model("evaluate/constant", testMethod = "doConstantTest")
model("evaluate/isPure", testMethod = "doIsPureTest") model("evaluate/isPure", testMethod = "doIsPureTest")
model("evaluate/usesVariableAsConstant", testMethod = "doUsesVariableAsConstantTest") model("evaluate/usesVariableAsConstant", testMethod = "doUsesVariableAsConstantTest")