You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by av...@apache.org on 2019/02/28 13:03:00 UTC
[ignite] branch master updated: IGNITE-11396 Actualize
JUnit3TestLegacyAssert (#6194)
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 efc6b96 IGNITE-11396 Actualize JUnit3TestLegacyAssert (#6194)
efc6b96 is described below
commit efc6b96578dc0b2b153a7ee60b0f4aadcab43fd9
Author: Ivan Fedotov <va...@gmail.com>
AuthorDate: Thu Feb 28 16:02:53 2019 +0300
IGNITE-11396 Actualize JUnit3TestLegacyAssert (#6194)
---
.../junits/JUnit3TestLegacySupport.java | 2 +-
...TestLegacyAssert.java => JUnitAssertAware.java} | 188 ++++++++++-----------
2 files changed, 93 insertions(+), 97 deletions(-)
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 772a0a0..5e492fd 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
@@ -28,7 +28,7 @@ import org.junit.runners.model.Statement;
*/
@SuppressWarnings({"TransientFieldInNonSerializableClass", "ExtendsUtilityClass"})
@Deprecated
-public abstract class JUnit3TestLegacySupport extends JUnit3TestLegacyAssert {
+public abstract class JUnit3TestLegacySupport extends JUnitAssertAware {
/**
* Supports obtaining test name for JUnit4 framework in a way that makes it available for legacy methods invoked
* from {@code runTest(Statement)}.
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/JUnitAssertAware.java
similarity index 65%
rename from modules/core/src/test/java/org/apache/ignite/testframework/junits/JUnit3TestLegacyAssert.java
rename to modules/core/src/test/java/org/apache/ignite/testframework/junits/JUnitAssertAware.java
index 1ae17f5..f46e6a3 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/JUnitAssertAware.java
@@ -20,190 +20,186 @@ package org.apache.ignite.testframework.junits;
import org.junit.Assert;
/**
- * Supports compatibility with legacy tests that expect inherited assertions by delegating these to respective methods
- * 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.
+ * Provides the basic functionality of {@link Assert} methods in org.junit package.
+ * Corresponding methods must be used in all ignite tests where necessary.
*/
-@Deprecated
-class JUnit3TestLegacyAssert {
- /** See class javadocs. */
+class JUnitAssertAware {
+ /** See {@link Assert#assertTrue(String, boolean)} javadocs. */
protected static void assertTrue(String msg, boolean cond) {
Assert.assertTrue(msg, cond);
}
- /** See class javadocs. */
+ /** See {@link Assert#assertTrue(boolean)} javadocs. */
protected static void assertTrue(boolean cond) {
Assert.assertTrue(cond);
}
- /** See class javadocs. */
+ /** See {@link Assert#assertFalse(String, boolean)} javadocs. */
protected static void assertFalse(String msg, boolean cond) {
Assert.assertFalse(msg, cond);
}
- /** See class javadocs. */
+ /** See {@link Assert#assertFalse(boolean)} javadocs. */
protected static void assertFalse(boolean cond) {
Assert.assertFalse(cond);
}
- /** See class javadocs. */
- protected static void assertEquals(String msg, Object exp, Object actual) {
- Assert.assertEquals(msg, exp, actual);
- }
-
- /** See class javadocs. */
- protected static void assertEquals(Object exp, Object actual) {
- Assert.assertEquals(exp, actual);
+ /** See {@link Assert#fail(String)} javadocs. */
+ protected static void fail(String msg) {
+ Assert.fail(msg);
}
- /** See class javadocs. */
- protected static void assertEquals(String msg, String exp, String actual) {
- Assert.assertEquals(msg, exp, actual);
+ /** See {@link Assert#fail()} javadocs. */
+ protected static void fail() {
+ Assert.fail();
}
- /** See class javadocs. */
- protected static void assertEquals(String exp, String actual) {
+ /** See {@link Assert#assertEquals(Object, Object)} javadocs. */
+ protected static void assertEquals(Object exp, Object actual) {
Assert.assertEquals(exp, actual);
}
- /** See class javadocs. */
- protected static void assertEquals(String msg, long exp, long actual) {
- Assert.assertEquals(msg, exp, actual);
- }
-
- /** See class javadocs. */
- protected static void assertEquals(long exp, long actual) {
+ /** See {@link Assert#assertEquals(Object, Object)} javadocs. */
+ protected static void assertEquals(String exp, String actual) {
Assert.assertEquals(exp, actual);
}
- /** See class javadocs. */
+ /** See {@link Assert#assertEquals(Object, Object)} javadocs. */
protected static void assertEquals(boolean exp, boolean actual) {
Assert.assertEquals(exp, actual);
}
- /** See class javadocs. */
- protected static void assertEquals(String msg, int exp, int actual) {
+ /** See {@link Assert#assertEquals(String, Object, Object)} javadocs. */
+ protected static void assertEquals(String msg, Object exp, Object actual) {
Assert.assertEquals(msg, exp, actual);
}
- /** See class javadocs. */
- protected static void assertEquals(int exp, int actual) {
- Assert.assertEquals(exp, actual);
+ /** See {@link Assert#assertEquals(String, Object, Object)} javadocs. */
+ protected static void assertEquals(String msg, String exp, String actual) {
+ Assert.assertEquals(msg, exp, actual);
}
- /** See class javadocs. */
- protected static void assertNotNull(Object obj) {
- Assert.assertNotNull(obj);
+ /** See {@link Assert#assertEquals(String, Object, Object)} javadocs. */
+ protected static void assertEquals(String msg, boolean exp, boolean actual) {
+ Assert.assertEquals(msg, exp, actual);
}
- /** See class javadocs. */
- protected static void assertNotNull(String msg, Object obj) {
- Assert.assertNotNull(msg, obj);
+ /** See {@link Assert#assertEquals(long, long)} javadocs. */
+ protected static void assertEquals(long exp, long actual) {
+ Assert.assertEquals(exp, actual);
}
- /** See class javadocs. */
- protected static void assertNull(Object obj) {
- Assert.assertNull(obj);
+ /** See {@link Assert#assertEquals(long, long)} javadocs. */
+ protected static void assertEquals(int exp, int actual) {
+ Assert.assertEquals(exp, actual);
}
- /** See class javadocs. */
- protected static void assertNull(String msg, Object obj) {
- Assert.assertNull(msg, obj);
+ /** See {@link Assert#assertEquals(long, long)} javadocs. */
+ protected static void assertEquals(byte exp, byte actual) {
+ Assert.assertEquals(exp, actual);
}
- /** See class javadocs. */
- protected static void fail(String msg) {
- Assert.fail(msg);
+ /** See {@link Assert#assertEquals(long, long)} javadocs. */
+ protected static void assertEquals(char exp, char actual) {
+ Assert.assertEquals(exp, actual);
}
- /** See class javadocs. */
- protected static void fail() {
- Assert.fail();
+ /** See {@link Assert#assertEquals(long, long)} javadocs. */
+ protected static void assertEquals(short exp, short actual) {
+ Assert.assertEquals(exp, actual);
}
- /** See class javadocs. */
- protected static void assertSame(Object exp, Object actual) {
- Assert.assertSame(exp, actual);
+ /** See {@link Assert#assertEquals(String, long, long)} javadocs. */
+ protected static void assertEquals(String msg, long exp, long actual) {
+ Assert.assertEquals(msg, exp, actual);
}
- /** See class javadocs. */
- protected static void assertNotSame(Object unexpected, Object actual) {
- Assert.assertNotSame(unexpected, actual);
+ /** See {@link Assert#assertEquals(String, long, long)} javadocs. */
+ protected static void assertEquals(String msg, int exp, int actual) {
+ Assert.assertEquals(msg, exp, actual);
}
- /** See class javadocs. */
- protected static void assertEquals(String msg, double exp, double actual) {
- Assert.assertEquals(msg, exp, actual, 0);
+ /** See {@link Assert#assertEquals(double, double, double)} javadocs. */
+ protected static void assertEquals(double exp, double actual, double delta) {
+ Assert.assertEquals(exp, actual, delta);
}
- /** See class javadocs. */
+ /** See {@link Assert#assertEquals(double, double, double)} javadocs. */
protected static void assertEquals(double exp, Double actual) {
Assert.assertEquals(exp, actual, 0);
}
- /** See class javadocs. */
+ /** See {@link Assert#assertEquals(double, double, double)} javadocs. */
protected static void assertEquals(Double exp, double actual) {
Assert.assertEquals(exp, actual, 0);
}
- /** See class javadocs. */
+ /** See {@link Assert#assertEquals(double, double, double)} javadocs. */
protected static void assertEquals(double exp, double actual) {
Assert.assertEquals(exp, actual, 0);
}
- /** See class javadocs. */
- protected static void assertEquals(float exp, float actual) {
- Assert.assertEquals(exp, actual, 0);
- }
-
- /** See class javadocs. */
- protected static void assertEquals(float exp, Float actual) {
- Assert.assertEquals(exp, actual, 0);
- }
-
- /** See class javadocs. */
+ /** See {@link Assert#assertEquals(String, double, double, double)} javadocs. */
protected static void assertEquals(String msg, double exp, double actual, double delta) {
Assert.assertEquals(msg, exp, actual, delta);
}
- /** See class javadocs. */
- protected static void assertEquals(double exp, double actual, double delta) {
- Assert.assertEquals(exp, actual, delta);
+ /** See {@link Assert#assertEquals(String, double, double, double)} javadocs. */
+ protected static void assertEquals(String msg, double exp, double actual) {
+ Assert.assertEquals(msg, exp, actual, 0);
}
- /** See class javadocs. */
+ /** See {@link Assert#assertEquals(float, float, float)} javadocs. */
protected static void assertEquals(float exp, float actual, float delta) {
Assert.assertEquals(exp, actual, delta);
}
- /** See class javadocs. */
- protected static void assertEquals(String msg, boolean exp, boolean actual) {
- Assert.assertEquals(msg, exp, actual);
+ /** See {@link Assert#assertEquals(float, float, float)} javadocs. */
+ protected static void assertEquals(float exp, float actual) {
+ Assert.assertEquals(exp, actual, 0);
}
- /** See class javadocs. */
+ /** See {@link Assert#assertEquals(float, float, float)} javadocs. */
+ protected static void assertEquals(float exp, Float actual) {
+ Assert.assertEquals(exp, actual, 0);
+ }
+
+ /** See {@link Assert#assertEquals(String, long, long)} javadocs. */
protected static void assertEquals(String msg, byte exp, byte actual) {
Assert.assertEquals(msg, exp, actual);
}
- /** See class javadocs. */
- protected static void assertEquals(byte exp, byte actual) {
- Assert.assertEquals(exp, actual);
+ /** See {@link Assert#assertNull(Object)} javadocs. */
+ protected static void assertNull(Object obj) {
+ Assert.assertNull(obj);
}
- /** See class javadocs. */
- protected static void assertEquals(char exp, char actual) {
- Assert.assertEquals(exp, actual);
+ /** See {@link Assert#assertNull(Object)} javadocs. */
+ protected static void assertNotNull(Object obj) {
+ Assert.assertNotNull(obj);
}
- /** See class javadocs. */
- protected static void assertEquals(short exp, short actual) {
- Assert.assertEquals(exp, actual);
+ /** See {@link Assert#assertNotNull(String, Object)} javadocs. */
+ protected static void assertNotNull(String msg, Object obj) {
+ Assert.assertNotNull(msg, obj);
+ }
+
+ /** See {@link Assert#assertNull(String, Object)} javadocs. */
+ protected static void assertNull(String msg, Object obj) {
+ Assert.assertNull(msg, obj);
+ }
+
+ /** See {@link Assert#assertSame(Object, Object)} javadocs. */
+ protected static void assertSame(Object exp, Object actual) {
+ Assert.assertSame(exp, actual);
+ }
+
+ /** See {@link Assert#assertNotSame(Object, Object)} javadocs. */
+ protected static void assertNotSame(Object unexpected, Object actual) {
+ Assert.assertNotSame(unexpected, actual);
}
- /** See class javadocs. */
+ /** See {@link Assert#assertNotSame(String, Object, Object)} javadocs. */
protected static void assertNotSame(String msg, Object exp, Object actual) {
Assert.assertNotSame(msg, exp, actual);
}