Skip to content

Commit d4bc5d9

Browse files
nastranastra
committed
GH-3652: Use assertThat checks in parquet-hadoop tests
1 parent 5922bf4 commit d4bc5d9

75 files changed

Lines changed: 3275 additions & 3071 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎parquet-hadoop/src/test/java/org/apache/parquet/crypto/DecryptionPropertiesFactoryTest.java‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
package org.apache.parquet.crypto;
2121

22-
import static org.junit.Assert.assertArrayEquals;
22+
import static org.assertj.core.api.Assertions.assertThat;
2323

2424
import org.apache.hadoop.conf.Configuration;
2525
import org.junit.Test;
@@ -36,12 +36,10 @@ public void testLoadDecPropertiesFactory() {
3636
FileDecryptionProperties decryptionProperties =
3737
decryptionPropertiesFactory.getFileDecryptionProperties(conf, null);
3838

39-
assertArrayEquals(decryptionProperties.getFooterKey(), SampleDecryptionPropertiesFactory.FOOTER_KEY);
40-
assertArrayEquals(
41-
decryptionProperties.getColumnKey(SampleDecryptionPropertiesFactory.COL1),
42-
SampleDecryptionPropertiesFactory.COL1_KEY);
43-
assertArrayEquals(
44-
decryptionProperties.getColumnKey(SampleDecryptionPropertiesFactory.COL2),
45-
SampleDecryptionPropertiesFactory.COL2_KEY);
39+
assertThat(decryptionProperties.getFooterKey()).isEqualTo(SampleDecryptionPropertiesFactory.FOOTER_KEY);
40+
assertThat(decryptionProperties.getColumnKey(SampleDecryptionPropertiesFactory.COL1))
41+
.isEqualTo(SampleDecryptionPropertiesFactory.COL1_KEY);
42+
assertThat(decryptionProperties.getColumnKey(SampleDecryptionPropertiesFactory.COL2))
43+
.isEqualTo(SampleDecryptionPropertiesFactory.COL2_KEY);
4644
}
4745
}

‎parquet-hadoop/src/test/java/org/apache/parquet/crypto/EncryptionPropertiesFactoryTest.java‎

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@
1919

2020
package org.apache.parquet.crypto;
2121

22-
import static org.junit.Assert.assertArrayEquals;
23-
import static org.junit.Assert.assertEquals;
22+
import static org.assertj.core.api.Assertions.assertThat;
2423

2524
import org.apache.hadoop.conf.Configuration;
2625
import org.apache.parquet.conf.ParquetConfiguration;
@@ -40,13 +39,11 @@ public void testLoadEncPropertiesFactory() {
4039
FileEncryptionProperties encryptionProperties =
4140
encryptionPropertiesFactory.getFileEncryptionProperties(conf, null, null);
4241

43-
assertArrayEquals(encryptionProperties.getFooterKey(), SampleEncryptionPropertiesFactory.FOOTER_KEY);
44-
assertEquals(
45-
encryptionProperties.getColumnProperties(SampleEncryptionPropertiesFactory.COL1),
46-
SampleEncryptionPropertiesFactory.COL1_ENCR_PROPERTIES);
47-
assertEquals(
48-
encryptionProperties.getColumnProperties(SampleEncryptionPropertiesFactory.COL2),
49-
SampleEncryptionPropertiesFactory.COL2_ENCR_PROPERTIES);
42+
assertThat(encryptionProperties.getFooterKey()).isEqualTo(SampleEncryptionPropertiesFactory.FOOTER_KEY);
43+
assertThat(encryptionProperties.getColumnProperties(SampleEncryptionPropertiesFactory.COL1))
44+
.isEqualTo(SampleEncryptionPropertiesFactory.COL1_ENCR_PROPERTIES);
45+
assertThat(encryptionProperties.getColumnProperties(SampleEncryptionPropertiesFactory.COL2))
46+
.isEqualTo(SampleEncryptionPropertiesFactory.COL2_ENCR_PROPERTIES);
5047
}
5148

5249
@Test
@@ -60,12 +57,10 @@ public void testLoadEncPropertiesFactoryParquetConfiguration() {
6057
FileEncryptionProperties encryptionProperties = encryptionPropertiesFactory.getFileEncryptionProperties(
6158
ConfigurationUtil.createHadoopConfiguration(conf), null, null);
6259

63-
assertArrayEquals(encryptionProperties.getFooterKey(), SampleEncryptionPropertiesFactory.FOOTER_KEY);
64-
assertEquals(
65-
encryptionProperties.getColumnProperties(SampleEncryptionPropertiesFactory.COL1),
66-
SampleEncryptionPropertiesFactory.COL1_ENCR_PROPERTIES);
67-
assertEquals(
68-
encryptionProperties.getColumnProperties(SampleEncryptionPropertiesFactory.COL2),
69-
SampleEncryptionPropertiesFactory.COL2_ENCR_PROPERTIES);
60+
assertThat(encryptionProperties.getFooterKey()).isEqualTo(SampleEncryptionPropertiesFactory.FOOTER_KEY);
61+
assertThat(encryptionProperties.getColumnProperties(SampleEncryptionPropertiesFactory.COL1))
62+
.isEqualTo(SampleEncryptionPropertiesFactory.COL1_ENCR_PROPERTIES);
63+
assertThat(encryptionProperties.getColumnProperties(SampleEncryptionPropertiesFactory.COL2))
64+
.isEqualTo(SampleEncryptionPropertiesFactory.COL2_ENCR_PROPERTIES);
7065
}
7166
}

‎parquet-hadoop/src/test/java/org/apache/parquet/crypto/propertiesfactory/SchemaControlEncryptionTest.java‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@
2424
import static org.apache.parquet.schema.Type.Repetition.OPTIONAL;
2525
import static org.apache.parquet.schema.Type.Repetition.REPEATED;
2626
import static org.apache.parquet.schema.Type.Repetition.REQUIRED;
27-
import static org.junit.Assert.assertArrayEquals;
28-
import static org.junit.Assert.assertEquals;
27+
import static org.assertj.core.api.Assertions.assertThat;
2928

3029
import java.io.IOException;
3130
import java.nio.file.Files;
@@ -172,14 +171,14 @@ private void decryptParquetFileAndValid(String file, Configuration conf) throws
172171
.build();
173172
for (int i = 0; i < numRecord; i++) {
174173
Group group = reader.read();
175-
assertEquals(testData.get("Name")[i], group.getBinary("Name", 0).toStringUsingUTF8());
176-
assertEquals(testData.get("Age")[i], group.getLong("Age", 0));
174+
assertThat(group.getBinary("Name", 0).toStringUsingUTF8()).isEqualTo(testData.get("Name")[i]);
175+
assertThat(group.getLong("Age", 0)).isEqualTo(testData.get("Age")[i]);
177176

178177
Group subGroup = group.getGroup("WebLinks", 0);
179-
assertArrayEquals(
180-
subGroup.getBinary("LinkedIn", 0).getBytes(), ((String) testData.get("LinkedIn")[i]).getBytes());
181-
assertArrayEquals(
182-
subGroup.getBinary("Twitter", 0).getBytes(), ((String) testData.get("Twitter")[i]).getBytes());
178+
assertThat(((String) testData.get("LinkedIn")[i]).getBytes())
179+
.isEqualTo(subGroup.getBinary("LinkedIn", 0).getBytes());
180+
assertThat(((String) testData.get("Twitter")[i]).getBytes())
181+
.isEqualTo(subGroup.getBinary("Twitter", 0).getBytes());
183182
}
184183
reader.close();
185184
}

‎parquet-hadoop/src/test/java/org/apache/parquet/encodings/FileEncodingsIT.java‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
*/
1919
package org.apache.parquet.encodings;
2020

21-
import static junit.framework.Assert.assertEquals;
21+
import static org.assertj.core.api.Assertions.assertThat;
2222

2323
import java.io.File;
2424
import java.io.IOException;
@@ -555,12 +555,11 @@ public PageValuesValidator(int rowGroupID, int pageID, List<?> expectedValues) {
555555
}
556556

557557
public void validateNextValue(Object value) {
558-
assertEquals(
559-
String.format(
558+
assertThat(value)
559+
.as(String.format(
560560
"Value from page is different than expected, ROW_GROUP_ID=%d PAGE_ID=%d VALUE_POS=%d",
561-
rowGroupID, pageID, currentPos),
562-
expectedValues.get(currentPos++),
563-
value);
561+
rowGroupID, pageID, currentPos))
562+
.isEqualTo(expectedValues.get(currentPos++));
564563
}
565564

566565
public static void validateValuesForPage(

‎parquet-hadoop/src/test/java/org/apache/parquet/filter2/TestFiltersWithMissingColumns.java‎

Lines changed: 83 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
import static org.apache.parquet.schema.OriginalType.UTF8;
3737
import static org.apache.parquet.schema.PrimitiveType.PrimitiveTypeName.BINARY;
3838
import static org.apache.parquet.schema.PrimitiveType.PrimitiveTypeName.INT64;
39-
import static org.junit.Assert.assertEquals;
39+
import static org.assertj.core.api.Assertions.assertThat;
4040

4141
import java.io.File;
4242
import java.io.IOException;
@@ -99,116 +99,110 @@ public void createDataFile() throws Exception {
9999

100100
@Test
101101
public void testNormalFilter() throws Exception {
102-
assertEquals(500, countFilteredRecords(path, lt(longColumn("id"), 500L)));
102+
assertThat(countFilteredRecords(path, lt(longColumn("id"), 500L))).isEqualTo(500);
103103
}
104104

105105
@Test
106106
public void testSimpleMissingColumnFilter() throws Exception {
107-
assertEquals(0, countFilteredRecords(path, lt(longColumn("missing"), 500L)));
107+
assertThat(countFilteredRecords(path, lt(longColumn("missing"), 500L))).isEqualTo(0);
108108
Set<Long> values = new HashSet<>();
109109
values.add(1L);
110110
values.add(2L);
111111
values.add(5L);
112-
assertEquals(0, countFilteredRecords(path, in(longColumn("missing"), values)));
113-
assertEquals(1000, countFilteredRecords(path, notIn(longColumn("missing"), values)));
112+
assertThat(countFilteredRecords(path, in(longColumn("missing"), values)))
113+
.isEqualTo(0);
114+
assertThat(countFilteredRecords(path, notIn(longColumn("missing"), values)))
115+
.isEqualTo(1000);
114116
}
115117

116118
@Test
117119
public void testAndMissingColumnFilter() throws Exception {
118120
// missing column filter is true
119-
assertEquals(
120-
500, countFilteredRecords(path, and(lt(longColumn("id"), 500L), eq(binaryColumn("missing"), null))));
121-
assertEquals(
122-
500,
123-
countFilteredRecords(
124-
path, and(lt(longColumn("id"), 500L), notEq(binaryColumn("missing"), fromString("any")))));
125-
126-
assertEquals(
127-
500, countFilteredRecords(path, and(eq(binaryColumn("missing"), null), lt(longColumn("id"), 500L))));
128-
assertEquals(
129-
500,
130-
countFilteredRecords(
131-
path, and(notEq(binaryColumn("missing"), fromString("any")), lt(longColumn("id"), 500L))));
121+
assertThat(countFilteredRecords(path, and(lt(longColumn("id"), 500L), eq(binaryColumn("missing"), null))))
122+
.isEqualTo(500);
123+
assertThat(countFilteredRecords(
124+
path, and(lt(longColumn("id"), 500L), notEq(binaryColumn("missing"), fromString("any")))))
125+
.isEqualTo(500);
126+
127+
assertThat(countFilteredRecords(path, and(eq(binaryColumn("missing"), null), lt(longColumn("id"), 500L))))
128+
.isEqualTo(500);
129+
assertThat(countFilteredRecords(
130+
path, and(notEq(binaryColumn("missing"), fromString("any")), lt(longColumn("id"), 500L))))
131+
.isEqualTo(500);
132132

133133
// missing column filter is false
134-
assertEquals(
135-
0,
136-
countFilteredRecords(
137-
path, and(lt(longColumn("id"), 500L), eq(binaryColumn("missing"), fromString("any")))));
138-
assertEquals(
139-
0, countFilteredRecords(path, and(lt(longColumn("id"), 500L), notEq(binaryColumn("missing"), null))));
140-
assertEquals(
141-
0, countFilteredRecords(path, and(lt(longColumn("id"), 500L), lt(doubleColumn("missing"), 33.33))));
142-
assertEquals(
143-
0, countFilteredRecords(path, and(lt(longColumn("id"), 500L), ltEq(doubleColumn("missing"), 33.33))));
144-
assertEquals(
145-
0, countFilteredRecords(path, and(lt(longColumn("id"), 500L), gt(doubleColumn("missing"), 33.33))));
146-
assertEquals(
147-
0, countFilteredRecords(path, and(lt(longColumn("id"), 500L), gtEq(doubleColumn("missing"), 33.33))));
148-
149-
assertEquals(
150-
0,
151-
countFilteredRecords(
152-
path, and(eq(binaryColumn("missing"), fromString("any")), lt(longColumn("id"), 500L))));
153-
assertEquals(
154-
0, countFilteredRecords(path, and(notEq(binaryColumn("missing"), null), lt(longColumn("id"), 500L))));
155-
assertEquals(
156-
0, countFilteredRecords(path, and(lt(doubleColumn("missing"), 33.33), lt(longColumn("id"), 500L))));
157-
assertEquals(
158-
0, countFilteredRecords(path, and(ltEq(doubleColumn("missing"), 33.33), lt(longColumn("id"), 500L))));
159-
assertEquals(
160-
0, countFilteredRecords(path, and(gt(doubleColumn("missing"), 33.33), lt(longColumn("id"), 500L))));
161-
assertEquals(
162-
0, countFilteredRecords(path, and(gtEq(doubleColumn("missing"), 33.33), lt(longColumn("id"), 500L))));
134+
assertThat(countFilteredRecords(
135+
path, and(lt(longColumn("id"), 500L), eq(binaryColumn("missing"), fromString("any")))))
136+
.isEqualTo(0);
137+
assertThat(countFilteredRecords(path, and(lt(longColumn("id"), 500L), notEq(binaryColumn("missing"), null))))
138+
.isEqualTo(0);
139+
assertThat(countFilteredRecords(path, and(lt(longColumn("id"), 500L), lt(doubleColumn("missing"), 33.33))))
140+
.isEqualTo(0);
141+
assertThat(countFilteredRecords(path, and(lt(longColumn("id"), 500L), ltEq(doubleColumn("missing"), 33.33))))
142+
.isEqualTo(0);
143+
assertThat(countFilteredRecords(path, and(lt(longColumn("id"), 500L), gt(doubleColumn("missing"), 33.33))))
144+
.isEqualTo(0);
145+
assertThat(countFilteredRecords(path, and(lt(longColumn("id"), 500L), gtEq(doubleColumn("missing"), 33.33))))
146+
.isEqualTo(0);
147+
148+
assertThat(countFilteredRecords(
149+
path, and(eq(binaryColumn("missing"), fromString("any")), lt(longColumn("id"), 500L))))
150+
.isEqualTo(0);
151+
assertThat(countFilteredRecords(path, and(notEq(binaryColumn("missing"), null), lt(longColumn("id"), 500L))))
152+
.isEqualTo(0);
153+
assertThat(countFilteredRecords(path, and(lt(doubleColumn("missing"), 33.33), lt(longColumn("id"), 500L))))
154+
.isEqualTo(0);
155+
assertThat(countFilteredRecords(path, and(ltEq(doubleColumn("missing"), 33.33), lt(longColumn("id"), 500L))))
156+
.isEqualTo(0);
157+
assertThat(countFilteredRecords(path, and(gt(doubleColumn("missing"), 33.33), lt(longColumn("id"), 500L))))
158+
.isEqualTo(0);
159+
assertThat(countFilteredRecords(path, and(gtEq(doubleColumn("missing"), 33.33), lt(longColumn("id"), 500L))))
160+
.isEqualTo(0);
163161
}
164162

165163
@Test
166164
public void testOrMissingColumnFilter() throws Exception {
167165
// missing column filter is false
168-
assertEquals(
169-
500,
170-
countFilteredRecords(
171-
path, or(lt(longColumn("id"), 500L), eq(binaryColumn("missing"), fromString("any")))));
172-
assertEquals(
173-
500, countFilteredRecords(path, or(lt(longColumn("id"), 500L), notEq(binaryColumn("missing"), null))));
174-
assertEquals(
175-
500, countFilteredRecords(path, or(lt(longColumn("id"), 500L), lt(doubleColumn("missing"), 33.33))));
176-
assertEquals(
177-
500, countFilteredRecords(path, or(lt(longColumn("id"), 500L), ltEq(doubleColumn("missing"), 33.33))));
178-
assertEquals(
179-
500, countFilteredRecords(path, or(lt(longColumn("id"), 500L), gt(doubleColumn("missing"), 33.33))));
180-
assertEquals(
181-
500, countFilteredRecords(path, or(lt(longColumn("id"), 500L), gtEq(doubleColumn("missing"), 33.33))));
182-
183-
assertEquals(
184-
500,
185-
countFilteredRecords(
186-
path, or(eq(binaryColumn("missing"), fromString("any")), lt(longColumn("id"), 500L))));
187-
assertEquals(
188-
500, countFilteredRecords(path, or(notEq(binaryColumn("missing"), null), lt(longColumn("id"), 500L))));
189-
assertEquals(
190-
500, countFilteredRecords(path, or(lt(doubleColumn("missing"), 33.33), lt(longColumn("id"), 500L))));
191-
assertEquals(
192-
500, countFilteredRecords(path, or(ltEq(doubleColumn("missing"), 33.33), lt(longColumn("id"), 500L))));
193-
assertEquals(
194-
500, countFilteredRecords(path, or(gt(doubleColumn("missing"), 33.33), lt(longColumn("id"), 500L))));
195-
assertEquals(
196-
500, countFilteredRecords(path, or(gtEq(doubleColumn("missing"), 33.33), lt(longColumn("id"), 500L))));
166+
assertThat(countFilteredRecords(
167+
path, or(lt(longColumn("id"), 500L), eq(binaryColumn("missing"), fromString("any")))))
168+
.isEqualTo(500);
169+
assertThat(countFilteredRecords(path, or(lt(longColumn("id"), 500L), notEq(binaryColumn("missing"), null))))
170+
.isEqualTo(500);
171+
assertThat(countFilteredRecords(path, or(lt(longColumn("id"), 500L), lt(doubleColumn("missing"), 33.33))))
172+
.isEqualTo(500);
173+
assertThat(countFilteredRecords(path, or(lt(longColumn("id"), 500L), ltEq(doubleColumn("missing"), 33.33))))
174+
.isEqualTo(500);
175+
assertThat(countFilteredRecords(path, or(lt(longColumn("id"), 500L), gt(doubleColumn("missing"), 33.33))))
176+
.isEqualTo(500);
177+
assertThat(countFilteredRecords(path, or(lt(longColumn("id"), 500L), gtEq(doubleColumn("missing"), 33.33))))
178+
.isEqualTo(500);
179+
180+
assertThat(countFilteredRecords(
181+
path, or(eq(binaryColumn("missing"), fromString("any")), lt(longColumn("id"), 500L))))
182+
.isEqualTo(500);
183+
assertThat(countFilteredRecords(path, or(notEq(binaryColumn("missing"), null), lt(longColumn("id"), 500L))))
184+
.isEqualTo(500);
185+
assertThat(countFilteredRecords(path, or(lt(doubleColumn("missing"), 33.33), lt(longColumn("id"), 500L))))
186+
.isEqualTo(500);
187+
assertThat(countFilteredRecords(path, or(ltEq(doubleColumn("missing"), 33.33), lt(longColumn("id"), 500L))))
188+
.isEqualTo(500);
189+
assertThat(countFilteredRecords(path, or(gt(doubleColumn("missing"), 33.33), lt(longColumn("id"), 500L))))
190+
.isEqualTo(500);
191+
assertThat(countFilteredRecords(path, or(gtEq(doubleColumn("missing"), 33.33), lt(longColumn("id"), 500L))))
192+
.isEqualTo(500);
197193

198194
// missing column filter is false
199-
assertEquals(
200-
1000, countFilteredRecords(path, or(lt(longColumn("id"), 500L), eq(binaryColumn("missing"), null))));
201-
assertEquals(
202-
1000,
203-
countFilteredRecords(
204-
path, or(lt(longColumn("id"), 500L), notEq(binaryColumn("missing"), fromString("any")))));
205-
206-
assertEquals(
207-
1000, countFilteredRecords(path, or(eq(binaryColumn("missing"), null), lt(longColumn("id"), 500L))));
208-
assertEquals(
209-
1000,
210-
countFilteredRecords(
211-
path, or(notEq(binaryColumn("missing"), fromString("any")), lt(longColumn("id"), 500L))));
195+
assertThat(countFilteredRecords(path, or(lt(longColumn("id"), 500L), eq(binaryColumn("missing"), null))))
196+
.isEqualTo(1000);
197+
assertThat(countFilteredRecords(
198+
path, or(lt(longColumn("id"), 500L), notEq(binaryColumn("missing"), fromString("any")))))
199+
.isEqualTo(1000);
200+
201+
assertThat(countFilteredRecords(path, or(eq(binaryColumn("missing"), null), lt(longColumn("id"), 500L))))
202+
.isEqualTo(1000);
203+
assertThat(countFilteredRecords(
204+
path, or(notEq(binaryColumn("missing"), fromString("any")), lt(longColumn("id"), 500L))))
205+
.isEqualTo(1000);
212206
}
213207

214208
public static long countFilteredRecords(Path path, FilterPredicate pred) throws IOException {

0 commit comments

Comments
 (0)