Attachment #120945 for bug #259096

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

Lines 9-14 Link Here

(-)src/org/eclipse/mtj/internal/jmunit/core/api/TestSuiteWriter.java (-2 / +3 lines)
9	* Contributors:	9	* Contributors:
10	* David Marques (Motorola) - Initial Version	10	* David Marques (Motorola) - Initial Version
11	* David Marques (Motorola) - Implementing updateSetupSuiteMethod method.	11	* David Marques (Motorola) - Implementing updateSetupSuiteMethod method.
		12	* David Marques (Motorola) - Fixing tag formatting behavior.
12	*/	13	*/
13	package org.eclipse.mtj.internal.jmunit.core.api;	14	package org.eclipse.mtj.internal.jmunit.core.api;
14		15
Lines 143-150 Link Here
143	adds.append(delimiter);	144	adds.append(delimiter);
144	}	145	}
145		146
146	int start = methodBuffer.indexOf(IJMUnitContants.START_MARKER) + IJMUnitContants.START_MARKER.length();	147	int start = methodBuffer.indexOf(IJMUnitContants.NON_COMMENT_START_MARKER) + IJMUnitContants.NON_COMMENT_START_MARKER.length();
147	int end = methodBuffer.indexOf(IJMUnitContants.END_MARKER);	148	int end = methodBuffer.indexOf(IJMUnitContants.COMMENT_START, start);
148	methodBuffer.replace(start, end, adds.toString());	149	methodBuffer.replace(start, end, adds.toString());
149		150
150	document.replace(methodRange.getOffset(), methodRange.getLength(), methodBuffer.toString());	151	document.replace(methodRange.getOffset(), methodRange.getLength(), methodBuffer.toString());

Lines 1-2 Link Here

(-)src/org/eclipse/mtj/internal/jmunit/ui/actions/messages.properties (+2 lines)
		1	UpdateJMUnitTestSuiteAction_ErrorUpdatingTestSuite=Error updating test suite
		2	UpdateJMUnitTestSuiteAction_MarkersNotFound=The markers on the setupSuite method are missing, unable to update suite tests.
1	UpdateJMUnitTestSuiteAction_UpdateTestSuite=Update Test Suite	3	UpdateJMUnitTestSuiteAction_UpdateTestSuite=Update Test Suite
2	UpdateJMUnitTestSuiteAction_UpdateTestSuiteTests=Select Suite Tests:	4	UpdateJMUnitTestSuiteAction_UpdateTestSuiteTests=Select Suite Tests:

Lines 15-20 Link Here

(-)src/org/eclipse/mtj/internal/jmunit/ui/actions/Messages.java (+2 lines)
15		15
16	public class Messages extends NLS {	16	public class Messages extends NLS {
17	private static final String BUNDLE_NAME = "org.eclipse.mtj.internal.jmunit.ui.actions.messages"; //$NON-NLS-1$	17	private static final String BUNDLE_NAME = "org.eclipse.mtj.internal.jmunit.ui.actions.messages"; //$NON-NLS-1$
		18	public static String UpdateJMUnitTestSuiteAction_ErrorUpdatingTestSuite;
		19	public static String UpdateJMUnitTestSuiteAction_MarkersNotFound;
18	public static String UpdateJMUnitTestSuiteAction_UpdateTestSuite;	20	public static String UpdateJMUnitTestSuiteAction_UpdateTestSuite;
19	public static String UpdateJMUnitTestSuiteAction_UpdateTestSuiteTests;	21	public static String UpdateJMUnitTestSuiteAction_UpdateTestSuiteTests;
20	static {	22	static {

Lines 9-14 Link Here

(-)src/org/eclipse/mtj/internal/jmunit/ui/actions/UpdateJMUnitTestSuiteAction.java (-8 / +42 lines)
9	* Contributors:	9	* Contributors:
10	* Diego Madruga (Motorola) - Initial version	10	* Diego Madruga (Motorola) - Initial version
11	* David Marques (Motorola) - Implementing class.	11	* David Marques (Motorola) - Implementing class.
		12	* David Marques (Motorola) - Fixing tag formatting behavior.
12	*	13	*
13	*	14	*
14	* @since 0.9.1	15	* @since 0.9.1
Lines 20-25 Link Here
20	import java.util.HashSet;	21	import java.util.HashSet;
21	import java.util.LinkedList;	22	import java.util.LinkedList;
22	import java.util.List;	23	import java.util.List;
		24	import java.util.regex.Matcher;
		25	import java.util.regex.Pattern;
23		26
24	import org.eclipse.core.runtime.CoreException;	27	import org.eclipse.core.runtime.CoreException;
25	import org.eclipse.core.runtime.IStatus;	28	import org.eclipse.core.runtime.IStatus;
Lines 33-38 Link Here
33	import org.eclipse.jdt.core.JavaModelException;	36	import org.eclipse.jdt.core.JavaModelException;
34	import org.eclipse.jdt.ui.JavaElementLabelProvider;	37	import org.eclipse.jdt.ui.JavaElementLabelProvider;
35	import org.eclipse.jface.action.IAction;	38	import org.eclipse.jface.action.IAction;
		39	import org.eclipse.jface.dialogs.MessageDialog;
36	import org.eclipse.jface.viewers.ILabelProvider;	40	import org.eclipse.jface.viewers.ILabelProvider;
37	import org.eclipse.jface.viewers.ISelection;	41	import org.eclipse.jface.viewers.ISelection;
38	import org.eclipse.jface.viewers.IStructuredContentProvider;	42	import org.eclipse.jface.viewers.IStructuredContentProvider;
Lines 98-104 Link Here
98	}	102	}
99	}	103	}
100	} catch (CoreException e) {	104	} catch (CoreException e) {
101	MTJCorePlugin.log(IStatus.ERROR, e);	105	MessageDialog.openError(Display.getDefault().getActiveShell()
		106	, Messages.UpdateJMUnitTestSuiteAction_ErrorUpdatingTestSuite, e.getMessage());
102	}	107	}
103	}	108	}
104		109
Lines 131-143 Link Here
131		136
132	IMethod method = clazzType.getMethod("setupSuite", new String[0]); //$NON-NLS-1$	137	IMethod method = clazzType.getMethod("setupSuite", new String[0]); //$NON-NLS-1$
133	if (method != null) {	138	if (method != null) {
134	StringBuffer buffer = new StringBuffer(method.getSource());	139	Pattern pattern = Pattern.compile(buildSetupSuiteMarkerExp(), Pattern.DOTALL \| Pattern.MULTILINE);
135	int startMarker = buffer.indexOf(IJMUnitContants.START_MARKER) + IJMUnitContants.START_MARKER.length();	140	Matcher matcher = pattern.matcher(method.getSource());
136	buffer.delete(0x00, startMarker);	141	if (matcher.find()) {
137	int endMarker = buffer.indexOf(IJMUnitContants.END_MARKER);	142	StringBuffer buffer = new StringBuffer(matcher.group());
138	buffer.delete(endMarker, buffer.length());	143	int start = 0x00;
139		144	int end = 0x00;
140	existingTypes = parseSetupSuite(buffer, clazzType.getJavaProject());	145
		146	end = buffer.indexOf(IJMUnitContants.NON_COMMENT_START_MARKER) + IJMUnitContants.NON_COMMENT_START_MARKER.length();
		147	buffer.delete(0x00, end);
		148
		149	start = buffer.indexOf(IJMUnitContants.COMMENT_START);
		150	end = buffer.indexOf(IJMUnitContants.NON_COMMENT_END_MARKER, start) + IJMUnitContants.NON_COMMENT_END_MARKER.length();
		151	buffer.delete(start, end);
		152
		153	existingTypes = parseSetupSuite(buffer, clazzType.getJavaProject());
		154	} else {
		155	MTJCorePlugin.throwCoreException(IStatus.ERROR, -999,
		156	Messages.UpdateJMUnitTestSuiteAction_MarkersNotFound);
		157	}
141	}	158	}
142	return existingTypes;	159	return existingTypes;
143	}	160	}
Lines 143-148 Link Here
143	}	160	}
144		161
145	/**	162	/**
		163	* Builds a regular expression for the test suite markers.
		164	*
		165	* @return the regular expression string.
		166	*/
		167	private String buildSetupSuiteMarkerExp() {
		168	StringBuffer regularExp = new StringBuffer();
		169	regularExp.append(IJMUnitContants.COMMENT_START);
		170	regularExp.append("(\\s)*"); //$NON-NLS-1$
		171	regularExp.append(IJMUnitContants.NON_COMMENT_START_MARKER);
		172	regularExp.append("(.)*"); //$NON-NLS-1$
		173	regularExp.append(IJMUnitContants.COMMENT_START);
		174	regularExp.append("(\\s)*"); //$NON-NLS-1$
		175	regularExp.append(IJMUnitContants.NON_COMMENT_END_MARKER);
		176	return regularExp.toString();
		177	}
		178
		179	/**
146	* Finds all tests contained in the type setupSuite method region.	180	* Finds all tests contained in the type setupSuite method region.
147	*	181	*
148	* @param buffer region buffer.	182	* @param buffer region buffer.

Return to bug 259096