Skip to content

Commit 8a2c107

Browse files
committed
Make JUnit diff order consistent with the default compare diff order
Similar to the refactoring wizard, JUnit diff order was always NOT following "traditional" Eclipse compare editor diff order (left is "new", right is "old"), so that "natural" order expected / actual was inconsistent with the compare editor preference, but it was based on this preference (via CompareConfiguration). Now the "natural" order is default, swap the sides in JUNit diff pane to keep same order in as before left: expected, right: actual. See eclipse-platform/eclipse.platform#2566 See eclipse-platform/eclipse.platform.ui#3777 See eclipse-platform/eclipse.platform.ui#3776 (comment)
1 parent 4533252 commit 8a2c107

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/ui/CompareResultDialog.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -254,9 +254,9 @@ protected Control createDialogArea(Composite parent) {
254254

255255
private Control createPreviewer(Composite parent) {
256256
final CompareConfiguration compareConfiguration= new CompareConfiguration();
257-
compareConfiguration.setLeftLabel(JUnitMessages.CompareResultDialog_expectedLabel);
257+
compareConfiguration.setLeftLabel(JUnitMessages.CompareResultDialog_actualLabel);
258258
compareConfiguration.setLeftEditable(false);
259-
compareConfiguration.setRightLabel(JUnitMessages.CompareResultDialog_actualLabel);
259+
compareConfiguration.setRightLabel(JUnitMessages.CompareResultDialog_expectedLabel);
260260
compareConfiguration.setRightEditable(false);
261261
compareConfiguration.setProperty(CompareConfiguration.IGNORE_WHITESPACE, Boolean.FALSE);
262262
compareConfiguration.setProperty(PREFIX_SUFFIX_PROPERTY, fPrefixSuffix);
@@ -271,7 +271,7 @@ private Control createPreviewer(Composite parent) {
271271

272272
private void setCompareViewerInput() {
273273
if (!fViewer.getControl().isDisposed()) {
274-
fViewer.setInput(new DiffNode(new CompareElement(fExpected), new CompareElement(fActual)));
274+
fViewer.setInput(new DiffNode(new CompareElement(fActual), new CompareElement(fExpected)));
275275
fCompareViewerPane.setText(fTestName);
276276
}
277277
}

0 commit comments

Comments
 (0)