Bug 427534 - Move away from excludesList in All[WS]Tests

Migrate Cocoa excludes to the individual test cases.

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

9 files changed, 184 insertions, 75 deletions

diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/AllCocoaTests.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/AllCocoaTests.java
index 4a88660533..0a2e203f3e 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/AllCocoaTests.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/AllCocoaTests.java
@@ -10,7 +10,6 @@
  *******************************************************************************/
 package org.eclipse.swt.tests.junit;
 
-
 import junit.framework.*;
 import junit.textui.*;
 
@@ -19,70 +18,11 @@ import junit.textui.*;
  */
 public class AllCocoaTests extends TestSuite {
 
-/**
- * Tests not run because they consistently fail
- */
-static String[] excludeTests = {
-	"test_getBoundsI(org.eclipse.swt.tests.junit.Test_org_eclipse_swt_widgets_TableItem)",
-	"test_getBoundsI(org.eclipse.swt.tests.junit.Test_org_eclipse_swt_widgets_TreeItem)",
-	"test_getBounds(org.eclipse.swt.tests.junit.Test_org_eclipse_swt_widgets_TreeItem)",
-	"test_getTopPixel(org.eclipse.swt.tests.junit.Test_org_eclipse_swt_widgets_Text)",
-	"test_postLorg_eclipse_swt_widgets_Event(org.eclipse.swt.tests.junit.Test_org_eclipse_swt_widgets_Display)",
-	
-	//tests pass locally, but fail on the releng machine
-	"test_copy(org.eclipse.swt.tests.junit.Test_org_eclipse_swt_widgets_Text)",
-	"test_cut(org.eclipse.swt.tests.junit.Test_org_eclipse_swt_widgets_Text)",
-	"test_paste(org.eclipse.swt.tests.junit.Test_org_eclipse_swt_widgets_Text)",
-	"test_selectAll(org.eclipse.swt.tests.junit.Test_org_eclipse_swt_widgets_Text)",
-	"test_copy(org.eclipse.swt.tests.junit.Test_org_eclipse_swt_widgets_Combo)",
-	"test_cut(org.eclipse.swt.tests.junit.Test_org_eclipse_swt_widgets_Combo)",
-	"test_paste(org.eclipse.swt.tests.junit.Test_org_eclipse_swt_widgets_Combo)",
-	"test_copy(org.eclipse.swt.tests.junit.Test_org_eclipse_swt_custom_CCombo)",
-	"test_cut(org.eclipse.swt.tests.junit.Test_org_eclipse_swt_custom_CCombo)",
-	"test_paste(org.eclipse.swt.tests.junit.Test_org_eclipse_swt_custom_CCombo)",
-	"test_copy(org.eclipse.swt.tests.junit.Test_org_eclipse_swt_custom_StyledText)",
-	"test_cut(org.eclipse.swt.tests.junit.Test_org_eclipse_swt_custom_StyledText)",
-	"test_invokeActionI(org.eclipse.swt.tests.junit.Test_org_eclipse_swt_custom_StyledText)",
-	"test_paste(org.eclipse.swt.tests.junit.Test_org_eclipse_swt_custom_StyledText)",
-	
-	// Text segments not implemented on cocoa
-	"test_consistency_Segments(org.eclipse.swt.tests.junit.Test_org_eclipse_swt_widgets_Text)",
-	
-	// TextLayout bugs
-	"test_getLineIndex(org.eclipse.swt.tests.junit.Test_org_eclipse_swt_graphics_TextLayout)",
-	"test_getLineBounds(org.eclipse.swt.tests.junit.Test_org_eclipse_swt_graphics_TextLayout)",
-	"test_getLocation(org.eclipse.swt.tests.junit.Test_org_eclipse_swt_graphics_TextLayout)",
-	"test_getNextOffset(org.eclipse.swt.tests.junit.Test_org_eclipse_swt_graphics_TextLayout)",
-	"test_getNextOffset2(org.eclipse.swt.tests.junit.Test_org_eclipse_swt_graphics_TextLayout)",
-	"test_getOffset(org.eclipse.swt.tests.junit.Test_org_eclipse_swt_graphics_TextLayout)",
-	"test_getSegmentsChars(org.eclipse.swt.tests.junit.Test_org_eclipse_swt_graphics_TextLayout)",
-};
-
-static boolean isExcluded(String name) {
-	for (int i = 0; i < excludeTests.length; i++) {
-		if (name.equals(excludeTests[i])) return true;
+	public static void main(String[] args) {
+		TestRunner.run(suite());
 	}
-	return false;
-}
-
-public static void main(String[] args) {
-	TestRunner.run(suite());
-	System.out.println("\nExcluded Tests: " + excludeTests.length);
-}
 
-public static Test suite() {
-	TestSuite fullSuite = (TestSuite)AllTests.suite();
-	TestSuite filteredSuite = new TestSuite();
-	for (int i = 0; i < fullSuite.testCount(); i++) {
-		Test candidateTest = fullSuite.testAt(i);
-		if (candidateTest instanceof TestSuite) {
-			TestSuite suite = (TestSuite)candidateTest;
-			for (int j = 0; j < suite.testCount(); j++) {
-				Test test = suite.testAt(j);
-				if (!isExcluded(test.toString())) filteredSuite.addTest(test);				
-			}
-		}
+	public static Test suite() {
+		return AllTests.suite();
 	}
-	return filteredSuite;
-}
 }
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_CCombo.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_CCombo.java
index d1c486bc13..f6d9ae38da 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_CCombo.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_CCombo.java
@@ -45,6 +45,14 @@ public void test_ConstructorLorg_eclipse_swt_widgets_CompositeI() {
 }
 
 public void test_copy() {
+	if (SwtTestUtil.isCocoa) {
+		// TODO Fix Cocoa failure.
+		if (SwtTestUtil.verbose) {
+			System.out
+					.println("Excluded test_copy(org.eclipse.swt.tests.junit.Test_org_eclipse_swt_custom_CCombo).");
+		}
+		return;
+	}
 	ccombo.setText("123456");
 	ccombo.setSelection(new Point(1,3));
 	ccombo.copy();
@@ -54,6 +62,14 @@ public void test_copy() {
 }
 
 public void test_cut() {
+	if (SwtTestUtil.isCocoa) {
+		// TODO Fix Cocoa failure.
+		if (SwtTestUtil.verbose) {
+			System.out
+					.println("Excluded test_cut(org.eclipse.swt.tests.junit.Test_org_eclipse_swt_custom_CCombo).");
+		}
+		return;
+	}
 	ccombo.setText("123456");
 	ccombo.setSelection(new Point(1,3));
 	ccombo.cut();
@@ -73,6 +89,14 @@ public void test_isFocusControl() {
 }
 
 public void test_paste() {
+	if (SwtTestUtil.isCocoa) {
+		// TODO Fix Cocoa failure.
+		if (SwtTestUtil.verbose) {
+			System.out
+					.println("Excluded test_paste(org.eclipse.swt.tests.junit.Test_org_eclipse_swt_custom_CCombo).");
+		}
+		return;
+	}
 	ccombo.setText("123456");
 	ccombo.setSelection(new Point(1,3));
 	ccombo.cut();
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_StyledText.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_StyledText.java
index 023c6def69..bfc63f037a 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_StyledText.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_StyledText.java
@@ -582,6 +582,14 @@ public void test_computeSizeIIZ() {
 }
 
 public void test_copy() {
+	if (SwtTestUtil.isCocoa) {
+		// TODO Fix Cocoa failure.
+		if (SwtTestUtil.verbose) {
+			System.out
+					.println("Excluded test_copy(org.eclipse.swt.tests.junit.Test_org_eclipse_swt_custom_StyledText).");
+		}
+		return;
+	}
 	Clipboard clipboard = new Clipboard(text.getDisplay());
 	TextTransfer transfer = TextTransfer.getInstance();
 	String clipboardText;
@@ -641,6 +649,14 @@ public void test_copy() {
 }
 
 public void test_cut() {
+	if (SwtTestUtil.isCocoa) {
+		// TODO Fix Cocoa failure.
+		if (SwtTestUtil.verbose) {
+			System.out
+					.println("Excluded test_cut(org.eclipse.swt.tests.junit.Test_org_eclipse_swt_custom_StyledText).");
+		}
+		return;
+	}
 	Clipboard clipboard = new Clipboard(text.getDisplay());
 	TextTransfer transfer = TextTransfer.getInstance();
 	String clipboardText;
@@ -1917,6 +1933,14 @@ public void test_insertLjava_lang_String(){
 }
 
 public void test_invokeActionI() {
+	if (SwtTestUtil.isCocoa) {
+		// TODO Fix Cocoa failure.
+		if (SwtTestUtil.verbose) {
+			System.out
+					.println("Excluded test_invokeAction(org.eclipse.swt.tests.junit.Test_org_eclipse_swt_custom_StyledText).");
+		}
+		return;
+	}
 	// invoking actions on an empty text should not crash
 	text.invokeAction(ST.LINE_DOWN);
 	text.invokeAction(ST.LINE_UP);
@@ -2068,6 +2092,14 @@ public void test_invokeActionI() {
 }
 
 public void test_paste(){
+	if (SwtTestUtil.isCocoa) {
+		// TODO Fix Cocoa failure.
+		if (SwtTestUtil.verbose) {
+			System.out
+					.println("Excluded test_paste(org.eclipse.swt.tests.junit.Test_org_eclipse_swt_custom_StyledText).");
+		}
+		return;
+	}
 	Clipboard clipboard = new Clipboard(text.getDisplay());
 	TextTransfer transfer = TextTransfer.getInstance();
 	String convertedText;
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_TextLayout.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_TextLayout.java
index 6c3a8516c6..0a1626b8d3 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_TextLayout.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_TextLayout.java
@@ -172,6 +172,14 @@ public void test_getSegments() {
 }
 
 public void test_getSegmentsChars() {
+	if (SwtTestUtil.isCocoa) {
+		// TODO Fix Cocoa failure.
+		if (SwtTestUtil.verbose) {
+			System.out
+					.println("Excluded test_getSegmentsChars(org.eclipse.swt.tests.junit.Test_org_eclipse_swt_graphics_TextLayout).");
+		}
+		return;
+	}
 	TextLayout layout = new TextLayout(display);
 	String text = "ab\u05d0\u05d1.\u05d2cd";
 	int textLength = text.length();
@@ -260,6 +268,14 @@ public void test_getLineOffsets() {
 	layout.dispose();
 }
 public void test_getLineIndex() {
+	if (SwtTestUtil.isCocoa) {
+		// TODO Fix Cocoa failure.
+		if (SwtTestUtil.verbose) {
+			System.out
+					.println("Excluded test_getLineIndex(org.eclipse.swt.tests.junit.Test_org_eclipse_swt_graphics_TextLayout).");
+		}
+		return;
+	}
 	TextLayout layout = new TextLayout(display);
 	String text = "0123456\n890123\n";
 	layout.setText(text);
@@ -281,6 +297,14 @@ public void test_getLineIndex() {
 	layout.dispose();
 }
 public void test_getLineBounds() {
+	if (SwtTestUtil.isCocoa) {
+		// TODO Fix Cocoa failure.
+		if (SwtTestUtil.verbose) {
+			System.out
+					.println("Excluded test_getLineBonds(org.eclipse.swt.tests.junit.Test_org_eclipse_swt_graphics_TextLayout).");
+		}
+		return;
+	}
 	TextLayout layout = new TextLayout(display);
 	String text = "0123456\n890123\n";
 	layout.setText(text);
@@ -533,6 +557,14 @@ public void test_getText() {
 	layout.dispose();
 }
 public void test_getLocation() {
+	if (SwtTestUtil.isCocoa) {
+		// TODO Fix Cocoa failure.
+		if (SwtTestUtil.verbose) {
+			System.out
+					.println("Excluded test_getLocation(org.eclipse.swt.tests.junit.Test_org_eclipse_swt_graphics_TextLayout).");
+		}
+		return;
+	}
 	TextLayout layout = new TextLayout(display);
 	String text = "AB\u05E9\u05E0";
 	layout.setText(text);
@@ -547,6 +579,14 @@ public void test_getLocation() {
 	layout.dispose();
 }
 public void test_getNextOffset() {
+	if (SwtTestUtil.isCocoa) {
+		// TODO Fix Cocoa failure.
+		if (SwtTestUtil.verbose) {
+			System.out
+					.println("Excluded test_getNextOffset(org.eclipse.swt.tests.junit.Test_org_eclipse_swt_graphics_TextLayout).");
+		}
+		return;
+	}
 	TextLayout layout = new TextLayout(display);
 	String text;
 	int offset;
@@ -651,8 +691,8 @@ public void test_getNextOffset() {
 }
 
 public void test_getNextOffset2() {
-	if (SwtTestUtil.isGTK) {
-		//TODO Fix GTK failure.
+	if (SwtTestUtil.isGTK||SwtTestUtil.isCocoa) {
+		//TODO Fix GTK and Cocoa failure.
 		if (SwtTestUtil.verbose) {
 			System.out.println("Excluded test_getNextOffset2(org.eclipse.swt.tests.junit.Test_org_eclipse_swt_graphics_TextLayout)");
 		}
@@ -701,6 +741,14 @@ public void test_getLineSpacing() {
 	layout.dispose();
 }
 public void test_getOffset() {
+	if (SwtTestUtil.isCocoa) {
+		// TODO Fix Cocoa failure.
+		if (SwtTestUtil.verbose) {
+			System.out
+					.println("Excluded test_getOffset(org.eclipse.swt.tests.junit.Test_org_eclipse_swt_graphics_TextLayout).");
+		}
+		return;
+	}
 	TextLayout layout = new TextLayout(display);
 	String text = "AB \u05E9\u05E0 CD\nHello";
 	layout.setText(text);	
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 c995bd90cf..8b6c8fb052 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
@@ -215,6 +215,14 @@ public void test_computeSizeIIZ() {
 }
 
 public void test_copy() {
+	if (SwtTestUtil.isCocoa) {
+		// TODO Fix Cocoa failure.
+		if (SwtTestUtil.verbose) {
+			System.out
+					.println("Excluded test_copy(org.eclipse.swt.tests.junit.Test_org_eclipse_swt_widgets_Combo).");
+		}
+		return;
+	}
 	combo.setText("123456");
 	combo.setSelection(new Point(1,3));
 	combo.copy();
@@ -224,6 +232,14 @@ public void test_copy() {
 }
 
 public void test_cut() {
+	if (SwtTestUtil.isCocoa) {
+		// TODO Fix Cocoa failure.
+		if (SwtTestUtil.verbose) {
+			System.out
+					.println("Excluded test_cut(org.eclipse.swt.tests.junit.Test_org_eclipse_swt_widgets_Combo).");
+		}
+		return;
+	}
 	combo.setText("123456");
 	combo.setSelection(new Point(1,3));
 	combo.cut();
@@ -448,6 +464,14 @@ public void test_indexOfLjava_lang_StringI() {
 }
 
 public void test_paste() {
+	if (SwtTestUtil.isCocoa) {
+		// TODO Fix Cocoa failure.
+		if (SwtTestUtil.verbose) {
+			System.out
+					.println("Excluded test_paste(org.eclipse.swt.tests.junit.Test_org_eclipse_swt_widgets_Combo).");
+		}
+		return;
+	}
 	combo.setText("123456");
 	combo.setSelection(new Point(1,3));
 	combo.cut();
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Display.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Display.java
index fbb4e97173..8312bd7923 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Display.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Display.java
@@ -673,8 +673,8 @@ public void test_mapLorg_eclipse_swt_widgets_ControlLorg_eclipse_swt_widgets_Con
 }
 
 public void test_postLorg_eclipse_swt_widgets_Event() {
-	if (SwtTestUtil.isGTK) {
-		//TODO Fix GTK failure.
+	if (SwtTestUtil.isGTK || SwtTestUtil.isCocoa) {
+		//TODO Fix GTK and Cocoa failure.
 		if (SwtTestUtil.verbose) {
 			System.out.println("Excluded test_postLorg_eclipse_swt_widgets_Event(org.eclipse.swt.tests.junit.Test_org_eclipse_swt_widgets_Display)");
 		}
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 fc68e56d1b..d52cf5ea61 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
@@ -64,8 +64,8 @@ public void test_ConstructorLorg_eclipse_swt_widgets_TableII() {
 }
 
 public void test_getBoundsI() {
-	if (SwtTestUtil.isGTK) {
-		//TODO Fix GTK failure.
+	if (SwtTestUtil.isGTK || SwtTestUtil.isCocoa) {
+		//TODO Fix GTK and Cocoa failure.
 		if (SwtTestUtil.verbose) {
 			System.out.println("Excluded test_getBoundsI(org.eclipse.swt.tests.junit.Test_org_eclipse_swt_widgets_TableItem)");
 		}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Text.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Text.java
index 8d56de017f..31ba41358f 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Text.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Text.java
@@ -288,6 +288,14 @@ public void test_computeSizeIIZ() {
 }
 
 public void test_copy() {
+	if (SwtTestUtil.isCocoa) {
+		// TODO Fix Cocoa failure.
+		if (SwtTestUtil.verbose) {
+			System.out
+					.println("Excluded test_copy(org.eclipse.swt.tests.junit.Test_org_eclipse_swt_widgets_Text).");
+		}
+		return;
+	}
 	text.copy();
 
 	text.selectAll();
@@ -325,6 +333,14 @@ public void test_copy() {
 }
 
 public void test_cut() {
+	if (SwtTestUtil.isCocoa) {
+		// TODO Fix Cocoa failure.
+		if (SwtTestUtil.verbose) {
+			System.out
+					.println("Excluded test_cut(org.eclipse.swt.tests.junit.Test_org_eclipse_swt_widgets_Text).");
+		}
+		return;
+	}
 	text.cut();
 	text.setText("01234567890");
 	text.setSelection(2, 5);
@@ -801,8 +817,8 @@ public void test_getTopIndex() {
 }
 
 public void test_getTopPixel() {
-	if (SwtTestUtil.isGTK) {
-		//TODO Fix GTK failure.
+	if (SwtTestUtil.isGTK || SwtTestUtil.isCocoa) {
+		//TODO Fix GTK  and Cocoa failure.
 		if (SwtTestUtil.verbose) {
 			System.out.println("Excluded test_getTopPixel(org.eclipse.swt.tests.junit.Test_org_eclipse_swt_widgets_Text)");
 		}
@@ -911,6 +927,14 @@ public void test_isVisible() {
 }
 
 public void test_paste() {
+	if (SwtTestUtil.isCocoa) {
+		// TODO Fix Cocoa failure.
+		if (SwtTestUtil.verbose) {
+			System.out
+					.println("Excluded test_paste(org.eclipse.swt.tests.junit.Test_org_eclipse_swt_widgets_Text).");
+		}
+		return;
+	}
 	text.setText("01234567890");
 	text.setSelection(2, 4);
 	assertEquals("01234567890", text.getText());
@@ -959,6 +983,14 @@ public void test_paste() {
 }
 
 public void test_selectAll() {
+	if (SwtTestUtil.isCocoa) {
+		// TODO Fix Cocoa failure.
+		if (SwtTestUtil.verbose) {
+			System.out
+					.println("Excluded test_selectAll(org.eclipse.swt.tests.junit.Test_org_eclipse_swt_widgets_Text).");
+		}
+		return;
+	}
 	text.setText("01234567890");
 	assertEquals("01234567890", text.getText());
 	text.selectAll();
@@ -1513,6 +1545,14 @@ public void test_consistency_DragDetect () {
 }
 
 public void test_consistency_Segments () {
+	if (SwtTestUtil.isCocoa) {
+		// TODO Fix Cocoa failure.
+		if (SwtTestUtil.verbose) {
+			System.out
+					.println("Excluded test_consistency_Segments(org.eclipse.swt.tests.junit.Test_org_eclipse_swt_widgets_Text).");
+		}
+		return;
+	}
 	final SegmentListener sl1 = new SegmentListener() {
 		public void getSegments(SegmentEvent event) {
 			if ((event.lineText.length() & 1) == 1) {
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_TreeItem.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_TreeItem.java
index 64b65f24e3..af6c08c41f 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_TreeItem.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_TreeItem.java
@@ -83,8 +83,8 @@ public void test_ConstructorLorg_eclipse_swt_widgets_TreeItemII() {
 }
 
 public void test_getBounds() {
-	if (SwtTestUtil.isGTK) {
-		//TODO Fix GTK failure.
+	if (SwtTestUtil.isGTK || SwtTestUtil.isCocoa) {
+		//TODO Fix GTK and Cocoa failure.
 		if (SwtTestUtil.verbose) {
 			System.out.println("Excluded test_getBounds(org.eclipse.swt.tests.junit.Test_org_eclipse_swt_widgets_TreeItem)");
 		}
@@ -519,7 +519,8 @@ void test_getBoundsID() {
 	assertTrue(":4x:", bounds.x > 0 && bounds.height > stringExtent1.y && bounds.width  == 0);
 }
 public void test_getBoundsI() {
-	if (SwtTestUtil.isGTK) {
+	if (SwtTestUtil.isGTK || SwtTestUtil.isCocoa) {
+		//TODO Fix Gtk and Cocoa failure.
 		if (SwtTestUtil.verbose) {
 			System.out.println("Excluded test_getBoundsI(org.eclipse.swt.tests.junit.Test_org_eclipse_swt_widgets_TreeItem)");
 		}