diff options
author | Hendrik Still | 2013-09-11 11:24:26 +0000 |
---|---|---|
committer | Gerrit Code Review @ Eclipse.org | 2013-09-17 13:20:56 +0000 |
commit | 94afd5ca34dc66e7e60cb5af54c0b1af79bb8e7f (patch) | |
tree | 8e00d1b89e6f09606b9460aa9ffd201a2d1f50e4 /tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/TableViewerComparatorTest.java | |
parent | d95f3516657cb987c46078778dcb69f673cab408 (diff) | |
download | eclipse.platform.ui-94afd5ca34dc66e7e60cb5af54c0b1af79bb8e7f.tar.gz eclipse.platform.ui-94afd5ca34dc66e7e60cb5af54c0b1af79bb8e7f.tar.xz eclipse.platform.ui-94afd5ca34dc66e7e60cb5af54c0b1af79bb8e7f.zip |
Bug 417142 - [Viewers] Update Viewer JUnit tests to use generics
Updates the JUnittest for the JFace Viewer
Change-Id: I767f9401ecf770e0844a4df03b44937374a2113c
Signed-off-by: Hendrik Still <hendrik.still@gammas.de>
Diffstat (limited to 'tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/TableViewerComparatorTest.java')
-rw-r--r-- | tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/TableViewerComparatorTest.java | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/TableViewerComparatorTest.java b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/TableViewerComparatorTest.java index 57d68a63d12..f7ebcc4ef00 100644 --- a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/TableViewerComparatorTest.java +++ b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/TableViewerComparatorTest.java @@ -40,7 +40,7 @@ public class TableViewerComparatorTest extends ViewerComparatorTest { * @see org.eclipse.jface.tests.viewers.ViewerTestCase#createViewer(org.eclipse.swt.widgets.Composite) */ protected StructuredViewer createViewer(Composite parent) { - TableViewer viewer = new TableViewer(parent); + TableViewer<Object,Object> viewer = new TableViewer<Object,Object>(parent); viewer.setContentProvider(new TeamModelContentProvider()); viewer.setLabelProvider(new TeamModelLabelProvider()); viewer.getTable().setLinesVisible(true); @@ -62,32 +62,32 @@ public class TableViewerComparatorTest extends ViewerComparatorTest { tc.setText(headers[i]); columns[i] = tc; } - + comparatorTestViewer = viewer; return viewer; } - + public void testViewerSorter(){ - fViewer.setSorter(new ViewerSorter()); + comparatorTestViewer.setSorter(new ViewerSorter()); assertSortedResult(TEAM1_SORTED); } - + public void testViewerSorterInsertElement(){ - fViewer.setSorter(new ViewerSorter()); + comparatorTestViewer.setSorter(new ViewerSorter()); team1.addMember("Duong"); assertSortedResult(TEAM1_SORTED_WITH_INSERT); } - + public void testViewerComparator(){ - fViewer.setComparator(new ViewerComparator()); + comparatorTestViewer.setComparator(new ViewerComparator<Object,Object>()); assertSortedResult(TEAM1_SORTED); } - + public void testViewerComparatorInsertElement(){ - fViewer.setComparator(new ViewerComparator()); + comparatorTestViewer.setComparator(new ViewerComparator<Object,Object>()); team1.addMember("Duong"); assertSortedResult(TEAM1_SORTED_WITH_INSERT); } - + private void assertSortedResult(String[] expected){ TableItem[] items = getTableViewer().getTable().getItems(); for (int i = 0; i < items.length; i++){ @@ -95,15 +95,15 @@ public class TableViewerComparatorTest extends ViewerComparatorTest { assertEquals("Item not expected. actual=" + item.getText() + " expected=", expected[i], item.getText()); } } - + protected void setInput() { - fViewer.setInput(team1); + comparatorTestViewer.setInput(team1); } - - protected TableViewer getTableViewer(){ - return (TableViewer)fViewer; + + protected TableViewer<Object,Object> getTableViewer(){ + return (TableViewer<Object,Object>)comparatorTestViewer; } - + /** * @param args */ |