Attachment #150079 for bug #248037

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 248037
Collapse All | Expand All

Lines 63-70 Link Here

(-)a/modules/tuxedo.testrunner/nbproject/project.xml (-5 / +21 lines)
63	<build-prerequisite/>	63	<build-prerequisite/>
64	<compile-dependency/>	64	<compile-dependency/>
65	<run-dependency>	65	<run-dependency>
66	<release-version>1</release-version>	66	<release-version>2</release-version>
67	<specification-version>1.31</specification-version>	67	<specification-version>2.0</specification-version>
		68	</run-dependency>
		69	</dependency>
		70	<dependency>
		71	<code-name-base>org.netbeans.modules.gsf.testrunner.ui</code-name-base>
		72	<build-prerequisite/>
		73	<compile-dependency/>
		74	<run-dependency>
		75	<specification-version>1.0</specification-version>
68	</run-dependency>	76	</run-dependency>
69	</dependency>	77	</dependency>
70	<dependency>	78	<dependency>
Lines 81-87 Link Here
81	<build-prerequisite/>	89	<build-prerequisite/>
82	<compile-dependency/>	90	<compile-dependency/>
83	<run-dependency>	91	<run-dependency>
84	<specification-version>7.47.1</specification-version>	92	<specification-version>9.0</specification-version>
85	</run-dependency>	93	</run-dependency>
86	</dependency>	94	</dependency>
87	<dependency>	95	<dependency>
Lines 97-103 Link Here
97	<build-prerequisite/>	105	<build-prerequisite/>
98	<compile-dependency/>	106	<compile-dependency/>
99	<run-dependency>	107	<run-dependency>
100	<specification-version>7.21.1</specification-version>	108	<specification-version>7.23</specification-version>
101	</run-dependency>	109	</run-dependency>
102	</dependency>	110	</dependency>
103	<dependency>	111	<dependency>
Lines 113-119 Link Here
113	<build-prerequisite/>	121	<build-prerequisite/>
114	<compile-dependency/>	122	<compile-dependency/>
115	<run-dependency>	123	<run-dependency>
116	<specification-version>8.15.1</specification-version>	124	<specification-version>9.0</specification-version>
		125	</run-dependency>
		126	</dependency>
		127	<dependency>
		128	<code-name-base>org.openide.util.base</code-name-base>
		129	<build-prerequisite/>
		130	<compile-dependency/>
		131	<run-dependency>
		132	<specification-version>9.0</specification-version>
117	</run-dependency>	133	</run-dependency>
118	</dependency>	134	</dependency>
119	<dependency>	135	<dependency>




import org.netbeans.api.extexecution.ExecutionDescriptor.LineConvertorFactory;
import org.netbeans.api.extexecution.print.LineConvertor;
import org.netbeans.api.project.Project;
import org.netbeans.modules.gsf.testrunner.ui.api.Manager;
import org.netbeans.modules.gsf.testrunner.api.RerunHandler;
import org.netbeans.modules.gsf.testrunner.api.RerunType;
import org.netbeans.modules.gsf.testrunner.api.TestSession;

    public void run(Project project, TuxedoSCAClient test, final TestRun run) {
        final TestSession session = new TestSession("Test", // NOI18N
                project,
                SessionType.TEST);

        final Manager manager = Manager.getInstance();
        manager.setNodeFactory(new CndTestRunnerNodeFactory());
        CndUnitHandlerFactory predefinedFactory = new CndUnitHandlerFactory();

        final List<TestHandlerFactory> factories = new ArrayList<TestHandlerFactory>();

Lines 9-15 Link Here

(-)a/modules/tuxedo.testrunner/src/com/sun/tools/tuxedo/testrunner/spi/TestRecognizerHandler.java (-1 / +1 lines)
9	import java.util.logging.Logger;	9	import java.util.logging.Logger;
10	import java.util.regex.Matcher;	10	import java.util.regex.Matcher;
11	import java.util.regex.Pattern;	11	import java.util.regex.Pattern;
12	import org.netbeans.modules.gsf.testrunner.api.Manager;	12	import org.netbeans.modules.gsf.testrunner.ui.api.Manager;
13	import org.netbeans.modules.gsf.testrunner.api.TestSession;	13	import org.netbeans.modules.gsf.testrunner.api.TestSession;
14		14
15	/**	15	/**

Lines 7-13 Link Here

(-)a/modules/tuxedo.testrunner/src/com/sun/tools/tuxedo/testrunner/ui/BaseTestMethodNodeAction.java (-1 / +1 lines)
7	import java.util.Collection;	7	import java.util.Collection;
8	import java.util.logging.Logger;	8	import java.util.logging.Logger;
9	import org.netbeans.api.project.Project;	9	import org.netbeans.api.project.Project;
10	import org.netbeans.modules.gsf.testrunner.api.TestNodeAction;	10	import org.netbeans.modules.gsf.testrunner.ui.api.TestNodeAction;
11	import org.netbeans.modules.gsf.testrunner.api.Testcase;	11	import org.netbeans.modules.gsf.testrunner.api.Testcase;
12	import org.openide.filesystems.FileObject;	12	import org.openide.filesystems.FileObject;
13	import org.openide.util.Lookup;	13	import org.openide.util.Lookup;

Lines 5-12 Link Here

(-)a/modules/tuxedo.testrunner/src/com/sun/tools/tuxedo/testrunner/ui/CndCallstackFrameNode.java (-2 / +2 lines)
5	package com.sun.tools.tuxedo.testrunner.ui;	5	package com.sun.tools.tuxedo.testrunner.ui;
6		6
7	import javax.swing.Action;	7	import javax.swing.Action;
8	import org.netbeans.modules.gsf.testrunner.api.CallstackFrameNode;	8	import org.netbeans.modules.gsf.testrunner.ui.api.CallstackFrameNode;
9	import org.netbeans.modules.gsf.testrunner.api.DiffViewAction;	9	import org.netbeans.modules.gsf.testrunner.ui.api.DiffViewAction;
10	import org.netbeans.modules.gsf.testrunner.api.Trouble.ComparisonFailure;	10	import org.netbeans.modules.gsf.testrunner.api.Trouble.ComparisonFailure;
11	import org.openide.util.actions.SystemAction;	11	import org.openide.util.actions.SystemAction;
12		12

Lines 8-16 Link Here

(-)a/modules/tuxedo.testrunner/src/com/sun/tools/tuxedo/testrunner/ui/CndTestMethodNode.java (-3 / +3 lines)
8	import java.util.List;	8	import java.util.List;
9	import javax.swing.Action;	9	import javax.swing.Action;
10	import org.netbeans.api.project.Project;	10	import org.netbeans.api.project.Project;
11	import org.netbeans.modules.gsf.testrunner.api.DiffViewAction;	11	import org.netbeans.modules.gsf.testrunner.ui.api.DiffViewAction;
12	import org.netbeans.modules.gsf.testrunner.api.Locator;	12	import org.netbeans.modules.gsf.testrunner.ui.api.Locator;
13	import org.netbeans.modules.gsf.testrunner.api.TestMethodNode;	13	import org.netbeans.modules.gsf.testrunner.ui.api.TestMethodNode;
14	import org.netbeans.modules.gsf.testrunner.api.Testcase;	14	import org.netbeans.modules.gsf.testrunner.api.Testcase;
15	import org.openide.nodes.Node;	15	import org.openide.nodes.Node;
16	import org.openide.util.NbBundle;	16	import org.openide.util.NbBundle;

Lines 5-13 Link Here

(-)a/modules/tuxedo.testrunner/src/com/sun/tools/tuxedo/testrunner/ui/CndTestRunnerNodeFactory.java (-2 / +2 lines)
5	package com.sun.tools.tuxedo.testrunner.ui;	5	package com.sun.tools.tuxedo.testrunner.ui;
6		6
7	import org.netbeans.api.project.Project;	7	import org.netbeans.api.project.Project;
8	import org.netbeans.modules.gsf.testrunner.api.TestRunnerNodeFactory;	8	import org.netbeans.modules.gsf.testrunner.ui.api.TestRunnerNodeFactory;
9	import org.netbeans.modules.gsf.testrunner.api.Testcase;	9	import org.netbeans.modules.gsf.testrunner.api.Testcase;
10	import org.netbeans.modules.gsf.testrunner.api.TestsuiteNode;	10	import org.netbeans.modules.gsf.testrunner.ui.api.TestsuiteNode;
11	import org.openide.nodes.Node;	11	import org.openide.nodes.Node;
12		12
13	/**	13	/**

Lines 7-15 Link Here

(-)a/modules/tuxedo.testrunner/src/com/sun/tools/tuxedo/testrunner/ui/CndTestsuiteNode.java (-2 / +2 lines)
7	import java.util.ArrayList;	7	import java.util.ArrayList;
8	import java.util.List;	8	import java.util.List;
9	import javax.swing.Action;	9	import javax.swing.Action;
10	import org.netbeans.modules.gsf.testrunner.api.Locator;	10	import org.netbeans.modules.gsf.testrunner.ui.api.Locator;
11	import org.netbeans.modules.gsf.testrunner.api.Testcase;	11	import org.netbeans.modules.gsf.testrunner.api.Testcase;
12	import org.netbeans.modules.gsf.testrunner.api.TestsuiteNode;	12	import org.netbeans.modules.gsf.testrunner.ui.api.TestsuiteNode;
13	import org.openide.nodes.Node;	13	import org.openide.nodes.Node;
14	import org.openide.util.NbBundle;	14	import org.openide.util.NbBundle;
15	import org.openide.util.lookup.Lookups;	15	import org.openide.util.lookup.Lookups;

Lines 13-19 Link Here

(-)a/modules/tuxedo.testrunner/src/com/sun/tools/tuxedo/testrunner/ui/CndUnitHandlerFactory.java (-1 / +1 lines)
13	import java.util.regex.Pattern;	13	import java.util.regex.Pattern;
14	import com.sun.tools.tuxedo.testrunner.spi.TestRecognizerHandler;	14	import com.sun.tools.tuxedo.testrunner.spi.TestRecognizerHandler;
15	import com.sun.tools.tuxedo.testrunner.spi.TestHandlerFactory;	15	import com.sun.tools.tuxedo.testrunner.spi.TestHandlerFactory;
16	import org.netbeans.modules.gsf.testrunner.api.Manager;	16	import org.netbeans.modules.gsf.testrunner.ui.api.Manager;
17	import org.netbeans.modules.gsf.testrunner.api.TestSession;	17	import org.netbeans.modules.gsf.testrunner.api.TestSession;
18	import org.netbeans.modules.gsf.testrunner.api.TestSuite;	18	import org.netbeans.modules.gsf.testrunner.api.TestSuite;
19	import org.netbeans.modules.gsf.testrunner.api.Testcase;	19	import org.netbeans.modules.gsf.testrunner.api.Testcase;

Lines 11-17 Link Here

(-)a/modules/tuxedo.testrunner/src/com/sun/tools/tuxedo/testrunner/ui/TestRunnerLineConvertor.java (-2 / +2 lines)
11	import java.util.logging.Logger;	11	import java.util.logging.Logger;
12	import org.netbeans.api.extexecution.print.ConvertedLine;	12	import org.netbeans.api.extexecution.print.ConvertedLine;
13	import org.netbeans.api.extexecution.print.LineConvertor;	13	import org.netbeans.api.extexecution.print.LineConvertor;
14	import org.netbeans.modules.gsf.testrunner.api.Manager;	14	import org.netbeans.modules.gsf.testrunner.ui.api.Manager;
15	import org.netbeans.modules.gsf.testrunner.api.RerunHandler;	15	import org.netbeans.modules.gsf.testrunner.api.RerunHandler;
16	import org.netbeans.modules.gsf.testrunner.api.TestSession;	16	import org.netbeans.modules.gsf.testrunner.api.TestSession;
17		17
Lines 37-43 Link Here
37		37
38	public synchronized void refreshSession() {	38	public synchronized void refreshSession() {
39	RerunHandler handler = this.session.getRerunHandler();	39	RerunHandler handler = this.session.getRerunHandler();
40	this.session = new TestSession(session.getName(), session.getProject(), session.getSessionType(), session.getNodeFactory());	40	this.session = new TestSession(session.getName(), session.getProject(), session.getSessionType());
41	session.setRerunHandler(handler);	41	session.setRerunHandler(handler);
42	}	42	}
43		43

Return to bug 248037

Lines 20-26 Link Here

(-)a/modules/tuxedo.testrunner/src/com/sun/tools/tuxedo/testrunner/TestRunnerProviderImpl.java (-2 / +3 lines)
20	import org.netbeans.api.extexecution.ExecutionDescriptor.LineConvertorFactory;	20	import org.netbeans.api.extexecution.ExecutionDescriptor.LineConvertorFactory;
21	import org.netbeans.api.extexecution.print.LineConvertor;	21	import org.netbeans.api.extexecution.print.LineConvertor;
22	import org.netbeans.api.project.Project;	22	import org.netbeans.api.project.Project;
23	import org.netbeans.modules.gsf.testrunner.api.Manager;	23	import org.netbeans.modules.gsf.testrunner.ui.api.Manager;
24	import org.netbeans.modules.gsf.testrunner.api.RerunHandler;	24	import org.netbeans.modules.gsf.testrunner.api.RerunHandler;
25	import org.netbeans.modules.gsf.testrunner.api.RerunType;	25	import org.netbeans.modules.gsf.testrunner.api.RerunType;
26	import org.netbeans.modules.gsf.testrunner.api.TestSession;	26	import org.netbeans.modules.gsf.testrunner.api.TestSession;
Lines 40-48 Link Here
40	public void run(Project project, TuxedoSCAClient test, final TestRun run) {	40	public void run(Project project, TuxedoSCAClient test, final TestRun run) {
41	final TestSession session = new TestSession("Test", // NOI18N	41	final TestSession session = new TestSession("Test", // NOI18N
42	project,	42	project,
43	SessionType.TEST, new CndTestRunnerNodeFactory());	43	SessionType.TEST);
44		44
45	final Manager manager = Manager.getInstance();	45	final Manager manager = Manager.getInstance();
		46	manager.setNodeFactory(new CndTestRunnerNodeFactory());
46	CndUnitHandlerFactory predefinedFactory = new CndUnitHandlerFactory();	47	CndUnitHandlerFactory predefinedFactory = new CndUnitHandlerFactory();
47		48
48	final List<TestHandlerFactory> factories = new ArrayList<TestHandlerFactory>();	49	final List<TestHandlerFactory> factories = new ArrayList<TestHandlerFactory>();