diff --git a/python/testSrc/com/jetbrains/python/fixtures/PyTestCase.java b/python/testSrc/com/jetbrains/python/fixtures/PyTestCase.java index 18dec8438a21..9fd93f9ddfec 100644 --- a/python/testSrc/com/jetbrains/python/fixtures/PyTestCase.java +++ b/python/testSrc/com/jetbrains/python/fixtures/PyTestCase.java @@ -15,6 +15,7 @@ */ package com.jetbrains.python.fixtures; +import com.google.common.base.Joiner; import com.intellij.codeInsight.intention.IntentionAction; import com.intellij.codeInsight.lookup.LookupElement; import com.intellij.codeInspection.LocalQuickFix; @@ -68,11 +69,10 @@ import com.jetbrains.python.psi.impl.PyFileImpl; import com.jetbrains.python.psi.impl.PythonLanguageLevelPusher; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.junit.Assert; import java.io.File; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; +import java.util.*; /** * @author yole @@ -100,12 +100,12 @@ public abstract class PyTestCase extends UsefulTestCase { IdeaTestFixtureFactory factory = IdeaTestFixtureFactory.getFixtureFactory(); TestFixtureBuilder fixtureBuilder = factory.createLightFixtureBuilder(getProjectDescriptor()); final IdeaProjectTestFixture fixture = fixtureBuilder.getFixture(); - myFixture = IdeaTestFixtureFactory.getFixtureFactory().createCodeInsightFixture(fixture, - new LightTempDirTestFixtureImpl(true)); - myFixture.setUp(); + myFixture = IdeaTestFixtureFactory.getFixtureFactory().createCodeInsightFixture(fixture, + new LightTempDirTestFixtureImpl(true)); + myFixture.setUp(); - myFixture.setTestDataPath(getTestDataPath()); - } + myFixture.setTestDataPath(getTestDataPath()); + } protected String getTestDataPath() { return PythonTestUtil.getTestDataPath(); @@ -319,5 +319,18 @@ public abstract class PyTestCase extends UsefulTestCase { } return null; } + + /** + * Comares sets with string sorting them and displaying one-per-line to make comparision easier + * @param message message to display in case of error + * @param actual actual set + * @param expected expected set + */ + protected static void compareStringSets(@NotNull final String message, + @NotNull final Set actual, + @NotNull final Set expected) { + final Joiner joiner = Joiner.on("\n"); + Assert.assertEquals(message, joiner.join(new TreeSet(actual)), joiner.join(new TreeSet(expected))); + } }