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 <andrey.mashen...@gmail.com>
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 @@
<dependencies>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.12</version>
+ <groupId>org.jetbrains</groupId>
+ <artifactId>annotations</artifactId>
+ <version>${jetbrains.annotations.version}</version>
+ </dependency>
+
+ <!--JUnit 5-->
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <version>${junit.jupiter.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.junit.platform</groupId>
+ <artifactId>junit-platform-runner</artifactId>
+ <version>${junit.platform.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
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 testFoldSizeNoVarlenIncomplete2Bytes() {
@@ -166,6 +174,7 @@ public class ColumnsTest {
}
/**
+ *
*/
@Test
public void testFoldSizeNoVarlenFull2Bytes() {
@@ -192,6 +201,7 @@ public class ColumnsTest {
}
/**
+ *
*/
@Test
public void testFoldSizeVarlenIncomplete1Byte() {
@@ -209,6 +219,7 @@ public class ColumnsTest {
}
/**
+ *
*/
@Test
public void testFoldSizeVarlenFull1Byte() {
@@ -227,6 +238,7 @@ public class ColumnsTest {
}
/**
+ *
*/
@Test
public void testFoldSizeVarlenIncomplete2Bytes1() {
@@ -246,6 +258,7 @@ public class ColumnsTest {
}
/**
+ *
*/
@Test
public void testFoldSizeVarlenIncomplete2Bytes2() {
@@ -267,6 +280,7 @@ public class ColumnsTest {
}
/**
+ *
*/
@Test
public void testFoldSizeVarlenIncomplete2Bytes3() {
@@ -288,6 +302,7 @@ public class ColumnsTest {
}
/**
+ *
*/
@Test
public void testFoldSizeVarlenFull2Bytes() {
@@ -314,6 +329,7 @@ public class ColumnsTest {
}
/**
+ *
*/
private void checkColumnFolding(Column[] colDef) {
Columns cols = new Columns(colDef);
@@ -328,6 +344,7 @@ public class ColumnsTest {
}
/**
+ *
*/
private void incrementMask(boolean[] mask) {
boolean add = true;
@@ -339,6 +356,7 @@ public class ColumnsTest {
}
/**
+ *
*/
private void checkSize(Columns cols, Column[] colDef, boolean[] nullMasks)
{
// Iterate over bytes first
@@ -353,7 +371,7 @@ public class ColumnsTest {
if (idx >= cols.numberOfFixsizeColumns())
break;
- Assert.assertTrue(colDef[idx].type().spec().fixedLength());
+ assertTrue(colDef[idx].type().spec().fixedLength());
if (nullMasks[idx])
// set bit in the mask (indicate null value).
@@ -363,12 +381,12 @@ public class ColumnsTest {
size += colDef[idx].type().length();
}
- assertEquals("Failed [b=" + b + ", mask=" + mask + ']',
- size, cols.foldFixedLength(b, mask));
+ assertEquals(size, cols.foldFixedLength(b, mask), "Failed [b=" + b
+ ", mask=" + mask + ']');
}
}
/**
+ *
*/
private static Column[] columns(int size) {
Column[] ret = new Column[size];
diff --git
a/modules/commons/src/test/java/org/apache/ignite/internal/schema/NativeTypeTest.java
b/modules/commons/src/test/java/org/apache/ignite/internal/schema/NativeTypeTest.java
index d2cf2a5..30b36dd 100644
---
a/modules/commons/src/test/java/org/apache/ignite/internal/schema/NativeTypeTest.java
+++
b/modules/commons/src/test/java/org/apache/ignite/internal/schema/NativeTypeTest.java
@@ -17,51 +17,55 @@
package org.apache.ignite.internal.schema;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
*
*/
public class NativeTypeTest {
/**
+ *
*/
@Test
public void testCompareFixlenVarlen() {
- Assert.assertTrue(NativeType.BYTE.compareTo(NativeType.STRING) < 0);
- Assert.assertTrue(NativeType.BYTE.compareTo(NativeType.BYTES) < 0);
+ assertTrue(NativeType.BYTE.compareTo(NativeType.STRING) < 0);
+ assertTrue(NativeType.BYTE.compareTo(NativeType.BYTES) < 0);
- Assert.assertTrue(NativeType.INTEGER.compareTo(NativeType.STRING) < 0);
- Assert.assertTrue(NativeType.INTEGER.compareTo(NativeType.BYTES) < 0);
+ assertTrue(NativeType.INTEGER.compareTo(NativeType.STRING) < 0);
+ assertTrue(NativeType.INTEGER.compareTo(NativeType.BYTES) < 0);
- Assert.assertTrue(NativeType.LONG.compareTo(NativeType.STRING) < 0);
- Assert.assertTrue(NativeType.LONG.compareTo(NativeType.BYTES) < 0);
+ assertTrue(NativeType.LONG.compareTo(NativeType.STRING) < 0);
+ assertTrue(NativeType.LONG.compareTo(NativeType.BYTES) < 0);
- Assert.assertTrue(NativeType.UUID.compareTo(NativeType.STRING) < 0);
- Assert.assertTrue(NativeType.UUID.compareTo(NativeType.BYTES) < 0);
+ assertTrue(NativeType.UUID.compareTo(NativeType.STRING) < 0);
+ assertTrue(NativeType.UUID.compareTo(NativeType.BYTES) < 0);
}
/**
+ *
*/
@Test
public void testCompareFixlenBySize() {
- Assert.assertTrue(NativeType.SHORT.compareTo(NativeType.INTEGER) < 0);
- Assert.assertTrue(NativeType.INTEGER.compareTo(NativeType.LONG) < 0);
- Assert.assertTrue(NativeType.LONG.compareTo(NativeType.UUID) < 0);
+ assertTrue(NativeType.SHORT.compareTo(NativeType.INTEGER) < 0);
+ assertTrue(NativeType.INTEGER.compareTo(NativeType.LONG) < 0);
+ assertTrue(NativeType.LONG.compareTo(NativeType.UUID) < 0);
}
/**
+ *
*/
@Test
public void testCompareFixlenByDesc() {
- Assert.assertTrue(NativeType.FLOAT.compareTo(NativeType.INTEGER) < 0);
+ assertTrue(NativeType.FLOAT.compareTo(NativeType.INTEGER) < 0);
}
/**
+ *
*/
@Test
public void testCompareVarlenByDesc() {
- Assert.assertTrue(NativeType.BYTES.compareTo(NativeType.STRING) < 0);
+ assertTrue(NativeType.BYTES.compareTo(NativeType.STRING) < 0);
}
}
diff --git
a/modules/commons/src/test/java/org/apache/ignite/internal/schema/SchemaTestSuite.java
b/modules/commons/src/test/java/org/apache/ignite/internal/schema/SchemaTestSuite.java
index 93e489b..3eded6a 100644
---
a/modules/commons/src/test/java/org/apache/ignite/internal/schema/SchemaTestSuite.java
+++
b/modules/commons/src/test/java/org/apache/ignite/internal/schema/SchemaTestSuite.java
@@ -17,15 +17,15 @@
package org.apache.ignite.internal.schema;
+import org.junit.platform.runner.JUnitPlatform;
+import org.junit.platform.suite.api.SelectClasses;
import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
/**
*
*/
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
+@RunWith(JUnitPlatform.class)
+@SelectClasses({
NativeTypeTest.class,
ColumnTest.class,
ColumnsTest.class,
diff --git
a/modules/commons/src/test/java/org/apache/ignite/internal/schema/TupleTest.java
b/modules/commons/src/test/java/org/apache/ignite/internal/schema/TupleTest.java
index 20fe7b4..afe58c6 100644
---
a/modules/commons/src/test/java/org/apache/ignite/internal/schema/TupleTest.java
+++
b/modules/commons/src/test/java/org/apache/ignite/internal/schema/TupleTest.java
@@ -21,9 +21,8 @@ import java.util.Arrays;
import java.util.BitSet;
import java.util.Collections;
import java.util.Random;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import static org.apache.ignite.internal.schema.NativeType.BYTE;
import static org.apache.ignite.internal.schema.NativeType.BYTES;
@@ -34,7 +33,8 @@ import static
org.apache.ignite.internal.schema.NativeType.LONG;
import static org.apache.ignite.internal.schema.NativeType.SHORT;
import static org.apache.ignite.internal.schema.NativeType.STRING;
import static org.apache.ignite.internal.schema.NativeType.UUID;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* Tests tuple assembling and reading.
@@ -44,8 +44,9 @@ public class TupleTest {
private Random rnd;
/**
+ *
*/
- @Before
+ @BeforeEach
public void initRandom() {
long seed = System.currentTimeMillis();
@@ -55,6 +56,7 @@ public class TupleTest {
}
/**
+ *
*/
@Test
public void testFixedSizes() {
@@ -86,6 +88,7 @@ public class TupleTest {
}
/**
+ *
*/
@Test
public void testVariableSizes() {
@@ -111,6 +114,7 @@ public class TupleTest {
}
/**
+ *
*/
@Test
public void testMixedSizes() {
@@ -128,6 +132,7 @@ public class TupleTest {
}
/**
+ *
*/
private void checkSchema(Column[] keyCols, Column[] valCols) {
checkSchemaShuffled(keyCols, valCols);
@@ -139,6 +144,7 @@ public class TupleTest {
}
/**
+ *
*/
private void checkSchemaShuffled(Column[] keyCols, Column[] valCols) {
SchemaDescriptor sch = new SchemaDescriptor(1, new Columns(keyCols),
new Columns(valCols));
@@ -167,6 +173,7 @@ public class TupleTest {
}
/**
+ *
*/
private Object[] sequence(SchemaDescriptor schema) {
Object[] res = new Object[schema.length()];
@@ -181,6 +188,7 @@ public class TupleTest {
}
/**
+ *
*/
private Object generateRandomValue(NativeType type) {
switch (type.spec()) {
@@ -249,6 +257,7 @@ public class TupleTest {
}
/**
+ *
*/
private void checkValues(SchemaDescriptor schema, Object... vals) {
assertEquals(schema.keyColumns().length() +
schema.valueColumns().length(), vals.length);
@@ -355,13 +364,14 @@ public class TupleTest {
NativeTypeSpec type = schema.column(i).type().spec();
if (type == NativeTypeSpec.BYTES)
- Assert.assertArrayEquals((byte[])vals[i],
(byte[])NativeTypeSpec.BYTES.objectValue(tup, i));
+ assertArrayEquals((byte[])vals[i],
(byte[])NativeTypeSpec.BYTES.objectValue(tup, i));
else
- Assert.assertEquals(vals[i], type.objectValue(tup, i));
+ assertEquals(vals[i], type.objectValue(tup, i));
}
}
/**
+ *
*/
private void shuffle(Column[] cols) {
Collections.shuffle(Arrays.asList(cols));
