feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Ambiguous tests added for differ.

Browse Source 
Change-Id: I274e65034534bba5895b586742474b8c0baf4efc
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
This commit is contained in:
jkobus
2014-01-16 14:00:44 +01:00
committed by Jarek Kobus
parent 4d3a26beea
commit ea0562059b
1 changed files with 101 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/auto/diff/differ/tst_differ.cpp
+101
View File
@@ -600,6 +600,55 @@ void tst_Differ::cleanupSemantics_data()
<< Diff(Diff::Delete, QString("S"))
<< Diff(Diff::Equal, QString("TU"))
<< Diff(Diff::Insert, QString("VW")));
// All ambiguous tests below should return the same result, but they don't.
QTest::newRow("Ambiguous 1")
<< (QList<Diff>()
<< Diff(Diff::Equal, QString("A"))
<< Diff(Diff::Delete, QString("X"))
<< Diff(Diff::Insert, QString("W "))
<< Diff(Diff::Equal, QString(" "))
<< Diff(Diff::Delete, QString("Y"))
<< Diff(Diff::Insert, QString("Z"))
<< Diff(Diff::Equal, QString("B")))
<< (QList<Diff>()
<< Diff(Diff::Equal, QString("A"))
<< Diff(Diff::Delete, QString("X"))
<< Diff(Diff::Insert, QString("W "))
<< Diff(Diff::Equal, QString(" "))
<< Diff(Diff::Delete, QString("Y"))
<< Diff(Diff::Insert, QString("Z"))
<< Diff(Diff::Equal, QString("B")));
QTest::newRow("Ambiguous 2")
<< (QList<Diff>()
<< Diff(Diff::Equal, QString("A"))
<< Diff(Diff::Delete, QString("X"))
<< Diff(Diff::Insert, QString("W "))
<< Diff(Diff::Equal, QString(" "))
<< Diff(Diff::Delete, QString("Y"))
<< Diff(Diff::Insert, QString(" Z"))
<< Diff(Diff::Equal, QString("B")))
<< (QList<Diff>()
<< Diff(Diff::Equal, QString("A"))
<< Diff(Diff::Delete, QString("X Y"))
<< Diff(Diff::Insert, QString("W Z"))
<< Diff(Diff::Equal, QString("B")));
QTest::newRow("Ambiguous 3")
<< (QList<Diff>()
<< Diff(Diff::Equal, QString("A"))
<< Diff(Diff::Delete, QString("X"))
<< Diff(Diff::Insert, QString("W"))
<< Diff(Diff::Equal, QString(" "))
<< Diff(Diff::Delete, QString("Y"))
<< Diff(Diff::Insert, QString(" Z"))
<< Diff(Diff::Equal, QString("B")))
<< (QList<Diff>()
<< Diff(Diff::Equal, QString("A"))
<< Diff(Diff::Delete, QString("X"))
<< Diff(Diff::Insert, QString("W"))
<< Diff(Diff::Equal, QString(" "))
<< Diff(Diff::Delete, QString("Y"))
<< Diff(Diff::Insert, QString(" Z"))
<< Diff(Diff::Equal, QString("B")));
}
void tst_Differ::cleanupSemantics()
@@ -690,6 +739,58 @@ void tst_Differ::cleanupSemanticsLossless_data()
<< Diff(Diff::Equal, QString("That "))
<< Diff(Diff::Insert, QString("cat "))
<< Diff(Diff::Equal, QString("cartoon")));
// All ambiguous tests below should return the same result, but they don't.
QTest::newRow("Ambiguous 1")
<< (QList<Diff>()
<< Diff(Diff::Equal, QString("A"))
<< Diff(Diff::Delete, QString("X"))
<< Diff(Diff::Insert, QString("W "))
<< Diff(Diff::Equal, QString(" "))
<< Diff(Diff::Delete, QString("Y"))
<< Diff(Diff::Insert, QString("Z"))
<< Diff(Diff::Equal, QString("B")))
<< (QList<Diff>()
<< Diff(Diff::Equal, QString("A"))
<< Diff(Diff::Delete, QString("X"))
<< Diff(Diff::Insert, QString("W "))
<< Diff(Diff::Equal, QString(" "))
<< Diff(Diff::Delete, QString("Y"))
<< Diff(Diff::Insert, QString("Z"))
<< Diff(Diff::Equal, QString("B")));
QTest::newRow("Ambiguous 2")
<< (QList<Diff>()
<< Diff(Diff::Equal, QString("A"))
<< Diff(Diff::Delete, QString("X"))
<< Diff(Diff::Insert, QString("W "))
<< Diff(Diff::Equal, QString(" "))
<< Diff(Diff::Delete, QString("Y"))
<< Diff(Diff::Insert, QString(" Z"))
<< Diff(Diff::Equal, QString("B")))
<< (QList<Diff>()
<< Diff(Diff::Equal, QString("A"))
<< Diff(Diff::Delete, QString("X"))
<< Diff(Diff::Insert, QString("W "))
<< Diff(Diff::Equal, QString(" "))
<< Diff(Diff::Delete, QString("Y"))
<< Diff(Diff::Insert, QString(" Z"))
<< Diff(Diff::Equal, QString("B")));
QTest::newRow("Ambiguous 3")
<< (QList<Diff>()
<< Diff(Diff::Equal, QString("A"))
<< Diff(Diff::Delete, QString("X"))
<< Diff(Diff::Insert, QString("W"))
<< Diff(Diff::Equal, QString(" "))
<< Diff(Diff::Delete, QString("Y"))
<< Diff(Diff::Insert, QString(" Z"))
<< Diff(Diff::Equal, QString("B")))
<< (QList<Diff>()
<< Diff(Diff::Equal, QString("A"))
<< Diff(Diff::Delete, QString("X"))
<< Diff(Diff::Insert, QString("W"))
<< Diff(Diff::Equal, QString(" "))
<< Diff(Diff::Delete, QString("Y"))
<< Diff(Diff::Insert, QString(" Z"))
<< Diff(Diff::Equal, QString("B")));
}
void tst_Differ::cleanupSemanticsLossless()