Menu
▾
▴
[Rubyeclipse-commit] SF.net SVN: rubyeclipse: [2040] trunk/org.rubypeople.rdt.testunit
|
From: <mir...@us...> - 2007-02-26 15:52:00
|
Revision: 2040
http://svn.sourceforge.net/rubyeclipse/?rev=2040&view=rev
Author: mirkostocker
Date: 2007-02-26 07:51:57 -0800 (Mon, 26 Feb 2007)
Log Message:
-----------
Copy the CompareResultDialog from JUnit and adapt to the testunit plug-in. Also change the RemoteTestRunner.rb to spit out the actual/expected text (I hope my solution is ok). I often have to compare text diffs in my tests and it annoyed me that we didn't have this feature, so here it is :)
Modified Paths:
--------------
trunk/org.rubypeople.rdt.testunit/META-INF/MANIFEST.MF
trunk/org.rubypeople.rdt.testunit/ruby/RemoteTestRunner.rb
trunk/org.rubypeople.rdt.testunit/src/org/rubypeople/rdt/internal/testunit/ui/CompareResultsAction.java
trunk/org.rubypeople.rdt.testunit/src/org/rubypeople/rdt/internal/testunit/ui/TestHierarchyTab.java
trunk/org.rubypeople.rdt.testunit/src/org/rubypeople/rdt/internal/testunit/ui/TestUnitMessages.java
Added Paths:
-----------
trunk/org.rubypeople.rdt.testunit/src/org/rubypeople/rdt/internal/testunit/ui/CompareResultDialog.java
Modified: trunk/org.rubypeople.rdt.testunit/META-INF/MANIFEST.MF
===================================================================
--- trunk/org.rubypeople.rdt.testunit/META-INF/MANIFEST.MF 2007-02-26 15:31:48 UTC (rev 2039)
+++ trunk/org.rubypeople.rdt.testunit/META-INF/MANIFEST.MF 2007-02-26 15:51:57 UTC (rev 2040)
@@ -21,5 +21,7 @@
org.eclipse.ui.workbench.texteditor,
org.eclipse.text,
org.jruby,
- org.eclipse.ui.ide
+ org.eclipse.ui.ide,
+ org.eclipse.compare,
+ org.eclipse.jface.text
Eclipse-LazyStart: true
Modified: trunk/org.rubypeople.rdt.testunit/ruby/RemoteTestRunner.rb
===================================================================
--- trunk/org.rubypeople.rdt.testunit/ruby/RemoteTestRunner.rb 2007-02-26 15:31:48 UTC (rev 2039)
+++ trunk/org.rubypeople.rdt.testunit/ruby/RemoteTestRunner.rb 2007-02-26 15:51:57 UTC (rev 2040)
@@ -106,6 +106,26 @@
def start_mediator # :nodoc:
return @mediator.run_suite
end
+
+ def convert_newlines(str)
+ str.gsub("\\n", "\n").gsub("\\r", "\r")
+ end
+
+ def output_actual(msg)
+ output_single("%ACTUALS \n")
+ msg =~ /<"(.*)">\.$/
+ actual = convert_newlines($1)
+ output_single("#{actual}\n")
+ output_single("%ACTUALE \n")
+ end
+
+ def output_expected(msg)
+ output_single("%EXPECTS \n")
+ msg =~ /^<"(.*?)">/
+ expected = convert_newlines($1)
+ output_single("#{expected}\n")
+ output_single("%EXPECTE \n")
+ end
def add_fault(fault) # :nodoc:
@faults << fault
@@ -118,6 +138,12 @@
header = "Exception: #{fault.exception.message}"
stack_trace = get_trace(fault.exception.backtrace)
end
+
+ if fault.message =~ /^<".*?">.*<".*?">\.$/m
+ output_actual(fault.message)
+ output_expected(fault.message)
+ end
+
output_single("#{fault_type}#{@last_test_id},#{@last_test_name}\n")
output_single("%TRACES \n")
output_single("#{header}\n")
Added: trunk/org.rubypeople.rdt.testunit/src/org/rubypeople/rdt/internal/testunit/ui/CompareResultDialog.java
===================================================================
--- trunk/org.rubypeople.rdt.testunit/src/org/rubypeople/rdt/internal/testunit/ui/CompareResultDialog.java (rev 0)
+++ trunk/org.rubypeople.rdt.testunit/src/org/rubypeople/rdt/internal/testunit/ui/CompareResultDialog.java 2007-02-26 15:51:57 UTC (rev 2040)
@@ -0,0 +1,220 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.rubypeople.rdt.internal.testunit.ui;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+
+import org.eclipse.compare.CompareConfiguration;
+import org.eclipse.compare.CompareViewerPane;
+import org.eclipse.compare.IEncodedStreamContentAccessor;
+import org.eclipse.compare.ITypedElement;
+import org.eclipse.compare.contentmergeviewer.TextMergeViewer;
+import org.eclipse.compare.structuremergeviewer.DiffNode;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.dialogs.TrayDialog;
+import org.eclipse.jface.text.DocumentEvent;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.IRegion;
+import org.eclipse.jface.text.ITypedRegion;
+import org.eclipse.jface.text.Region;
+import org.eclipse.jface.text.TextAttribute;
+import org.eclipse.jface.text.TextPresentation;
+import org.eclipse.jface.text.TextViewer;
+import org.eclipse.jface.text.presentation.IPresentationDamager;
+import org.eclipse.jface.text.presentation.IPresentationReconciler;
+import org.eclipse.jface.text.presentation.IPresentationRepairer;
+import org.eclipse.jface.text.presentation.PresentationReconciler;
+import org.eclipse.jface.text.source.ISourceViewer;
+import org.eclipse.jface.text.source.SourceViewer;
+import org.eclipse.jface.text.source.SourceViewerConfiguration;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.StyleRange;
+import org.eclipse.swt.events.DisposeEvent;
+import org.eclipse.swt.events.DisposeListener;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Shell;
+
+public class CompareResultDialog extends TrayDialog {
+ private static class CompareResultMergeViewer extends TextMergeViewer {
+ private CompareResultMergeViewer(Composite parent, int style, CompareConfiguration configuration) {
+ super(parent, style, configuration);
+ }
+
+ protected void createControls(Composite composite) {
+ super.createControls(composite);
+ //PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, IJUnitHelpContextIds.RESULT_COMPARE_DIALOG);
+ }
+
+ protected void configureTextViewer(TextViewer textViewer) {
+ if (textViewer instanceof SourceViewer) {
+ ((SourceViewer)textViewer).configure(new CompareResultViewerConfiguration());
+ }
+ }
+ }
+
+ public static class CompareResultViewerConfiguration extends SourceViewerConfiguration {
+ public static class SimpleDamagerRepairer implements IPresentationDamager, IPresentationRepairer {
+ private IDocument fDocument;
+
+ public void setDocument(IDocument document) {
+ fDocument= document;
+ }
+
+ public IRegion getDamageRegion(ITypedRegion partition, DocumentEvent event, boolean changed) {
+ return new Region(0, fDocument.getLength());
+ }
+
+ public void createPresentation(TextPresentation presentation, ITypedRegion damage) {
+ int suffix= CompareResultDialog.fgThis.fSuffix;
+ int prefix= CompareResultDialog.fgThis.fPrefix;
+ TextAttribute attr= new TextAttribute(Display.getDefault().getSystemColor(SWT.COLOR_RED), null, SWT.BOLD);
+ presentation.addStyleRange(new StyleRange(prefix, fDocument.getLength()-suffix-prefix, attr.getForeground(), attr.getBackground(), attr.getStyle()));
+ }
+ }
+
+ public IPresentationReconciler getPresentationReconciler(ISourceViewer sourceViewer) {
+ PresentationReconciler reconciler= new PresentationReconciler();
+ SimpleDamagerRepairer dr= new SimpleDamagerRepairer();
+ reconciler.setDamager(dr, IDocument.DEFAULT_CONTENT_TYPE);
+ reconciler.setRepairer(dr, IDocument.DEFAULT_CONTENT_TYPE);
+ return reconciler;
+ }
+ }
+
+ private static class CompareElement implements ITypedElement, IEncodedStreamContentAccessor {
+ private String fContent;
+
+ public CompareElement(String content) {
+ fContent= content;
+ }
+ public String getName() {
+ return "<no name>"; //$NON-NLS-1$
+ }
+ public Image getImage() {
+ return null;
+ }
+ public String getType() {
+ return "txt"; //$NON-NLS-1$
+ }
+ public InputStream getContents() {
+ try {
+ return new ByteArrayInputStream(fContent.getBytes("UTF-8")); //$NON-NLS-1$
+ } catch (UnsupportedEncodingException e) {
+ return new ByteArrayInputStream(fContent.getBytes());
+ }
+ }
+ public String getCharset() throws CoreException {
+ return "UTF-8"; //$NON-NLS-1$
+ }
+ }
+
+ private TextMergeViewer fViewer;
+ private String fExpected;
+ private String fActual;
+ private String fTestName;
+
+ /* workaround - to make prefix and suffix accessible to the CompareResultViewerConfiguration */
+ private static CompareResultDialog fgThis;
+
+ private int fPrefix;
+ private int fSuffix;
+
+ public CompareResultDialog(Shell parentShell, TestRunInfo element) {
+ super(parentShell);
+ fgThis= this;
+ setShellStyle(getShellStyle() | SWT.RESIZE | SWT.MAX);
+ fTestName= element.getTestName();
+ fExpected= element.getExpected();
+ fActual= element.getActual();
+ computePrefixSuffix();
+ }
+
+ private void computePrefixSuffix() {
+ int end= Math.min(fExpected.length(), fActual.length());
+ int i= 0;
+ for(; i < end; i++)
+ if (fExpected.charAt(i) != fActual.charAt(i))
+ break;
+ fPrefix= i;
+
+ int j= fExpected.length()-1;
+ int k= fActual.length()-1;
+ int l= 0;
+ for (; k >= fPrefix && j >= fPrefix; k--,j--) {
+ if (fExpected.charAt(j) != fActual.charAt(k))
+ break;
+ l++;
+ }
+ fSuffix= l;
+ }
+
+ protected void configureShell(Shell newShell) {
+ super.configureShell(newShell);
+ newShell.setText(TestUnitMessages.CompareResultDialog_title);
+ //PlatformUI.getWorkbench().getHelpSystem().setHelp(newShell, IJUnitHelpContextIds.RESULT_COMPARE_DIALOG);
+ }
+
+ protected void createButtonsForButtonBar(Composite parent) {
+ createButton(parent, IDialogConstants.OK_ID, TestUnitMessages.CompareResultDialog_labelOK, true);
+ }
+
+ protected Control createDialogArea(Composite parent) {
+ Composite composite = (Composite)super.createDialogArea(parent);
+ GridLayout layout= new GridLayout();
+ layout.numColumns= 1;
+ composite.setLayout(layout);
+
+ CompareViewerPane pane = new CompareViewerPane(composite, SWT.BORDER | SWT.FLAT);
+ pane.setText(fTestName);
+ GridData data= new GridData(GridData.FILL_HORIZONTAL | GridData.FILL_VERTICAL);
+ data.widthHint= convertWidthInCharsToPixels(120);
+ data.heightHint= convertHeightInCharsToPixels(13);
+ pane.setLayoutData(data);
+
+ Control previewer= createPreviewer(pane);
+ pane.setContent(previewer);
+ GridData gd= new GridData(GridData.FILL_BOTH);
+ previewer.setLayoutData(gd);
+ applyDialogFont(parent);
+ return composite;
+ }
+
+ private Control createPreviewer(Composite parent) {
+ final CompareConfiguration compareConfiguration= new CompareConfiguration();
+ compareConfiguration.setLeftLabel(TestUnitMessages.CompareResultDialog_expectedLabel);
+ compareConfiguration.setLeftEditable(false);
+ compareConfiguration.setRightLabel(TestUnitMessages.CompareResultDialog_actualLabel);
+ compareConfiguration.setRightEditable(false);
+ compareConfiguration.setProperty(CompareConfiguration.IGNORE_WHITESPACE, Boolean.FALSE);
+
+ fViewer= new CompareResultMergeViewer(parent, SWT.NONE, compareConfiguration);
+ fViewer.setInput(new DiffNode(
+ new CompareElement(fExpected),
+ new CompareElement(fActual)));
+
+ Control control= fViewer.getControl();
+ control.addDisposeListener(new DisposeListener() {
+ public void widgetDisposed(DisposeEvent e) {
+ if (compareConfiguration != null)
+ compareConfiguration.dispose();
+ }
+ });
+ return control;
+ }
+}
Modified: trunk/org.rubypeople.rdt.testunit/src/org/rubypeople/rdt/internal/testunit/ui/CompareResultsAction.java
===================================================================
--- trunk/org.rubypeople.rdt.testunit/src/org/rubypeople/rdt/internal/testunit/ui/CompareResultsAction.java 2007-02-26 15:31:48 UTC (rev 2039)
+++ trunk/org.rubypeople.rdt.testunit/src/org/rubypeople/rdt/internal/testunit/ui/CompareResultsAction.java 2007-02-26 15:51:57 UTC (rev 2040)
@@ -18,8 +18,11 @@
public class CompareResultsAction extends Action {
+ private final FailureTrace fView;
+
public CompareResultsAction(FailureTrace view) {
super(TestUnitMessages.CompareResultsAction_label);
+ this.fView = view;
setDescription(TestUnitMessages.CompareResultsAction_description);
setToolTipText(TestUnitMessages.CompareResultsAction_tooltip);
@@ -33,8 +36,8 @@
*/
public void run() {
// TODO Allow comparison of results
-// CompareResultDialog dialog = new CompareResultDialog(fView.getShell(), fView.getFailedTest());
-// dialog.create();
-// dialog.open();
+ CompareResultDialog dialog = new CompareResultDialog(fView.getShell(), fView.getFailedTest());
+ dialog.create();
+ dialog.open();
}
}
\ No newline at end of file
Modified: trunk/org.rubypeople.rdt.testunit/src/org/rubypeople/rdt/internal/testunit/ui/TestHierarchyTab.java
===================================================================
--- trunk/org.rubypeople.rdt.testunit/src/org/rubypeople/rdt/internal/testunit/ui/TestHierarchyTab.java 2007-02-26 15:31:48 UTC (rev 2039)
+++ trunk/org.rubypeople.rdt.testunit/src/org/rubypeople/rdt/internal/testunit/ui/TestHierarchyTab.java 2007-02-26 15:51:57 UTC (rev 2040)
@@ -411,7 +411,6 @@
if (testInfo == null)
return;
- String testLabel= testInfo.getTestName();
IAction action = null;
Shell shell = fTree.getShell();
@@ -427,9 +426,6 @@
public void menuAboutToShow(IMenuManager manager) {
if (fTree.getSelectionCount() > 0) {
- TreeItem treeItem = fTree.getSelection()[0];
- TestRunInfo testInfo = (TestRunInfo) treeItem.getData();
- String testLabel = testInfo.getTestName();
Shell shell = fTree.getShell();
ISymbolFinder symbolFinder = RubyCore.getPlugin().getSymbolFinder();
if (isSuiteSelected()) {
Modified: trunk/org.rubypeople.rdt.testunit/src/org/rubypeople/rdt/internal/testunit/ui/TestUnitMessages.java
===================================================================
--- trunk/org.rubypeople.rdt.testunit/src/org/rubypeople/rdt/internal/testunit/ui/TestUnitMessages.java 2007-02-26 15:31:48 UTC (rev 2039)
+++ trunk/org.rubypeople.rdt.testunit/src/org/rubypeople/rdt/internal/testunit/ui/TestUnitMessages.java 2007-02-26 15:51:57 UTC (rev 2040)
@@ -63,6 +63,10 @@
public static String TestRunnerViewPart_message_finish;
public static String TestRunnerViewPart_message_started;
public static String TestRunnerViewPart_configName;
+ public static String CompareResultDialog_expectedLabel;
+ public static String CompareResultDialog_actualLabel;
+ public static String CompareResultDialog_labelOK;
+ public static String CompareResultDialog_title;
static {
NLS.initializeMessages(BUNDLE_NAME, TestUnitMessages.class);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
