Skip to content

GH-3652: Use assertThat checks in parquet-format-structures/parquet-encoding/parquet-thrift tests #3650

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nastra wants to merge 1 commit into
base: master
Choose a base branch
from
Open

GH-3652: Use assertThat checks in parquet-format-structures/parquet-encoding/parquet-thrift tests #3650

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions parquet-encoding/src/test/java/org/apache/parquet/bytes/TestBytesInput.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/
package org.apache.parquet.bytes;

import static org.junit.Assert.assertEquals;
import static org.assertj.core.api.Assertions.assertThat;

import java.io.ByteArrayInputStream;
import org.junit.Test;
Expand All @@ -32,7 +32,7 @@ public void testWriteInt() throws Throwable {
BytesInput varInt = BytesInput.fromUnsignedVarInt(testVal);
byte[] rno = varInt.toByteArray();
int i = BytesUtils.readUnsignedVarInt(new ByteArrayInputStream(rno));
assertEquals((int) testVal, i);
assertThat(i).isEqualTo(testVal);
}
}
}
189 changes: 83 additions & 106 deletions ...et-encoding/src/test/java/org/apache/parquet/bytes/TestCapacityByteArrayOutputStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,10 @@
*/
package org.apache.parquet.bytes;

import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.assertj.core.api.Assertions.assertThat;

import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.util.Arrays;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
Expand All @@ -49,7 +46,7 @@ public void testWrite() throws Throwable {
final int expectedSize = 54;
for (int i = 0; i < expectedSize; i++) {
capacityByteArrayOutputStream.write(i);
assertEquals(i + 1, capacityByteArrayOutputStream.size());
assertThat(capacityByteArrayOutputStream.size()).isEqualTo(i + 1);
}
validate(capacityByteArrayOutputStream, expectedSize);
}
Expand All @@ -67,42 +64,40 @@ public void testWriteArray() throws Throwable {
@Test
public void testWriteArrayExpand() throws Throwable {
try (CapacityByteArrayOutputStream capacityByteArrayOutputStream = newCapacityBAOS(2)) {
assertEquals(0, capacityByteArrayOutputStream.getCapacity());
assertThat(capacityByteArrayOutputStream.getCapacity()).isZero();

byte[] toWrite = {(byte) (1), (byte) (2), (byte) (3), (byte) (4)};
byte[] toWrite = bytes(1, 2, 3, 4);
int toWriteOffset = 0;
int writeLength = 2;
// write 2 bytes array
capacityByteArrayOutputStream.write(toWrite, toWriteOffset, writeLength);
toWriteOffset += writeLength;
assertEquals(2, capacityByteArrayOutputStream.size());
assertEquals(2, capacityByteArrayOutputStream.getCapacity());
assertThat(capacityByteArrayOutputStream.size()).isEqualTo(2);
assertThat(capacityByteArrayOutputStream.getCapacity()).isEqualTo(2);

// write 1 byte array, expand capacity to 4
writeLength = 1;
capacityByteArrayOutputStream.write(toWrite, toWriteOffset, writeLength);
toWriteOffset += writeLength;
assertEquals(3, capacityByteArrayOutputStream.size());
assertEquals(4, capacityByteArrayOutputStream.getCapacity());
assertThat(capacityByteArrayOutputStream.size()).isEqualTo(3);
assertThat(capacityByteArrayOutputStream.getCapacity()).isEqualTo(4);

// write 1 byte array, not expand
capacityByteArrayOutputStream.write(toWrite, toWriteOffset, writeLength);
assertEquals(4, capacityByteArrayOutputStream.size());
assertEquals(4, capacityByteArrayOutputStream.getCapacity());
final byte[] byteArray =
BytesInput.from(capacityByteArrayOutputStream).toByteArray();
assertArrayEquals(toWrite, byteArray);
assertThat(capacityByteArrayOutputStream.size()).isEqualTo(4);
assertThat(capacityByteArrayOutputStream.getCapacity()).isEqualTo(4);
assertThat(BytesInput.from(capacityByteArrayOutputStream).toByteArray())
.containsExactly(toWrite);
}
}

@Test
public void testWriteArrayAndInt() throws Throwable {
try (CapacityByteArrayOutputStream capacityByteArrayOutputStream = newCapacityBAOS(10)) {
for (int i = 0; i < 23; i++) {
byte[] toWrite = {(byte) (i * 3), (byte) (i * 3 + 1)};
capacityByteArrayOutputStream.write(toWrite);
capacityByteArrayOutputStream.write((byte) (i * 3 + 2));
assertEquals((i + 1) * 3, capacityByteArrayOutputStream.size());
capacityByteArrayOutputStream.write(bytes(i * 3, i * 3 + 1));
capacityByteArrayOutputStream.write(i * 3 + 2);
assertThat(capacityByteArrayOutputStream.size()).isEqualTo((i + 1) * 3);
}
validate(capacityByteArrayOutputStream, 23 * 3);
}
Expand All @@ -117,19 +112,15 @@ public void testReset() throws Throwable {
try (CapacityByteArrayOutputStream capacityByteArrayOutputStream = newCapacityBAOS(10)) {
for (int i = 0; i < 54; i++) {
capacityByteArrayOutputStream.write(i);
assertEquals(i + 1, capacityByteArrayOutputStream.size());
assertThat(capacityByteArrayOutputStream.size()).isEqualTo(i + 1);
}
capacityByteArrayOutputStream.reset();
for (int i = 0; i < 54; i++) {
capacityByteArrayOutputStream.write(54 + i);
assertEquals(i + 1, capacityByteArrayOutputStream.size());
}
final byte[] byteArray =
BytesInput.from(capacityByteArrayOutputStream).toByteArray();
assertEquals(54, byteArray.length);
for (int i = 0; i < 54; i++) {
assertEquals(i + " in " + Arrays.toString(byteArray), 54 + i, byteArray[i]);
assertThat(capacityByteArrayOutputStream.size()).isEqualTo(i + 1);
}
assertThat(BytesInput.from(capacityByteArrayOutputStream).toByteArray())
.isEqualTo(byteRange(54, 54));
}
}

Expand All @@ -139,42 +130,17 @@ public void testWriteArrayBiggerThanSlab() throws Throwable {
int v = 23;
writeArraysOf3(capacityByteArrayOutputStream, v);
int n = v * 3;
byte[] toWrite = { // bigger than 2 slabs of size of 10
(byte) n,
(byte) (n + 1),
(byte) (n + 2),
(byte) (n + 3),
(byte) (n + 4),
(byte) (n + 5),
(byte) (n + 6),
(byte) (n + 7),
(byte) (n + 8),
(byte) (n + 9),
(byte) (n + 10),
(byte) (n + 11),
(byte) (n + 12),
(byte) (n + 13),
(byte) (n + 14),
(byte) (n + 15),
(byte) (n + 16),
(byte) (n + 17),
(byte) (n + 18),
(byte) (n + 19),
(byte) (n + 20)
};
byte[] toWrite = byteRange(n, 21);
capacityByteArrayOutputStream.write(toWrite);
n = n + toWrite.length;
assertEquals(n, capacityByteArrayOutputStream.size());
assertThat(capacityByteArrayOutputStream.size()).isEqualTo(n);
validate(capacityByteArrayOutputStream, n);
capacityByteArrayOutputStream.reset();
// check it works after reset too
capacityByteArrayOutputStream.write(toWrite);
assertEquals(toWrite.length, capacityByteArrayOutputStream.size());
byte[] byteArray = BytesInput.from(capacityByteArrayOutputStream).toByteArray();
assertEquals(toWrite.length, byteArray.length);
for (int i = 0; i < toWrite.length; i++) {
assertEquals(toWrite[i], byteArray[i]);
}
assertThat(capacityByteArrayOutputStream.size()).isEqualTo(toWrite.length);
assertThat(BytesInput.from(capacityByteArrayOutputStream).toByteArray())
.isEqualTo(toWrite);
}
}

Expand All @@ -185,27 +151,24 @@ public void testWriteArrayManySlabs() throws Throwable {
int v = 23;
for (int j = 0; j < it; j++) {
for (int i = 0; i < v; i++) {
byte[] toWrite = {(byte) (i * 3), (byte) (i * 3 + 1), (byte) (i * 3 + 2)};
capacityByteArrayOutputStream.write(toWrite);
assertEquals((i + 1) * 3 + v * 3 * j, capacityByteArrayOutputStream.size());
capacityByteArrayOutputStream.write(bytes(i * 3, i * 3 + 1, i * 3 + 2));
assertThat(capacityByteArrayOutputStream.size()).isEqualTo((i + 1) * 3 + v * 3 * j);
}
}
byte[] byteArray = BytesInput.from(capacityByteArrayOutputStream).toByteArray();
assertEquals(v * 3 * it, byteArray.length);
for (int i = 0; i < v * 3 * it; i++) {
assertEquals(i % (v * 3), byteArray[i]);
}
assertThat(byteArray).hasSize(v * 3 * it);
assertThat(byteArray).isEqualTo(repeatedByteRange(0, v * 3, v * 3 * it));
// verifying we have not created 500 * 23 / 10 slabs
assertTrue(
"slab count: " + capacityByteArrayOutputStream.getSlabCount(),
capacityByteArrayOutputStream.getSlabCount() <= 20);
assertThat(capacityByteArrayOutputStream.getSlabCount())
.as("slab count: " + capacityByteArrayOutputStream.getSlabCount())
.isLessThanOrEqualTo(20);
capacityByteArrayOutputStream.reset();
writeArraysOf3(capacityByteArrayOutputStream, v);
validate(capacityByteArrayOutputStream, v * 3);
// verifying we use less slabs now
assertTrue(
"slab count: " + capacityByteArrayOutputStream.getSlabCount(),
capacityByteArrayOutputStream.getSlabCount() <= 2);
assertThat(capacityByteArrayOutputStream.getSlabCount())
.as("slab count: " + capacityByteArrayOutputStream.getSlabCount())
.isLessThanOrEqualTo(2);
}
}

Expand All @@ -214,11 +177,11 @@ public void testReplaceByte() throws Throwable {
// test replace the first value
try (CapacityByteArrayOutputStream cbaos = newCapacityBAOS(5)) {
cbaos.write(10);
assertEquals(0, cbaos.getCurrentIndex());
assertThat(cbaos.getCurrentIndex()).isZero();
cbaos.setByte(0, (byte) 7);
ByteArrayOutputStream baos = new ByteArrayOutputStream();
cbaos.writeTo(baos);
assertEquals(7, baos.toByteArray()[0]);
assertThat(baos.toByteArray()).isEqualTo(bytes(7));
}

// test replace value in the first slab
Expand All @@ -227,77 +190,91 @@ public void testReplaceByte() throws Throwable {
cbaos.write(13);
cbaos.write(15);
cbaos.write(17);
assertEquals(3, cbaos.getCurrentIndex());
assertThat(cbaos.getCurrentIndex()).isEqualTo(3);
cbaos.write(19);
cbaos.setByte(3, (byte) 7);
ByteArrayOutputStream baos = new ByteArrayOutputStream();
cbaos.writeTo(baos);
assertArrayEquals(new byte[] {10, 13, 15, 7, 19}, baos.toByteArray());
assertThat(baos.toByteArray()).isEqualTo(bytes(10, 13, 15, 7, 19));
}

// test replace in *not* the first slab
try (CapacityByteArrayOutputStream cbaos = newCapacityBAOS(5)) {

// advance part way through the 3rd slab
for (int i = 0; i < 12; i++) {
cbaos.write(100 + i);
}
assertEquals(11, cbaos.getCurrentIndex());
writeRange(cbaos, 100, 12);
assertThat(cbaos.getCurrentIndex()).isEqualTo(11);

cbaos.setByte(6, (byte) 7);
ByteArrayOutputStream baos = new ByteArrayOutputStream();
cbaos.writeTo(baos);
assertArrayEquals(
new byte[] {100, 101, 102, 103, 104, 105, 7, 107, 108, 109, 110, 111}, baos.toByteArray());
assertThat(baos.toByteArray()).isEqualTo(bytes(100, 101, 102, 103, 104, 105, 7, 107, 108, 109, 110, 111));
}

// test replace last value of a slab
try (CapacityByteArrayOutputStream cbaos = newCapacityBAOS(5)) {

// advance part way through the 3rd slab
for (int i = 0; i < 12; i++) {
cbaos.write(100 + i);
}
assertEquals(11, cbaos.getCurrentIndex());
writeRange(cbaos, 100, 12);
assertThat(cbaos.getCurrentIndex()).isEqualTo(11);

cbaos.setByte(9, (byte) 7);
ByteArrayOutputStream baos = new ByteArrayOutputStream();
cbaos.writeTo(baos);
assertArrayEquals(
new byte[] {100, 101, 102, 103, 104, 105, 106, 107, 108, 7, 110, 111}, baos.toByteArray());
assertThat(baos.toByteArray()).isEqualTo(bytes(100, 101, 102, 103, 104, 105, 106, 107, 108, 7, 110, 111));
}

// test replace last value
try (CapacityByteArrayOutputStream cbaos = newCapacityBAOS(5)) {

// advance part way through the 3rd slab
for (int i = 0; i < 12; i++) {
cbaos.write(100 + i);
}
assertEquals(11, cbaos.getCurrentIndex());
writeRange(cbaos, 100, 12);
assertThat(cbaos.getCurrentIndex()).isEqualTo(11);

cbaos.setByte(11, (byte) 7);
ByteArrayOutputStream baos = new ByteArrayOutputStream();
cbaos.writeTo(baos);
assertArrayEquals(
new byte[] {100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 7}, baos.toByteArray());
assertThat(baos.toByteArray()).isEqualTo(bytes(100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 7));
}
}

private void writeArraysOf3(CapacityByteArrayOutputStream capacityByteArrayOutputStream, int n) throws IOException {
for (int i = 0; i < n; i++) {
byte[] toWrite = {(byte) (i * 3), (byte) (i * 3 + 1), (byte) (i * 3 + 2)};
capacityByteArrayOutputStream.write(toWrite);
assertEquals((i + 1) * 3, capacityByteArrayOutputStream.size());
capacityByteArrayOutputStream.write(bytes(i * 3, i * 3 + 1, i * 3 + 2));
assertThat(capacityByteArrayOutputStream.size()).isEqualTo((i + 1) * 3);
}
}

private void validate(CapacityByteArrayOutputStream capacityByteArrayOutputStream, final int expectedSize)
throws IOException {
final byte[] byteArray = BytesInput.from(capacityByteArrayOutputStream).toByteArray();
assertEquals(expectedSize, byteArray.length);
for (int i = 0; i < expectedSize; i++) {
assertEquals(i, byteArray[i]);
assertThat(BytesInput.from(capacityByteArrayOutputStream).toByteArray()).isEqualTo(byteRange(0, expectedSize));
}

private static void writeRange(CapacityByteArrayOutputStream stream, int start, int count) {
for (int i = 0; i < count; i++) {
stream.write(start + i);
}
}

private static byte[] bytes(int... values) {
byte[] result = new byte[values.length];
for (int i = 0; i < values.length; i++) {
result[i] = (byte) values[i];
}
return result;
}

private static byte[] byteRange(int start, int length) {
return bytes(range(start, start + length));
}

private static byte[] repeatedByteRange(int start, int period, int totalLength) {
int[] values = new int[totalLength];
for (int i = 0; i < totalLength; i++) {
values[i] = start + (i % period);
}
return bytes(values);
}

private static int[] range(int startInclusive, int endExclusive) {
int[] values = new int[endExclusive - startInclusive];
for (int i = 0; i < values.length; i++) {
values[i] = startInclusive + i;
}
return values;
}
}
7 changes: 3 additions & 4 deletions ...et-encoding/src/test/java/org/apache/parquet/column/values/bitpacking/TestBitPacking.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,13 @@
*/
package org.apache.parquet.column.values.bitpacking;

import static org.junit.Assert.assertArrayEquals;
import static org.assertj.core.api.Assertions.assertThat;

import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import org.apache.parquet.column.values.bitpacking.BitPacking.BitPackingReader;
import org.apache.parquet.column.values.bitpacking.BitPacking.BitPackingWriter;
import org.junit.Assert;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down Expand Up @@ -165,15 +164,15 @@ private void validateEncodeDecode(int bitLength, int[] vals, String expected) th
byte[] bytes = baos.toByteArray();
LOG.debug("vals (" + bitLength + "): " + toString(vals));
LOG.debug("bytes: {}", toString(bytes));
Assert.assertEquals(expected, toString(bytes));
assertThat(toString(bytes)).isEqualTo(expected);
ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
BitPackingReader r = BitPacking.createBitPackingReader(bitLength, bais, vals.length);
int[] result = new int[vals.length];
for (int i = 0; i < result.length; i++) {
result[i] = r.read();
}
LOG.debug("result: {}", toString(result));
assertArrayEquals(vals, result);
assertThat(result).containsExactly(vals);
}

public static String toString(int[] vals) {
Expand Down
Loading
Loading