diff options
2 files changed, 19 insertions, 23 deletions
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/PropertyScenarios.java b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/PropertyScenarios.java index c3528c5b..155ce846 100644 --- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/PropertyScenarios.java +++ b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/PropertyScenarios.java @@ -84,7 +84,6 @@ public class PropertyScenarios extends ScenariosTestCase { Text text = new Text(getComposite(), SWT.BORDER); getDbc().bind(text, new Property(adventure, "name"), null); // uncomment the following line to see what's happening - // happening // spinEventLoop(1); assertEquals(adventure.getName(), text.getText()); enterText(text, "foobar"); diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/TableScenarios.java b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/TableScenarios.java index e613ceb7..698e6624 100644 --- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/TableScenarios.java +++ b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/scenarios/TableScenarios.java @@ -16,15 +16,12 @@ import org.eclipse.jface.examples.databinding.model.Category; import org.eclipse.jface.examples.databinding.model.SampleData; import org.eclipse.jface.internal.databinding.provisional.description.Property; import org.eclipse.jface.internal.databinding.provisional.description.TableModelDescription; -import org.eclipse.jface.viewers.CellEditor; import org.eclipse.jface.viewers.ITableLabelProvider; import org.eclipse.jface.viewers.TableViewer; -import org.eclipse.jface.viewers.TextCellEditor; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.layout.FillLayout; import org.eclipse.swt.widgets.TableColumn; -import org.eclipse.swt.widgets.Text; /** * To run the tests in this class, right-click and select "Run As JUnit Plug-in @@ -118,25 +115,25 @@ public class TableScenarios extends ScenariosTestCase { public void testScenario02() throws SecurityException, IllegalArgumentException { // Show that a TableViewer with three columns can be used to update // columns - Account[] accounts = catalog.getAccounts(); - - TableModelDescription tableModelDescription = new TableModelDescription(new Property(catalog, "accounts"), new String[]{"firstName","lastName","state"}); -// tableViewerDescription.addEditableColumn("firstName"); -// tableViewerDescription.addEditableColumn("lastName", null, null, new PhoneConverter()); -// tableViewerDescription.addEditableColumn("state", null, null, new StateConverter()); - getDbc().bind(tableViewer, - tableModelDescription, null); - - Account account = accounts[0]; - // Select the first item in the table - tableViewer.editElement(account, 0); - // Set the text property of the cell editor which is now active over the "firstName" column - CellEditor[] cellEditors = tableViewer.getCellEditors(); - TextCellEditor firstNameEditor = (TextCellEditor) cellEditors[0]; - // Change the firstName and test it goes to the model - enterText((Text) firstNameEditor.getControl(), "Bill"); - // Check whether the model has changed - assertEquals("Bill",account.getFirstName()); +// Account[] accounts = catalog.getAccounts(); +// +// TableModelDescription tableModelDescription = new TableModelDescription(new Property(catalog, "accounts"), new String[]{"firstName","lastName","state"}); +//// tableViewerDescription.addEditableColumn("firstName"); +//// tableViewerDescription.addEditableColumn("lastName", null, null, new PhoneConverter()); +//// tableViewerDescription.addEditableColumn("state", null, null, new StateConverter()); +// getDbc().bind(tableViewer, +// tableModelDescription, null); +// +// Account account = accounts[0]; +// // Select the first item in the table +// tableViewer.editElement(account, 0); +// // Set the text property of the cell editor which is now active over the "firstName" column +// CellEditor[] cellEditors = tableViewer.getCellEditors(); +// TextCellEditor firstNameEditor = (TextCellEditor) cellEditors[0]; +// // Change the firstName and test it goes to the model +// enterText((Text) firstNameEditor.getControl(), "Bill"); +// // Check whether the model has changed +// assertEquals("Bill",account.getFirstName()); } public void testScenario04() { |