Attachment #234140 for bug #414550

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

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

Lines 555-565 public abstract class AbstractTreeTester extends WidgetTester { Link Here

(-)a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/AbstractTreeTester.java (-5 lines)
555	AbstractTreeOperationContext context = getTreeAdapter().getContext();	555	AbstractTreeOperationContext context = getTreeAdapter().getContext();
556	Object selectedNode =	556	Object selectedNode =
557	getSelectedNode(context);	557	getSelectedNode(context);
558	if (selectedNode == null) {
559	throw new StepExecutionException("No tree item selected", //$NON-NLS-1$
560	EventFactory.createActionError(TestErrorEvent.NO_SELECTION));
561	}
562
563	return context.getRenderedText(selectedNode);	558	return context.getRenderedText(selectedNode);
564	}	559	}
565		560




import org.eclipse.jubula.rc.common.driver.DragAndDropHelper;
import org.eclipse.jubula.rc.common.exception.StepExecutionException;
import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IListComponent;
import org.eclipse.jubula.rc.common.util.ArrayValidator;
import org.eclipse.jubula.rc.common.util.IndexConverter;
import org.eclipse.jubula.rc.common.util.ListSelectionVerifier;
import org.eclipse.jubula.rc.common.util.MatchUtil;

     */
    private int[] getCheckedSelectedIndices() throws StepExecutionException {
        int[] selected = getListAdapter().getSelectedIndices();
        ArrayValidator.validateSelectionArray(selected);
            throw new StepExecutionException("No list element selected", //$NON-NLS-1$
                EventFactory.createActionError(TestErrorEvent.NO_SELECTION));
        }
        return selected;
    }


    public void rcVerifyText(String text, String operator) {
        String[] selected = getListAdapter().getSelectedValues();
        final int selCount = selected.length;
        ArrayValidator.validateSelectionArray(selected);
            throw new StepExecutionException("No selection", //$NON-NLS-1$
                EventFactory.createActionError(TestErrorEvent.NO_SELECTION));
        }
        for (int i = 0; i < selCount; i++) {
            Verifier.match(selected[i], text, operator);
        }

     */
    public String rcReadValue(String variable) {
        String[] selected = getListAdapter().getSelectedValues();
        return (String) ArrayValidator.validateSelectionArray(selected);
            return selected[0];
        }
        throw new StepExecutionException("No list item selected", //$NON-NLS-1$
            EventFactory.createActionError(TestErrorEvent.NO_SELECTION));
    }
    
    /**




package org.eclipse.jubula.rc.common.util;

import org.eclipse.jubula.rc.common.exception.StepExecutionException;
import org.eclipse.jubula.tools.objects.event.EventFactory;
import org.eclipse.jubula.tools.objects.event.TestErrorEvent;

/**
 * Utility methods to check whether an array is valid or not.
 * 
 * @author BREDEX GmbH
 * @created Aug 06, 2013
 *
 */
public class ArrayValidator {

    /**
     * private constructor
     */
    private ArrayValidator() {
        //do nothing
    }
    
    /**
     * Checks if there is any selection on the widget
     * 
     * @param array an array of Objects to be validated
     * @throws StepExecutionException thrown if 
     * @return The first selected Item
     */
    public static Object validateSelectionArray(Object[] array) 
        throws StepExecutionException {
                
        if (array == null || array.length == 0) {
            throw new StepExecutionException("No selection found", //$NON-NLS-1$
                    EventFactory.createActionError(
                            TestErrorEvent.NO_SELECTION));
        }
        return array[0];
    }
    
    /**
     * Checks if there is any selection on the widget
     * 
     * @param array an array of Objects to be validated
     * @throws StepExecutionException thrown if 
     * @return The first selected Item
     */
    public static int validateSelectionArray(int[] array) 
        throws StepExecutionException {
                    
        if (array == null || array.length == 0) {
            throw new StepExecutionException("No selection found", //$NON-NLS-1$
                    EventFactory.createActionError(
                            TestErrorEvent.NO_SELECTION));
        }
        return array[0];
    }
}




import org.eclipse.jubula.rc.common.driver.IRunnable;
import org.eclipse.jubula.rc.common.exception.StepExecutionException;
import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IListComponent;
import org.eclipse.jubula.rc.common.util.ArrayValidator;
import org.eclipse.jubula.rc.common.util.MatchUtil;
import org.eclipse.jubula.rc.swing.tester.util.TesterUtil;
import org.eclipse.jubula.tools.objects.event.EventFactory;

     */
    public String getText() {
        String[] selected = getSelectedValues();
        return (String) ArrayValidator.validateSelectionArray(selected);
            return selected[0];
        }
        throw new StepExecutionException("No list item selected", //$NON-NLS-1$
            EventFactory.createActionError(TestErrorEvent.NO_SELECTION));
    }

    /**

Lines 266-272 public class JTableAdapter extends JComponentAdapter Link Here

(-)a/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/tester/adapter/JTableAdapter.java (-1 / +1 lines)
266	.Property	266	.Property
267	.DESCRIPTION_KEY)))) {	267	.DESCRIPTION_KEY)))) {
268	// set "invalid index" to "no selection" -> better description!	268	// set "invalid index" to "no selection" -> better description!
269	throw new StepExecutionException("No selection", //$NON-NLS-1$	269	throw new StepExecutionException("No selection found", //$NON-NLS-1$
270	EventFactory.createActionError(	270	EventFactory.createActionError(
271	TestErrorEvent.NO_SELECTION));	271	TestErrorEvent.NO_SELECTION));
272	}	272	}




import org.eclipse.jubula.rc.common.exception.StepExecutionException;
import org.eclipse.jubula.rc.common.implclasses.tree.AbstractTreeOperationContext;
import org.eclipse.jubula.rc.common.logger.AutServerLogger;
import org.eclipse.jubula.rc.common.util.ArrayValidator;
import org.eclipse.jubula.rc.swing.driver.EventThreadQueuerAwtImpl;
import org.eclipse.jubula.tools.objects.event.EventFactory;
import org.eclipse.jubula.tools.objects.event.TestErrorEvent;


/**

     */
    private TreePath[] getCheckedSelectedPaths() {
        TreePath[] paths = (TreePath[])getSelectionPaths();
        ArrayValidator.validateSelectionArray(paths);
            throw new StepExecutionException("No tree node(s) selected", //$NON-NLS-1$
                EventFactory.createActionError(TestErrorEvent.NO_SELECTION));
        }
        return paths;
    }
    /**

Lines 32-37 import org.eclipse.jubula.rc.common.implclasses.tree.StandardDepthFirstTraverser Link Here

(-)a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/TreeTester.java (-2 / +5 lines)
32	import org.eclipse.jubula.rc.common.implclasses.tree.TreeNodeOperation;	32	import org.eclipse.jubula.rc.common.implclasses.tree.TreeNodeOperation;
33	import org.eclipse.jubula.rc.common.implclasses.tree.TreeNodeOperationConstraint;	33	import org.eclipse.jubula.rc.common.implclasses.tree.TreeNodeOperationConstraint;
34	import org.eclipse.jubula.rc.common.tester.AbstractTreeTester;	34	import org.eclipse.jubula.rc.common.tester.AbstractTreeTester;
		35	import org.eclipse.jubula.rc.common.tester.adapter.interfaces.ITreeComponent;
35	import org.eclipse.jubula.rc.common.util.IndexConverter;	36	import org.eclipse.jubula.rc.common.util.IndexConverter;
36	import org.eclipse.jubula.rc.common.util.KeyStrokeUtil;	37	import org.eclipse.jubula.rc.common.util.KeyStrokeUtil;
37	import org.eclipse.jubula.rc.common.util.MatchUtil;	38	import org.eclipse.jubula.rc.common.util.MatchUtil;
Lines 785-792 public class TreeTester extends AbstractTreeTester { Link Here
785	throws StepExecutionException {	786	throws StepExecutionException {
786	Boolean checkSelected = ((Boolean)getEventThreadQueuer().invokeAndWait(	787	Boolean checkSelected = ((Boolean)getEventThreadQueuer().invokeAndWait(
787	"rcVerifyTreeCheckbox", new IRunnable() { //$NON-NLS-1$	788	"rcVerifyTreeCheckbox", new IRunnable() { //$NON-NLS-1$
788	public Object run() {	789	public Object run() {
789	TreeItem node = getTree().getSelection()[0];	790	AbstractTreeOperationContext context =
		791	((ITreeComponent)getComponent()).getContext();
		792	TreeItem node = (TreeItem) getSelectedNode(context);
790	return new Boolean(node.getChecked());	793	return new Boolean(node.getChecked());
791	}	794	}
792	}));	795	}));




import org.eclipse.jubula.rc.common.driver.IRunnable;
import org.eclipse.jubula.rc.common.exception.StepExecutionException;
import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IListComponent;
import org.eclipse.jubula.rc.common.util.ArrayValidator;
import org.eclipse.jubula.rc.swt.utils.SwtUtils;
import org.eclipse.jubula.tools.objects.event.EventFactory;
import org.eclipse.jubula.tools.objects.event.TestErrorEvent;
import org.eclipse.swt.graphics.Rectangle;
import org.eclipse.swt.widgets.List;
/**

     */
    public String getText() {
        String[] selected = getSelectedValues();
        return (String) ArrayValidator.validateSelectionArray(selected);
            return selected[0];
        }
        throw new StepExecutionException("No list item selected", //$NON-NLS-1$
            EventFactory.createActionError(TestErrorEvent.NO_SELECTION));
    }
    
    /**




import org.eclipse.jubula.rc.common.exception.StepExecutionException;
import org.eclipse.jubula.rc.common.implclasses.tree.AbstractTreeOperationContext;
import org.eclipse.jubula.rc.common.logger.AutServerLogger;
import org.eclipse.jubula.rc.common.util.ArrayValidator;
import org.eclipse.jubula.rc.common.util.Verifier;
import org.eclipse.jubula.rc.swt.tester.CAPUtil;
import org.eclipse.jubula.rc.swt.utils.SwtPointUtil;
import org.eclipse.jubula.rc.swt.utils.SwtUtils;
import org.eclipse.jubula.tools.constants.SwtAUTHierarchyConstants;
import org.eclipse.jubula.tools.objects.event.EventFactory;
import org.eclipse.jubula.tools.objects.event.TestErrorEvent;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Event;

                public Object run() {
                    TreeItem [] selectedItems = 
                        ((Tree)getTree()).getSelection();
                    return ArrayValidator.validateSelectionArray(selectedItems);
                        throw new StepExecutionException(
                            "No tree node(s) selected", //$NON-NLS-1$
                            EventFactory.createActionError(
                                TestErrorEvent.NO_SELECTION));
                    }
                    return selectedItems[0];
                }

            });

                public Object run() {
                    TreeItem [] selectedItems = 
                        ((Tree)getTree()).getSelection();
                    return ArrayValidator.validateSelectionArray(selectedItems);
                        throw new StepExecutionException(
                            "No tree node(s) selected", //$NON-NLS-1$
                            EventFactory.createActionError(
                                TestErrorEvent.NO_SELECTION));
                    }
                    return selectedItems;
                }

            });
- 

Return to bug 414550

Lines 20-25 import org.eclipse.jubula.rc.common.driver.ClickOptions; Link Here

(-)a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/ListTester.java (-13 / +4 lines)
20	import org.eclipse.jubula.rc.common.driver.DragAndDropHelper;	20	import org.eclipse.jubula.rc.common.driver.DragAndDropHelper;
21	import org.eclipse.jubula.rc.common.exception.StepExecutionException;	21	import org.eclipse.jubula.rc.common.exception.StepExecutionException;
22	import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IListComponent;	22	import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IListComponent;
		23	import org.eclipse.jubula.rc.common.util.ArrayValidator;
23	import org.eclipse.jubula.rc.common.util.IndexConverter;	24	import org.eclipse.jubula.rc.common.util.IndexConverter;
24	import org.eclipse.jubula.rc.common.util.ListSelectionVerifier;	25	import org.eclipse.jubula.rc.common.util.ListSelectionVerifier;
25	import org.eclipse.jubula.rc.common.util.MatchUtil;	26	import org.eclipse.jubula.rc.common.util.MatchUtil;
Lines 58-67 public class ListTester extends AbstractTextVerifiableTester { Link Here
58	*/	59	*/
59	private int[] getCheckedSelectedIndices() throws StepExecutionException {	60	private int[] getCheckedSelectedIndices() throws StepExecutionException {
60	int[] selected = getListAdapter().getSelectedIndices();	61	int[] selected = getListAdapter().getSelectedIndices();
61	if (selected.length == 0) {	62	ArrayValidator.validateSelectionArray(selected);
62	throw new StepExecutionException("No list element selected", //$NON-NLS-1$
63	EventFactory.createActionError(TestErrorEvent.NO_SELECTION));
64	}
65	return selected;	63	return selected;
66	}	64	}
67		65
Lines 131-140 public class ListTester extends AbstractTextVerifiableTester { Link Here
131	public void rcVerifyText(String text, String operator) {	129	public void rcVerifyText(String text, String operator) {
132	String[] selected = getListAdapter().getSelectedValues();	130	String[] selected = getListAdapter().getSelectedValues();
133	final int selCount = selected.length;	131	final int selCount = selected.length;
134	if (selCount < 1) {	132	ArrayValidator.validateSelectionArray(selected);
135	throw new StepExecutionException("No selection", //$NON-NLS-1$
136	EventFactory.createActionError(TestErrorEvent.NO_SELECTION));
137	}
138	for (int i = 0; i < selCount; i++) {	133	for (int i = 0; i < selCount; i++) {
139	Verifier.match(selected[i], text, operator);	134	Verifier.match(selected[i], text, operator);
140	}	135	}
Lines 211-221 public class ListTester extends AbstractTextVerifiableTester { Link Here
211	*/	206	*/
212	public String rcReadValue(String variable) {	207	public String rcReadValue(String variable) {
213	String[] selected = getListAdapter().getSelectedValues();	208	String[] selected = getListAdapter().getSelectedValues();
214	if (selected.length > 0) {	209	return (String) ArrayValidator.validateSelectionArray(selected);
215	return selected[0];
216	}
217	throw new StepExecutionException("No list item selected", //$NON-NLS-1$
218	EventFactory.createActionError(TestErrorEvent.NO_SELECTION));
219	}	210	}
220		211
221	/**	212	/**

Added Link Here

(-)a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/util/ArrayValidator.java (+58 lines)
1	package org.eclipse.jubula.rc.common.util;
2
3	import org.eclipse.jubula.rc.common.exception.StepExecutionException;
4	import org.eclipse.jubula.tools.objects.event.EventFactory;
5	import org.eclipse.jubula.tools.objects.event.TestErrorEvent;
6
7	/**
8	* Utility methods to check whether an array is valid or not.
9	*
10	* @author BREDEX GmbH
11	* @created Aug 06, 2013
12	*
13	*/
14	public class ArrayValidator {
15
16	/**
17	* private constructor
18	*/
19	private ArrayValidator() {
20	//do nothing
21	}
22
23	/**
24	* Checks if there is any selection on the widget
25	*
26	* @param array an array of Objects to be validated
27	* @throws StepExecutionException thrown if
28	* @return The first selected Item
29	*/
30	public static Object validateSelectionArray(Object[] array)
31	throws StepExecutionException {
32
33	if (array == null \|\| array.length == 0) {
34	throw new StepExecutionException("No selection found", //$NON-NLS-1$
35	EventFactory.createActionError(
36	TestErrorEvent.NO_SELECTION));
37	}
38	return array[0];
39	}
40
41	/**
42	* Checks if there is any selection on the widget
43	*
44	* @param array an array of Objects to be validated
45	* @throws StepExecutionException thrown if
46	* @return The first selected Item
47	*/
48	public static int validateSelectionArray(int[] array)
49	throws StepExecutionException {
50
51	if (array == null \|\| array.length == 0) {
52	throw new StepExecutionException("No selection found", //$NON-NLS-1$
53	EventFactory.createActionError(
54	TestErrorEvent.NO_SELECTION));
55	}
56	return array[0];
57	}
58	}