Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Vogel2015-08-14 09:50:21 +0000
committerLars Vogel2015-08-14 09:50:21 +0000
commit8f5fb7ab69b1d58548433700030f850e26f91e0b (patch)
tree0f62bed8418e074a563ae342dbb548757b580da5
parent9650a451af8866afab65d01a119398e3b253dc70 (diff)
downloadeclipse.platform.ui-8f5fb7ab69b1d58548433700030f850e26f91e0b.tar.gz
eclipse.platform.ui-8f5fb7ab69b1d58548433700030f850e26f91e0b.tar.xz
eclipse.platform.ui-8f5fb7ab69b1d58548433700030f850e26f91e0b.zip
Bug 474132 - [Tests] Move test suite of o.e.ui.tests and migrate
progress jobs to JUnit 4 Adds RunWith to the JUnit3 test suites Change-Id: Ie1c09873c0d1defdd82c1ec6729f3bec6bfc6198 Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
-rw-r--r--tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/datatransfer/DataTransferTestSuite.java9
-rw-r--r--tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/decorators/DecoratorsTestSuite.java6
-rw-r--r--tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/services/ContributedServiceTest.java4
-rw-r--r--tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/services/ServicesTestSuite.java6
4 files changed, 17 insertions, 8 deletions
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/datatransfer/DataTransferTestSuite.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/datatransfer/DataTransferTestSuite.java
index 6427314cb46..41ff75ff9aa 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/datatransfer/DataTransferTestSuite.java
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/datatransfer/DataTransferTestSuite.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -7,15 +7,16 @@
*
* Contributors:
* IBM Corporation - initial API and implementation
+ * Lars Vogel <Lars.Vogel@vogella.com> - Bug 474132
*******************************************************************************/
package org.eclipse.ui.tests.datatransfer;
+import org.junit.runner.RunWith;
+
import junit.framework.Test;
import junit.framework.TestSuite;
-/**
- * .
- */
+@RunWith(org.junit.runners.AllTests.class)
public class DataTransferTestSuite extends TestSuite {
/**
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/decorators/DecoratorsTestSuite.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/decorators/DecoratorsTestSuite.java
index 80cfd46241a..b5153af9af3 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/decorators/DecoratorsTestSuite.java
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/decorators/DecoratorsTestSuite.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2004, 2012 IBM Corporation and others.
+ * Copyright (c) 2004, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -7,12 +7,16 @@
*
* Contributors:
* IBM Corporation - initial API and implementation
+ * Lars Vogel <Lars.Vogel@vogella.com> - Bug 474132
*******************************************************************************/
package org.eclipse.ui.tests.decorators;
+import org.junit.runner.RunWith;
+
import junit.framework.Test;
import junit.framework.TestSuite;
+@RunWith(org.junit.runners.AllTests.class)
public class DecoratorsTestSuite extends TestSuite {
/**
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/services/ContributedServiceTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/services/ContributedServiceTest.java
index c0a8f30ca11..490b400c6fe 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/services/ContributedServiceTest.java
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/services/ContributedServiceTest.java
@@ -11,8 +11,6 @@
package org.eclipse.ui.tests.services;
-import junit.framework.TestSuite;
-
import org.eclipse.ui.IViewPart;
import org.eclipse.ui.IViewReference;
import org.eclipse.ui.IWorkbenchWindow;
@@ -27,6 +25,8 @@ import org.eclipse.ui.services.IServiceLocator;
import org.eclipse.ui.services.IServiceScopes;
import org.eclipse.ui.tests.harness.util.UITestCase;
+import junit.framework.TestSuite;
+
/**
* @since 3.4
*
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/services/ServicesTestSuite.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/services/ServicesTestSuite.java
index 353dd8dd58c..186c2b947e4 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/services/ServicesTestSuite.java
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/services/ServicesTestSuite.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2012 IBM Corporation and others.
+ * Copyright (c) 2003, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -7,9 +7,12 @@
*
* Contributors:
* IBM Corporation - initial API and implementation
+ * Lars Vogel <Lars.Vogel@vogella.com> - Bug 474132
*******************************************************************************/
package org.eclipse.ui.tests.services;
+import org.junit.runner.RunWith;
+
import junit.framework.Test;
import junit.framework.TestSuite;
@@ -17,6 +20,7 @@ import junit.framework.TestSuite;
* Tests general to services.
* @since 3.3
*/
+@RunWith(org.junit.runners.AllTests.class)
public final class ServicesTestSuite extends TestSuite {
/**

Back to the top