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>

1 files changed, 68 insertions, 68 deletions

diff --git a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/CheckboxTableViewerTest.java b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/CheckboxTableViewerTest.java
index bae8bbf8e62..2346b39859a 100644
--- a/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/CheckboxTableViewerTest.java
+++ b/tests/org.eclipse.ui.tests/Eclipse JFace Tests/org/eclipse/jface/tests/viewers/CheckboxTableViewerTest.java
@@ -33,23 +33,23 @@ import org.eclipse.swt.widgets.TableItem;
 
 public class CheckboxTableViewerTest extends TableViewerTest {
     public static class CheckboxTableTestLabelProvider extends
-            TestLabelProvider implements ITableLabelProvider {
+            TestLabelProvider implements ITableLabelProvider<TestElement> {
 
         public boolean fExtended = false;
 
-        public String getText(Object element) {
+        public String getText(TestElement element) {
             if (fExtended)
-                return providedString((String) element);
+                return providedString(element);
             return element.toString();
         }
 
-        public String getColumnText(Object element, int index) {
+        public String getColumnText(TestElement element, int index) {
             if (fExtended)
-                return providedString((TestElement) element);
+                return providedString(element);
             return element.toString();
         }
 
-        public Image getColumnImage(Object element, int columnIndex) {
+        public Image getColumnImage(TestElement element, int columnIndex) {
             return null;
         }
     }
@@ -57,10 +57,10 @@ public class CheckboxTableViewerTest extends TableViewerTest {
 		public DeprecatedConstructor(String name) {
 			super(name);
 		}
-    	
-	    protected StructuredViewer createViewer(Composite parent) {
+
+	    protected StructuredViewer<TestElement,TestElement> createViewer(Composite parent) {
 	    	TableViewer viewer = new CheckboxTableViewer(parent);
-	    	
+
 	        Table table = viewer.getTable();
 	        table.setLinesVisible(true);
 	        TableLayout layout = new TableLayout();
@@ -86,7 +86,7 @@ public class CheckboxTableViewerTest extends TableViewerTest {
 	        viewer.setLabelProvider(new TableTestLabelProvider());
 	        return viewer;
 	    }
-	    
+
 		public void testViewerColumn() {
 	    	assertNull(getViewerColumn((TableViewer) fViewer, -1));
 			assertNotNull(getViewerColumn((TableViewer) fViewer, 0));
@@ -97,15 +97,15 @@ public class CheckboxTableViewerTest extends TableViewerTest {
 			assertNull(getViewerColumn((TableViewer) fViewer, 3));
 	    }
     }
-    
+
     public static class FactoryMethod extends CheckboxTableViewerTest {
 		public FactoryMethod(String name) {
 			super(name);
 		}
-    	
+
 	    protected StructuredViewer createViewer(Composite parent) {
 	    	TableViewer viewer = CheckboxTableViewer.newCheckList(parent, SWT.NONE);
-	    	
+
 	        Table table = viewer.getTable();
 	        table.setLinesVisible(true);
 	        TableLayout layout = new TableLayout();
@@ -230,20 +230,20 @@ public class CheckboxTableViewerTest extends TableViewerTest {
 
         ctv.setAllGrayed(false);
     }
-    
+
     public void testWithoutCheckProvider() {
     	//Check that without a provider, no exceptions are thrown
     	CheckboxTableViewer ctv = (CheckboxTableViewer)fViewer;
     	ctv.refresh();
     }
-    
+
     public void testCheckProviderInvoked() {
     	//Check that a refresh successfully causes the provider's
     	//setChecked and setGrayed methods to be invoked.
     	CheckboxTableViewer ctv = (CheckboxTableViewer)fViewer;
 
     	TestMethodsInvokedCheckStateProvider provider = new TestMethodsInvokedCheckStateProvider();
-    	
+
     	ctv.setCheckStateProvider(provider);
     	assertTrue("isChecked should be invoked on a refresh", (!provider.isCheckedInvokedOn.isEmpty()));
     	assertTrue("isGrayed should be invoked on a refresh", (!provider.isGrayedInvokedOn.isEmpty()));
@@ -253,109 +253,109 @@ public class CheckboxTableViewerTest extends TableViewerTest {
     	assertTrue("isChecked should be invoked on a refresh", (!provider.isCheckedInvokedOn.isEmpty()));
     	assertTrue("isGrayed should be invoked on a refresh", (!provider.isGrayedInvokedOn.isEmpty()));
     }
-    
+
     public void testCheckedFalseGrayedFalse() {
     	testSpecificState(false, false);
     }
-    
+
     public void testCheckedFalseGrayedTrue() {
     	testSpecificState(false, true);
     }
-    
+
     public void testCheckedTrueGrayedFalse() {
     	testSpecificState(true, false);
     }
-    
+
     public void testCheckedTrueGrayedTrue() {
     	testSpecificState(true, true);
     }
-    
+
     private void testSpecificState(final boolean isChecked, final boolean isGrayed) {
     	CheckboxTableViewer ctv = (CheckboxTableViewer)fViewer;
-    	
+
     	ctv.setCheckStateProvider(new ICheckStateProvider() {
 			public boolean isChecked(Object element)	{	return isChecked;	}
 			public boolean isGrayed(Object element) 	{	return isGrayed;	}
     	});
-    	
+
     	TableItem item = ctv.getTable().getItem(0);
-    	
+
     	assertEquals(item.getChecked(), isChecked);
     	assertEquals(item.getGrayed(), isGrayed);
     }
-    
+
     public void testSetCheckProviderRefreshesItems() {
     	CheckboxTableViewer ctv = (CheckboxTableViewer)fViewer;
-    	
+
     	//First provider
     	//Should cause visible items' check state to adhere to provider
     	ctv.setCheckStateProvider(new TestCheckStateProvider(0));
-    	
+
     	//Check that all states are properly set
     	checkAllStates("Testing checkbox state after refresh", ctv, 0);
-    	
+
     	//Remove the check state provider
     	ctv.setCheckStateProvider(null);
-    	
+
     	//Test that an update doesn't fail
     	TestElement update = fRootElement.getChildAt(5);
     	ctv.update(update, null);
-    	
+
     	//Test that a refresh doesn't fail
     	ctv.refresh();
     }
-    
+
     public void testCheckProviderWithSorter() {
     	CheckboxTableViewer ctv = (CheckboxTableViewer) fViewer;
-    	
+
     	ctv.setSorter(new CheckStateProviderTestsUtil.Sorter());
-    	
+
     	//First provider
     	//Should cause visible items' check state adhere to provider
     	ctv.setCheckStateProvider(new TestCheckStateProvider(0));
-    	
+
     	//Check that all states are properly set
     	checkAllStates("Testing checkbox state with a sorter", ctv, 0);
     }
-    
+
     public void testCheckProviderWithFilter() {
     	CheckboxTableViewer ctv = (CheckboxTableViewer) fViewer;
-    	
+
     	final CheckStateProviderTestsUtil.Filter filter = new CheckStateProviderTestsUtil.Filter();
 		ctv.addFilter(filter);
-    	
+
     	//First provider
 		//Should cause visible items' check state adhere to provider
     	final TestCheckStateProvider checkStateProvider = new TestCheckStateProvider(0);
 		ctv.setCheckStateProvider(checkStateProvider);
-    	
+
     	//Check that all states are properly set
     	checkAllStates("Testing checkbox state with a sorter", ctv, 0);
-    	
+
     	//Check that the provider is only invoked on elements which pass the filter
     	for (Iterator i = checkStateProvider.isCheckedInvokedOn.iterator(); i.hasNext();) {
 			TestElement element = (TestElement) i.next();
 			assertTrue("The check provider should not be invoked on elements which did not get through the filter", filter.select(ctv, null, element));
 		}
-    	
+
     	for (Iterator i = checkStateProvider.isGrayedInvokedOn.iterator(); i.hasNext();) {
 			TestElement element = (TestElement) i.next();
 			assertTrue("The check provider should not be invoked on elements which did not get through the filter", filter.select(ctv, null, element));
 		}
     }
-    
+
     public void testCheckProviderUpdate() {
     	CheckboxTableViewer ctv = (CheckboxTableViewer)fViewer;
-    	
+
     	//First provider
     	//Should cause visible items' check state to adhere to provider
     	ctv.setCheckStateProvider(new TestCheckStateProvider(0));
-    	
+
     	checkAllStates("Testing checkbox state after refresh", ctv, 0);
-    	
+
     	//Put in a new check state provider
     	ctv.setCheckStateProvider(new TestCheckStateProvider(1));
-    	
+
     	//Check that setting a new check provider caused a refresh,
     	//and thus all the items have their new appropriate check
     	//states.
@@ -364,17 +364,17 @@ public class CheckboxTableViewerTest extends TableViewerTest {
 
 	private void checkAllStates(String comment, CheckboxTableViewer ctv, int shift) {
 		TableItem[] items = ctv.getTable().getItems();
-    	
+
     	//Check that actual states were set properly
     	for (int i = 0; i < items.length; i++) {
 			TableItem item = items[i];
     		TestElement element = (TestElement)items[i].getData();
-    		
+
     		checkState(comment, element, item, shift);	//check in Table
     		checkState(comment, element, ctv, shift);	//check in Viewer
 		}
 	}
-    
+
 	/**
 	 * Invokes the appropriate asserts to verify the state
 	 * of a TestElement.
@@ -386,7 +386,7 @@ public class CheckboxTableViewerTest extends TableViewerTest {
 		assertEquals(comment, CheckStateProviderTestsUtil.shouldBeChecked(te, shift), viewer.getChecked(te));
 		assertEquals(comment, CheckStateProviderTestsUtil.shouldBeGrayed(te, shift), viewer.getGrayed(te));
 	}
-	
+
 	/**
 	 * Invokes the appropriate asserts to verify the state
 	 * of a TestElement's associated TableItem
@@ -398,41 +398,41 @@ public class CheckboxTableViewerTest extends TableViewerTest {
 		assertEquals("Wrong checkstate: " + comment, CheckStateProviderTestsUtil.shouldBeChecked(te, shift), item.getChecked());
 		assertEquals("Wrong checkstate: " + comment, CheckStateProviderTestsUtil.shouldBeGrayed(te, shift), item.getGrayed());
 	}
-	
+
 	public void testGetCheckedElements() {
 		CheckboxTableViewer ctv = (CheckboxTableViewer) fViewer;
-		
+
 		TestElement[] children = fRootElement.getChildren();
-		
+
 		List checked = new ArrayList((children.length + 1) / 2);
-		
+
 		for (int i = 0; i < children.length; i+=2) {
 			ctv.setChecked(children[i], true);
 			checked.add(children[i]);
 		}
-		
+
 		Object[] actuallyChecked = ctv.getCheckedElements();
-		
+
 		for (int i = 0; i < actuallyChecked.length; i++) {
 			assertTrue("getCheckedElements should include all checked elements", checked.remove(actuallyChecked[i]));
 		}
-		
+
 		assertTrue("getCheckedElements should not include any unchecked elements", checked.isEmpty());
 	}
-	
+
 	public void testSetCheckedElements() {
 		CheckboxTableViewer ctv = (CheckboxTableViewer) fViewer;
-		
+
 		TestElement[] children = fRootElement.getChildren();
-		
+
 		List toCheck = new ArrayList((children.length + 1) / 2);
-		
+
 		for (int i = 0; i < children.length; i+=2) {
 			toCheck.add(children[i]);
 		}
-		
+
 		ctv.setCheckedElements(toCheck.toArray());
-		
+
 		for (int i = 0; i < children.length; i++) {
 			if(i % 2 == 0) {
 				assertTrue("an element passed through setCheckedElements should be checked", ctv.getChecked(children[i]));
@@ -441,20 +441,20 @@ public class CheckboxTableViewerTest extends TableViewerTest {
 			}
 		}
 	}
-	
+
 	public void testSetGrayedElements() {
 		CheckboxTableViewer ctv = (CheckboxTableViewer) fViewer;
-		
+
 		TestElement[] children = fRootElement.getChildren();
-		
+
 		List toGray = new ArrayList((children.length + 1) / 2);
-		
+
 		for (int i = 0; i < children.length; i+=2) {
 			toGray.add(children[i]);
 		}
-		
+
 		ctv.setGrayedElements(toGray.toArray());
-		
+
 		for (int i = 0; i < children.length; i++) {
 			if(i % 2 == 0) {
 				assertTrue("an element passed through setGrayedElements should be grayed", ctv.getGrayed(children[i]));