Skip to content

Commit a9d569b

Browse files
committed
Extract helpers from FileOpenerTest. (#514)
1 parent db1a32b commit a9d569b

File tree

3 files changed

+66
-22
lines changed

3 files changed

+66
-22
lines changed

metafacture-io/src/test/java/org/metafacture/io/FileOpenerCompressionTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public void testOpenCompressedFiles() throws IOException {
9393
Files.copy(in, file.toPath(), StandardCopyOption.REPLACE_EXISTING);
9494
}
9595

96-
FileOpenerTest.assertData(receiver, DATA, file, o -> o.setCompression(compression));
96+
TestHelpers.assertFile(receiver, DATA, file, o -> o.setCompression(compression));
9797
}
9898

9999
}

metafacture-io/src/test/java/org/metafacture/io/FileOpenerTest.java

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import org.junit.Test;
2626
import org.junit.rules.TemporaryFolder;
2727
import org.mockito.Mock;
28-
import org.mockito.Mockito;
2928
import org.mockito.junit.MockitoJUnit;
3029
import org.mockito.junit.MockitoRule;
3130

@@ -40,7 +39,6 @@
4039
import java.nio.charset.StandardCharsets;
4140
import java.nio.file.Files;
4241
import java.nio.file.StandardCopyOption;
43-
import java.util.function.Consumer;
4442

4543
/**
4644
* Tests for class {@link FileOpener}.
@@ -66,7 +64,7 @@ public void testUtf8IsDefaultEncoding() throws IOException {
6664
Assume.assumeFalse("Default encoding is UTF-8: It is not possible to test whether FileOpener sets " +
6765
"the encoding to UTF-8 correctly.", StandardCharsets.UTF_8.equals(Charset.defaultCharset()));
6866

69-
assertData(receiver, DATA, createTestFile(), null);
67+
TestHelpers.assertFile(receiver, DATA, createTestFile(), null);
7068
}
7169

7270
@Test
@@ -93,27 +91,10 @@ private void testDecompressConcatenated(final boolean decompressConcatenated) th
9391
final String data = sb.toString();
9492
Assert.assertTrue(data.length() + " > " + maxBytes, data.length() > maxBytes);
9593

96-
assertData(receiver, decompressConcatenated ? data : data.substring(0, maxBytes),
94+
TestHelpers.assertFile(receiver, decompressConcatenated ? data : data.substring(0, maxBytes),
9795
copyResourceToTempFile("compressed-large.txt.bgzf"), o -> o.setDecompressConcatenated(decompressConcatenated));
9896
}
9997

100-
/*package-private*/ static void assertData(final ObjectReceiver<Reader> receiver, final String expected, final File file, final Consumer<FileOpener> consumer) {
101-
final StringBuilder sb = new StringBuilder();
102-
Mockito.doAnswer(i -> sb.append(ResourceUtil.readAll(i.getArgument(0)))).when(receiver).process(Mockito.any(Reader.class));
103-
104-
final FileOpener opener = new FileOpener();
105-
if (consumer != null) {
106-
consumer.accept(opener);
107-
}
108-
109-
opener.setReceiver(receiver);
110-
opener.process(file.getAbsolutePath());
111-
opener.closeStream();
112-
113-
Mockito.verify(receiver).process(Mockito.any(Reader.class));
114-
Assert.assertEquals(expected, sb.toString());
115-
}
116-
11798
private File createTestFile() throws IOException {
11899
final File file = tempFolder.newFile();
119100
try (OutputStream stream = new FileOutputStream(file)) {
Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
/*
2+
* Copyright 2024 hbz NRW
3+
*
4+
* Licensed under the Apache License, Version 2.0 the "License";
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package org.metafacture.io;
18+
19+
import org.metafacture.commons.ResourceUtil;
20+
import org.metafacture.framework.ObjectReceiver;
21+
22+
import org.junit.Assert;
23+
import org.mockito.Mockito;
24+
25+
import java.io.File;
26+
import java.io.Reader;
27+
import java.util.function.Consumer;
28+
import java.util.function.IntSupplier;
29+
30+
public final class TestHelpers {
31+
32+
public static void assertFile(final ObjectReceiver<Reader> receiver, final String expected, final File file, final Consumer<FileOpener> consumer) {
33+
assertReader(receiver, expected, () -> {
34+
final FileOpener opener = new FileOpener();
35+
if (consumer != null) {
36+
consumer.accept(opener);
37+
}
38+
39+
opener.setReceiver(receiver);
40+
opener.process(file.getAbsolutePath());
41+
opener.closeStream();
42+
43+
return 1;
44+
});
45+
}
46+
47+
public static void assertReader(final ObjectReceiver<Reader> receiver, final String expected, final IntSupplier supplier) {
48+
final StringBuilder sb = new StringBuilder();
49+
50+
Mockito.doAnswer(i -> {
51+
sb.delete(0, sb.length());
52+
sb.append(ResourceUtil.readAll(i.getArgument(0)));
53+
54+
return null;
55+
}).when(receiver).process(Mockito.any(Reader.class));
56+
57+
final int times = supplier.getAsInt();
58+
59+
Mockito.verify(receiver, Mockito.times(times)).process(Mockito.any(Reader.class));
60+
Assert.assertEquals(expected, sb.toString());
61+
}
62+
63+
}

0 commit comments

Comments
 (0)