This is an automated email from the ASF dual-hosted git repository. av pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push: new 8e6de9b IGNITE-10739 Incorrect deprecation rolled back. 8e6de9b is described below commit 8e6de9b3bab1159841439ad697365375e0dd54b2 Author: Anton Vinogradov <a...@apache.org> AuthorDate: Mon Feb 18 17:42:07 2019 +0300 IGNITE-10739 Incorrect deprecation rolled back. Signed-off-by: Anton Vinogradov <a...@apache.org> --- .../testframework/junits/JUnit3TestLegacyAssert.java | 2 ++ .../testframework/junits/JUnit3TestLegacySupport.java | 14 ++------------ 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/JUnit3TestLegacyAssert.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/JUnit3TestLegacyAssert.java index 9943a01..1ae17f5 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/JUnit3TestLegacyAssert.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/JUnit3TestLegacyAssert.java @@ -24,7 +24,9 @@ import org.junit.Assert; * in {@link Assert} in org.junit package. * Deprecation notice: instead of invoking inherited methods, directly refer to respective static methods of * {@link Assert} class. + * @deprecated and should be removed once all tests will be refactored to use proper API. */ +@Deprecated class JUnit3TestLegacyAssert { /** See class javadocs. */ protected static void assertTrue(String msg, boolean cond) { diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/JUnit3TestLegacySupport.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/JUnit3TestLegacySupport.java index f18c20c..772a0a0 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/JUnit3TestLegacySupport.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/JUnit3TestLegacySupport.java @@ -24,8 +24,10 @@ import org.junit.runners.model.Statement; /** * Supports compatibility with old tests that expect specific threading behavior of JUnit 3 TestCase class, * inherited assertions and specific old interface for GridTestUtils. + * @deprecated and should be removed once all tests will be refactored to use proper API. */ @SuppressWarnings({"TransientFieldInNonSerializableClass", "ExtendsUtilityClass"}) +@Deprecated public abstract class JUnit3TestLegacySupport extends JUnit3TestLegacyAssert { /** * Supports obtaining test name for JUnit4 framework in a way that makes it available for legacy methods invoked @@ -79,10 +81,7 @@ public abstract class JUnit3TestLegacySupport extends JUnit3TestLegacyAssert { * Do not annotate with Before in overriding methods.</p> * * @throws Exception If failed. {@link #afterTest()} will be called in this case. - * @deprecated This method is deprecated. Instead of invoking or overriding it, it is recommended to make your own - * method with {@code @Before} annotation. */ - @Deprecated protected void beforeTest() throws Exception { // No-op. } @@ -94,10 +93,7 @@ public abstract class JUnit3TestLegacySupport extends JUnit3TestLegacyAssert { * Do not annotate with After in overriding methods.</p> * * @throws Exception If failed. - * @deprecated This method is deprecated. Instead of invoking or overriding it, it is recommended to make your own - * method with {@code @After} annotation. */ - @Deprecated protected void afterTest() throws Exception { // No-op. } @@ -108,10 +104,7 @@ public abstract class JUnit3TestLegacySupport extends JUnit3TestLegacyAssert { * Do not annotate with BeforeClass in overriding methods.</p> * * @throws Exception If failed. {@link #afterTestsStopped()} will be called in this case. - * @deprecated This method is deprecated. Instead of invoking or overriding it, it is recommended to make your own - * method with {@code @BeforeClass} annotation. */ - @Deprecated protected void beforeTestsStarted() throws Exception { // No-op. } @@ -123,10 +116,7 @@ public abstract class JUnit3TestLegacySupport extends JUnit3TestLegacyAssert { * Do not annotate with AfterClass in overriding methods.</p> * * @throws Exception If failed. - * @deprecated This method is deprecated. Instead of invoking or overriding it, it is recommended to make your own - * method with {@code @AfterClass} annotation. */ - @Deprecated protected void afterTestsStopped() throws Exception { // No-op. }