+ * Two modes of operation: + *
+ * Configuration via system properties: + *
Extend {@link PredefinedTests} to add more entries; no other class + * needs to change. + */ +public final class JUnitTestDescriptor { + + /** Human-readable label shown in the selection dialog. */ + private final String label; + + /** + * Fully-qualified class name of the JUnit test class, + * e.g. {@code com.example.myapp.tests.MyFeatureTest}. + */ + private final String testClassName; + + /** + * Optional method name. When {@code null} the whole class is run. + * When set, only that single test method is run, + * e.g. {@code testParseValidDocument}. + */ + private final String testMethodName; + + private final String testObjective; + + // ----------------------------------------------------------------------- + + /** + * Creates a descriptor for running an entire test class. + */ + public JUnitTestDescriptor(String label, String testClassName) { + this(label, testClassName, null, null); + } + + public JUnitTestDescriptor(String label, String testClassName, String testMethodName) { + this(label, testClassName, testMethodName, null); + } + + + /** + * Creates a descriptor for running a single test method. + */ + public JUnitTestDescriptor(String label, String testClassName, String testMethodName, String testObjective) { + this.label = label; + this.testClassName = testClassName; + this.testMethodName = testMethodName; + this.testObjective = testObjective; + } + + // ----------------------------------------------------------------------- + + public String getLabel() { return label; } + public String getTestClassName() { return testClassName; } + public String getTestMethodName() { return testMethodName; } + public String getTestObjective() { return testObjective; } + + /** Returns {@code true} when only a single method should be executed. */ + public boolean hasSingleMethod() { return testMethodName != null && !testMethodName.isEmpty(); } + public boolean hastestObjective() { return testObjective != null && !testObjective.isEmpty(); } + + @Override + public String toString() { return label; } +} \ No newline at end of file diff --git a/plugins/org.etsi.mts.tdl.execution.java/src/org/etsi/mts/tdl/execution/java/eclipse/commands/RenderHandler.java b/plugins/org.etsi.mts.tdl.execution.java/src/org/etsi/mts/tdl/execution/java/eclipse/commands/RenderHandler.java index a9a05cf7e4b5cf95288a8f341f1fa32ab34fd159..90788bb300e9abb7cc521d9cd9707088d941b429 100644 --- a/plugins/org.etsi.mts.tdl.execution.java/src/org/etsi/mts/tdl/execution/java/eclipse/commands/RenderHandler.java +++ b/plugins/org.etsi.mts.tdl.execution.java/src/org/etsi/mts/tdl/execution/java/eclipse/commands/RenderHandler.java @@ -25,7 +25,9 @@ import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.ui.IEditorInput; import org.eclipse.ui.handlers.HandlerUtil; +import org.eclipse.ui.part.FileEditorInput; import org.etsi.mts.tdl.Package; import org.etsi.mts.tdl.execution.java.codegen.JUnitTestGenerator; import org.etsi.mts.tdl.execution.java.codegen.Settings; @@ -39,7 +41,10 @@ public class RenderHandler extends AbstractHandler implements IHandler { IFile tdl = null; ISelection selection = HandlerUtil.getCurrentSelection(event); - if (selection instanceof IStructuredSelection && !selection.isEmpty()) { + IEditorInput input = HandlerUtil.getActiveEditorInput(event); + if (input != null && input instanceof FileEditorInput) { + tdl = ((FileEditorInput) input).getFile(); + } else if (selection instanceof IStructuredSelection && !selection.isEmpty()) { Object element = ((IStructuredSelection) selection).getFirstElement(); if (element instanceof IFile) { String ext = ((IFile) element).getFileExtension(); @@ -69,7 +74,8 @@ public class RenderHandler extends AbstractHandler implements IHandler { preferences.get(Settings.INJECTOR, ""), preferences.get(Settings.DATE_FORMAT, ""), preferences.get(Settings.USE_MAPPING, ""), - preferences.getBoolean(Settings.UNMAPPED_DATA, false)); + preferences.getBoolean(Settings.UNMAPPED_DATA, false), + preferences.getBoolean(Settings.LOG_BEHAVIOUR_TRACES, false)); JUnitTestGenerator generator = new JUnitTestGenerator(model, settings); diff --git a/plugins/org.etsi.mts.tdl.execution.java/src/org/etsi/mts/tdl/execution/java/eclipse/commands/RunJUnitTestHandler.java b/plugins/org.etsi.mts.tdl.execution.java/src/org/etsi/mts/tdl/execution/java/eclipse/commands/RunJUnitTestHandler.java new file mode 100644 index 0000000000000000000000000000000000000000..a0922b5a72d6eb1edf19597a19011339eb957742 --- /dev/null +++ b/plugins/org.etsi.mts.tdl.execution.java/src/org/etsi/mts/tdl/execution/java/eclipse/commands/RunJUnitTestHandler.java @@ -0,0 +1,286 @@ +package org.etsi.mts.tdl.execution.java.eclipse.commands; + +import java.util.Iterator; +import java.util.List; + +import org.eclipse.core.commands.AbstractHandler; +import org.eclipse.core.commands.ExecutionEvent; +import org.eclipse.core.commands.ExecutionException; +import org.eclipse.core.resources.IContainer; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IFolder; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.ProjectScope; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.Path; +import org.eclipse.core.runtime.Status; +import org.eclipse.debug.core.DebugPlugin; +import org.eclipse.debug.core.ILaunchConfiguration; +import org.eclipse.debug.core.ILaunchConfigurationType; +import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; +import org.eclipse.debug.core.ILaunchManager; +import org.eclipse.debug.ui.DebugUITools; +import org.eclipse.emf.common.util.URI; +import org.eclipse.emf.ecore.resource.Resource; +import org.eclipse.emf.ecore.util.EcoreUtil; +import org.eclipse.jdt.core.IType; +import org.eclipse.jdt.core.JavaCore; +import org.eclipse.jdt.core.JavaModelException; +import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants; +import org.eclipse.jface.dialogs.ErrorDialog; +import org.eclipse.jface.dialogs.IDialogConstants; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.ui.IEditorInput; +import org.eclipse.ui.IFileEditorInput; +import org.eclipse.ui.IWorkbenchWindow; +import org.eclipse.ui.handlers.HandlerUtil; +import org.eclipse.ui.part.FileEditorInput; +import org.eclipse.xtext.EcoreUtil2; +import org.eclipse.xtext.resource.XtextResourceSet; +import org.etsi.mts.tdl.Package; +import org.etsi.mts.tdl.TestDescription; +import org.etsi.mts.tdl.execution.java.codegen.Settings; +import org.etsi.mts.tdl.execution.java.eclipse.ui.PropertyPage; +import org.osgi.service.prefs.Preferences; + +import com.google.inject.Guice; +import com.google.inject.Injector; + +/** + * Handles the "Run Specific JUnit Test…" command. + * + *
Configuration names follow the pattern:
+ * {@code
After {@link #open()} returns {@link IDialogConstants#OK_ID} call + * {@link #getSelectedTest()} to retrieve the chosen descriptor.
+ */ +public class SelectJUnitTestDialog extends Dialog { + + private final Listnull if none.
+ */
+ private String lastPath;
+
+
+ private String[] extensions = null;
+
+ private File filterPath = null;
+
+ /**
+ * The special label text for directory chooser,
+ * or null if none.
+ */
+ private String dirChooserLabelText;
+
+ /**
+ * Creates a new path field editor
+ */
+ protected FileListEditor() {
+ }
+
+ /**
+ * Creates a path field editor.
+ *
+ * @param name the name of the preference this field editor works on
+ * @param labelText the label text of the field editor
+ * @param dirChooserLabelText the label text displayed for the directory chooser
+ * @param parent the parent of the field editor's control
+ */
+ public FileListEditor(String name, String labelText,
+ String dirChooserLabelText, Composite parent) {
+ init(name, labelText);
+ this.dirChooserLabelText = dirChooserLabelText;
+ createControl(parent);
+ adapt();
+ }
+
+ private void adapt() {
+ getAddButton().removeListener(SWT.Selection, getAddButton().getListeners(SWT.Selection)[0]);
+ getAddButton().addListener(SWT.Selection, e -> {
+ addPressed();
+ });
+ }
+
+ @Override
+ protected String createList(String[] items) {
+ StringBuilder path = new StringBuilder("");//$NON-NLS-1$
+
+ for (String item : items) {
+ path.append(item);
+ path.append(File.pathSeparator);
+ }
+ return path.toString();
+ }
+
+ /**
+ * Notifies that the Add button has been pressed.
+ */
+ private void addPressed() {
+ setPresentsDefaultValue(false);
+ String[] input = getNewFileListInputObject();
+
+ if (input != null && input.length > 0) {
+ int index = getList().getSelectionIndex();
+ List