From 27b654cc5014543edf521bea4f18eb94037f66ea Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Sat, 4 Oct 2014 22:56:23 +0400 Subject: [PATCH] Refactoring: rename and make public --- .../codeInsight/AbstractLineMarkersTest.java | 4 +-- .../highlighter/AbstractHighlightingTest.java | 4 +-- ...estDataUtil.java => TagsTestDataUtil.java} | 32 +++++++++++-------- 3 files changed, 22 insertions(+), 18 deletions(-) rename idea/tests/org/jetbrains/jet/testing/{HighlightTestDataUtil.java => TagsTestDataUtil.java} (85%) diff --git a/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractLineMarkersTest.java b/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractLineMarkersTest.java index 3bcf6646c60..202ca24a807 100644 --- a/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractLineMarkersTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractLineMarkersTest.java @@ -35,8 +35,8 @@ import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase; import org.jetbrains.jet.plugin.PluginTestCaseBase; import org.jetbrains.jet.plugin.highlighter.markers.SuperDeclarationMarkerNavigationHandler; import org.jetbrains.jet.plugin.navigation.NavigationTestUtils; -import org.jetbrains.jet.testing.HighlightTestDataUtil; import org.jetbrains.jet.testing.ReferenceUtils; +import org.jetbrains.jet.testing.TagsTestDataUtil; import org.junit.Assert; import java.io.File; @@ -75,7 +75,7 @@ public abstract class AbstractLineMarkersTest extends JetLightCodeInsightFixture } catch (AssertionError error) { try { - String actualTextWithTestData = HighlightTestDataUtil.insertInfoTags(markers, true, myFixture.getFile().getText()); + String actualTextWithTestData = TagsTestDataUtil.insertInfoTags(markers, true, myFixture.getFile().getText()); JetTestUtils.assertEqualsToFile(new File(getTestDataPath(), fileName()), actualTextWithTestData); } catch (FileComparisonFailure failure) { diff --git a/idea/tests/org/jetbrains/jet/plugin/highlighter/AbstractHighlightingTest.java b/idea/tests/org/jetbrains/jet/plugin/highlighter/AbstractHighlightingTest.java index b276da1063a..0841a393809 100644 --- a/idea/tests/org/jetbrains/jet/plugin/highlighter/AbstractHighlightingTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/highlighter/AbstractHighlightingTest.java @@ -25,7 +25,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.InTextDirectivesUtils; import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase; import org.jetbrains.jet.plugin.JetLightProjectDescriptor; -import org.jetbrains.jet.testing.HighlightTestDataUtil; +import org.jetbrains.jet.testing.TagsTestDataUtil; import java.io.File; import java.util.List; @@ -53,7 +53,7 @@ public abstract class AbstractHighlightingTest extends JetLightCodeInsightFixtur DaemonCodeAnalyzerImpl.getHighlights(myFixture.getDocument(myFixture.getFile()), null, myFixture.getProject()); String text = myFixture.getFile().getText(); - System.out.println(HighlightTestDataUtil.insertInfoTags(highlights, text)); + System.out.println(TagsTestDataUtil.insertInfoTags(highlights, text)); throw e; } } diff --git a/idea/tests/org/jetbrains/jet/testing/HighlightTestDataUtil.java b/idea/tests/org/jetbrains/jet/testing/TagsTestDataUtil.java similarity index 85% rename from idea/tests/org/jetbrains/jet/testing/HighlightTestDataUtil.java rename to idea/tests/org/jetbrains/jet/testing/TagsTestDataUtil.java index 33a2e346e60..b4f81365c5a 100644 --- a/idea/tests/org/jetbrains/jet/testing/HighlightTestDataUtil.java +++ b/idea/tests/org/jetbrains/jet/testing/TagsTestDataUtil.java @@ -25,7 +25,7 @@ import org.jetbrains.annotations.NotNull; import java.util.List; -public class HighlightTestDataUtil { +public class TagsTestDataUtil { public static String insertInfoTags(List lineMarkers, boolean withDescription, String text) { List lineMarkerPoints = Lists.newArrayList(); for (LineMarkerInfo markerInfo : lineMarkers) { @@ -46,13 +46,13 @@ public class HighlightTestDataUtil { return insertTagsInText(highlightPoints, text); } - private static String insertTagsInText(List tags, String text) { + public static String insertTagsInText(List tags, String text) { StringBuilder builder = new StringBuilder(text); - List sortedTagPoints = Ordering.natural().reverse().sortedCopy(tags); + List sortedTagPoints = Ordering.natural().reverse().sortedCopy(tags); // Insert tags into text starting from the end for preventing invalidating previous tags offsets - for (HighlightTag point : sortedTagPoints) { + for (TagInfo point : sortedTagPoints) { String tagText; if (point.isStart) { String attributesString = point.getAttributesString(); @@ -73,19 +73,19 @@ public class HighlightTestDataUtil { return builder.toString(); } - private static abstract class HighlightTag implements Comparable> { + public static class TagInfo implements Comparable> { protected final int offset; protected final boolean isStart; protected final Data data; - private HighlightTag(int offset, boolean start, Data data) { + public TagInfo(int offset, boolean start, Data data) { this.offset = offset; isStart = start; this.data = data; } @Override - public int compareTo(@NotNull HighlightTag other) { + public int compareTo(@NotNull TagInfo other) { if (offset != other.offset) { return ((Integer) offset).compareTo(other.offset); } @@ -103,13 +103,17 @@ public class HighlightTestDataUtil { } @NotNull - abstract String getName(); + public String getName() { + return data.toString(); + } @NotNull - abstract String getAttributesString(); + public String getAttributesString() { + return ""; + } } - private static class HighlightTagPoint extends HighlightTag { + private static class HighlightTagPoint extends TagInfo { private final HighlightInfo highlightInfo; private HighlightTagPoint(int offset, boolean start, HighlightInfo info) { @@ -127,7 +131,7 @@ public class HighlightTestDataUtil { @NotNull @Override - String getAttributesString() { + public String getAttributesString() { if (isStart) { if (highlightInfo.getDescription() != null) { return String.format("textAttributesKey=\"%s\" descr=%s", @@ -144,7 +148,7 @@ public class HighlightTestDataUtil { } } - private static class LineMarkerTagPoint extends HighlightTag { + private static class LineMarkerTagPoint extends TagInfo { private final boolean withDescription; public LineMarkerTagPoint(int offset, boolean start, LineMarkerInfo info, boolean withDescription) { @@ -154,13 +158,13 @@ public class HighlightTestDataUtil { @NotNull @Override - String getName() { + public String getName() { return "lineMarker"; } @NotNull @Override - String getAttributesString() { + public String getAttributesString() { return withDescription ? String.format("descr=\"%s\"", data.getLineMarkerTooltip()) : "descr=\"*\""; } }