MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

diff: fix tests

Browse Source
This commit is contained in:
Aleksey Pivovarov
2015-02-03 20:17:33 +03:00
parent 82a976000b
commit 8b3bedf29a
2 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/diff-impl/tests/com/intellij/diff/comparison/ComparisonUtilAutoTest.java
+11 -8
View File
@@ -35,6 +35,7 @@ import java.util.Map;
@SuppressWarnings({"InstanceofCatchParameter"})
public class ComparisonUtilAutoTest extends AutoTestCase {
private static DumbProgressIndicator INDICATOR = DumbProgressIndicator.INSTANCE;
private static ComparisonManager myComparisonManager = new ComparisonManagerImpl();
private static int CHAR_COUNT = 12;
private static Map<Integer, Character> CHAR_TABLE = initCharMap();
@@ -79,7 +80,7 @@ public class ComparisonUtilAutoTest extends AutoTestCase {
CharSequence sequence1 = text1.getCharsSequence();
CharSequence sequence2 = text2.getCharsSequence();
List<LineFragment> fragments = ComparisonManager.getInstance().compareLinesInner(sequence1, sequence2, policy, INDICATOR);
List<LineFragment> fragments = myComparisonManager.compareLinesInner(sequence1, sequence2, policy, INDICATOR);
debugData.set(fragments);
checkResultLine(text1, text2, fragments, policy, true);
@@ -96,10 +97,10 @@ public class ComparisonUtilAutoTest extends AutoTestCase {
CharSequence sequence1 = text1.getCharsSequence();
CharSequence sequence2 = text2.getCharsSequence();
List<LineFragment> fragments = ComparisonManager.getInstance().compareLinesInner(sequence1, sequence2, policy, INDICATOR);
List<LineFragment> fragments = myComparisonManager.compareLinesInner(sequence1, sequence2, policy, INDICATOR);
debugData.set(fragments);
List<LineFragment> squashedFragments = ComparisonManager.getInstance().squash(fragments);
List<LineFragment> squashedFragments = myComparisonManager.squash(fragments);
debugData.set(new Object[]{fragments, squashedFragments});
checkResultLine(text1, text2, squashedFragments, policy, false);
@@ -116,10 +117,10 @@ public class ComparisonUtilAutoTest extends AutoTestCase {
CharSequence sequence1 = text1.getCharsSequence();
CharSequence sequence2 = text2.getCharsSequence();
List<LineFragment> fragments = ComparisonManager.getInstance().compareLinesInner(sequence1, sequence2, policy, INDICATOR);
List<LineFragment> fragments = myComparisonManager.compareLinesInner(sequence1, sequence2, policy, INDICATOR);
debugData.set(fragments);
List<LineFragment> processed = ComparisonManager.getInstance().processBlocks(fragments, sequence1, sequence2, policy, true, true);
List<LineFragment> processed = myComparisonManager.processBlocks(fragments, sequence1, sequence2, policy, true, true);
debugData.set(new Object[]{fragments, processed});
checkResultLine(text1, text2, processed, policy, false);
@@ -133,11 +134,13 @@ public class ComparisonUtilAutoTest extends AutoTestCase {
doTest(seed, runs, maxLength, policies, new TestTask() {
@Override
public void run(@NotNull Document text1, @NotNull Document text2, @NotNull ComparisonPolicy policy, @NotNull Ref<Object> debugData) {
List<DiffFragment> fragments = ComparisonManager.getInstance()
.compareChars(text1.getCharsSequence(), text2.getCharsSequence(), policy, INDICATOR);
CharSequence sequence1 = text1.getCharsSequence();
CharSequence sequence2 = text2.getCharsSequence();
List<DiffFragment> fragments = myComparisonManager.compareChars(sequence1, sequence2, policy, INDICATOR);
debugData.set(fragments);
checkResultChar(text1.getCharsSequence(), text2.getCharsSequence(), fragments, policy);
checkResultChar(sequence1, sequence2, fragments, policy);
}
});
}
platform/diff-impl/tests/com/intellij/diff/comparison/ComparisonUtilTestBase.java
+14 -9
View File
@@ -33,6 +33,7 @@ import java.util.List;
public abstract class ComparisonUtilTestBase extends UsefulTestCase {
private static DumbProgressIndicator INDICATOR = DumbProgressIndicator.INSTANCE;
private static ComparisonManager myComparisonManager = new ComparisonManagerImpl();
private boolean myOldRegistryValue;
@@ -58,8 +59,9 @@ public abstract class ComparisonUtilTestBase extends UsefulTestCase {
@Nullable Couple<BitSet> matchings,
@Nullable List<Change> expected,
@NotNull ComparisonPolicy policy) {
List<LineFragment> fragments = ComparisonManager.getInstance()
.compareLines(before.getCharsSequence(), after.getCharsSequence(), policy, INDICATOR);
CharSequence sequence1 = before.getCharsSequence();
CharSequence sequence2 = after.getCharsSequence();
List<LineFragment> fragments = myComparisonManager.compareLines(sequence1, sequence2, policy, INDICATOR);
checkConsistency(fragments, before, after, policy);
if (matchings != null) checkLineMatching(fragments, before, after, matchings, policy);
if (expected != null) checkLineChanges(fragments, before, after, expected, policy);
@@ -70,9 +72,10 @@ public abstract class ComparisonUtilTestBase extends UsefulTestCase {
@Nullable Couple<BitSet> matchings,
@Nullable List<Change> expected,
@NotNull ComparisonPolicy policy) {
List<LineFragment> rawFragments = ComparisonManager.getInstance()
.compareLinesInner(before.getCharsSequence(), after.getCharsSequence(), policy, INDICATOR);
List<LineFragment> fragments = ComparisonManager.getInstance().squash(rawFragments);
CharSequence sequence1 = before.getCharsSequence();
CharSequence sequence2 = after.getCharsSequence();
List<LineFragment> rawFragments = myComparisonManager.compareLinesInner(sequence1, sequence2, policy, INDICATOR);
List<LineFragment> fragments = myComparisonManager.squash(rawFragments);
checkConsistencyWord(fragments, before, after, policy);
@@ -88,8 +91,9 @@ public abstract class ComparisonUtilTestBase extends UsefulTestCase {
@Nullable Couple<BitSet> matchings,
@Nullable List<Change> expected,
@NotNull ComparisonPolicy policy) {
List<DiffFragment> fragments = ComparisonManager.getInstance()
.compareChars(before.getCharsSequence(), after.getCharsSequence(), policy, INDICATOR);
CharSequence sequence1 = before.getCharsSequence();
CharSequence sequence2 = after.getCharsSequence();
List<DiffFragment> fragments = myComparisonManager.compareChars(sequence1, sequence2, policy, INDICATOR);
checkConsistency(fragments, before, after, policy);
if (matchings != null) checkDiffMatching(fragments, before, after, matchings, policy);
if (expected != null) checkDiffChanges(fragments, before, after, expected, policy);
@@ -100,8 +104,9 @@ public abstract class ComparisonUtilTestBase extends UsefulTestCase {
@Nullable Couple<BitSet> matchings,
@Nullable List<Change> expected,
@NotNull ComparisonPolicy policy) {
List<LineFragment> fragments = ComparisonManager.getInstance()
.compareLinesInner(before.getCharsSequence(), after.getCharsSequence(), policy, INDICATOR);
CharSequence sequence1 = before.getCharsSequence();
CharSequence sequence2 = after.getCharsSequence();
List<LineFragment> fragments = myComparisonManager.compareLinesInner(sequence1, sequence2, policy, INDICATOR);
checkConsistency(fragments, before, after, policy);
if (matchings != null) checkLineMatching(fragments, before, after, matchings, policy);
if (expected != null) checkLineChanges(fragments, before, after, expected, policy);