Bug 462631 - Adapt to JUnit 4 style tests
Update browser listener/adapter to JUnit 4 style.
Change-Id: Ie53a2811d2ae709e61f1ac183d759c2df9a8be95
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/AllBrowserTests.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/AllBrowserTests.java
index 4b79713..4cf9ec3 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/AllBrowserTests.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/AllBrowserTests.java
@@ -11,32 +11,31 @@
package org.eclipse.swt.tests.junit;
-import junit.framework.*;
-import junit.textui.*;
+import org.junit.runner.JUnitCore;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
/**
* Suite for testing all of the graphics test cases.
*/
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+ Test_org_eclipse_swt_browser_Browser.class,
+ Test_org_eclipse_swt_browser_CloseWindowListener.class,
+ Test_org_eclipse_swt_browser_LocationAdapter.class,
+ Test_org_eclipse_swt_browser_LocationListener.class,
+ Test_org_eclipse_swt_browser_OpenWindowListener.class,
+ Test_org_eclipse_swt_browser_ProgressAdapter.class,
+ Test_org_eclipse_swt_browser_ProgressListener.class,
+ Test_org_eclipse_swt_browser_StatusTextListener.class,
+ Test_org_eclipse_swt_browser_TitleListener.class,
+ Test_org_eclipse_swt_browser_VisibilityWindowAdapter.class,
+ Test_org_eclipse_swt_browser_VisibilityWindowListener.class,
+ org.eclipse.swt.tests.junit.browser.Test_BrowserSuite.class,
+})
public class AllBrowserTests {
public static void main(String[] args) {
- TestRunner.run (suite());
-}
-public static Test suite() {
- TestSuite suite = new TestSuite(AllBrowserTests.class.getName());
- suite.addTestSuite(Test_org_eclipse_swt_browser_Browser.class);
- suite.addTestSuite(Test_org_eclipse_swt_browser_CloseWindowListener.class);
- suite.addTestSuite(Test_org_eclipse_swt_browser_LocationAdapter.class);
- suite.addTestSuite(Test_org_eclipse_swt_browser_LocationListener.class);
- suite.addTestSuite(Test_org_eclipse_swt_browser_OpenWindowListener.class);
- suite.addTestSuite(Test_org_eclipse_swt_browser_ProgressAdapter.class);
- suite.addTestSuite(Test_org_eclipse_swt_browser_ProgressListener.class);
- suite.addTestSuite(Test_org_eclipse_swt_browser_StatusTextListener.class);
- suite.addTestSuite(Test_org_eclipse_swt_browser_TitleListener.class);
- suite.addTestSuite(Test_org_eclipse_swt_browser_VisibilityWindowAdapter.class);
- suite.addTestSuite(Test_org_eclipse_swt_browser_VisibilityWindowListener.class);
- suite.addTestSuite(org.eclipse.swt.tests.junit.browser.Test_BrowserSuite.class);
-
- return suite;
+ JUnitCore.main(AllBrowserTests.class.getName());
}
}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_CloseWindowListener.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_CloseWindowListener.java
index 4034bfa..14672d9 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_CloseWindowListener.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_CloseWindowListener.java
@@ -10,22 +10,22 @@
*******************************************************************************/
package org.eclipse.swt.tests.junit;
-import junit.framework.TestCase;
-
import org.eclipse.swt.SWT;
import org.eclipse.swt.browser.Browser;
import org.eclipse.swt.browser.CloseWindowListener;
import org.eclipse.swt.browser.WindowEvent;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;
+import org.junit.Test;
/**
* Automated Test Suite for class org.eclipse.swt.browser.CloseWindowListener
*
* @see org.eclipse.swt.browser.CloseWindowListener
*/
-public class Test_org_eclipse_swt_browser_CloseWindowListener extends TestCase {
+public class Test_org_eclipse_swt_browser_CloseWindowListener {
+@Test
public void test_closeLorg_eclipse_swt_browser_WindowEvent() {
Display display = Display.getCurrent();
Shell shell = new Shell(display);
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_LocationAdapter.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_LocationAdapter.java
index 80c8d8b..a51e7e4 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_LocationAdapter.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_LocationAdapter.java
@@ -10,25 +10,26 @@
*******************************************************************************/
package org.eclipse.swt.tests.junit;
-import junit.framework.TestCase;
-
import org.eclipse.swt.SWT;
import org.eclipse.swt.browser.Browser;
import org.eclipse.swt.browser.LocationAdapter;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;
+import org.junit.Test;
/**
* Automated Test Suite for class org.eclipse.swt.browser.LocationAdapter
*
* @see org.eclipse.swt.browser.LocationAdapter
*/
-public class Test_org_eclipse_swt_browser_LocationAdapter extends TestCase {
+public class Test_org_eclipse_swt_browser_LocationAdapter {
+@Test
public void test_Constructor() {
new LocationAdapter() {};
}
+@Test
public void test_changedLorg_eclipse_swt_browser_LocationEvent() {
Display display = Display.getCurrent();
Shell shell = new Shell(display);
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_LocationListener.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_LocationListener.java
index 5e29822..b515bcc 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_LocationListener.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_LocationListener.java
@@ -10,22 +10,22 @@
*******************************************************************************/
package org.eclipse.swt.tests.junit;
-import junit.framework.TestCase;
-
import org.eclipse.swt.SWT;
import org.eclipse.swt.browser.Browser;
import org.eclipse.swt.browser.LocationEvent;
import org.eclipse.swt.browser.LocationListener;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;
+import org.junit.Test;
/**
* Automated Test Suite for class org.eclipse.swt.browser.LocationListener
*
* @see org.eclipse.swt.browser.LocationListener
*/
-public class Test_org_eclipse_swt_browser_LocationListener extends TestCase {
+public class Test_org_eclipse_swt_browser_LocationListener {
+@Test
public void test_changedLorg_eclipse_swt_browser_LocationEvent() {
Display display = Display.getCurrent();
Shell shell = new Shell(display);
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_OpenWindowListener.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_OpenWindowListener.java
index 8516a61..29e4b04 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_OpenWindowListener.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_OpenWindowListener.java
@@ -10,22 +10,22 @@
*******************************************************************************/
package org.eclipse.swt.tests.junit;
-import junit.framework.TestCase;
-
import org.eclipse.swt.SWT;
import org.eclipse.swt.browser.Browser;
import org.eclipse.swt.browser.OpenWindowListener;
import org.eclipse.swt.browser.WindowEvent;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;
+import org.junit.Test;
/**
* Automated Test Suite for class org.eclipse.swt.browser.OpenWindowListener
*
* @see org.eclipse.swt.browser.OpenWindowListener
*/
-public class Test_org_eclipse_swt_browser_OpenWindowListener extends TestCase {
+public class Test_org_eclipse_swt_browser_OpenWindowListener {
+@Test
public void test_openWindowLorg_eclipse_swt_browser_WindowEvent() {
Display display = Display.getCurrent();
Shell shell = new Shell(display);
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_ProgressAdapter.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_ProgressAdapter.java
index 1fb217f..5db23d0 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_ProgressAdapter.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_ProgressAdapter.java
@@ -10,25 +10,25 @@
*******************************************************************************/
package org.eclipse.swt.tests.junit;
-import junit.framework.TestCase;
-
import org.eclipse.swt.SWT;
import org.eclipse.swt.browser.Browser;
import org.eclipse.swt.browser.ProgressAdapter;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;
+import org.junit.Test;
/**
* Automated Test Suite for class org.eclipse.swt.browser.ProgressAdapter
*
* @see org.eclipse.swt.browser.ProgressAdapter
*/
-public class Test_org_eclipse_swt_browser_ProgressAdapter extends TestCase {
+public class Test_org_eclipse_swt_browser_ProgressAdapter {
+@Test
public void test_Constructor() {
new ProgressAdapter() {};
}
-
+@Test
public void test_changedLorg_eclipse_swt_browser_ProgressEvent() {
Display display = Display.getCurrent();
Shell shell = new Shell(display);
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_ProgressListener.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_ProgressListener.java
index 94add98..cdc6f31 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_ProgressListener.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_ProgressListener.java
@@ -10,22 +10,22 @@
*******************************************************************************/
package org.eclipse.swt.tests.junit;
-import junit.framework.TestCase;
-
import org.eclipse.swt.SWT;
import org.eclipse.swt.browser.Browser;
import org.eclipse.swt.browser.ProgressEvent;
import org.eclipse.swt.browser.ProgressListener;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;
+import org.junit.Test;
/**
* Automated Test Suite for class org.eclipse.swt.browser.ProgressListener
*
* @see org.eclipse.swt.browser.ProgressListener
*/
-public class Test_org_eclipse_swt_browser_ProgressListener extends TestCase {
+public class Test_org_eclipse_swt_browser_ProgressListener {
+@Test
public void test_changedLorg_eclipse_swt_browser_ProgressEvent() {
Display display = Display.getCurrent();
Shell shell = new Shell(display);
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_StatusTextListener.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_StatusTextListener.java
index 4e57746..036b21e 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_StatusTextListener.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_StatusTextListener.java
@@ -10,22 +10,22 @@
*******************************************************************************/
package org.eclipse.swt.tests.junit;
-import junit.framework.TestCase;
-
import org.eclipse.swt.SWT;
import org.eclipse.swt.browser.Browser;
import org.eclipse.swt.browser.StatusTextEvent;
import org.eclipse.swt.browser.StatusTextListener;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;
+import org.junit.Test;
/**
* Automated Test Suite for class org.eclipse.swt.browser.StatusTextListener
*
* @see org.eclipse.swt.browser.StatusTextListener
*/
-public class Test_org_eclipse_swt_browser_StatusTextListener extends TestCase {
+public class Test_org_eclipse_swt_browser_StatusTextListener {
+@Test
public void test_changedLorg_eclipse_swt_browser_StatusTextEvent() {
Display display = Display.getCurrent();
Shell shell = new Shell(display);
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_TitleListener.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_TitleListener.java
index 6c1f6e1..2e44dae 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_TitleListener.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_TitleListener.java
@@ -11,22 +11,21 @@
package org.eclipse.swt.tests.junit;
-import junit.framework.TestCase;
-
import org.eclipse.swt.SWT;
import org.eclipse.swt.browser.Browser;
import org.eclipse.swt.browser.TitleEvent;
import org.eclipse.swt.browser.TitleListener;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;
+import org.junit.Test;
/**
* Automated Test Suite for class org.eclipse.swt.browser.TitleListener
*
* @see org.eclipse.swt.browser.TitleListener
*/
-public class Test_org_eclipse_swt_browser_TitleListener extends TestCase {
-
+public class Test_org_eclipse_swt_browser_TitleListener {
+@Test
public void test_changedLorg_eclipse_swt_browser_TitleEvent() {
Display display = Display.getCurrent();
Shell shell = new Shell(display);
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_VisibilityWindowAdapter.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_VisibilityWindowAdapter.java
index 3a5070d..33e1eb9 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_VisibilityWindowAdapter.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_VisibilityWindowAdapter.java
@@ -10,25 +10,24 @@
*******************************************************************************/
package org.eclipse.swt.tests.junit;
-import junit.framework.TestCase;
-
import org.eclipse.swt.SWT;
import org.eclipse.swt.browser.Browser;
import org.eclipse.swt.browser.VisibilityWindowAdapter;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;
+import org.junit.Test;
/**
* Automated Test Suite for class org.eclipse.swt.browser.VisibilityWindowAdapter
*
* @see org.eclipse.swt.browser.VisibilityWindowAdapter
*/
-public class Test_org_eclipse_swt_browser_VisibilityWindowAdapter extends TestCase {
-
+public class Test_org_eclipse_swt_browser_VisibilityWindowAdapter {
+@Test
public void test_Constructor() {
new VisibilityWindowAdapter() {};
}
-
+@Test
public void test_hideLorg_eclipse_swt_browser_WindowEvent() {
Display display = Display.getCurrent();
Shell shell = new Shell(display);
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_VisibilityWindowListener.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_VisibilityWindowListener.java
index ed23874..d8a94ea 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_VisibilityWindowListener.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_VisibilityWindowListener.java
@@ -10,22 +10,21 @@
*******************************************************************************/
package org.eclipse.swt.tests.junit;
-import junit.framework.TestCase;
-
import org.eclipse.swt.SWT;
import org.eclipse.swt.browser.Browser;
import org.eclipse.swt.browser.VisibilityWindowListener;
import org.eclipse.swt.browser.WindowEvent;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;
+import org.junit.Test;
/**
* Automated Test Suite for class org.eclipse.swt.browser.VisibilityWindowListener
*
* @see org.eclipse.swt.browser.VisibilityWindowListener
*/
-public class Test_org_eclipse_swt_browser_VisibilityWindowListener extends TestCase {
-
+public class Test_org_eclipse_swt_browser_VisibilityWindowListener {
+@Test
public void test_hideLorg_eclipse_swt_browser_WindowEvent() {
Display display = Display.getCurrent();
Shell shell = new Shell(display);
