Attachment #71256 for bug #149315

This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 149315
Collapse All | Expand All

Lines 96-101 Link Here

(-)a/ruby.testrunner/src/org/netbeans/modules/ruby/testrunner/ui/Bundle.properties (+5 lines)
96	MSG_TestMethodPending_HTML_time=PENDING ({0,number,0.0##} s)	96	MSG_TestMethodPending_HTML_time=PENDING ({0,number,0.0##} s)
97	MSG_TestMethodError_HTML_time=caused an ERROR ({0,number,0.0##} s)	97	MSG_TestMethodError_HTML_time=caused an ERROR ({0,number,0.0##} s)
98		98
		99	MSG_TestMethodPassed_HTML_cause=passed
		100	MSG_TestMethodFailed_HTML_cause=FAILED ({0})
		101	MSG_TestMethodPending_HTML_cause=PENDING ({0})
		102	MSG_TestMethodError_HTML_cause=caused an ERROR ({0})
		103
99	# Elapsed time for a test suite	104	# Elapsed time for a test suite
100	MSG_TestSuiteElapsedTime= ({0,number,0.0##} s)	105	MSG_TestSuiteElapsedTime= ({0,number,0.0##} s)
101		106




package org.netbeans.modules.ruby.testrunner.ui;

import java.awt.Image;
import java.io.CharConversionException;
import java.util.HashMap;
import java.util.Map;
import javax.swing.Action;

import org.openide.util.ImageUtilities;
import org.openide.util.NbBundle;
import org.openide.util.actions.SystemAction;
import org.openide.xml.XMLUtil;

/**
 *
 * @author Marian Petras, Erno Mononen
 */
final class TestMethodNode extends AbstractNode {
    private static final boolean INLINE_RESULTS = Boolean.getBoolean("junit.inline_result"); // NOI18N

    /** */
    private final Report.Testcase testcase;

        buf.append("&nbsp;&nbsp;");                                     //NOI18N
        buf.append("<font color='#");                                   //NOI18N
        buf.append(status.getHtmlDisplayColor() + "'>"); //NOI18N

        String cause = null;
//        if (INLINE_RESULTS && testcase.trouble != null && testcase.trouble.message != null &&
//                !"null".equals(testcase.trouble.message)) { // NOI18N
        if (INLINE_RESULTS && testcase.trouble != null && testcase.trouble.stackTrace != null &&
                testcase.trouble.stackTrace.length > 0) {
            try {
                //cause = XMLUtil.toElementContent(testcase.trouble.message);
                cause = XMLUtil.toElementContent(testcase.trouble.stackTrace[0]);
            } catch (CharConversionException ex) {
                // We're messing with user testoutput - always risky. Don't complain
                // here, simply fall back to the old behavior of the test runner -
                // don't include the message
                cause = null;
            }
        }
        if (cause != null) {
            buf.append(NbBundle.getMessage(getClass(),
                     DisplayNameMapper.getCauseKey(status), cause));
        } else
        buf.append(testcase.timeMillis < 0
                   ? NbBundle.getMessage(getClass(),
                                         DisplayNameMapper.getNoTimeKey(status))

            result.put(Status.PENDING, "MSG_TestMethodPending_HTML_time"); //NOI18N
            return result;
        }

        private static final Map< Status,String> CAUSE_KEYS = initCauseKeys();
        private static Map< Status,String> initCauseKeys() {
            Map< Status,String> result = new HashMap< Status,String>(4);
            result.put(Status.PASSED, "MSG_TestMethodPassed_HTML_cause"); //NOI18N
            result.put(Status.ERROR, "MSG_TestMethodError_HTML_cause"); //NOI18N
            result.put(Status.FAILED, "MSG_TestMethodFailed_HTML_cause"); //NOI18N
            result.put(Status.PENDING, "MSG_TestMethodPending_HTML_cause"); //NOI18N
            return result;
        }
        static String getCauseKey(Status status) {
            return CAUSE_KEYS.get(status);
        }
        
        static String getNoTimeKey(Status status) {
            return NO_TIME_KEYS.get(status);

        static String getTimeKey(Status status) {
            return TIME_KEYS.get(status);
        }

    }
}

Return to bug 149315

Lines 42-47 Link Here

(-)a/ruby.testrunner/src/org/netbeans/modules/ruby/testrunner/ui/TestMethodNode.java (-1 / +36 lines)
42	package org.netbeans.modules.ruby.testrunner.ui;	42	package org.netbeans.modules.ruby.testrunner.ui;
43		43
44	import java.awt.Image;	44	import java.awt.Image;
		45	import java.io.CharConversionException;
45	import java.util.HashMap;	46	import java.util.HashMap;
46	import java.util.Map;	47	import java.util.Map;
47	import javax.swing.Action;	48	import javax.swing.Action;
Lines 51-62 Link Here
51	import org.openide.util.ImageUtilities;	52	import org.openide.util.ImageUtilities;
52	import org.openide.util.NbBundle;	53	import org.openide.util.NbBundle;
53	import org.openide.util.actions.SystemAction;	54	import org.openide.util.actions.SystemAction;
		55	import org.openide.xml.XMLUtil;
54		56
55	/**	57	/**
56	*	58	*
57	* @author Marian Petras, Erno Mononen	59	* @author Marian Petras, Erno Mononen
58	*/	60	*/
59	final class TestMethodNode extends AbstractNode {	61	final class TestMethodNode extends AbstractNode {
		62	private static final boolean INLINE_RESULTS = Boolean.getBoolean("junit.inline_result"); // NOI18N
60		63
61	/** */	64	/** */
62	private final Report.Testcase testcase;	65	private final Report.Testcase testcase;
Lines 119-124 Link Here
119	buf.append("  "); //NOI18N	122	buf.append("  "); //NOI18N
120	buf.append("<font color='#"); //NOI18N	123	buf.append("<font color='#"); //NOI18N
121	buf.append(status.getHtmlDisplayColor() + "'>"); //NOI18N	124	buf.append(status.getHtmlDisplayColor() + "'>"); //NOI18N
		125
		126	String cause = null;
		127	// if (INLINE_RESULTS && testcase.trouble != null && testcase.trouble.message != null &&
		128	// !"null".equals(testcase.trouble.message)) { // NOI18N
		129	if (INLINE_RESULTS && testcase.trouble != null && testcase.trouble.stackTrace != null &&
		130	testcase.trouble.stackTrace.length > 0) {
		131	try {
		132	//cause = XMLUtil.toElementContent(testcase.trouble.message);
		133	cause = XMLUtil.toElementContent(testcase.trouble.stackTrace[0]);
		134	} catch (CharConversionException ex) {
		135	// We're messing with user testoutput - always risky. Don't complain
		136	// here, simply fall back to the old behavior of the test runner -
		137	// don't include the message
		138	cause = null;
		139	}
		140	}
		141	if (cause != null) {
		142	buf.append(NbBundle.getMessage(getClass(),
		143	DisplayNameMapper.getCauseKey(status), cause));
		144	} else
122	buf.append(testcase.timeMillis < 0	145	buf.append(testcase.timeMillis < 0
123	? NbBundle.getMessage(getClass(),	146	? NbBundle.getMessage(getClass(),
124	DisplayNameMapper.getNoTimeKey(status))	147	DisplayNameMapper.getNoTimeKey(status))
Lines 211-216 Link Here
211	result.put(Status.PENDING, "MSG_TestMethodPending_HTML_time"); //NOI18N	234	result.put(Status.PENDING, "MSG_TestMethodPending_HTML_time"); //NOI18N
212	return result;	235	return result;
213	}	236	}
		237
		238	private static final Map< Status,String> CAUSE_KEYS = initCauseKeys();
		239	private static Map< Status,String> initCauseKeys() {
		240	Map< Status,String> result = new HashMap< Status,String>(4);
		241	result.put(Status.PASSED, "MSG_TestMethodPassed_HTML_cause"); //NOI18N
		242	result.put(Status.ERROR, "MSG_TestMethodError_HTML_cause"); //NOI18N
		243	result.put(Status.FAILED, "MSG_TestMethodFailed_HTML_cause"); //NOI18N
		244	result.put(Status.PENDING, "MSG_TestMethodPending_HTML_cause"); //NOI18N
		245	return result;
		246	}
		247	static String getCauseKey(Status status) {
		248	return CAUSE_KEYS.get(status);
		249	}
214		250
215	static String getNoTimeKey(Status status) {	251	static String getNoTimeKey(Status status) {
216	return NO_TIME_KEYS.get(status);	252	return NO_TIME_KEYS.get(status);
Lines 219-224 Link Here
219	static String getTimeKey(Status status) {	255	static String getTimeKey(Status status) {
220	return TIME_KEYS.get(status);	256	return TIME_KEYS.get(status);
221	}	257	}
222
223	}	258	}
224	}	259	}