Skip to content

Commit d63eeb9

Browse files
author
jossonsmith
committed
Merge /trunk upto [214]
Implement Java2Script's JUnit
1 parent c9dfa90 commit d63eeb9

File tree

7 files changed

+1014
-2
lines changed

7 files changed

+1014
-2
lines changed

‎META-INF/MANIFEST.MF

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ Require-Bundle: org.eclipse.ui,
2828
org.eclipse.ltk.ui.refactoring,
2929
org.eclipse.ui.console,
3030
net.sf.j2s.core,
31-
org.eclipse.core.filesystem
31+
org.eclipse.core.filesystem;
32+
org.junit,
33+
org.eclipse.jdt.junit
3234
Eclipse-AutoStart: true
3335
Main-Class: net.sf.j2s.ui.jdtenhancer.JDTCoreEnhancer

‎plugin.xml

Lines changed: 81 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
class="net.sf.j2s.ui.launching.J2SApplicationLaunchShortcut"
5959
helpContextId="org.eclipse.jdt.debug.ui.shortcut_local_java_application"
6060
icon="icons/z-logo.gif"
61-
id="net.sf.j2s.debug.ui.localJavaShortcut"
61+
id="net.sf.j2s.debug.ui.localJava2ScriptShortcut"
6262
label="Java2Script Application"
6363
modes="run, debug">
6464
<contextualLaunch>
@@ -89,8 +89,52 @@
8989
<perspective
9090
id="org.eclipse.debug.ui.DebugPerspective">
9191
</perspective>
92+
<perspective
93+
id="org.eclipse.pde.PDEPerspective">
94+
</perspective>
9295
<perspective id="org.eclipse.ui.resourcePerspective"/>
9396
</shortcut>
97+
<shortcut
98+
label="Java2Script Unit Test"
99+
icon="icons/z-logo.gif"
100+
modes="run, debug"
101+
class="net.sf.j2s.ui.launching.J2SUnitLaunchShortcut"
102+
id="net.sf.j2s.debug.ui.localJ2SJUnitShortcut">
103+
<contextualLaunch>
104+
<enablement>
105+
<with
106+
variable="selection">
107+
<count
108+
value="1">
109+
</count>
110+
<iterate>
111+
<or>
112+
<test property="org.eclipse.debug.ui.matchesPattern" value="*.java"/>
113+
<test property="org.eclipse.debug.ui.matchesPattern" value="*.class"/>
114+
<adapt type="org.eclipse.jdt.core.IJavaElement"/>
115+
</or>
116+
<!--test property="org.eclipse.pde.core.PluginNature"/-->
117+
<test property="org.eclipse.jdt.junit.isTest"/>
118+
</iterate>
119+
</with>
120+
</enablement>
121+
</contextualLaunch>
122+
<perspective
123+
id="org.eclipse.jdt.ui.JavaPerspective">
124+
</perspective>
125+
<perspective
126+
id="org.eclipse.jdt.ui.JavaHierarchyPerspective">
127+
</perspective>
128+
<perspective
129+
id="org.eclipse.jdt.ui.JavaBrowsingPerspective">
130+
</perspective>
131+
<perspective
132+
id="org.eclipse.debug.ui.DebugPerspective">
133+
</perspective>
134+
<perspective
135+
id="org.eclipse.pde.PDEPerspective">
136+
</perspective>
137+
</shortcut>
94138
</extension>
95139
<extension
96140
point="org.eclipse.ui.perspectiveExtensions">
@@ -109,6 +153,22 @@
109153
class="net.sf.j2s.ui.launching.J2SLaunchingTabGroup"
110154
id="net.sf.j2s.ui.launching.launchConfigurationTabGroup.j2sApplication"
111155
type="net.sf.j2s.ui.launching.j2sApplication"/>
156+
<launchConfigurationTabGroup
157+
type="net.sf.j2s.ui.launching.j2sUnit"
158+
class="net.sf.j2s.ui.launching.J2SUnitTabGroup"
159+
id="net.sf.j2s.ui.launching.launchConfigurationTabGroup.j2sUnit">
160+
<!--
161+
<launchMode
162+
description="%jUnitTabGroup.description.debug"
163+
perspective="org.eclipse.debug.ui.DebugPerspective"
164+
mode="debug">
165+
</launchMode>
166+
<launchMode
167+
description="%jUnitTabGroup.description.run"
168+
mode="run">
169+
</launchMode>
170+
-->
171+
</launchConfigurationTabGroup>
112172
</extension>
113173
<extension
114174
point="org.eclipse.debug.core.launchConfigurationTypes">
@@ -117,13 +177,33 @@
117177
id="net.sf.j2s.ui.launching.j2sApplication"
118178
modes="run, debug"
119179
name="Java2Script Application"/>
180+
<launchConfigurationType
181+
sourceLocatorId="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"
182+
name="Java2Script Unit Test"
183+
sourcePathComputerId="org.eclipse.jdt.launching.sourceLookup.javaSourcePathComputer"
184+
delegate="net.sf.j2s.ui.launching.J2SUnitConfigurationDelegate"
185+
modes="run, debug"
186+
id="net.sf.j2s.ui.launching.j2sUnit">
187+
<fileExtension
188+
default="false"
189+
extension="java">
190+
</fileExtension>
191+
<fileExtension
192+
default="false"
193+
extension="class">
194+
</fileExtension>
195+
</launchConfigurationType>
120196
</extension>
121197
<extension
122198
point="org.eclipse.debug.ui.launchConfigurationTypeImages">
123199
<launchConfigurationTypeImage
124200
configTypeID="net.sf.j2s.ui.launching.j2sApplication"
125201
icon="icons/z-logo.gif"
126202
id="net.sf.j2s.ui.launching.launchConfigurationTypeImage.j2sApplication"/>
203+
<launchConfigurationTypeImage
204+
icon="icons/z-logo.gif"
205+
configTypeID="net.sf.j2s.ui.launching.j2sUnit"
206+
id="net.sf.j2s.ui.launching.launchConfigurationTypeImage.j2sUnit"/>
127207
</extension>
128208
<extension
129209
point="org.eclipse.ui.editors">

‎src/net/sf/j2s/ui/launching/J2SUnitConfigurationDelegate.java

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
package net.sf.j2s.ui.launching;
2+
3+
import org.eclipse.core.runtime.CoreException;
4+
import org.eclipse.core.runtime.IProgressMonitor;
5+
import org.eclipse.debug.core.ILaunch;
6+
import org.eclipse.debug.core.ILaunchConfiguration;
7+
import org.eclipse.debug.core.model.LaunchConfigurationDelegate;
8+
9+
public class J2SUnitConfigurationDelegate extends LaunchConfigurationDelegate {
10+
11+
public J2SUnitConfigurationDelegate() {
12+
super();
13+
}
14+
15+
public void launch(ILaunchConfiguration configuration, String mode,
16+
ILaunch launch, IProgressMonitor monitor) throws CoreException {
17+
if (configuration != null) {
18+
try {
19+
J2SUnitLaunchingUtil.launchingJ2SUnit(configuration);
20+
} catch (CoreException e) {
21+
e.printStackTrace();
22+
}
23+
//DebugUITools.launch(config, mode);
24+
}
25+
}
26+
27+
}

0 commit comments

Comments
 (0)