AA: test evaluation mode with same test inputs
diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/compileTimeConstantProvider/Fe10CompileTimeConstantEvaluatorConstantTestGenerated.java b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/compileTimeConstantProvider/Fe10CompileTimeConstantEvaluatorConstantTestGenerated.java
deleted file mode 100644
index 6b33515..0000000
--- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/compileTimeConstantProvider/Fe10CompileTimeConstantEvaluatorConstantTestGenerated.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.analysis.api.fe10.components.compileTimeConstantProvider;
-
-import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.util.KtTestUtil;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService;
-import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService;
-import org.jetbrains.kotlin.analysis.api.impl.base.test.components.compileTimeConstantProvider.AbstractCompileTimeConstantEvaluatorConstantTest;
-import org.jetbrains.kotlin.test.TestMetadata;
-import org.junit.jupiter.api.Nested;
-import org.junit.jupiter.api.Test;
-
-import java.io.File;
-import java.util.regex.Pattern;
-
-/** This class is generated by {@link GenerateNewCompilerTests.kt}. DO NOT MODIFY MANUALLY */
-@SuppressWarnings("all")
-@TestMetadata("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constant")
-@TestDataPath("$PROJECT_ROOT")
-public class Fe10CompileTimeConstantEvaluatorConstantTestGenerated extends AbstractCompileTimeConstantEvaluatorConstantTest {
- @NotNull
- @Override
- public FrontendApiTestConfiguratorService getConfigurator() {
- return KtFe10FrontendApiTestConfiguratorService.INSTANCE;
- }
-
- @Test
- public void testAllFilesPresentInEvaluate_constant() throws Exception {
- KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constant"), Pattern.compile("^(.+)\\.kt$"), null, true);
- }
-
- @Test
- @TestMetadata("namedReference_const.kt")
- public void testNamedReference_const() throws Exception {
- runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constant/namedReference_const.kt");
- }
-
- @Test
- @TestMetadata("namedReference_val.kt")
- public void testNamedReference_val() throws Exception {
- runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constant/namedReference_val.kt");
- }
-
- @Test
- @TestMetadata("propertyInit_DivByOtherProperty_const.kt")
- public void testPropertyInit_DivByOtherProperty_const() throws Exception {
- runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constant/propertyInit_DivByOtherProperty_const.kt");
- }
-
- @Test
- @TestMetadata("propertyInit_DivByOtherProperty_val.kt")
- public void testPropertyInit_DivByOtherProperty_val() throws Exception {
- runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constant/propertyInit_DivByOtherProperty_val.kt");
- }
-}
diff --git a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/compileTimeConstantProvider/Fe10CompileTimeConstantEvaluatorConstantLikeTestGenerated.java b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/compileTimeConstantProvider/Fe10CompileTimeConstantEvaluatorTestGenerated.java
similarity index 74%
rename from analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/compileTimeConstantProvider/Fe10CompileTimeConstantEvaluatorConstantLikeTestGenerated.java
rename to analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/compileTimeConstantProvider/Fe10CompileTimeConstantEvaluatorTestGenerated.java
index a3312d9..c530fad 100644
--- a/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/compileTimeConstantProvider/Fe10CompileTimeConstantEvaluatorConstantLikeTestGenerated.java
+++ b/analysis/analysis-api-fe10/tests/org/jetbrains/kotlin/analysis/api/fe10/components/compileTimeConstantProvider/Fe10CompileTimeConstantEvaluatorTestGenerated.java
@@ -10,7 +10,7 @@
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.descriptors.test.KtFe10FrontendApiTestConfiguratorService;
-import org.jetbrains.kotlin.analysis.api.impl.base.test.components.compileTimeConstantProvider.AbstractCompileTimeConstantEvaluatorConstantLikeTest;
+import org.jetbrains.kotlin.analysis.api.impl.base.test.components.compileTimeConstantProvider.AbstractCompileTimeConstantEvaluatorTest;
import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
@@ -20,9 +20,9 @@
/** This class is generated by {@link GenerateNewCompilerTests.kt}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
-@TestMetadata("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike")
+@TestMetadata("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate")
@TestDataPath("$PROJECT_ROOT")
-public class Fe10CompileTimeConstantEvaluatorConstantLikeTestGenerated extends AbstractCompileTimeConstantEvaluatorConstantLikeTest {
+public class Fe10CompileTimeConstantEvaluatorTestGenerated extends AbstractCompileTimeConstantEvaluatorTest {
@NotNull
@Override
public FrontendApiTestConfiguratorService getConfigurator() {
@@ -30,109 +30,109 @@
}
@Test
- public void testAllFilesPresentInEvaluate_constantLike() throws Exception {
- KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike"), Pattern.compile("^(.+)\\.kt$"), null, true);
+ public void testAllFilesPresentInEvaluate() throws Exception {
+ KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate"), Pattern.compile("^(.+)\\.kt$"), null, true);
}
@Test
@TestMetadata("binaryExpressionWithString.kt")
public void testBinaryExpressionWithString() throws Exception {
- runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/binaryExpressionWithString.kt");
+ runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/binaryExpressionWithString.kt");
}
@Test
@TestMetadata("namedReference_const.kt")
public void testNamedReference_const() throws Exception {
- runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/namedReference_const.kt");
+ runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/namedReference_const.kt");
}
@Test
@TestMetadata("namedReference_val.kt")
public void testNamedReference_val() throws Exception {
- runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/namedReference_val.kt");
+ runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/namedReference_val.kt");
}
@Test
@TestMetadata("namedReference_var.kt")
public void testNamedReference_var() throws Exception {
- runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/namedReference_var.kt");
+ runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/namedReference_var.kt");
}
@Test
@TestMetadata("propertyInCompanionObject.kt")
public void testPropertyInCompanionObject() throws Exception {
- runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/propertyInCompanionObject.kt");
+ runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInCompanionObject.kt");
}
@Test
@TestMetadata("propertyInCompanionObject_indirect.kt")
public void testPropertyInCompanionObject_indirect() throws Exception {
- runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/propertyInCompanionObject_indirect.kt");
+ runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInCompanionObject_indirect.kt");
}
@Test
@TestMetadata("propertyInCompanionObject_indirect_twice.kt")
public void testPropertyInCompanionObject_indirect_twice() throws Exception {
- runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/propertyInCompanionObject_indirect_twice.kt");
+ runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInCompanionObject_indirect_twice.kt");
}
@Test
@TestMetadata("propertyInit_Byte.kt")
public void testPropertyInit_Byte() throws Exception {
- runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/propertyInit_Byte.kt");
+ runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInit_Byte.kt");
}
@Test
@TestMetadata("propertyInit_DivByOtherProperty_const.kt")
public void testPropertyInit_DivByOtherProperty_const() throws Exception {
- runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/propertyInit_DivByOtherProperty_const.kt");
+ runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInit_DivByOtherProperty_const.kt");
}
@Test
@TestMetadata("propertyInit_DivByOtherProperty_val.kt")
public void testPropertyInit_DivByOtherProperty_val() throws Exception {
- runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/propertyInit_DivByOtherProperty_val.kt");
+ runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInit_DivByOtherProperty_val.kt");
}
@Test
@TestMetadata("propertyInit_DivByZero.kt")
public void testPropertyInit_DivByZero() throws Exception {
- runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/propertyInit_DivByZero.kt");
+ runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInit_DivByZero.kt");
}
@Test
@TestMetadata("propertyInit_Double.kt")
public void testPropertyInit_Double() throws Exception {
- runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/propertyInit_Double.kt");
+ runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInit_Double.kt");
}
@Test
@TestMetadata("propertyInit_Float.kt")
public void testPropertyInit_Float() throws Exception {
- runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/propertyInit_Float.kt");
+ runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInit_Float.kt");
}
@Test
@TestMetadata("propertyInit_Int.kt")
public void testPropertyInit_Int() throws Exception {
- runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/propertyInit_Int.kt");
+ runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInit_Int.kt");
}
@Test
@TestMetadata("propertyInit_Long.kt")
public void testPropertyInit_Long() throws Exception {
- runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/propertyInit_Long.kt");
+ runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInit_Long.kt");
}
@Test
@TestMetadata("propertyInit_UInt.kt")
public void testPropertyInit_UInt() throws Exception {
- runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/propertyInit_UInt.kt");
+ runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInit_UInt.kt");
}
@Test
@TestMetadata("stringLiteral.kt")
public void testStringLiteral() throws Exception {
- runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/stringLiteral.kt");
+ runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/stringLiteral.kt");
}
}
diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/compileTimeConstantProvider/FirCompileTimeConstantEvaluatorConstantTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/compileTimeConstantProvider/FirCompileTimeConstantEvaluatorConstantTestGenerated.java
deleted file mode 100644
index 08e945d..0000000
--- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/compileTimeConstantProvider/FirCompileTimeConstantEvaluatorConstantTestGenerated.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.analysis.api.fir.components.compileTimeConstantProvider;
-
-import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.util.KtTestUtil;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService;
-import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService;
-import org.jetbrains.kotlin.analysis.api.impl.base.test.components.compileTimeConstantProvider.AbstractCompileTimeConstantEvaluatorConstantTest;
-import org.jetbrains.kotlin.test.TestMetadata;
-import org.junit.jupiter.api.Nested;
-import org.junit.jupiter.api.Test;
-
-import java.io.File;
-import java.util.regex.Pattern;
-
-/** This class is generated by {@link GenerateNewCompilerTests.kt}. DO NOT MODIFY MANUALLY */
-@SuppressWarnings("all")
-@TestMetadata("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constant")
-@TestDataPath("$PROJECT_ROOT")
-public class FirCompileTimeConstantEvaluatorConstantTestGenerated extends AbstractCompileTimeConstantEvaluatorConstantTest {
- @NotNull
- @Override
- public FrontendApiTestConfiguratorService getConfigurator() {
- return FirFrontendApiTestConfiguratorService.INSTANCE;
- }
-
- @Test
- public void testAllFilesPresentInEvaluate_constant() throws Exception {
- KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constant"), Pattern.compile("^(.+)\\.kt$"), null, true);
- }
-
- @Test
- @TestMetadata("namedReference_const.kt")
- public void testNamedReference_const() throws Exception {
- runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constant/namedReference_const.kt");
- }
-
- @Test
- @TestMetadata("namedReference_val.kt")
- public void testNamedReference_val() throws Exception {
- runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constant/namedReference_val.kt");
- }
-
- @Test
- @TestMetadata("propertyInit_DivByOtherProperty_const.kt")
- public void testPropertyInit_DivByOtherProperty_const() throws Exception {
- runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constant/propertyInit_DivByOtherProperty_const.kt");
- }
-
- @Test
- @TestMetadata("propertyInit_DivByOtherProperty_val.kt")
- public void testPropertyInit_DivByOtherProperty_val() throws Exception {
- runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constant/propertyInit_DivByOtherProperty_val.kt");
- }
-}
diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/compileTimeConstantProvider/FirCompileTimeConstantEvaluatorConstantLikeTestGenerated.java b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/compileTimeConstantProvider/FirCompileTimeConstantEvaluatorTestGenerated.java
similarity index 74%
rename from analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/compileTimeConstantProvider/FirCompileTimeConstantEvaluatorConstantLikeTestGenerated.java
rename to analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/compileTimeConstantProvider/FirCompileTimeConstantEvaluatorTestGenerated.java
index 88584d2..54de7e2 100644
--- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/compileTimeConstantProvider/FirCompileTimeConstantEvaluatorConstantLikeTestGenerated.java
+++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/components/compileTimeConstantProvider/FirCompileTimeConstantEvaluatorTestGenerated.java
@@ -10,7 +10,7 @@
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService;
import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService;
-import org.jetbrains.kotlin.analysis.api.impl.base.test.components.compileTimeConstantProvider.AbstractCompileTimeConstantEvaluatorConstantLikeTest;
+import org.jetbrains.kotlin.analysis.api.impl.base.test.components.compileTimeConstantProvider.AbstractCompileTimeConstantEvaluatorTest;
import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
@@ -20,9 +20,9 @@
/** This class is generated by {@link GenerateNewCompilerTests.kt}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
-@TestMetadata("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike")
+@TestMetadata("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate")
@TestDataPath("$PROJECT_ROOT")
-public class FirCompileTimeConstantEvaluatorConstantLikeTestGenerated extends AbstractCompileTimeConstantEvaluatorConstantLikeTest {
+public class FirCompileTimeConstantEvaluatorTestGenerated extends AbstractCompileTimeConstantEvaluatorTest {
@NotNull
@Override
public FrontendApiTestConfiguratorService getConfigurator() {
@@ -30,109 +30,109 @@
}
@Test
- public void testAllFilesPresentInEvaluate_constantLike() throws Exception {
- KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike"), Pattern.compile("^(.+)\\.kt$"), null, true);
+ public void testAllFilesPresentInEvaluate() throws Exception {
+ KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate"), Pattern.compile("^(.+)\\.kt$"), null, true);
}
@Test
@TestMetadata("binaryExpressionWithString.kt")
public void testBinaryExpressionWithString() throws Exception {
- runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/binaryExpressionWithString.kt");
+ runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/binaryExpressionWithString.kt");
}
@Test
@TestMetadata("namedReference_const.kt")
public void testNamedReference_const() throws Exception {
- runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/namedReference_const.kt");
+ runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/namedReference_const.kt");
}
@Test
@TestMetadata("namedReference_val.kt")
public void testNamedReference_val() throws Exception {
- runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/namedReference_val.kt");
+ runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/namedReference_val.kt");
}
@Test
@TestMetadata("namedReference_var.kt")
public void testNamedReference_var() throws Exception {
- runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/namedReference_var.kt");
+ runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/namedReference_var.kt");
}
@Test
@TestMetadata("propertyInCompanionObject.kt")
public void testPropertyInCompanionObject() throws Exception {
- runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/propertyInCompanionObject.kt");
+ runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInCompanionObject.kt");
}
@Test
@TestMetadata("propertyInCompanionObject_indirect.kt")
public void testPropertyInCompanionObject_indirect() throws Exception {
- runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/propertyInCompanionObject_indirect.kt");
+ runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInCompanionObject_indirect.kt");
}
@Test
@TestMetadata("propertyInCompanionObject_indirect_twice.kt")
public void testPropertyInCompanionObject_indirect_twice() throws Exception {
- runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/propertyInCompanionObject_indirect_twice.kt");
+ runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInCompanionObject_indirect_twice.kt");
}
@Test
@TestMetadata("propertyInit_Byte.kt")
public void testPropertyInit_Byte() throws Exception {
- runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/propertyInit_Byte.kt");
+ runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInit_Byte.kt");
}
@Test
@TestMetadata("propertyInit_DivByOtherProperty_const.kt")
public void testPropertyInit_DivByOtherProperty_const() throws Exception {
- runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/propertyInit_DivByOtherProperty_const.kt");
+ runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInit_DivByOtherProperty_const.kt");
}
@Test
@TestMetadata("propertyInit_DivByOtherProperty_val.kt")
public void testPropertyInit_DivByOtherProperty_val() throws Exception {
- runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/propertyInit_DivByOtherProperty_val.kt");
+ runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInit_DivByOtherProperty_val.kt");
}
@Test
@TestMetadata("propertyInit_DivByZero.kt")
public void testPropertyInit_DivByZero() throws Exception {
- runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/propertyInit_DivByZero.kt");
+ runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInit_DivByZero.kt");
}
@Test
@TestMetadata("propertyInit_Double.kt")
public void testPropertyInit_Double() throws Exception {
- runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/propertyInit_Double.kt");
+ runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInit_Double.kt");
}
@Test
@TestMetadata("propertyInit_Float.kt")
public void testPropertyInit_Float() throws Exception {
- runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/propertyInit_Float.kt");
+ runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInit_Float.kt");
}
@Test
@TestMetadata("propertyInit_Int.kt")
public void testPropertyInit_Int() throws Exception {
- runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/propertyInit_Int.kt");
+ runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInit_Int.kt");
}
@Test
@TestMetadata("propertyInit_Long.kt")
public void testPropertyInit_Long() throws Exception {
- runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/propertyInit_Long.kt");
+ runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInit_Long.kt");
}
@Test
@TestMetadata("propertyInit_UInt.kt")
public void testPropertyInit_UInt() throws Exception {
- runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/propertyInit_UInt.kt");
+ runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInit_UInt.kt");
}
@Test
@TestMetadata("stringLiteral.kt")
public void testStringLiteral() throws Exception {
- runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/stringLiteral.kt");
+ runTest("analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/stringLiteral.kt");
}
}
diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/compileTimeConstantProvider/AbstractCompileTimeConstantEvaluatorConstantLikeTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/compileTimeConstantProvider/AbstractCompileTimeConstantEvaluatorConstantLikeTest.kt
deleted file mode 100644
index 3757654..0000000
--- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/compileTimeConstantProvider/AbstractCompileTimeConstantEvaluatorConstantLikeTest.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.analysis.api.impl.base.test.components.compileTimeConstantProvider
-
-import org.jetbrains.kotlin.analysis.api.components.KtConstantEvaluationMode
-
-abstract class AbstractCompileTimeConstantEvaluatorConstantLikeTest
- : AbstractCompileTimeConstantEvaluatorTest(KtConstantEvaluationMode.CONSTANT_LIKE_EXPRESSION_EVALUATION)
diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/compileTimeConstantProvider/AbstractCompileTimeConstantEvaluatorConstantTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/compileTimeConstantProvider/AbstractCompileTimeConstantEvaluatorConstantTest.kt
deleted file mode 100644
index 70f33a8..0000000
--- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/compileTimeConstantProvider/AbstractCompileTimeConstantEvaluatorConstantTest.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.analysis.api.impl.base.test.components.compileTimeConstantProvider
-
-import org.jetbrains.kotlin.analysis.api.components.KtConstantEvaluationMode
-
-abstract class AbstractCompileTimeConstantEvaluatorConstantTest
- : AbstractCompileTimeConstantEvaluatorTest(KtConstantEvaluationMode.CONSTANT_EXPRESSION_EVALUATION)
diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/compileTimeConstantProvider/AbstractCompileTimeConstantEvaluatorTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/compileTimeConstantProvider/AbstractCompileTimeConstantEvaluatorTest.kt
index 0e4e395..5095a20 100644
--- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/compileTimeConstantProvider/AbstractCompileTimeConstantEvaluatorTest.kt
+++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/compileTimeConstantProvider/AbstractCompileTimeConstantEvaluatorTest.kt
@@ -15,9 +15,7 @@
import org.jetbrains.kotlin.test.services.TestServices
import org.jetbrains.kotlin.test.services.assertions
-abstract class AbstractCompileTimeConstantEvaluatorTest(
- private val mode: KtConstantEvaluationMode
-) : AbstractHLApiSingleFileTest() {
+abstract class AbstractCompileTimeConstantEvaluatorTest : AbstractHLApiSingleFileTest() {
override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) {
val element = testServices.expressionMarkerProvider.getSelectedElement(ktFile)
val expression = when (element) {
@@ -27,13 +25,24 @@
} ?: testServices.assertions.fail { "Unsupported expression: $element" }
val constantValue = executeOnPooledThreadInReadAction {
analyseForTest(expression) {
- expression.evaluate(mode)
+ expression.evaluate(KtConstantEvaluationMode.CONSTANT_EXPRESSION_EVALUATION)
+ }
+ }
+ val constantLikeValue = executeOnPooledThreadInReadAction {
+ analyseForTest(expression) {
+ expression.evaluate(KtConstantEvaluationMode.CONSTANT_LIKE_EXPRESSION_EVALUATION)
}
}
val actual = buildString {
appendLine("expression: ${expression.text}")
+ appendLine()
+ appendLine("CONSTANT_EXPRESSION_EVALUATION")
appendLine("constant: ${constantValue?.renderAsKotlinConstant() ?: "NOT_EVALUATED"}")
appendLine("constantValueKind: ${constantValue?.constantValueKind ?: "NOT_EVALUATED"}")
+ appendLine()
+ appendLine("CONSTANT_LIKE_EXPRESSION_EVALUATION")
+ appendLine("constantLike: ${constantLikeValue?.renderAsKotlinConstant() ?: "NOT_EVALUATED"}")
+ appendLine("constantLikeValueKind: ${constantLikeValue?.constantValueKind ?: "NOT_EVALUATED"}")
}
testServices.assertions.assertEqualsToTestDataFileSibling(actual)
}
diff --git a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/binaryExpressionWithString.kt b/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/binaryExpressionWithString.kt
similarity index 100%
rename from analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/binaryExpressionWithString.kt
rename to analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/binaryExpressionWithString.kt
diff --git a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/binaryExpressionWithString.txt b/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/binaryExpressionWithString.txt
new file mode 100644
index 0000000..7af7e07
--- /dev/null
+++ b/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/binaryExpressionWithString.txt
@@ -0,0 +1,9 @@
+expression: "message" + msg
+
+CONSTANT_EXPRESSION_EVALUATION
+constant: NOT_EVALUATED
+constantValueKind: NOT_EVALUATED
+
+CONSTANT_LIKE_EXPRESSION_EVALUATION
+constantLike: NOT_EVALUATED
+constantLikeValueKind: NOT_EVALUATED
diff --git a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constant/namedReference_const.kt b/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/namedReference_const.kt
similarity index 100%
rename from analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constant/namedReference_const.kt
rename to analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/namedReference_const.kt
diff --git a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/namedReference_const.txt b/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/namedReference_const.txt
new file mode 100644
index 0000000..332ee02
--- /dev/null
+++ b/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/namedReference_const.txt
@@ -0,0 +1,9 @@
+expression: bar
+
+CONSTANT_EXPRESSION_EVALUATION
+constant: 42
+constantValueKind: Int
+
+CONSTANT_LIKE_EXPRESSION_EVALUATION
+constantLike: 42
+constantLikeValueKind: Int
diff --git a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constant/namedReference_val.kt b/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/namedReference_val.kt
similarity index 100%
rename from analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constant/namedReference_val.kt
rename to analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/namedReference_val.kt
diff --git a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/namedReference_val.txt b/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/namedReference_val.txt
new file mode 100644
index 0000000..6a2069c
--- /dev/null
+++ b/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/namedReference_val.txt
@@ -0,0 +1,9 @@
+expression: bar
+
+CONSTANT_EXPRESSION_EVALUATION
+constant: NOT_EVALUATED
+constantValueKind: NOT_EVALUATED
+
+CONSTANT_LIKE_EXPRESSION_EVALUATION
+constantLike: 42
+constantLikeValueKind: Int
diff --git a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/namedReference_var.kt b/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/namedReference_var.kt
similarity index 100%
rename from analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/namedReference_var.kt
rename to analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/namedReference_var.kt
diff --git a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/namedReference_var.txt b/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/namedReference_var.txt
new file mode 100644
index 0000000..8e79da2
--- /dev/null
+++ b/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/namedReference_var.txt
@@ -0,0 +1,9 @@
+expression: bar
+
+CONSTANT_EXPRESSION_EVALUATION
+constant: NOT_EVALUATED
+constantValueKind: NOT_EVALUATED
+
+CONSTANT_LIKE_EXPRESSION_EVALUATION
+constantLike: NOT_EVALUATED
+constantLikeValueKind: NOT_EVALUATED
diff --git a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/propertyInCompanionObject.kt b/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInCompanionObject.kt
similarity index 100%
rename from analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/propertyInCompanionObject.kt
rename to analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInCompanionObject.kt
diff --git a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInCompanionObject.txt b/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInCompanionObject.txt
new file mode 100644
index 0000000..fa05454
--- /dev/null
+++ b/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInCompanionObject.txt
@@ -0,0 +1,9 @@
+expression: someField
+
+CONSTANT_EXPRESSION_EVALUATION
+constant: NOT_EVALUATED
+constantValueKind: NOT_EVALUATED
+
+CONSTANT_LIKE_EXPRESSION_EVALUATION
+constantLike: "something"
+constantLikeValueKind: String
diff --git a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/propertyInCompanionObject_indirect.kt b/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInCompanionObject_indirect.kt
similarity index 100%
rename from analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/propertyInCompanionObject_indirect.kt
rename to analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInCompanionObject_indirect.kt
diff --git a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInCompanionObject_indirect.txt b/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInCompanionObject_indirect.txt
new file mode 100644
index 0000000..afad1f3
--- /dev/null
+++ b/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInCompanionObject_indirect.txt
@@ -0,0 +1,9 @@
+expression: indirectPointer
+
+CONSTANT_EXPRESSION_EVALUATION
+constant: NOT_EVALUATED
+constantValueKind: NOT_EVALUATED
+
+CONSTANT_LIKE_EXPRESSION_EVALUATION
+constantLike: "something"
+constantLikeValueKind: String
diff --git a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/propertyInCompanionObject_indirect_twice.kt b/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInCompanionObject_indirect_twice.kt
similarity index 100%
rename from analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/propertyInCompanionObject_indirect_twice.kt
rename to analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInCompanionObject_indirect_twice.kt
diff --git a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInCompanionObject_indirect_twice.txt b/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInCompanionObject_indirect_twice.txt
new file mode 100644
index 0000000..253bf93
--- /dev/null
+++ b/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInCompanionObject_indirect_twice.txt
@@ -0,0 +1,9 @@
+expression: oneMore
+
+CONSTANT_EXPRESSION_EVALUATION
+constant: NOT_EVALUATED
+constantValueKind: NOT_EVALUATED
+
+CONSTANT_LIKE_EXPRESSION_EVALUATION
+constantLike: "something"
+constantLikeValueKind: String
diff --git a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/propertyInit_Byte.kt b/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInit_Byte.kt
similarity index 100%
rename from analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/propertyInit_Byte.kt
rename to analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInit_Byte.kt
diff --git a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInit_Byte.txt b/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInit_Byte.txt
new file mode 100644
index 0000000..1709038
--- /dev/null
+++ b/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInit_Byte.txt
@@ -0,0 +1,9 @@
+expression: 42
+
+CONSTANT_EXPRESSION_EVALUATION
+constant: 42
+constantValueKind: Byte
+
+CONSTANT_LIKE_EXPRESSION_EVALUATION
+constantLike: 42
+constantLikeValueKind: Byte
diff --git a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/propertyInit_DivByOtherProperty_const.kt b/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInit_DivByOtherProperty_const.kt
similarity index 100%
rename from analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/propertyInit_DivByOtherProperty_const.kt
rename to analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInit_DivByOtherProperty_const.kt
diff --git a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInit_DivByOtherProperty_const.txt b/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInit_DivByOtherProperty_const.txt
new file mode 100644
index 0000000..9cd860b
--- /dev/null
+++ b/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInit_DivByOtherProperty_const.txt
@@ -0,0 +1,9 @@
+expression: 42 / d
+
+CONSTANT_EXPRESSION_EVALUATION
+constant: 42
+constantValueKind: Int
+
+CONSTANT_LIKE_EXPRESSION_EVALUATION
+constantLike: 42
+constantLikeValueKind: Int
diff --git a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInit_DivByOtherProperty_val.descriptors.txt b/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInit_DivByOtherProperty_val.descriptors.txt
new file mode 100644
index 0000000..9cd860b
--- /dev/null
+++ b/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInit_DivByOtherProperty_val.descriptors.txt
@@ -0,0 +1,9 @@
+expression: 42 / d
+
+CONSTANT_EXPRESSION_EVALUATION
+constant: 42
+constantValueKind: Int
+
+CONSTANT_LIKE_EXPRESSION_EVALUATION
+constantLike: 42
+constantLikeValueKind: Int
diff --git a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/propertyInit_DivByOtherProperty_val.kt b/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInit_DivByOtherProperty_val.kt
similarity index 100%
rename from analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/propertyInit_DivByOtherProperty_val.kt
rename to analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInit_DivByOtherProperty_val.kt
diff --git a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInit_DivByOtherProperty_val.txt b/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInit_DivByOtherProperty_val.txt
new file mode 100644
index 0000000..91a5b49
--- /dev/null
+++ b/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInit_DivByOtherProperty_val.txt
@@ -0,0 +1,9 @@
+expression: 42 / d
+
+CONSTANT_EXPRESSION_EVALUATION
+constant: NOT_EVALUATED
+constantValueKind: NOT_EVALUATED
+
+CONSTANT_LIKE_EXPRESSION_EVALUATION
+constantLike: 42
+constantLikeValueKind: Int
diff --git a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInit_DivByZero.descriptors.txt b/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInit_DivByZero.descriptors.txt
new file mode 100644
index 0000000..f2735ba
--- /dev/null
+++ b/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInit_DivByZero.descriptors.txt
@@ -0,0 +1,9 @@
+expression: 42 / 0
+
+CONSTANT_EXPRESSION_EVALUATION
+constant: error("Division by zero")
+constantValueKind: Error
+
+CONSTANT_LIKE_EXPRESSION_EVALUATION
+constantLike: error("Division by zero")
+constantLikeValueKind: Error
diff --git a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/propertyInit_DivByZero.kt b/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInit_DivByZero.kt
similarity index 100%
rename from analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/propertyInit_DivByZero.kt
rename to analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInit_DivByZero.kt
diff --git a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInit_DivByZero.txt b/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInit_DivByZero.txt
new file mode 100644
index 0000000..c1e452e
--- /dev/null
+++ b/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInit_DivByZero.txt
@@ -0,0 +1,9 @@
+expression: 42 / 0
+
+CONSTANT_EXPRESSION_EVALUATION
+constant: error("/ by zero")
+constantValueKind: Error
+
+CONSTANT_LIKE_EXPRESSION_EVALUATION
+constantLike: error("/ by zero")
+constantLikeValueKind: Error
diff --git a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/propertyInit_Double.kt b/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInit_Double.kt
similarity index 100%
rename from analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/propertyInit_Double.kt
rename to analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInit_Double.kt
diff --git a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInit_Double.txt b/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInit_Double.txt
new file mode 100644
index 0000000..6bd6f8b
--- /dev/null
+++ b/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInit_Double.txt
@@ -0,0 +1,9 @@
+expression: 3.14
+
+CONSTANT_EXPRESSION_EVALUATION
+constant: 3.14
+constantValueKind: Double
+
+CONSTANT_LIKE_EXPRESSION_EVALUATION
+constantLike: 3.14
+constantLikeValueKind: Double
diff --git a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/propertyInit_Float.kt b/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInit_Float.kt
similarity index 100%
rename from analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/propertyInit_Float.kt
rename to analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInit_Float.kt
diff --git a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInit_Float.txt b/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInit_Float.txt
new file mode 100644
index 0000000..26bcd55
--- /dev/null
+++ b/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInit_Float.txt
@@ -0,0 +1,9 @@
+expression: 3.14f
+
+CONSTANT_EXPRESSION_EVALUATION
+constant: 3.14f
+constantValueKind: Float
+
+CONSTANT_LIKE_EXPRESSION_EVALUATION
+constantLike: 3.14f
+constantLikeValueKind: Float
diff --git a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/propertyInit_Int.kt b/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInit_Int.kt
similarity index 100%
rename from analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/propertyInit_Int.kt
rename to analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInit_Int.kt
diff --git a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInit_Int.txt b/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInit_Int.txt
new file mode 100644
index 0000000..3c9e339
--- /dev/null
+++ b/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInit_Int.txt
@@ -0,0 +1,9 @@
+expression: 42
+
+CONSTANT_EXPRESSION_EVALUATION
+constant: 42
+constantValueKind: Int
+
+CONSTANT_LIKE_EXPRESSION_EVALUATION
+constantLike: 42
+constantLikeValueKind: Int
diff --git a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/propertyInit_Long.kt b/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInit_Long.kt
similarity index 100%
rename from analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/propertyInit_Long.kt
rename to analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInit_Long.kt
diff --git a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInit_Long.txt b/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInit_Long.txt
new file mode 100644
index 0000000..38e2de2
--- /dev/null
+++ b/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInit_Long.txt
@@ -0,0 +1,9 @@
+expression: 42
+
+CONSTANT_EXPRESSION_EVALUATION
+constant: 42
+constantValueKind: Long
+
+CONSTANT_LIKE_EXPRESSION_EVALUATION
+constantLike: 42
+constantLikeValueKind: Long
diff --git a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/propertyInit_UInt.kt b/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInit_UInt.kt
similarity index 100%
rename from analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/propertyInit_UInt.kt
rename to analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInit_UInt.kt
diff --git a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInit_UInt.txt b/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInit_UInt.txt
new file mode 100644
index 0000000..3b931e6
--- /dev/null
+++ b/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/propertyInit_UInt.txt
@@ -0,0 +1,9 @@
+expression: 42u
+
+CONSTANT_EXPRESSION_EVALUATION
+constant: 42u
+constantValueKind: UInt
+
+CONSTANT_LIKE_EXPRESSION_EVALUATION
+constantLike: 42u
+constantLikeValueKind: UInt
diff --git a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/stringLiteral.kt b/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/stringLiteral.kt
similarity index 100%
rename from analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/stringLiteral.kt
rename to analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/stringLiteral.kt
diff --git a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/stringLiteral.txt b/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/stringLiteral.txt
new file mode 100644
index 0000000..f9f9b77
--- /dev/null
+++ b/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate/stringLiteral.txt
@@ -0,0 +1,9 @@
+expression: "42"
+
+CONSTANT_EXPRESSION_EVALUATION
+constant: "42"
+constantValueKind: String
+
+CONSTANT_LIKE_EXPRESSION_EVALUATION
+constantLike: "42"
+constantLikeValueKind: String
diff --git a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constant/namedReference_const.txt b/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constant/namedReference_const.txt
deleted file mode 100644
index 9ff5cc7..0000000
--- a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constant/namedReference_const.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-expression: bar
-constant: 42
-constantValueKind: Int
diff --git a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constant/namedReference_val.txt b/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constant/namedReference_val.txt
deleted file mode 100644
index 1ef30c1..0000000
--- a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constant/namedReference_val.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-expression: bar
-constant: NOT_EVALUATED
-constantValueKind: NOT_EVALUATED
diff --git a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constant/propertyInit_DivByOtherProperty_const.kt b/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constant/propertyInit_DivByOtherProperty_const.kt
deleted file mode 100644
index 8355293..0000000
--- a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constant/propertyInit_DivByOtherProperty_const.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-class Test {
- val p = <expr>42 / d</expr> // uninitialized d
- const val d = 1
-}
diff --git a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constant/propertyInit_DivByOtherProperty_const.txt b/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constant/propertyInit_DivByOtherProperty_const.txt
deleted file mode 100644
index 67e5f61..0000000
--- a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constant/propertyInit_DivByOtherProperty_const.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-expression: 42 / d
-constant: 42
-constantValueKind: Int
diff --git a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constant/propertyInit_DivByOtherProperty_val.descriptors.txt b/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constant/propertyInit_DivByOtherProperty_val.descriptors.txt
deleted file mode 100644
index 0fb51cc..0000000
--- a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constant/propertyInit_DivByOtherProperty_val.descriptors.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-expression: 42 / d
-constant: error("Division by zero")
-constantValueKind: Error
diff --git a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constant/propertyInit_DivByOtherProperty_val.kt b/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constant/propertyInit_DivByOtherProperty_val.kt
deleted file mode 100644
index 59e24ec..0000000
--- a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constant/propertyInit_DivByOtherProperty_val.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-class Test {
- val p = <expr>42 / d</expr> // uninitialized d
- val d = 0 // should not raise div-by-zero error
-}
-
diff --git a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constant/propertyInit_DivByOtherProperty_val.txt b/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constant/propertyInit_DivByOtherProperty_val.txt
deleted file mode 100644
index 0b93431..0000000
--- a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constant/propertyInit_DivByOtherProperty_val.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-expression: 42 / d
-constant: NOT_EVALUATED
-constantValueKind: NOT_EVALUATED
diff --git a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/binaryExpressionWithString.txt b/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/binaryExpressionWithString.txt
deleted file mode 100644
index 77c6bb2..0000000
--- a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/binaryExpressionWithString.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-expression: "message" + msg
-constant: NOT_EVALUATED
-constantValueKind: NOT_EVALUATED
diff --git a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/namedReference_const.kt b/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/namedReference_const.kt
deleted file mode 100644
index fd1ee8e..0000000
--- a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/namedReference_const.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-class Test {
- const val bar : Int = 42
-}
-
-fun box() {
- val t = Test()
- t.<expr>bar</expr>
-}
diff --git a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/namedReference_const.txt b/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/namedReference_const.txt
deleted file mode 100644
index 9ff5cc7..0000000
--- a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/namedReference_const.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-expression: bar
-constant: 42
-constantValueKind: Int
diff --git a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/namedReference_val.kt b/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/namedReference_val.kt
deleted file mode 100644
index 58ffcfe..0000000
--- a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/namedReference_val.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-class Test {
- val bar : Int = 42
-}
-
-fun box() {
- val t = Test()
- t.<expr>bar</expr>
-}
diff --git a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/namedReference_val.txt b/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/namedReference_val.txt
deleted file mode 100644
index 9ff5cc7..0000000
--- a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/namedReference_val.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-expression: bar
-constant: 42
-constantValueKind: Int
diff --git a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/namedReference_var.txt b/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/namedReference_var.txt
deleted file mode 100644
index 1ef30c1..0000000
--- a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/namedReference_var.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-expression: bar
-constant: NOT_EVALUATED
-constantValueKind: NOT_EVALUATED
diff --git a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/propertyInCompanionObject.txt b/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/propertyInCompanionObject.txt
deleted file mode 100644
index a082d0c..0000000
--- a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/propertyInCompanionObject.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-expression: someField
-constant: "something"
-constantValueKind: String
diff --git a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/propertyInCompanionObject_indirect.txt b/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/propertyInCompanionObject_indirect.txt
deleted file mode 100644
index 82c273b..0000000
--- a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/propertyInCompanionObject_indirect.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-expression: indirectPointer
-constant: "something"
-constantValueKind: String
diff --git a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/propertyInCompanionObject_indirect_twice.txt b/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/propertyInCompanionObject_indirect_twice.txt
deleted file mode 100644
index c493fcb4..0000000
--- a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/propertyInCompanionObject_indirect_twice.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-expression: oneMore
-constant: "something"
-constantValueKind: String
diff --git a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/propertyInit_Byte.txt b/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/propertyInit_Byte.txt
deleted file mode 100644
index 8ec31c1..0000000
--- a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/propertyInit_Byte.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-expression: 42
-constant: 42
-constantValueKind: Byte
diff --git a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/propertyInit_DivByOtherProperty_const.txt b/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/propertyInit_DivByOtherProperty_const.txt
deleted file mode 100644
index 67e5f61..0000000
--- a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/propertyInit_DivByOtherProperty_const.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-expression: 42 / d
-constant: 42
-constantValueKind: Int
diff --git a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/propertyInit_DivByOtherProperty_val.txt b/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/propertyInit_DivByOtherProperty_val.txt
deleted file mode 100644
index 67e5f61..0000000
--- a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/propertyInit_DivByOtherProperty_val.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-expression: 42 / d
-constant: 42
-constantValueKind: Int
diff --git a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/propertyInit_DivByZero.descriptors.txt b/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/propertyInit_DivByZero.descriptors.txt
deleted file mode 100644
index b6e7261..0000000
--- a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/propertyInit_DivByZero.descriptors.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-expression: 42 / 0
-constant: error("Division by zero")
-constantValueKind: Error
diff --git a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/propertyInit_DivByZero.txt b/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/propertyInit_DivByZero.txt
deleted file mode 100644
index d15d732..0000000
--- a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/propertyInit_DivByZero.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-expression: 42 / 0
-constant: error("/ by zero")
-constantValueKind: Error
diff --git a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/propertyInit_Double.txt b/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/propertyInit_Double.txt
deleted file mode 100644
index 81ac4f9..0000000
--- a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/propertyInit_Double.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-expression: 3.14
-constant: 3.14
-constantValueKind: Double
diff --git a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/propertyInit_Float.txt b/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/propertyInit_Float.txt
deleted file mode 100644
index fd09911..0000000
--- a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/propertyInit_Float.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-expression: 3.14f
-constant: 3.14f
-constantValueKind: Float
diff --git a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/propertyInit_Int.txt b/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/propertyInit_Int.txt
deleted file mode 100644
index 726a500..0000000
--- a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/propertyInit_Int.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-expression: 42
-constant: 42
-constantValueKind: Int
diff --git a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/propertyInit_Long.txt b/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/propertyInit_Long.txt
deleted file mode 100644
index 0063a31..0000000
--- a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/propertyInit_Long.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-expression: 42
-constant: 42
-constantValueKind: Long
diff --git a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/propertyInit_UInt.txt b/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/propertyInit_UInt.txt
deleted file mode 100644
index 3d2ee0a..0000000
--- a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/propertyInit_UInt.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-expression: 42u
-constant: 42u
-constantValueKind: UInt
diff --git a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/stringLiteral.txt b/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/stringLiteral.txt
deleted file mode 100644
index f072b4a..0000000
--- a/analysis/analysis-api/testData/components/compileTimeConstantProvider/evaluate_constantLike/stringLiteral.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-expression: "42"
-constant: "42"
-constantValueKind: String
diff --git a/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/analysisApi.kt b/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/analysisApi.kt
index 09516f3..6dbf592 100644
--- a/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/analysisApi.kt
+++ b/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/analysisApi.kt
@@ -15,8 +15,7 @@
import org.jetbrains.kotlin.analysis.api.impl.base.test.annotations.AbstractAnalysisApiAnnotationsOnTypesTest
import org.jetbrains.kotlin.analysis.api.impl.base.test.components.AbstractResolveCallTest
import org.jetbrains.kotlin.analysis.api.impl.base.test.components.AbstractResolveCandidatesTest
-import org.jetbrains.kotlin.analysis.api.impl.base.test.components.compileTimeConstantProvider.AbstractCompileTimeConstantEvaluatorConstantLikeTest
-import org.jetbrains.kotlin.analysis.api.impl.base.test.components.compileTimeConstantProvider.AbstractCompileTimeConstantEvaluatorConstantTest
+import org.jetbrains.kotlin.analysis.api.impl.base.test.components.compileTimeConstantProvider.AbstractCompileTimeConstantEvaluatorTest
import org.jetbrains.kotlin.analysis.api.impl.base.test.components.diagnosticProvider.AbstractCollectDiagnosticsTest
import org.jetbrains.kotlin.analysis.api.impl.base.test.components.expressionInfoProvider.AbstractReturnTargetSymbolTest
import org.jetbrains.kotlin.analysis.api.impl.base.test.components.expressionInfoProvider.AbstractWhenMissingCasesTest
@@ -144,11 +143,8 @@
}
component("compileTimeConstantProvider") {
- test(AbstractCompileTimeConstantEvaluatorConstantTest::class) {
- model("evaluate_constant")
- }
- test(AbstractCompileTimeConstantEvaluatorConstantLikeTest::class) {
- model("evaluate_constantLike")
+ test(AbstractCompileTimeConstantEvaluatorTest::class) {
+ model("evaluate")
}
}
