Enhancements to modelled tests

[simantics/platform.git] / bundles / org.simantics.tests.modelled.ui / src / org / simantics / tests / modelled / ui / STSTestRunnerView.java

diff --git a/bundles/org.simantics.tests.modelled.ui/src/org/simantics/tests/modelled/ui/STSTestRunnerView.java b/bundles/org.simantics.tests.modelled.ui/src/org/simantics/tests/modelled/ui/STSTestRunnerView.java
index 203f2832501c57d98aa48bd54e344c833fb373d3..b8b8094491da298706a44b976731a051b487674e 100644 (file)
--- a/bundles/org.simantics.tests.modelled.ui/src/org/simantics/tests/modelled/ui/STSTestRunnerView.java
+++ b/bundles/org.simantics.tests.modelled.ui/src/org/simantics/tests/modelled/ui/STSTestRunnerView.java
@@ -7,6 +7,7 @@ import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 
 import org.eclipse.e4.ui.di.Focus;
+import org.eclipse.e4.ui.model.application.ui.basic.MPart;
 import org.eclipse.jface.layout.TreeColumnLayout;
 import org.eclipse.jface.viewers.CellLabelProvider;
 import org.eclipse.jface.viewers.ColumnWeightData;
@@ -32,6 +33,9 @@ import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.Layout;
+import org.eclipse.swt.widgets.Listener;
+import org.eclipse.swt.widgets.Menu;
+import org.eclipse.swt.widgets.MenuItem;
 import org.eclipse.swt.widgets.Tree;
 import org.eclipse.swt.widgets.TreeColumn;
 import org.eclipse.ui.part.PageBook;
@@ -54,19 +58,21 @@ public class STSTestRunnerView {
     private Composite counterComposite;
 
     @PostConstruct
-    void createView(Composite parent) {
+    void createView(MPart part, Composite parent) {
         
         GridLayout gridLayout= new GridLayout();
         gridLayout.marginWidth= 0;
         gridLayout.marginHeight= 0;
         parent.setLayout(gridLayout);
         
-        counterComposite= createProgressCountPanel(parent);
+        counterComposite = createProgressCountPanel(parent);
         counterComposite.setLayoutData(new GridData(GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_FILL));
         counterComposite.pack();
         
         SashForm sashForm = createSashForm(parent);
         sashForm.setLayoutData(new GridData(GridData.FILL_BOTH));
+        
+//        IToolBarManager toolBarManager = getViewSite().getActionBars().getToolBarManager();
     }
     
     private SashForm createSashForm(Composite parent) {
@@ -335,6 +341,26 @@ public class STSTestRunnerView {
         treeViewer.setContentProvider(provider);
         treeViewer.setLabelProvider(provider);
 
+        
+        Menu menu = new Menu(treeViewer.getControl());
+        
+        MenuItem item1 = new MenuItem(menu, SWT.PUSH);
+        item1.setText("Stop");
+        item1.addListener(SWT.Selection, new Listener() {
+            
+            @Override
+            public void handleEvent(Event event) {
+                TreeSelection selec = (TreeSelection) treeViewer.getSelection();
+                if (!selec.isEmpty()) {
+                    Object elem = selec.getFirstElement();
+                    provider.getModel().interrupt();
+                    
+                }
+            }
+        });
+        
+        treeViewer.getControl().setMenu(menu);
+        
 
         viewerbook.showPage(treeViewer.getTree());
         
@@ -388,6 +414,7 @@ public class STSTestRunnerView {
 
        counterPanel.setTotal(totalCount);
        counterPanel.setRunValue(startedCount, ignoredCount, assumptionFailureCount);
+       counterPanel.setIgnoredValue(ignoredCount);
        counterPanel.setErrorValue(errorCount);
        counterPanel.setFailureValue(failureCount);