diff options
author | Alexander Kurtakov | 2015-04-01 20:10:11 +0000 |
---|---|---|
committer | Alexander Kurtakov | 2015-04-02 11:55:04 +0000 |
commit | 1e80de65188461566f219bb66b8b65ebfbf5a2a4 (patch) | |
tree | d6fc5a9fe04ebef7d8443ae1ba7b6d21f5b12f23 | |
parent | ef8273b6f65a66277ec69ce4fd9da0e8a9254e93 (diff) | |
download | org.eclipse.swtbot-1e80de65188461566f219bb66b8b65ebfbf5a2a4.tar.gz org.eclipse.swtbot-1e80de65188461566f219bb66b8b65ebfbf5a2a4.tar.xz org.eclipse.swtbot-1e80de65188461566f219bb66b8b65ebfbf5a2a4.zip |
Get rid of JUnit related deprecations.
Extended SWTBotJUnit4Suite deprecation message to clarify the new way.
Change-Id: I51a4cdaf3c62b9df4fccd668da9c5fc14e72aacf
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
6 files changed, 12 insertions, 5 deletions
diff --git a/org.eclipse.swtbot.forms.finder.test/src/org/eclipse/swtbot/forms/finder/test/AllTests.java b/org.eclipse.swtbot.forms.finder.test/src/org/eclipse/swtbot/forms/finder/test/AllTests.java index 33dd134d..d26a1e0a 100644 --- a/org.eclipse.swtbot.forms.finder.test/src/org/eclipse/swtbot/forms/finder/test/AllTests.java +++ b/org.eclipse.swtbot.forms.finder.test/src/org/eclipse/swtbot/forms/finder/test/AllTests.java @@ -12,14 +12,14 @@ package org.eclipse.swtbot.forms.finder.test; import org.eclipse.swtbot.forms.finder.test.widgets.SWTBotHyperlinkTest; import org.eclipse.swtbot.forms.finder.test.widgets.SWTBotImageHyperlinkTest; -import org.eclipse.swtbot.swt.finder.junit.SWTBotJUnit4Suite; import org.junit.runner.RunWith; +import org.junit.runners.Suite; import org.junit.runners.Suite.SuiteClasses; /** * @author Ketan Padegaonkar <KetanPadegaonkar [at] gmail [dot] com> */ -@RunWith(SWTBotJUnit4Suite.class) +@RunWith(Suite.class) @SuiteClasses({ SWTBotHyperlinkTest.class, SWTBotImageHyperlinkTest.class, diff --git a/org.eclipse.swtbot.forms.finder.test/src/org/eclipse/swtbot/forms/finder/test/widgets/SWTBotHyperlinkTest.java b/org.eclipse.swtbot.forms.finder.test/src/org/eclipse/swtbot/forms/finder/test/widgets/SWTBotHyperlinkTest.java index 78f08013..9d85dc73 100644 --- a/org.eclipse.swtbot.forms.finder.test/src/org/eclipse/swtbot/forms/finder/test/widgets/SWTBotHyperlinkTest.java +++ b/org.eclipse.swtbot.forms.finder.test/src/org/eclipse/swtbot/forms/finder/test/widgets/SWTBotHyperlinkTest.java @@ -16,9 +16,12 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import org.eclipse.swtbot.forms.finder.widgets.SWTBotHyperlink; +import org.eclipse.swtbot.swt.finder.junit.SWTBotJunit4ClassRunner; import org.eclipse.ui.forms.widgets.Hyperlink; import org.junit.Test; +import org.junit.runner.RunWith; +@RunWith(SWTBotJunit4ClassRunner.class) public class SWTBotHyperlinkTest extends AbstractSWTBotFormsTest { @Test diff --git a/org.eclipse.swtbot.forms.finder.test/src/org/eclipse/swtbot/forms/finder/test/widgets/SWTBotImageHyperlinkTest.java b/org.eclipse.swtbot.forms.finder.test/src/org/eclipse/swtbot/forms/finder/test/widgets/SWTBotImageHyperlinkTest.java index 62d1cc8a..678466b7 100644 --- a/org.eclipse.swtbot.forms.finder.test/src/org/eclipse/swtbot/forms/finder/test/widgets/SWTBotImageHyperlinkTest.java +++ b/org.eclipse.swtbot.forms.finder.test/src/org/eclipse/swtbot/forms/finder/test/widgets/SWTBotImageHyperlinkTest.java @@ -15,9 +15,12 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import org.eclipse.swtbot.forms.finder.widgets.SWTBotImageHyperlink; +import org.eclipse.swtbot.swt.finder.junit.SWTBotJunit4ClassRunner; import org.eclipse.ui.forms.widgets.ImageHyperlink; import org.junit.Test; +import org.junit.runner.RunWith; +@RunWith(SWTBotJunit4ClassRunner.class) public class SWTBotImageHyperlinkTest extends AbstractSWTBotFormsTest { @Test diff --git a/org.eclipse.swtbot.junit4_x/src/org/eclipse/swtbot/swt/finder/junit/SWTBotJUnit4Suite.java b/org.eclipse.swtbot.junit4_x/src/org/eclipse/swtbot/swt/finder/junit/SWTBotJUnit4Suite.java index 8ededb5b..52191db4 100644 --- a/org.eclipse.swtbot.junit4_x/src/org/eclipse/swtbot/swt/finder/junit/SWTBotJUnit4Suite.java +++ b/org.eclipse.swtbot.junit4_x/src/org/eclipse/swtbot/swt/finder/junit/SWTBotJUnit4Suite.java @@ -29,7 +29,8 @@ import org.junit.runners.model.RunnerBuilder; * @version $Id: * @noextend This class is not intended to be subclassed by clients. * @noinstantiate This class is not intended to be instantiated by clients. - * @deprecated Please use {@link Suite} instead. <code>@RunWith(Suite.class)</code> + * @deprecated Please use {@link Suite} <code>@RunWith(Suite.class)</code> instead and annotate the individual tests + * to run with {@link SWTBotJunit4ClassRunner} <code>@RunWith(SWTBotJunit4ClassRunner.class)</code>. */ public final class SWTBotJUnit4Suite extends Suite { diff --git a/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/utils/BidiMapTest.java b/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/utils/BidiMapTest.java index 783b3a06..159e6597 100644 --- a/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/utils/BidiMapTest.java +++ b/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/utils/BidiMapTest.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.swtbot.swt.finder.utils; -import static junit.framework.Assert.assertEquals; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import java.util.Map.Entry; diff --git a/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotTreeItemTest.java b/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotTreeItemTest.java index 5526a0af..7b903797 100644 --- a/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotTreeItemTest.java +++ b/org.eclipse.swtbot.swt.finder.test/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotTreeItemTest.java @@ -12,9 +12,9 @@ *******************************************************************************/ package org.eclipse.swtbot.swt.finder.widgets; -import static junit.framework.Assert.assertEquals; import static org.eclipse.swtbot.swt.finder.SWTBotTestCase.assertText; import static org.eclipse.swtbot.swt.finder.SWTBotTestCase.assertTextContains; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; |