From 4db54ee6e58dbb19a14992d0ebe17add6c6a6499 Mon Sep 17 00:00:00 2001 From: "Anna.Kozlova" Date: Thu, 19 Jul 2018 18:59:53 +0200 Subject: [PATCH] enable univocity property test on TC --- .../propertyBased/AbstractApplyAndRevertTestCase.java | 9 --------- .../com/intellij/java/propertyBased/UnivocityTest.java | 8 ++++++-- .../testFramework/testSrc/tests/testGroups.properties | 4 ++-- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/java/java-tests/testSrc/com/intellij/java/propertyBased/AbstractApplyAndRevertTestCase.java b/java/java-tests/testSrc/com/intellij/java/propertyBased/AbstractApplyAndRevertTestCase.java index aec9a5652a6e..2241f6738229 100644 --- a/java/java-tests/testSrc/com/intellij/java/propertyBased/AbstractApplyAndRevertTestCase.java +++ b/java/java-tests/testSrc/com/intellij/java/propertyBased/AbstractApplyAndRevertTestCase.java @@ -26,7 +26,6 @@ import com.intellij.psi.search.GlobalSearchScope; import com.intellij.testFramework.CompilerTester; import com.intellij.testFramework.PlatformTestCase; import com.intellij.testFramework.TestDataProvider; -import com.intellij.testFramework.UsefulTestCase; import com.intellij.util.containers.ContainerUtil; import kotlin.Unit; import org.jetbrains.jetCheck.Generator; @@ -55,14 +54,6 @@ public abstract class AbstractApplyAndRevertTestCase extends PlatformTestCase { return javaFiles().map(vf -> (PsiJavaFile)PsiManager.getInstance(myProject).findFile(vf)); } - @Override - protected boolean shouldRunTest() { - if (UsefulTestCase.IS_UNDER_TEAMCITY) { - return false; - } - return super.shouldRunTest(); - } - protected abstract String getTestDataPath(); public void setUp() throws Exception { diff --git a/java/java-tests/testSrc/com/intellij/java/propertyBased/UnivocityTest.java b/java/java-tests/testSrc/com/intellij/java/propertyBased/UnivocityTest.java index b479b4839c22..9eb6922f7898 100644 --- a/java/java-tests/testSrc/com/intellij/java/propertyBased/UnivocityTest.java +++ b/java/java-tests/testSrc/com/intellij/java/propertyBased/UnivocityTest.java @@ -15,6 +15,8 @@ */ package com.intellij.java.propertyBased; +import com.intellij.idea.Bombed; +import com.intellij.openapi.application.PathManager; import com.intellij.psi.PsiDocumentManager; import com.intellij.psi.PsiJavaFile; import com.intellij.psi.PsiManager; @@ -22,11 +24,12 @@ import com.intellij.psi.impl.PsiDocumentManagerImpl; import com.intellij.psi.util.PsiModificationTracker; import com.intellij.testFramework.SkipSlowTestLocally; import com.intellij.testFramework.propertyBased.*; -import com.intellij.util.SystemProperties; import org.jetbrains.jetCheck.Generator; import org.jetbrains.jetCheck.IntDistribution; import org.jetbrains.jetCheck.PropertyChecker; +import java.io.File; +import java.util.Calendar; import java.util.concurrent.atomic.AtomicLong; @SkipSlowTestLocally @@ -39,6 +42,7 @@ public class UnivocityTest extends AbstractApplyAndRevertTestCase { MadTestingUtil.enableAllInspections(myProject, myProject); } + @Bombed(user = "ann", month = Calendar.AUGUST, day = 31) public void testCompilabilityAfterIntentions() { initCompiler(); PsiModificationTracker tracker = PsiManager.getInstance(myProject).getModificationTracker(); @@ -87,7 +91,7 @@ public class UnivocityTest extends AbstractApplyAndRevertTestCase { @Override protected String getTestDataPath() { - return SystemProperties.getUserHome() + "/IdeaProjects/univocity-parsers"; + return new File(PathManager.getHomePath(), "univocity-parsers").getAbsolutePath(); } } diff --git a/platform/testFramework/testSrc/tests/testGroups.properties b/platform/testFramework/testSrc/tests/testGroups.properties index 4705f14f0d1e..78e8c2ff405b 100644 --- a/platform/testFramework/testSrc/tests/testGroups.properties +++ b/platform/testFramework/testSrc/tests/testGroups.properties @@ -147,10 +147,10 @@ com.siyeh.* -com.intellij.javaee.* -com.intellij.javascript.* -com.intellij.java.compiler.* --com.intellij.java.propertyBased.JavaCodeInsightSanityTest --com.intellij.java.propertyBased.JavaPsiIndexConsistencyTest +-com.intellij.java.propertyBased.* [COMMUNITY_EXPLORATORY_TESTS] +com.intellij.java.propertyBased.UnivocityTest com.intellij.java.propertyBased.JavaCodeInsightSanityTest com.intellij.java.propertyBased.JavaPsiIndexConsistencyTest com.intellij.lang.properties.propertyBased.PropertiesCodeInsightSanityTest