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

Check idea with apiVersion instead of BUILD_NUMBER

Browse Source 
BUILD_NUMBER is probably rewritten in tests from KotlinCoreEnvironment.
This commit is contained in:
Nikolay Krasko
2018-02-14 13:21:59 +03:00
parent 882913c773
commit 71043821da
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractOutOfBlockModificationTest.java
+7 -4
View File
@@ -16,7 +16,7 @@
package org.jetbrains.kotlin.idea.codeInsight;
import com.intellij.ide.plugins.PluginManagerCore;
import com.intellij.openapi.application.ApplicationInfo;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.util.text.StringUtil;
@@ -55,9 +55,12 @@ public abstract class AbstractOutOfBlockModificationTest extends KotlinLightCode
boolean expectedOutOfBlock = getExpectedOutOfBlockResult();
boolean isSkipCheckDefined = InTextDirectivesUtils.isDirectiveDefined(myFixture.getFile().getText(), "SKIP_ANALYZE_CHECK");
if ("InGlobalPropertyWithGetter".equals(getTestName(false)) && PluginManagerCore.BUILD_NUMBER.contains("-173.")) {
expectedOutOfBlock = true;
isSkipCheckDefined = true;
if ("InGlobalPropertyWithGetter".equals(getTestName(false))) {
String apiVersion = ApplicationInfo.getInstance().getApiVersion();
if (apiVersion != null && apiVersion.contains("-173.")) {
expectedOutOfBlock = true;
isSkipCheckDefined = true;
}
}
assertTrue("It's allowed to skip check with analyze only for tests where out-of-block is expected",