Bug 444725 - Remove carbon support from swt

Remove carbon specific tests.

Change-Id: I171352e29913188830cf934cb7a07edef6cb60cc
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>

8 files changed, 6 insertions, 26 deletions

diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/ConsistencyUtility.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/ConsistencyUtility.java
index 28c6ff3a85..125c232931 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/ConsistencyUtility.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/ConsistencyUtility.java
@@ -368,7 +368,7 @@ public class ConsistencyUtility {
 
     //determines which button to drag with
     private static int determineDrag() {
-        if(SwtTestUtil.isWindows || SwtTestUtil.isCarbon || SwtTestUtil.isGTK)
+        if(SwtTestUtil.isWindows || SwtTestUtil.isGTK)
             return 1;
         return 2;
     }
@@ -394,8 +394,6 @@ public class ConsistencyUtility {
             x += -35;
         } else if(SwtTestUtil.isLinux) {
         	x += -16;
-        } else if (SwtTestUtil.isCarbon) {
-        	x += 30;
         }
         return postClick(display, x, y, button);    
     }
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/SwtTestUtil.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/SwtTestUtil.java
index ea9c2b8df0..4ac7abe216 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/SwtTestUtil.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/SwtTestUtil.java
@@ -61,7 +61,6 @@ public class SwtTestUtil {
 	
 	public static final String testFontName;
 	public final static boolean isWindows = SWT.getPlatform().startsWith("win32");
-	public final static boolean isCarbon = SWT.getPlatform().startsWith("carbon");
 	public final static boolean isCocoa = SWT.getPlatform().startsWith("cocoa");
 	public final static boolean isGTK = SWT.getPlatform().equals("gtk");
 	public final static boolean isLinux = System.getProperty("os.name").equals("Linux");
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Combo.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Combo.java
index faa7124bcd..54951e6172 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Combo.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Combo.java
@@ -560,7 +560,7 @@ public void test_removeI() {
 		combo.select(0);
 		assertEquals("index " + i, 0, combo.getSelectionIndex());
 		combo.remove(0);
-		if (SwtTestUtil.isWindows || SwtTestUtil.isGTK || SwtTestUtil.isCarbon) {
+		if (SwtTestUtil.isWindows || SwtTestUtil.isGTK ) {
 			// The behavior on Windows and GTK when the selected item is removed
 			// is to simply say that no items are selected.
 			assertEquals("index " + i, -1, combo.getSelectionIndex());
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Control.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Control.java
index a68557408a..a382c783fc 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Control.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Control.java
@@ -743,12 +743,8 @@ protected void consistencyEvent(final int paramA, final int paramB,
                                     pt[0], pt[1]));
                         break;
                     case ConsistencyUtility.SHELL_ICONIFY:
-                        if(SwtTestUtil.isCarbon)
-                            Assert.assertTrue(test,
-                                ConsistencyUtility.postShellIconify(display, pt[0], paramA));
-                        else
-                            Assert.assertTrue(test,
-                                ConsistencyUtility.postShellIconify(display, pt[1], paramA));
+                        Assert.assertTrue(test,
+                            ConsistencyUtility.postShellIconify(display, pt[1], paramA));
                     	if(control instanceof Shell) {
                     	    display.syncExec(new Thread() {
                     	        @Override
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Shell.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Shell.java
index 23598a1f9b..91bbf12174 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Shell.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Shell.java
@@ -469,10 +469,7 @@ public void test_consistency_Iconify() {
 public void test_consistency_Close() {
     createShell();
     consistencyPrePackShell();
-    if(!SwtTestUtil.isCarbon)
-        consistencyEvent(0, SWT.ALT, 0, SWT.F4, ConsistencyUtility.DOUBLE_KEY_PRESS);
-    else
-        consistencyEvent(10, 10, 1, 0, ConsistencyUtility.MOUSE_CLICK);
+    consistencyEvent(0, SWT.ALT, 0, SWT.F4, ConsistencyUtility.DOUBLE_KEY_PRESS);
     createShell();
 }
 
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Table.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Table.java
index 570741b87b..2cef121b79 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Table.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Table.java
@@ -1313,11 +1313,6 @@ public void test_setHeaderVisibleZ() {
 }
 
 public void test_setLinesVisibleZ() {
-	if (SwtTestUtil.isCarbon) {
-		/* only carbon versions >= 10.4 support Table lines */
-		assertFalse(table.getLinesVisible());
-		return;
-	}
 	assertFalse(table.getLinesVisible());
 	table.setLinesVisible(true);
 	assertTrue(table.getLinesVisible());
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_TableItem.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_TableItem.java
index 504ce90f45..3d120c2daa 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_TableItem.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_TableItem.java
@@ -694,7 +694,7 @@ public void test_setImageILorg_eclipse_swt_graphics_Image() {
 
 @SuppressWarnings("deprecation")
 public void test_setImageIndentI() {
-	if (SwtTestUtil.isCarbon || SwtTestUtil.isCocoa || SwtTestUtil.isGTK) {
+	if (SwtTestUtil.isCocoa || SwtTestUtil.isGTK) {
 		//setImageIndent not implemented on Carbon
 		tableItem.setImageIndent(1);
 		return; 
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Tree.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Tree.java
index df0c4dc109..2c7e2a9afd 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Tree.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Tree.java
@@ -384,11 +384,6 @@ public void test_setItemCountI() {
 }
 
 public void test_setLinesVisibleZ() {
-	if (SwtTestUtil.isCarbon) {
-		// carbon does not support lines
-		tree.getLinesVisible();
-		return;
-	}
 	assertFalse(tree.getLinesVisible());
 	tree.setLinesVisible(true);
 	assertTrue(tree.getLinesVisible());