[ignite] 02/03: Add JUnit 5 support.
This is an automated email from the ASF dual-hosted git repository. agoncharuk pushed a commit to branch ignite-13617 in repository https://gitbox.apache.org/repos/asf/ignite.git commit 7000daf6837da48fa32a5aa93cbf2b2c8f8ee22d Author: Andrew Mashenkov AuthorDate: Wed Nov 11 22:57:14 2020 +0300 Add JUnit 5 support. --- modules/commons/pom.xml| 20 ++-- .../apache/ignite/internal/schema/ColumnTest.java | 5 +-- .../apache/ignite/internal/schema/ColumnsTest.java | 38 -- .../ignite/internal/schema/NativeTypeTest.java | 34 ++- .../ignite/internal/schema/SchemaTestSuite.java| 8 ++--- .../apache/ignite/internal/schema/TupleTest.java | 24 ++ 6 files changed, 88 insertions(+), 41 deletions(-) diff --git a/modules/commons/pom.xml b/modules/commons/pom.xml index 562fd06..ad7636f 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -144,9 +144,23 @@ -junit -junit -4.12 +org.jetbrains +annotations +${jetbrains.annotations.version} + + + + +org.junit.jupiter +junit-jupiter-engine +${junit.jupiter.version} +test + + + +org.junit.platform +junit-platform-runner +${junit.platform.version} test diff --git a/modules/commons/src/test/java/org/apache/ignite/internal/schema/ColumnTest.java b/modules/commons/src/test/java/org/apache/ignite/internal/schema/ColumnTest.java index 7725500..ddc5b74 100644 --- a/modules/commons/src/test/java/org/apache/ignite/internal/schema/ColumnTest.java +++ b/modules/commons/src/test/java/org/apache/ignite/internal/schema/ColumnTest.java @@ -18,15 +18,16 @@ package org.apache.ignite.internal.schema; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * */ public class ColumnTest { /** + * */ @Test public void testCompareColumns() { diff --git a/modules/commons/src/test/java/org/apache/ignite/internal/schema/ColumnsTest.java b/modules/commons/src/test/java/org/apache/ignite/internal/schema/ColumnsTest.java index a0d859e..93e5e45 100644 --- a/modules/commons/src/test/java/org/apache/ignite/internal/schema/ColumnsTest.java +++ b/modules/commons/src/test/java/org/apache/ignite/internal/schema/ColumnsTest.java @@ -17,16 +17,18 @@ package org.apache.ignite.internal.schema; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * */ public class ColumnsTest { /** + * */ @Test public void testFixsizeIndex() { @@ -40,13 +42,14 @@ public class ColumnsTest { assertEquals(-1, cols.firstVarlengthColumn()); for (int c = 0; c < cols.length(); c++) -Assert.assertTrue(cols.isFixedSize(c)); +assertTrue(cols.isFixedSize(c)); assertEquals(1, cols.nullMapSize()); assertEquals(3, cols.numberOfFixsizeColumns()); } /** + * */ @Test public void testVarsizeIndex() { @@ -60,13 +63,14 @@ public class ColumnsTest { assertEquals(0, cols.firstVarlengthColumn()); for (int c = 0; c < cols.length(); c++) -Assert.assertFalse(cols.isFixedSize(c)); +assertFalse(cols.isFixedSize(c)); assertEquals(1, cols.nullMapSize()); assertEquals(0, cols.numberOfFixsizeColumns()); } /** + * */ @Test public void testMixedIndex() { @@ -82,9 +86,9 @@ public class ColumnsTest { for (int c = 0; c < cols.length(); c++) { if (c < cols.firstVarlengthColumn()) -Assert.assertTrue(cols.isFixedSize(c)); +assertTrue(cols.isFixedSize(c)); else -Assert.assertFalse(cols.isFixedSize(c)); +assertFalse(cols.isFixedSize(c)); } assertEquals(1, cols.nullMapSize()); @@ -92,6 +96,7 @@ public class ColumnsTest { } /** + * */ @Test public void testNullMapSize() { @@ -111,6 +116,7 @@ public class ColumnsTest { } /** + * */ @Test public void testFoldSizeNoVarlenIncomplete1Byte() { @@ -128,6 +134,7 @@ public class ColumnsTest { } /** + * */ @Test public void testFoldSizeNoVarlenFull1Byte() { @@ -146,6 +153,7 @@ public class ColumnsTest { } /** + * */ @Test public void
[ignite] 02/03: Add JUnit 5 support.
This is an automated email from the ASF dual-hosted git repository. amashenkov pushed a commit to branch ignite-13618 in repository https://gitbox.apache.org/repos/asf/ignite.git commit 71a9439a18ea25752611c4c51daeafb11eb9af7c Author: Andrew Mashenkov AuthorDate: Wed Nov 11 22:57:14 2020 +0300 Add JUnit 5 support. --- modules/commons/pom.xml| 20 ++-- .../apache/ignite/internal/schema/ColumnTest.java | 5 +-- .../apache/ignite/internal/schema/ColumnsTest.java | 38 -- .../ignite/internal/schema/NativeTypeTest.java | 34 ++- .../ignite/internal/schema/SchemaTestSuite.java| 8 ++--- .../apache/ignite/internal/schema/TupleTest.java | 24 ++ 6 files changed, 88 insertions(+), 41 deletions(-) diff --git a/modules/commons/pom.xml b/modules/commons/pom.xml index 562fd06..ad7636f 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -144,9 +144,23 @@ -junit -junit -4.12 +org.jetbrains +annotations +${jetbrains.annotations.version} + + + + +org.junit.jupiter +junit-jupiter-engine +${junit.jupiter.version} +test + + + +org.junit.platform +junit-platform-runner +${junit.platform.version} test diff --git a/modules/commons/src/test/java/org/apache/ignite/internal/schema/ColumnTest.java b/modules/commons/src/test/java/org/apache/ignite/internal/schema/ColumnTest.java index 7725500..ddc5b74 100644 --- a/modules/commons/src/test/java/org/apache/ignite/internal/schema/ColumnTest.java +++ b/modules/commons/src/test/java/org/apache/ignite/internal/schema/ColumnTest.java @@ -18,15 +18,16 @@ package org.apache.ignite.internal.schema; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * */ public class ColumnTest { /** + * */ @Test public void testCompareColumns() { diff --git a/modules/commons/src/test/java/org/apache/ignite/internal/schema/ColumnsTest.java b/modules/commons/src/test/java/org/apache/ignite/internal/schema/ColumnsTest.java index a0d859e..93e5e45 100644 --- a/modules/commons/src/test/java/org/apache/ignite/internal/schema/ColumnsTest.java +++ b/modules/commons/src/test/java/org/apache/ignite/internal/schema/ColumnsTest.java @@ -17,16 +17,18 @@ package org.apache.ignite.internal.schema; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * */ public class ColumnsTest { /** + * */ @Test public void testFixsizeIndex() { @@ -40,13 +42,14 @@ public class ColumnsTest { assertEquals(-1, cols.firstVarlengthColumn()); for (int c = 0; c < cols.length(); c++) -Assert.assertTrue(cols.isFixedSize(c)); +assertTrue(cols.isFixedSize(c)); assertEquals(1, cols.nullMapSize()); assertEquals(3, cols.numberOfFixsizeColumns()); } /** + * */ @Test public void testVarsizeIndex() { @@ -60,13 +63,14 @@ public class ColumnsTest { assertEquals(0, cols.firstVarlengthColumn()); for (int c = 0; c < cols.length(); c++) -Assert.assertFalse(cols.isFixedSize(c)); +assertFalse(cols.isFixedSize(c)); assertEquals(1, cols.nullMapSize()); assertEquals(0, cols.numberOfFixsizeColumns()); } /** + * */ @Test public void testMixedIndex() { @@ -82,9 +86,9 @@ public class ColumnsTest { for (int c = 0; c < cols.length(); c++) { if (c < cols.firstVarlengthColumn()) -Assert.assertTrue(cols.isFixedSize(c)); +assertTrue(cols.isFixedSize(c)); else -Assert.assertFalse(cols.isFixedSize(c)); +assertFalse(cols.isFixedSize(c)); } assertEquals(1, cols.nullMapSize()); @@ -92,6 +96,7 @@ public class ColumnsTest { } /** + * */ @Test public void testNullMapSize() { @@ -111,6 +116,7 @@ public class ColumnsTest { } /** + * */ @Test public void testFoldSizeNoVarlenIncomplete1Byte() { @@ -128,6 +134,7 @@ public class ColumnsTest { } /** + * */ @Test public void testFoldSizeNoVarlenFull1Byte() { @@ -146,6 +153,7 @@ public class ColumnsTest { } /** + * */ @Test public void