From 21cc4b9088d9ec48d3f6a7daed6e914dc2964aec Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Tue, 6 Nov 2018 08:44:29 +0200 Subject: Remove AIX leftovers. Hacks for it was just multiplied for work on Bug 540692 so we would better stop that. It has never gained GTK3 support and the fragment is long gone. Change-Id: If9e400c93fc1d05661b200274a90b9ccc35ad31a Signed-off-by: Alexander Kurtakov --- .../org/eclipse/swt/tests/junit/SwtTestUtil.java | 1 - .../junit/Test_org_eclipse_swt_widgets_Control.java | 12 +++++------- .../tests/junit/Test_org_eclipse_swt_widgets_Text.java | 18 +++++++----------- 3 files changed, 12 insertions(+), 19 deletions(-) (limited to 'tests') 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 5fabf71e22..24d62cd985 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 @@ -70,7 +70,6 @@ public class SwtTestUtil { public final static boolean isGTK = SWT.getPlatform().equals("gtk"); public final static boolean isWindowsOS = System.getProperty("os.name").startsWith("Windows"); public final static boolean isLinux = System.getProperty("os.name").equals("Linux"); - public final static boolean isAIX = System.getProperty("os.name").equals("AIX"); /** Useful if you want some tests not to run on Jenkins with user "genie.platform" */ 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 ecc6ef3e91..0c1459c130 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 @@ -535,13 +535,11 @@ public void test_isVisible() { control.setVisible(false); assertFalse(control.isVisible()); - if (!SwtTestUtil.isAIX) { - control.setVisible(true); - shell.setVisible(true); - assertTrue("Window should be visible", control.isVisible()); - shell.setVisible(false); - assertFalse("Window should not be visible", control.isVisible()); - } + control.setVisible(true); + shell.setVisible(true); + assertTrue("Window should be visible", control.isVisible()); + shell.setVisible(false); + assertFalse("Window should not be visible", control.isVisible()); } @Test public void test_moveAboveLorg_eclipse_swt_widgets_Control() { 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 c289f8672e..361b41b4f1 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 @@ -489,10 +489,8 @@ public void test_getCharCount() { } text.setText(""); assertEquals(0, text.getCharCount()); - if (!SwtTestUtil.isAIX) { - text.setText("01234\t567890"); - assertEquals(12, text.getCharCount()); - } + text.setText("01234\t567890"); + assertEquals(12, text.getCharCount()); } @Test @@ -970,13 +968,11 @@ public void test_isVisible() { control.setVisible(false); assertTrue(!control.isVisible()); - if (!SwtTestUtil.isAIX) { - control.setVisible(true); - shell.setVisible(true); - assertTrue("Window should be visible", control.isVisible()); - shell.setVisible(false); - assertFalse("Window should not be visible", control.isVisible()); - } + control.setVisible(true); + shell.setVisible(true); + assertTrue("Window should be visible", control.isVisible()); + shell.setVisible(false); + assertFalse("Window should not be visible", control.isVisible()); } @Test -- cgit v1.2.3