Attachment #76136 for bug #198904




 * Contributors:
 *     IBM Corporation - initial API and implementation
 *     Brad Reynolds - bug 164653
 *     Ashley Cambrell - bug 198904
 *******************************************************************************/
package org.eclipse.jface.internal.databinding.internal.swt;


		return Boolean.class;
	}

	/*
	 * (non-Javadoc)
	 *
	 * @see org.eclipse.core.databinding.observable.value.AbstractObservableValue#dispose()
	 */
	public synchronized void dispose() {
		super.dispose();

		if (!button.isDisposed()) {
			button.removeListener(SWT.Selection, updateListener);
			button.removeListener(SWT.DefaultSelection, updateListener);
		}
	}

}




 * Contributors:
 *     IBM Corporation - initial API and implementation
 *     Brad Reynolds - bug 164653
 *     Ashley Cambrell - bug 198904
 *******************************************************************************/
package org.eclipse.jface.internal.databinding.internal.swt;


	private final String attribute;
	private boolean updating = false;
	private String currentValue;
	private ModifyListener modifyListener;

	/**
	 * @param combo

		if (attribute.equals(SWTProperties.SELECTION)
				|| attribute.equals(SWTProperties.TEXT)) {
			this.currentValue = combo.getText();
			modifyListener = new ModifyListener() {

				public void modifyText(ModifyEvent e) {
					if (!updating) {

								currentValue));
					}
				}
			};
			combo.addModifyListener(modifyListener);
		} else
			throw new IllegalArgumentException();
	}

	public String getAttribute() {
		return attribute;
	}

	/*
	 * (non-Javadoc)
	 *
	 * @see org.eclipse.core.databinding.observable.value.AbstractObservableValue#dispose()
	 */
	public synchronized void dispose() {
		super.dispose();

		if (modifyListener != null && !combo.isDisposed()) {
			combo.removeModifyListener(modifyListener);
		}
	}
}

Lines 8-13 Link Here

(-)src/org/eclipse/jface/internal/databinding/internal/swt/ComboSingleSelectionObservableValue.java (-5 / +21 lines)
8	* Contributors:	8	* Contributors:
9	* IBM Corporation - initial API and implementation	9	* IBM Corporation - initial API and implementation
10	* Brad Reynolds - bug 164653	10	* Brad Reynolds - bug 164653
		11	* Ashley Cambrell - bug 198904
11	*******************************************************************************/	12	*******************************************************************************/
12	package org.eclipse.jface.internal.databinding.internal.swt;	13	package org.eclipse.jface.internal.databinding.internal.swt;
13		14
Lines 17-25 Link Here
17		18
18	/**	19	/**
19	* @since 1.0	20	* @since 1.0
20	*	21	*
21	*/	22	*/
22	public class ComboSingleSelectionObservableValue extends SingleSelectionObservableValue {	23	public class ComboSingleSelectionObservableValue extends
		24	SingleSelectionObservableValue {
		25
		26	private SelectionListener selectionListener;
23		27
24	/**	28	/**
25	* @param combo	29	* @param combo
Lines 33-39 Link Here
33	}	37	}
34		38
35	protected void doAddSelectionListener(final Runnable runnable) {	39	protected void doAddSelectionListener(final Runnable runnable) {
36	getCombo().addSelectionListener(new SelectionListener() {	40	selectionListener = new SelectionListener() {
37	public void widgetDefaultSelected(SelectionEvent e) {	41	public void widgetDefaultSelected(SelectionEvent e) {
38	runnable.run();	42	runnable.run();
39	}	43	}
Lines 41-47 Link Here
41	public void widgetSelected(SelectionEvent e) {	45	public void widgetSelected(SelectionEvent e) {
42	runnable.run();	46	runnable.run();
43	}	47	}
44	});	48	};
		49	getCombo().addSelectionListener(selectionListener);
45	}	50	}
46		51
47	protected int doGetSelectionIndex() {	52	protected int doGetSelectionIndex() {
Lines 49-55 Link Here
49	}	54	}
50		55
51	protected void doSetSelectionIndex(int index) {	56	protected void doSetSelectionIndex(int index) {
52	getCombo().setText(getCombo().getItem(index));	57	getCombo().select(index);
53	}	58	}
54		59
		60	/*
		61	* (non-Javadoc)
		62	*
		63	* @see org.eclipse.core.databinding.observable.value.AbstractObservableValue#dispose()
		64	*/
		65	public synchronized void dispose() {
		66	super.dispose();
		67	if (selectionListener != null && !getCombo().isDisposed()) {
		68	getCombo().removeSelectionListener(selectionListener);
		69	}
		70	}
55	}	71	}

Lines 8-13 Link Here

(-)src/org/eclipse/jface/internal/databinding/internal/swt/ListObservableValue.java (-2 / +17 lines)
8	* Contributors:	8	* Contributors:
9	* IBM Corporation - initial API and implementation	9	* IBM Corporation - initial API and implementation
10	* Brad Reynolds - bug 164653	10	* Brad Reynolds - bug 164653
		11	* Ashley Cambrell - bug 198904
11	*******************************************************************************/	12	*******************************************************************************/
12	package org.eclipse.jface.internal.databinding.internal.swt;	13	package org.eclipse.jface.internal.databinding.internal.swt;
13		14
Lines 30-35 Link Here
30		31
31	private String currentValue;	32	private String currentValue;
32		33
		34	private Listener listener;
		35
33	/**	36	/**
34	* @param list	37	* @param list
35	*/	38	*/
Lines 42-48 Link Here
42	throw new IllegalArgumentException(	45	throw new IllegalArgumentException(
43	"SWT.SINGLE support only for a List selection"); //$NON-NLS-1$	46	"SWT.SINGLE support only for a List selection"); //$NON-NLS-1$
44		47
45	list.addListener(SWT.Selection, new Listener() {	48	listener = new Listener() {
46		49
47	public void handleEvent(Event event) {	50	public void handleEvent(Event event) {
48	if (!updating) {	51	if (!updating) {
Lines 53-59 Link Here
53	}	56	}
54	}	57	}
55		58
56	});	59	};
		60	list.addListener(SWT.Selection, listener);
57	}	61	}
58		62
59	public void doSetValue(Object value) {	63	public void doSetValue(Object value) {
Lines 91-94 Link Here
91	return String.class;	95	return String.class;
92	}	96	}
93		97
		98	/*
		99	* (non-Javadoc)
		100	*
		101	* @see org.eclipse.core.databinding.observable.value.AbstractObservableValue#dispose()
		102	*/
		103	public synchronized void dispose() {
		104	super.dispose();
		105	if (listener != null && !list.isDisposed()) {
		106	list.removeListener(SWT.Selection, listener);
		107	}
		108	}
94	}	109	}

Lines 8-13 Link Here

(-)src/org/eclipse/jface/internal/databinding/internal/swt/ListSingleSelectionObservableValue.java (-2 / +17 lines)
8	* Contributors:	8	* Contributors:
9	* IBM Corporation - initial API and implementation	9	* IBM Corporation - initial API and implementation
10	* Brad Reynolds - bug 164653	10	* Brad Reynolds - bug 164653
		11	* Ashley Cambrell - bug 198904
11	*******************************************************************************/	12	*******************************************************************************/
12	package org.eclipse.jface.internal.databinding.internal.swt;	13	package org.eclipse.jface.internal.databinding.internal.swt;
13		14
Lines 22-27 Link Here
22	public class ListSingleSelectionObservableValue extends	23	public class ListSingleSelectionObservableValue extends
23	SingleSelectionObservableValue {	24	SingleSelectionObservableValue {
24		25
		26	private SelectionListener selectionListener;
		27
25	/**	28	/**
26	* @param combo	29	* @param combo
27	*/	30	*/
Lines 34-40 Link Here
34	}	37	}
35		38
36	protected void doAddSelectionListener(final Runnable runnable) {	39	protected void doAddSelectionListener(final Runnable runnable) {
37	getList().addSelectionListener(new SelectionListener() {	40	selectionListener = new SelectionListener() {
38	public void widgetDefaultSelected(SelectionEvent e) {	41	public void widgetDefaultSelected(SelectionEvent e) {
39	runnable.run();	42	runnable.run();
40	}	43	}
Lines 42-48 Link Here
42	public void widgetSelected(SelectionEvent e) {	45	public void widgetSelected(SelectionEvent e) {
43	runnable.run();	46	runnable.run();
44	}	47	}
45	});	48	};
		49	getList().addSelectionListener(selectionListener);
46	}	50	}
47		51
48	protected int doGetSelectionIndex() {	52	protected int doGetSelectionIndex() {
Lines 53-56 Link Here
53	getList().setSelection(index);	57	getList().setSelection(index);
54	}	58	}
55		59
		60	/*
		61	* (non-Javadoc)
		62	*
		63	* @see org.eclipse.core.databinding.observable.value.AbstractObservableValue#dispose()
		64	*/
		65	public synchronized void dispose() {
		66	super.dispose();
		67	if (selectionListener != null && !getList().isDisposed()) {
		68	getList().removeSelectionListener(selectionListener);
		69	}
		70	}
56	}	71	}

Lines 8-13 Link Here

(-)src/org/eclipse/jface/internal/databinding/internal/swt/TableSingleSelectionObservableValue.java (-3 / +19 lines)
8	* Contributors:	8	* Contributors:
9	* IBM Corporation - initial API and implementation	9	* IBM Corporation - initial API and implementation
10	* Brad Reynolds - bug 164653	10	* Brad Reynolds - bug 164653
		11	* Ashley Cambrell - bug 198904
11	*******************************************************************************/	12	*******************************************************************************/
12	package org.eclipse.jface.internal.databinding.internal.swt;	13	package org.eclipse.jface.internal.databinding.internal.swt;
13		14
Lines 19-25 Link Here
19	* @since 1.0	20	* @since 1.0
20	*	21	*
21	*/	22	*/
22	public class TableSingleSelectionObservableValue extends SingleSelectionObservableValue {	23	public class TableSingleSelectionObservableValue extends
		24	SingleSelectionObservableValue {
		25
		26	private SelectionListener selectionListener;
23		27
24	/**	28	/**
25	* @param table	29	* @param table
Lines 33-39 Link Here
33	}	37	}
34		38
35	protected void doAddSelectionListener(final Runnable runnable) {	39	protected void doAddSelectionListener(final Runnable runnable) {
36	getTable().addSelectionListener(new SelectionListener() {	40	selectionListener = new SelectionListener() {
37	public void widgetDefaultSelected(SelectionEvent e) {	41	public void widgetDefaultSelected(SelectionEvent e) {
38	runnable.run();	42	runnable.run();
39	}	43	}
Lines 41-47 Link Here
41	public void widgetSelected(SelectionEvent e) {	45	public void widgetSelected(SelectionEvent e) {
42	runnable.run();	46	runnable.run();
43	}	47	}
44	});	48	};
		49	getTable().addSelectionListener(selectionListener);
45	}	50	}
46		51
47	protected int doGetSelectionIndex() {	52	protected int doGetSelectionIndex() {
Lines 52-55 Link Here
52	getTable().setSelection(index);	57	getTable().setSelection(index);
53	}	58	}
54		59
		60	/*
		61	* (non-Javadoc)
		62	*
		63	* @see org.eclipse.core.databinding.observable.value.AbstractObservableValue#dispose()
		64	*/
		65	public synchronized void dispose() {
		66	super.dispose();
		67	if (selectionListener != null && !getTable().isDisposed()) {
		68	getTable().removeSelectionListener(selectionListener);
		69	}
		70	}
55	}	71	}

Lines 8-13 Link Here

(-)src/org/eclipse/jface/internal/databinding/internal/swt/CComboObservableValue.java (-2 / +19 lines)
8	* Contributors:	8	* Contributors:
9	* IBM Corporation - initial API and implementation	9	* IBM Corporation - initial API and implementation
10	* Brad Reynolds - bug 164653	10	* Brad Reynolds - bug 164653
		11	* Ashley Cambrell - bug 198904
11	*******************************************************************************/	12	*******************************************************************************/
12	package org.eclipse.jface.internal.databinding.internal.swt;	13	package org.eclipse.jface.internal.databinding.internal.swt;
13		14
Lines 36-41 Link Here
36		37
37	private String currentValue;	38	private String currentValue;
38		39
		40	private ModifyListener modifyListener;
		41
39	/**	42	/**
40	* @param ccombo	43	* @param ccombo
41	* @param attribute	44	* @param attribute
Lines 48-54 Link Here
48	if (attribute.equals(SWTProperties.SELECTION)	51	if (attribute.equals(SWTProperties.SELECTION)
49	\|\| attribute.equals(SWTProperties.TEXT)) {	52	\|\| attribute.equals(SWTProperties.TEXT)) {
50	this.currentValue = ccombo.getText();	53	this.currentValue = ccombo.getText();
51	ccombo.addModifyListener(new ModifyListener() {	54	modifyListener = new ModifyListener() {
52		55
53	public void modifyText(ModifyEvent e) {	56	public void modifyText(ModifyEvent e) {
54	if (!updating) {	57	if (!updating) {
Lines 59-65 Link Here
59	currentValue));	62	currentValue));
60	}	63	}
61	}	64	}
62	});	65	};
		66	ccombo.addModifyListener(modifyListener);
63	} else	67	} else
64	throw new IllegalArgumentException();	68	throw new IllegalArgumentException();
65	}	69	}
Lines 118-121 Link Here
118	public String getAttribute() {	122	public String getAttribute() {
119	return attribute;	123	return attribute;
120	}	124	}
		125
		126	/*
		127	* (non-Javadoc)
		128	*
		129	* @see org.eclipse.core.databinding.observable.value.AbstractObservableValue#dispose()
		130	*/
		131	public synchronized void dispose() {
		132	super.dispose();
		133
		134	if (modifyListener != null && !ccombo.isDisposed()) {
		135	ccombo.removeModifyListener(modifyListener);
		136	}
		137	}
121	}	138	}

Lines 8-13 Link Here

(-)src/org/eclipse/jface/internal/databinding/internal/swt/CComboSingleSelectionObservableValue.java (-4 / +21 lines)
8	* Contributors:	8	* Contributors:
9	* IBM Corporation - initial API and implementation	9	* IBM Corporation - initial API and implementation
10	* Brad Reynolds - bug 164653	10	* Brad Reynolds - bug 164653
		11	* Ashley Cambrell - bug 198904
11	*******************************************************************************/	12	*******************************************************************************/
12	package org.eclipse.jface.internal.databinding.internal.swt;	13	package org.eclipse.jface.internal.databinding.internal.swt;
13		14
Lines 17-25 Link Here
17		18
18	/**	19	/**
19	* @since 1.0	20	* @since 1.0
20	*	21	*
21	*/	22	*/
22	public class CComboSingleSelectionObservableValue extends SingleSelectionObservableValue {	23	public class CComboSingleSelectionObservableValue extends
		24	SingleSelectionObservableValue {
		25
		26	private SelectionListener selectionListener;
23		27
24	/**	28	/**
25	* @param combo	29	* @param combo
Lines 33-39 Link Here
33	}	37	}
34		38
35	protected void doAddSelectionListener(final Runnable runnable) {	39	protected void doAddSelectionListener(final Runnable runnable) {
36	getCCombo().addSelectionListener(new SelectionListener() {	40	selectionListener = new SelectionListener() {
37	public void widgetDefaultSelected(SelectionEvent e) {	41	public void widgetDefaultSelected(SelectionEvent e) {
38	runnable.run();	42	runnable.run();
39	}	43	}
Lines 41-47 Link Here
41	public void widgetSelected(SelectionEvent e) {	45	public void widgetSelected(SelectionEvent e) {
42	runnable.run();	46	runnable.run();
43	}	47	}
44	});	48	};
		49	getCCombo().addSelectionListener(selectionListener);
45	}	50	}
46		51
47	protected int doGetSelectionIndex() {	52	protected int doGetSelectionIndex() {
Lines 52-55 Link Here
52	getCCombo().setText(getCCombo().getItem(index));	57	getCCombo().setText(getCCombo().getItem(index));
53	}	58	}
54		59
		60	/*
		61	* (non-Javadoc)
		62	*
		63	* @see org.eclipse.core.databinding.observable.value.AbstractObservableValue#dispose()
		64	*/
		65	public synchronized void dispose() {
		66	super.dispose();
		67	if (selectionListener != null && !getCCombo().isDisposed()) {
		68	getCCombo().removeSelectionListener(selectionListener);
		69	}
		70
		71	}
55	}	72	}

Lines 8-13 Link Here

(-)src/org/eclipse/jface/internal/databinding/internal/swt/SpinnerObservableValue.java (-2 / +18 lines)
8	* Contributors:	8	* Contributors:
9	* IBM Corporation - initial API and implementation	9	* IBM Corporation - initial API and implementation
10	* Brad Reynolds - bug 164653	10	* Brad Reynolds - bug 164653
		11	* Ashley Cambrell - bug 198904
11	*******************************************************************************/	12	*******************************************************************************/
12	package org.eclipse.jface.internal.databinding.internal.swt;	13	package org.eclipse.jface.internal.databinding.internal.swt;
13		14
Lines 32-37 Link Here
32		33
33	private int currentSelection;	34	private int currentSelection;
34		35
		36	private ModifyListener modifyListener;
		37
35	/**	38	/**
36	* @param spinner	39	* @param spinner
37	* @param attribute	40	* @param attribute
Lines 42-48 Link Here
42	this.attribute = attribute;	45	this.attribute = attribute;
43	if (attribute.equals(SWTProperties.SELECTION)) {	46	if (attribute.equals(SWTProperties.SELECTION)) {
44	currentSelection = spinner.getSelection();	47	currentSelection = spinner.getSelection();
45	spinner.addModifyListener(new ModifyListener() {	48	modifyListener = new ModifyListener() {
46	public void modifyText(ModifyEvent e) {	49	public void modifyText(ModifyEvent e) {
47	if (!updating) {	50	if (!updating) {
48	int newSelection = SpinnerObservableValue.this.spinner	51	int newSelection = SpinnerObservableValue.this.spinner
Lines 52-58 Link Here
52	currentSelection = newSelection;	55	currentSelection = newSelection;
53	}	56	}
54	}	57	}
55	});	58	};
		59	spinner.addModifyListener(modifyListener);
56	} else if (!attribute.equals(SWTProperties.MIN)	60	} else if (!attribute.equals(SWTProperties.MIN)
57	&& !attribute.equals(SWTProperties.MAX)) {	61	&& !attribute.equals(SWTProperties.MAX)) {
58	throw new IllegalArgumentException(	62	throw new IllegalArgumentException(
Lines 109-112 Link Here
109	public String getAttribute() {	113	public String getAttribute() {
110	return attribute;	114	return attribute;
111	}	115	}
		116
		117	/*
		118	* (non-Javadoc)
		119	*
		120	* @see org.eclipse.core.databinding.observable.value.AbstractObservableValue#dispose()
		121	*/
		122	public synchronized void dispose() {
		123	super.dispose();
		124	if (modifyListener != null && !spinner.isDisposed()) {
		125	spinner.removeModifyListener(modifyListener);
		126	}
		127	}
112	}	128	}

Lines 7-54 Link Here

(-)src/org/eclipse/jface/tests/databinding/AbstractSWTTestCase.java (-9 / +25 lines)
7	*	7	*
8	* Contributors:	8	* Contributors:
9	* IBM Corporation - initial API and implementation	9	* IBM Corporation - initial API and implementation
		10	* Ashley Cambrell - bug 198904
10	******************************************************************************/	11	******************************************************************************/
11		12
12	package org.eclipse.jface.tests.databinding;	13	package org.eclipse.jface.tests.databinding;
13		14
		15	import org.eclipse.swt.SWT;
		16	import org.eclipse.swt.widgets.Event;
14	import org.eclipse.swt.widgets.Shell;	17	import org.eclipse.swt.widgets.Shell;
		18	import org.eclipse.swt.widgets.Widget;
15		19
16	/**	20	/**
17	* Abstract test case that handles disposing of the Shell after each test.	21	* Abstract test case that handles disposing of the Shell after each test.
18	*	22	*
19	* @since 1.1	23	* @since 1.1
20	*/	24	*/
21	public abstract class AbstractSWTTestCase extends AbstractDefaultRealmTestCase {	25	public abstract class AbstractSWTTestCase extends AbstractDefaultRealmTestCase {
22	private Shell shell;	26	private Shell shell;
23		27
24	/* (non-Javadoc)	28	/*
		29	* (non-Javadoc)
		30	*
25	* @see org.eclipse.jface.tests.databinding.AbstractDefaultRealmTestCase#setUp()	31	* @see org.eclipse.jface.tests.databinding.AbstractDefaultRealmTestCase#setUp()
26	*/	32	*/
27	protected void setUp() throws Exception {	33	protected void setUp() throws Exception {
28	super.setUp();	34	super.setUp();
29	}	35	}
30		36
31	/* (non-Javadoc)	37	/*
		38	* (non-Javadoc)
		39	*
32	* @see org.eclipse.jface.tests.databinding.AbstractDefaultRealmTestCase#tearDown()	40	* @see org.eclipse.jface.tests.databinding.AbstractDefaultRealmTestCase#tearDown()
33	*/	41	*/
34	protected void tearDown() throws Exception {	42	protected void tearDown() throws Exception {
35	super.tearDown();	43	super.tearDown();
36		44
37	if (shell != null && !shell.isDisposed()) {	45	if (shell != null && !shell.isDisposed()) {
38	shell.dispose();	46	shell.dispose();
39	}	47	}
40	}	48	}
41		49
42	/**	50	/**
43	* Returns a Shell to be used in a test.	51	* Returns a Shell to be used in a test.
44	*	52	*
45	* @return shell	53	* @return shell
46	*/	54	*/
47	protected Shell getShell() {	55	protected Shell getShell() {
48	if (shell == null \|\| shell.isDisposed()) {	56	if (shell == null \|\| shell.isDisposed()) {
49	shell = new Shell();	57	shell = new Shell();
50	}	58	}
51		59
52	return shell;	60	return shell;
53	}	61	}
		62
		63	public static void notifySelection(Widget widget) {
		64	Event event = new Event();
		65	event.type = SWT.Selection;
		66	event.display = widget.getDisplay();
		67	event.widget = widget;
		68	widget.notifyListeners(SWT.Selection, event);
		69	}
54	}	70	}




 *     Brad Reynolds - bug 116920
 *     Brad Reynolds - bug 164247
 *     Brad Reynolds - bug 164653, 159768, 170848, 147515
 *     Ashley Cambrell - bug 198904
 *******************************************************************************/
package org.eclipse.jface.tests.databinding;


import org.eclipse.jface.tests.examples.databinding.mask.internal.EditMaskParserTest;
import org.eclipse.jface.tests.internal.databinding.internal.swt.ButtonObservableValueTest;
import org.eclipse.jface.tests.internal.databinding.internal.swt.CComboObservableValueTest;
import org.eclipse.jface.tests.internal.databinding.internal.swt.CComboSingleSelectionObservableValueTest;
import org.eclipse.jface.tests.internal.databinding.internal.swt.CLabelObservableValueTest;
import org.eclipse.jface.tests.internal.databinding.internal.swt.ComboObservableValueTest;
import org.eclipse.jface.tests.internal.databinding.internal.swt.ComboSingleSelectionObservableValueTest;
import org.eclipse.jface.tests.internal.databinding.internal.swt.ControlObservableValueTest;
import org.eclipse.jface.tests.internal.databinding.internal.swt.LabelObservableValueTest;
import org.eclipse.jface.tests.internal.databinding.internal.swt.ListSingleSelectionObservableValueTest;
import org.eclipse.jface.tests.internal.databinding.internal.swt.ScaleObservableValueTest;
import org.eclipse.jface.tests.internal.databinding.internal.swt.SpinnerObservableValueTest;
import org.eclipse.jface.tests.internal.databinding.internal.swt.TableObservableValueTest;

		addTestSuite(UnionSetRealmTest.class);
		addTestSuite(WritableSetRealmTest.class);
		addTestSuite(WritableSetTest.class);

		//org.eclipse.core.tests.databinding.observable.value
		addTestSuite(AbstractObservableValueTest.class);
		addTestSuite(AbstractVetoableValueTest.class);
		addTestSuite(ComputedValueTest.class);
		addTestSuite(WritableValueTest.class);

		//org.eclipse.core.tests.databinding.validation
		addTestSuite(ValidationStatusTest.class);

		// org.eclipse.core.tests.internal.databinding
		addTestSuite(BindingMessagesTest.class);
		addTestSuite(BindingStatusTest.class);

		addTestSuite(JavaBeanObservableSetTest.class);
		addTestSuite(JavaBeanObservableValueTest.class);
		addTestSuite(ListenerSupportTest.class);

		//org.eclipse.core.tests.internal.databinding.observable
		addTestSuite(UnmodifiableObservableListTest.class);

		// org.eclipse.core.tests.internal.databinding.observable.masterdetail
		addTestSuite(DetailObservableListTest.class);
		addTestSuite(DetailObservableSetTest.class);


		//org.eclipse.jface.tests.databinding.swt
		addTestSuite(SWTObservablesTest.class);

		// org.eclipse.jface.tests.databinding.viewers
		addTestSuite(ObservableMapLabelProviderTest.class);
		addTestSuite(ObservableSetContentProviderTest.class);

		//org.eclipse.jface.tests.example.databinding.mask.internal
		addTestSuite(EditMaskLexerAndTokenTest.class);
		addTestSuite(EditMaskParserTest.class);

		//org.eclipse.jface.tests.internal.databinding.internal.swt
		addTestSuite(ButtonObservableValueTest.class);
		addTestSuite(CComboObservableValueTest.class);
		addTestSuite(CComboSingleSelectionObservableValueTest.class);
		addTestSuite(CLabelObservableValueTest.class);
		addTestSuite(ComboObservableValueTest.class);
		addTestSuite(ComboSingleSelectionObservableValueTest.class);
		addTestSuite(ControlObservableValueTest.class);
		addTestSuite(LabelObservableValueTest.class);
		addTestSuite(ListSingleSelectionObservableValueTest.class);
		addTestSuite(ScaleObservableValueTest.class);
		addTestSuite(SpinnerObservableValueTest.class);
		addTestSuite(TableObservableValueTest.class);
		addTestSuite(TextEditableObservableValueTest.class);
		addTestSuite(TextObservableValueTest.class);

		//org.eclipse.jface.tests.internal.databinding.internal.viewers
		addTestSuite(SelectionProviderSingleSelectionObservableValueTest.class);
	}




 *
 * Contributors:
 *     Brad Reynolds - initial API and implementation
 *     Ashley Cambrell - bug 198904
 ******************************************************************************/

package org.eclipse.jface.tests.internal.databinding.internal.swt;

import junit.framework.TestCase;

import org.eclipse.jface.internal.databinding.internal.swt.ButtonObservableValue;
import org.eclipse.jface.tests.databinding.AbstractSWTTestCase;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Shell;

/**
 * @since 3.2
 *
 */
public class ButtonObservableValueTest extends AbstractSWTTestCase {

	public void testSetValue() throws Exception {
		Button button = new Button(getShell(), SWT.CHECK);
		ButtonObservableValue observableValue = new ButtonObservableValue(
				button);
		assertEquals(Boolean.FALSE, observableValue.getValue());
		assertFalse(button.getSelection());

		Boolean value = Boolean.TRUE;
		observableValue.setValue(value);
		assertTrue("button value", button.getSelection());
		assertEquals("observable value", value, observableValue.getValue());
	}

	public void testDispose() throws Exception {
		Button button = new Button(getShell(), SWT.CHECK);
		ButtonObservableValue observableValue = new ButtonObservableValue(
				button);
		TestCounterValueChangeListener testCounterValueChangeListener = new TestCounterValueChangeListener();
		observableValue.addValueChangeListener(testCounterValueChangeListener);

		assertEquals(Boolean.FALSE, observableValue.getValue());
		assertFalse(button.getSelection());

		button.setSelection(true);
		notifySelection(button);

		assertEquals(1, testCounterValueChangeListener.counter);
		assertEquals(Boolean.TRUE, observableValue.getValue());
		assertTrue(button.getSelection());

		observableValue.dispose();

		button.setSelection(false);
		notifySelection(button);

		assertEquals(1, testCounterValueChangeListener.counter);

	}
}




 *
 * Contributors:
 *     Brad Reynolds - initial API and implementation
 *     Ashley Cambrell - bug 198904
 ******************************************************************************/

package org.eclipse.jface.tests.internal.databinding.internal.swt;

import junit.framework.TestCase;

import org.eclipse.jface.internal.databinding.internal.swt.ComboObservableValue;
import org.eclipse.jface.internal.databinding.internal.swt.SWTProperties;
import org.eclipse.jface.tests.databinding.AbstractSWTTestCase;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Shell;

/**
 * @since 3.2
 *
 */
public class ComboObservableValueTest extends AbstractSWTTestCase {
	public void testSetValueText() throws Exception {
		Combo combo = new Combo(getShell(), SWT.NONE);
		ComboObservableValue observableValue = new ComboObservableValue(combo,
				SWTProperties.TEXT);
		assertEquals("", combo.getText());
		assertEquals("", observableValue.getValue());

		String value = "value";
		observableValue.setValue(value);
		assertEquals("combo text", value, combo.getText());
		assertEquals("observable value", value, observableValue.getValue());
	}

	public void testDispose() throws Exception {
		Combo combo = new Combo(getShell(), SWT.NONE);
		ComboObservableValue observableValue = new ComboObservableValue(combo,
				SWTProperties.TEXT);
		TestCounterValueChangeListener testCounterValueChangeListener = new TestCounterValueChangeListener();
		observableValue.addValueChangeListener(testCounterValueChangeListener);

		assertEquals("", combo.getText());
		assertEquals("", observableValue.getValue());

		String expected1 = "Test123";
		combo.setText(expected1);

		assertEquals(1, testCounterValueChangeListener.counter);
		assertEquals(expected1, combo.getText());
		assertEquals(expected1, observableValue.getValue());

		observableValue.dispose();

		String expected2 = "NewValue123";
		combo.setText(expected2);

		assertEquals(1, testCounterValueChangeListener.counter);
		assertEquals(expected2, combo.getText());
	}
}




 *
 * Contributors:
 *     Brad Reynolds - initial API and implementation
 *     Ashley Cambrell - bug 198904
 ******************************************************************************/

package org.eclipse.jface.tests.internal.databinding.internal.swt;

import junit.framework.TestCase;

import org.eclipse.jface.internal.databinding.internal.swt.TableSingleSelectionObservableValue;
import org.eclipse.jface.tests.databinding.AbstractSWTTestCase;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Table;
import org.eclipse.swt.widgets.TableItem;

/**
 * @since 3.2
 */
public class TableObservableValueTest extends AbstractSWTTestCase {
	public void testSetValue() throws Exception {
		Table table = new Table(getShell(), SWT.NONE);
		TableSingleSelectionObservableValue observableValue = new TableSingleSelectionObservableValue(
				table);
		new TableItem(table, SWT.NONE);

		assertEquals(-1, table.getSelectionIndex());
		assertEquals(-1, ((Integer) observableValue.getValue()).intValue());

		Integer value = new Integer(0);
		observableValue.setValue(value);
		assertEquals("table selection index", value.intValue(), table
				.getSelectionIndex());
		assertEquals("observable value", value, observableValue.getValue());
	}

	public void testDispose() throws Exception {
		Table table = new Table(getShell(), SWT.NONE);
		TableSingleSelectionObservableValue observableValue = new TableSingleSelectionObservableValue(
				table);

		TableItem item1 = new TableItem(table, SWT.NONE);
		item1.setText("Item1");
		TableItem item2 = new TableItem(table, SWT.NONE);
		item2.setText("Item2");

		assertEquals(-1, table.getSelectionIndex());
		assertEquals(-1, ((Integer) observableValue.getValue()).intValue());

		table.select(0);
		notifySelection(table);
		assertEquals(0, table.getSelectionIndex());
		assertEquals(new Integer(0), observableValue.getValue());

		observableValue.dispose();

		table.select(1);
		notifySelection(table);
		assertEquals(1, table.getSelectionIndex());
	}
}




 *     IBM Corporation - initial API and implementation
 *     Brad Reynolds - bug 116920
 *     Brad Reynolds - bug 164653
 *     Ashley Cambrell - bug 198904
 *******************************************************************************/

package org.eclipse.jface.tests.internal.databinding.internal.swt;


/**
 * Tests to assert the inputs of the TextObservableValue constructor.
 *
 * @since 3.2
 */
public class TextObservableValueTest extends AbstractDefaultRealmTestCase {


		Shell shell = new Shell();
		text = new Text(shell, SWT.NONE);

		listener = new ValueChangeEventTracker();
	}


		observableValue.setValue(value);
		assertEquals("observable value", value, observableValue.getValue());
	}

	public void testSetValueValueChangeEvent() throws Exception {
		String a = "a";
		String b = "b";

		TextObservableValue observableValue = new TextObservableValue(text, SWT.NONE);
		observableValue.addValueChangeListener(listener);

		observableValue.setValue(a);
		assertEquals("", listener.event.diff.getOldValue());
		assertEquals(a, listener.event.diff.getNewValue());

		observableValue.setValue(b);
		assertEquals(a, listener.event.diff.getOldValue());
		assertEquals(b, listener.event.diff.getNewValue());

		String b = "b";

		text.setText(a);

		observableValue.addValueChangeListener(listener);

		assertEquals(0, listener.count);

	public void testOnFocusOutValueChangeEvent() throws Exception {
		String a = "a";
		String b = "b";

		text.setText(a);

		TextObservableValue observableValue = new TextObservableValue(text,
				SWT.FocusOut);

		observableValue.addValueChangeListener(listener);

		text.setText(b);
		assertEquals(0, listener.count);

		text.notifyListeners(SWT.FocusOut, null);
		assertEquals(1, listener.count);

		assertEquals(a, listener.event.diff.getOldValue());
		assertEquals(b, listener.event.diff.getNewValue());
	}

	public void testChangeEventsSuppressedWhenValueDoesNotChange() throws Exception {
		TextObservableValue observableValue = new TextObservableValue(text, SWT.Modify);

		observableValue.addValueChangeListener(listener);

		String value = "value";
		text.setText(value);
		assertEquals(1, listener.count);

		text.setText(value);
		assertEquals("listener not notified", 1, listener.count);
	}

	/**
	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=171132
	 *
	 * @throws Exception
	 */
	public void testGetValueBeforeFocusOutChangeEventsFire() throws Exception {
		TextObservableValue observableValue = new TextObservableValue(text, SWT.FocusOut);
		observableValue.addValueChangeListener(listener);

		String a = "a";
		String b = "b";

		text.setText(a);
		assertEquals(a, observableValue.getValue()); //fetch the value updating the buffered value

		text.setText(b);
		text.notifyListeners(SWT.FocusOut, null);

		assertEquals(1, listener.count);
		assertEquals(a, listener.event.diff.getOldValue());
		assertEquals(b, listener.event.diff.getNewValue());
	}

	public void testDispose() throws Exception {
		TextObservableValue observableValue = new TextObservableValue(text,
				SWT.Modify);
		TestCounterValueChangeListener testCounterValueChangeListener = new TestCounterValueChangeListener();
		observableValue.addValueChangeListener(testCounterValueChangeListener);

		String expected1 = "Test123";
		text.setText(expected1);

		assertEquals(1, testCounterValueChangeListener.counter);
		assertEquals(expected1, text.getText());
		assertEquals(expected1, observableValue.getValue());

		observableValue.dispose();

		String expected2 = "NewValue123";
		text.setText(expected2);

		assertEquals(1, testCounterValueChangeListener.counter);
		assertEquals(expected2, text.getText());
	}
}




 *
 * Contributors:
 *     Brad Reynolds - initial API and implementation
 *     Ashley Cambrell - bug 198904
 ******************************************************************************/

package org.eclipse.jface.tests.internal.databinding.internal.swt;

import junit.framework.TestCase;

import org.eclipse.jface.internal.databinding.internal.swt.SWTProperties;
import org.eclipse.jface.internal.databinding.internal.swt.SpinnerObservableValue;
import org.eclipse.jface.tests.databinding.AbstractSWTTestCase;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Spinner;

/**
 * @since 3.2
 *
 */
public class SpinnerObservableValueTest extends AbstractSWTTestCase {
	public void testSetValueSelection() throws Exception {
		Spinner spinner = new Spinner(getShell(), SWT.NONE);
		SpinnerObservableValue observableValue = new SpinnerObservableValue(
				spinner, SWTProperties.SELECTION);

		assertEquals(0, spinner.getSelection());
		assertEquals(0, ((Integer) observableValue.getValue()).intValue());

		Integer value = new Integer(1);
		observableValue.setValue(value);
		assertEquals("spinner selection", value.intValue(), spinner
				.getSelection());
		assertEquals("observable value", value, observableValue.getValue());
	}

	public void testDispose() throws Exception {
		Spinner spinner = new Spinner(getShell(), SWT.NONE);
		SpinnerObservableValue observableValue = new SpinnerObservableValue(
				spinner, SWTProperties.SELECTION);
		TestCounterValueChangeListener testCounterValueChangeListener = new TestCounterValueChangeListener();
		observableValue.addValueChangeListener(testCounterValueChangeListener);

		assertEquals(0, spinner.getSelection());
		assertEquals(0, ((Integer) observableValue.getValue()).intValue());

		Integer expected1 = new Integer(1);
		spinner.setSelection(expected1.intValue());

		assertEquals(1, testCounterValueChangeListener.counter);
		assertEquals(expected1.intValue(), spinner.getSelection());
		assertEquals(expected1, observableValue.getValue());

		observableValue.dispose();

		Integer expected2 = new Integer(2);
		spinner.setSelection(expected2.intValue());

		assertEquals(1, testCounterValueChangeListener.counter);
		assertEquals(expected2.intValue(), spinner.getSelection());
	}
}




 *
 * Contributors:
 *     Brad Reynolds - initial API and implementation
 *     Ashley Cambrell - bug 198904
 ******************************************************************************/

package org.eclipse.jface.tests.internal.databinding.internal.swt;

import junit.framework.TestCase;

import org.eclipse.jface.internal.databinding.internal.swt.CComboObservableValue;
import org.eclipse.jface.internal.databinding.internal.swt.SWTProperties;
import org.eclipse.jface.tests.databinding.AbstractSWTTestCase;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.CCombo;
import org.eclipse.swt.widgets.Shell;

/**
 * @since 3.2
 */
public class CComboObservableValueTest extends AbstractSWTTestCase {
	public void testSetValueText() throws Exception {
		CCombo combo = new CCombo(getShell(), SWT.NONE);
		CComboObservableValue observableValue = new CComboObservableValue(
				combo, SWTProperties.TEXT);
		assertEquals("", combo.getText());
		assertEquals("", observableValue.getValue());

		String value = "value";
		observableValue.setValue(value);
		assertEquals("combo value", value, combo.getText());
		assertEquals("observable value value is incorrect", value,
				observableValue.getValue());
	}

	public void testDispose() throws Exception {
		CCombo combo = new CCombo(getShell(), SWT.NONE);
		CComboObservableValue observableValue = new CComboObservableValue(
				combo, SWTProperties.TEXT);

		TestCounterValueChangeListener testCounterValueChangeListener = new TestCounterValueChangeListener();
		observableValue.addValueChangeListener(testCounterValueChangeListener);

		assertEquals("", combo.getText());
		assertEquals("", observableValue.getValue());

		String expected1 = "Test123";
		combo.setText(expected1);

		assertEquals(1, testCounterValueChangeListener.counter);
		assertEquals(expected1, combo.getText());
		assertEquals(expected1, observableValue.getValue());

		observableValue.dispose();

		String expected2 = "NewValue123";
		combo.setText(expected2);

		assertEquals(1, testCounterValueChangeListener.counter);
		assertEquals(expected2, combo.getText());
	}
}




/*******************************************************************************
 * Copyright (c) 2007 Ashley Cambrell and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     Ashley Cambrell - initial API and implementation
 ******************************************************************************/

package org.eclipse.jface.tests.internal.databinding.internal.swt;

import org.eclipse.jface.internal.databinding.internal.swt.ListSingleSelectionObservableValue;
import org.eclipse.jface.tests.databinding.AbstractSWTTestCase;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.List;

/**
 * @since 3.2
 *
 */
public class ListSingleSelectionObservableValueTest extends AbstractSWTTestCase {
	public void testSetValue() throws Exception {
		List list = new List(getShell(), SWT.NONE);
		ListSingleSelectionObservableValue observableValue = new ListSingleSelectionObservableValue(
				list);
		list.add("Item1");

		assertEquals(-1, list.getSelectionIndex());
		assertEquals(-1, ((Integer) observableValue.getValue()).intValue());

		Integer value = new Integer(0);
		observableValue.setValue(value);
		assertEquals("list selection index", value.intValue(), list
				.getSelectionIndex());
		assertEquals("observable value", value, observableValue.getValue());
	}

	public void testDispose() throws Exception {
		List list = new List(getShell(), SWT.NONE);
		ListSingleSelectionObservableValue observableValue = new ListSingleSelectionObservableValue(
				list);
		list.add("Item1");
		list.add("Item2");

		assertEquals(-1, list.getSelectionIndex());
		assertEquals(-1, ((Integer) observableValue.getValue()).intValue());

		list.select(0);
		notifySelection(list);
		assertEquals(0, list.getSelectionIndex());
		assertEquals(new Integer(0), observableValue.getValue());

		observableValue.dispose();

		list.select(1);
		notifySelection(list);
		assertEquals(1, list.getSelectionIndex());
	}
}




/*******************************************************************************
 * Copyright (c) 2007 Ashley Cambrell and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     Ashley Cambrell - initial API and implementation
 ******************************************************************************/

package org.eclipse.jface.tests.internal.databinding.internal.swt;

import org.eclipse.core.databinding.observable.value.IValueChangeListener;
import org.eclipse.core.databinding.observable.value.ValueChangeEvent;

class TestCounterValueChangeListener implements
		IValueChangeListener {
	public int counter = 0;

	public void handleValueChange(ValueChangeEvent event) {
		++counter;
	}
}




/*******************************************************************************
 * Copyright (c) 2007 Ashley Cambrell and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     Ashley Cambrell - initial API and implementation
 ******************************************************************************/

package org.eclipse.jface.tests.internal.databinding.internal.swt;

import org.eclipse.jface.internal.databinding.internal.swt.ComboSingleSelectionObservableValue;
import org.eclipse.jface.tests.databinding.AbstractSWTTestCase;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Combo;

/**
 * @since 3.2
 *
 */
public class ComboSingleSelectionObservableValueTest extends
		AbstractSWTTestCase {
	public void testSetValue() throws Exception {
		Combo combo = new Combo(getShell(), SWT.NONE);
		ComboSingleSelectionObservableValue observableValue = new ComboSingleSelectionObservableValue(
				combo);
		combo.add("Item1");
		combo.add("Item2");

		assertEquals(-1, combo.getSelectionIndex());
		assertEquals(-1, ((Integer) observableValue.getValue()).intValue());

		Integer value = new Integer(1);
		observableValue.setValue(value);
		assertEquals("combo selection index", value.intValue(), combo
				.getSelectionIndex());
		assertEquals("observable value", value, observableValue.getValue());

		assertEquals("Item2", combo.getText());
	}

	public void testDispose() throws Exception {
		Combo combo = new Combo(getShell(), SWT.NONE);
		ComboSingleSelectionObservableValue observableValue = new ComboSingleSelectionObservableValue(
				combo);
		combo.add("Item1");
		combo.add("Item2");

		assertEquals(-1, combo.getSelectionIndex());
		assertEquals(-1, ((Integer) observableValue.getValue()).intValue());

		combo.select(0);
		notifySelection(combo);
		assertEquals(0, combo.getSelectionIndex());
		assertEquals(new Integer(0), observableValue.getValue());

		observableValue.dispose();

		combo.select(1);
		notifySelection(combo);
		assertEquals(1, combo.getSelectionIndex());
	}
}




/*******************************************************************************
 * Copyright (c) 2007 Ashley Cambrell and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     Ashley Cambrell - initial API and implementation
 ******************************************************************************/

package org.eclipse.jface.tests.internal.databinding.internal.swt;

import org.eclipse.jface.internal.databinding.internal.swt.CComboSingleSelectionObservableValue;
import org.eclipse.jface.tests.databinding.AbstractSWTTestCase;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.CCombo;

/**
 * @since 3.2
 *
 */
public class CComboSingleSelectionObservableValueTest extends
		AbstractSWTTestCase {
	public void testSetValue() throws Exception {
		CCombo combo = new CCombo(getShell(), SWT.NONE);
		CComboSingleSelectionObservableValue observableValue = new CComboSingleSelectionObservableValue(
				combo);
		combo.add("Item1");
		combo.add("Item2");

		assertEquals(-1, combo.getSelectionIndex());
		assertEquals(-1, ((Integer) observableValue.getValue()).intValue());

		Integer value = new Integer(1);
		observableValue.setValue(value);
		assertEquals("combo selection index", value.intValue(), combo
				.getSelectionIndex());
		assertEquals("observable value", value, observableValue.getValue());

		assertEquals("Item2", combo.getText());
	}


	public void testDispose() throws Exception {
		CCombo combo = new CCombo(getShell(), SWT.NONE);
		CComboSingleSelectionObservableValue observableValue = new CComboSingleSelectionObservableValue(
				combo);
		combo.add("Item1");
		combo.add("Item2");

		assertEquals(-1, combo.getSelectionIndex());
		assertEquals(-1, ((Integer) observableValue.getValue()).intValue());

		combo.select(0);
		notifySelection(combo);
		assertEquals(0, combo.getSelectionIndex());
		assertEquals(new Integer(0), observableValue.getValue());

		observableValue.dispose();

		combo.select(1);
		notifySelection(combo);
		assertEquals(1, combo.getSelectionIndex());
	}
}

Return to bug 198904

Lines 11-16 Link Here

(-)src/org/eclipse/jface/tests/databinding/BindingTestSuite.java (-8 / +15 lines)
11	* Brad Reynolds - bug 116920	11	* Brad Reynolds - bug 116920
12	* Brad Reynolds - bug 164247	12	* Brad Reynolds - bug 164247
13	* Brad Reynolds - bug 164653, 159768, 170848, 147515	13	* Brad Reynolds - bug 164653, 159768, 170848, 147515
		14	* Ashley Cambrell - bug 198904
14	*******************************************************************************/	15	*******************************************************************************/
15	package org.eclipse.jface.tests.databinding;	16	package org.eclipse.jface.tests.databinding;
16		17
Lines 109-118 Link Here
109	import org.eclipse.jface.tests.examples.databinding.mask.internal.EditMaskParserTest;	110	import org.eclipse.jface.tests.examples.databinding.mask.internal.EditMaskParserTest;
110	import org.eclipse.jface.tests.internal.databinding.internal.swt.ButtonObservableValueTest;	111	import org.eclipse.jface.tests.internal.databinding.internal.swt.ButtonObservableValueTest;
111	import org.eclipse.jface.tests.internal.databinding.internal.swt.CComboObservableValueTest;	112	import org.eclipse.jface.tests.internal.databinding.internal.swt.CComboObservableValueTest;
		113	import org.eclipse.jface.tests.internal.databinding.internal.swt.CComboSingleSelectionObservableValueTest;
112	import org.eclipse.jface.tests.internal.databinding.internal.swt.CLabelObservableValueTest;	114	import org.eclipse.jface.tests.internal.databinding.internal.swt.CLabelObservableValueTest;
113	import org.eclipse.jface.tests.internal.databinding.internal.swt.ComboObservableValueTest;	115	import org.eclipse.jface.tests.internal.databinding.internal.swt.ComboObservableValueTest;
		116	import org.eclipse.jface.tests.internal.databinding.internal.swt.ComboSingleSelectionObservableValueTest;
114	import org.eclipse.jface.tests.internal.databinding.internal.swt.ControlObservableValueTest;	117	import org.eclipse.jface.tests.internal.databinding.internal.swt.ControlObservableValueTest;
115	import org.eclipse.jface.tests.internal.databinding.internal.swt.LabelObservableValueTest;	118	import org.eclipse.jface.tests.internal.databinding.internal.swt.LabelObservableValueTest;
		119	import org.eclipse.jface.tests.internal.databinding.internal.swt.ListSingleSelectionObservableValueTest;
116	import org.eclipse.jface.tests.internal.databinding.internal.swt.ScaleObservableValueTest;	120	import org.eclipse.jface.tests.internal.databinding.internal.swt.ScaleObservableValueTest;
117	import org.eclipse.jface.tests.internal.databinding.internal.swt.SpinnerObservableValueTest;	121	import org.eclipse.jface.tests.internal.databinding.internal.swt.SpinnerObservableValueTest;
118	import org.eclipse.jface.tests.internal.databinding.internal.swt.TableObservableValueTest;	122	import org.eclipse.jface.tests.internal.databinding.internal.swt.TableObservableValueTest;
Lines 169-184 Link Here
169	addTestSuite(UnionSetRealmTest.class);	173	addTestSuite(UnionSetRealmTest.class);
170	addTestSuite(WritableSetRealmTest.class);	174	addTestSuite(WritableSetRealmTest.class);
171	addTestSuite(WritableSetTest.class);	175	addTestSuite(WritableSetTest.class);
172		176
173	//org.eclipse.core.tests.databinding.observable.value	177	//org.eclipse.core.tests.databinding.observable.value
174	addTestSuite(AbstractObservableValueTest.class);	178	addTestSuite(AbstractObservableValueTest.class);
175	addTestSuite(AbstractVetoableValueTest.class);	179	addTestSuite(AbstractVetoableValueTest.class);
176	addTestSuite(ComputedValueTest.class);	180	addTestSuite(ComputedValueTest.class);
177	addTestSuite(WritableValueTest.class);	181	addTestSuite(WritableValueTest.class);
178		182
179	//org.eclipse.core.tests.databinding.validation	183	//org.eclipse.core.tests.databinding.validation
180	addTestSuite(ValidationStatusTest.class);	184	addTestSuite(ValidationStatusTest.class);
181		185
182	// org.eclipse.core.tests.internal.databinding	186	// org.eclipse.core.tests.internal.databinding
183	addTestSuite(BindingMessagesTest.class);	187	addTestSuite(BindingMessagesTest.class);
184	addTestSuite(BindingStatusTest.class);	188	addTestSuite(BindingStatusTest.class);
Lines 220-229 Link Here
220	addTestSuite(JavaBeanObservableSetTest.class);	224	addTestSuite(JavaBeanObservableSetTest.class);
221	addTestSuite(JavaBeanObservableValueTest.class);	225	addTestSuite(JavaBeanObservableValueTest.class);
222	addTestSuite(ListenerSupportTest.class);	226	addTestSuite(ListenerSupportTest.class);
223		227
224	//org.eclipse.core.tests.internal.databinding.observable	228	//org.eclipse.core.tests.internal.databinding.observable
225	addTestSuite(UnmodifiableObservableListTest.class);	229	addTestSuite(UnmodifiableObservableListTest.class);
226		230
227	// org.eclipse.core.tests.internal.databinding.observable.masterdetail	231	// org.eclipse.core.tests.internal.databinding.observable.masterdetail
228	addTestSuite(DetailObservableListTest.class);	232	addTestSuite(DetailObservableListTest.class);
229	addTestSuite(DetailObservableSetTest.class);	233	addTestSuite(DetailObservableSetTest.class);
Lines 251-261 Link Here
251		255
252	//org.eclipse.jface.tests.databinding.swt	256	//org.eclipse.jface.tests.databinding.swt
253	addTestSuite(SWTObservablesTest.class);	257	addTestSuite(SWTObservablesTest.class);
254		258
255	// org.eclipse.jface.tests.databinding.viewers	259	// org.eclipse.jface.tests.databinding.viewers
256	addTestSuite(ObservableMapLabelProviderTest.class);	260	addTestSuite(ObservableMapLabelProviderTest.class);
257	addTestSuite(ObservableSetContentProviderTest.class);	261	addTestSuite(ObservableSetContentProviderTest.class);
258		262
259	//org.eclipse.jface.tests.example.databinding.mask.internal	263	//org.eclipse.jface.tests.example.databinding.mask.internal
260	addTestSuite(EditMaskLexerAndTokenTest.class);	264	addTestSuite(EditMaskLexerAndTokenTest.class);
261	addTestSuite(EditMaskParserTest.class);	265	addTestSuite(EditMaskParserTest.class);
Lines 263-278 Link Here
263	//org.eclipse.jface.tests.internal.databinding.internal.swt	267	//org.eclipse.jface.tests.internal.databinding.internal.swt
264	addTestSuite(ButtonObservableValueTest.class);	268	addTestSuite(ButtonObservableValueTest.class);
265	addTestSuite(CComboObservableValueTest.class);	269	addTestSuite(CComboObservableValueTest.class);
		270	addTestSuite(CComboSingleSelectionObservableValueTest.class);
266	addTestSuite(CLabelObservableValueTest.class);	271	addTestSuite(CLabelObservableValueTest.class);
267	addTestSuite(ComboObservableValueTest.class);	272	addTestSuite(ComboObservableValueTest.class);
		273	addTestSuite(ComboSingleSelectionObservableValueTest.class);
268	addTestSuite(ControlObservableValueTest.class);	274	addTestSuite(ControlObservableValueTest.class);
269	addTestSuite(LabelObservableValueTest.class);	275	addTestSuite(LabelObservableValueTest.class);
		276	addTestSuite(ListSingleSelectionObservableValueTest.class);
270	addTestSuite(ScaleObservableValueTest.class);	277	addTestSuite(ScaleObservableValueTest.class);
271	addTestSuite(SpinnerObservableValueTest.class);	278	addTestSuite(SpinnerObservableValueTest.class);
272	addTestSuite(TableObservableValueTest.class);	279	addTestSuite(TableObservableValueTest.class);
273	addTestSuite(TextEditableObservableValueTest.class);	280	addTestSuite(TextEditableObservableValueTest.class);
274	addTestSuite(TextObservableValueTest.class);	281	addTestSuite(TextObservableValueTest.class);
275		282
276	//org.eclipse.jface.tests.internal.databinding.internal.viewers	283	//org.eclipse.jface.tests.internal.databinding.internal.viewers
277	addTestSuite(SelectionProviderSingleSelectionObservableValueTest.class);	284	addTestSuite(SelectionProviderSingleSelectionObservableValueTest.class);
278	}	285	}

Lines 7-39 Link Here

(-)src/org/eclipse/jface/tests/internal/databinding/internal/swt/ButtonObservableValueTest.java (-17 / +42 lines)
7	*	7	*
8	* Contributors:	8	* Contributors:
9	* Brad Reynolds - initial API and implementation	9	* Brad Reynolds - initial API and implementation
		10	* Ashley Cambrell - bug 198904
10	******************************************************************************/	11	******************************************************************************/
11		12
12	package org.eclipse.jface.tests.internal.databinding.internal.swt;	13	package org.eclipse.jface.tests.internal.databinding.internal.swt;
13		14
14	import junit.framework.TestCase;
15
16	import org.eclipse.jface.internal.databinding.internal.swt.ButtonObservableValue;	15	import org.eclipse.jface.internal.databinding.internal.swt.ButtonObservableValue;
		16	import org.eclipse.jface.tests.databinding.AbstractSWTTestCase;
17	import org.eclipse.swt.SWT;	17	import org.eclipse.swt.SWT;
18	import org.eclipse.swt.widgets.Button;	18	import org.eclipse.swt.widgets.Button;
19	import org.eclipse.swt.widgets.Shell;
20		19
21	/**	20	/**
22	* @since 3.2	21	* @since 3.2
23	*	22	*
24	*/	23	*/
25	public class ButtonObservableValueTest extends TestCase {	24	public class ButtonObservableValueTest extends AbstractSWTTestCase {
26	public void testSetValue() throws Exception {	25
27	Shell shell = new Shell();	26	public void testSetValue() throws Exception {
28	Button button = new Button(shell, SWT.CHECK);	27	Button button = new Button(getShell(), SWT.CHECK);
29	ButtonObservableValue observableValue = new ButtonObservableValue(button);	28	ButtonObservableValue observableValue = new ButtonObservableValue(
30	assertEquals(Boolean.FALSE, observableValue.getValue());	29	button);
31	assertFalse(button.getSelection());	30	assertEquals(Boolean.FALSE, observableValue.getValue());
32		31	assertFalse(button.getSelection());
33	Boolean value = Boolean.TRUE;	32
34	observableValue.setValue(value);	33	Boolean value = Boolean.TRUE;
35	assertTrue("button value", button.getSelection());	34	observableValue.setValue(value);
36	assertEquals("observable value", value, observableValue.getValue());	35	assertTrue("button value", button.getSelection());
37	shell.dispose();	36	assertEquals("observable value", value, observableValue.getValue());
38	}	37	}
		38
		39	public void testDispose() throws Exception {
		40	Button button = new Button(getShell(), SWT.CHECK);
		41	ButtonObservableValue observableValue = new ButtonObservableValue(
		42	button);
		43	TestCounterValueChangeListener testCounterValueChangeListener = new TestCounterValueChangeListener();
		44	observableValue.addValueChangeListener(testCounterValueChangeListener);
		45
		46	assertEquals(Boolean.FALSE, observableValue.getValue());
		47	assertFalse(button.getSelection());
		48
		49	button.setSelection(true);
		50	notifySelection(button);
		51
		52	assertEquals(1, testCounterValueChangeListener.counter);
		53	assertEquals(Boolean.TRUE, observableValue.getValue());
		54	assertTrue(button.getSelection());
		55
		56	observableValue.dispose();
		57
		58	button.setSelection(false);
		59	notifySelection(button);
		60
		61	assertEquals(1, testCounterValueChangeListener.counter);
		62
		63	}
39	}	64	}

Added Link Here

(-)src/org/eclipse/jface/tests/internal/databinding/internal/swt/ListSingleSelectionObservableValueTest.java (+61 lines)
1	/*******************************************************************************
2	* Copyright (c) 2007 Ashley Cambrell and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* Ashley Cambrell - initial API and implementation
10	******************************************************************************/
11
12	package org.eclipse.jface.tests.internal.databinding.internal.swt;
13
14	import org.eclipse.jface.internal.databinding.internal.swt.ListSingleSelectionObservableValue;
15	import org.eclipse.jface.tests.databinding.AbstractSWTTestCase;
16	import org.eclipse.swt.SWT;
17	import org.eclipse.swt.widgets.List;
18
19	/**
20	* @since 3.2
21	*
22	*/
23	public class ListSingleSelectionObservableValueTest extends AbstractSWTTestCase {
24	public void testSetValue() throws Exception {
25	List list = new List(getShell(), SWT.NONE);
26	ListSingleSelectionObservableValue observableValue = new ListSingleSelectionObservableValue(
27	list);
28	list.add("Item1");
29
30	assertEquals(-1, list.getSelectionIndex());
31	assertEquals(-1, ((Integer) observableValue.getValue()).intValue());
32
33	Integer value = new Integer(0);
34	observableValue.setValue(value);
35	assertEquals("list selection index", value.intValue(), list
36	.getSelectionIndex());
37	assertEquals("observable value", value, observableValue.getValue());
38	}
39
40	public void testDispose() throws Exception {
41	List list = new List(getShell(), SWT.NONE);
42	ListSingleSelectionObservableValue observableValue = new ListSingleSelectionObservableValue(
43	list);
44	list.add("Item1");
45	list.add("Item2");
46
47	assertEquals(-1, list.getSelectionIndex());
48	assertEquals(-1, ((Integer) observableValue.getValue()).intValue());
49
50	list.select(0);
51	notifySelection(list);
52	assertEquals(0, list.getSelectionIndex());
53	assertEquals(new Integer(0), observableValue.getValue());
54
55	observableValue.dispose();
56
57	list.select(1);
58	notifySelection(list);
59	assertEquals(1, list.getSelectionIndex());
60	}
61	}