summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorKevin Barnes <krbarnes>2009-04-01 16:16:39 +0000
committerKevin Barnes <krbarnes>2009-04-01 16:16:39 +0000
commita3633e1d325297b90c35176bcd7606d33c0133a3 (patch)
tree982649f27ac6fc9cfaa4dc557924cf994e5bec31 /tests
parent39f524661c3f159c1747cd6c25d68a931d789c50 (diff)
downloadeclipse.platform.swt-a3633e1d325297b90c35176bcd7606d33c0133a3.tar.gz
eclipse.platform.swt-a3633e1d325297b90c35176bcd7606d33c0133a3.tar.xz
eclipse.platform.swt-a3633e1d325297b90c35176bcd7606d33c0133a3.zip
cocoa
Diffstat (limited to 'tests')
-rw-r--r--tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/SwtJunit.java1
-rw-r--r--tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/SwtTestCase.java9
-rw-r--r--tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_TableItem.java2
3 files changed, 2 insertions, 10 deletions
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/SwtJunit.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/SwtJunit.java
index e3a688bbf4..1b59e64649 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/SwtJunit.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/SwtJunit.java
@@ -21,6 +21,7 @@ public class SwtJunit {
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 isMotif = SWT.getPlatform().equals("motif");
public final static boolean isGTK = SWT.getPlatform().equals("gtk");
public final static boolean isPhoton = SWT.getPlatform().equals("photon");
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/SwtTestCase.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/SwtTestCase.java
index 7d4da9add0..28aeadbb1f 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/SwtTestCase.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/SwtTestCase.java
@@ -244,15 +244,6 @@ protected void setUp() {
}
protected void tearDown() {
- try {
- super.tearDown();
- Display display = Display.getCurrent();
- if (display != null) display.readAndDispatch();
- } catch (Exception e) {
- SWTError error = new SWTError();
- error.throwable = e;
- throw error;
- }
}
protected void warnUnimpl(String message) {
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 8b4649c77e..e3331dc44a 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
@@ -729,7 +729,7 @@ public void test_setImageILorg_eclipse_swt_graphics_Image() {
}
public void test_setImageIndentI() {
- if (SwtJunit.isCarbon || SwtJunit.isGTK) {
+ if (SwtJunit.isCarbon || SwtJunit.isCocoa || SwtJunit.isGTK) {
//setImageIndent not implemented on Carbon
tableItem.setImageIndent(1);
return;