2525import org .junit .Test ;
2626import org .junit .rules .TemporaryFolder ;
2727import org .mockito .Mock ;
28- import org .mockito .Mockito ;
2928import org .mockito .junit .MockitoJUnit ;
3029import org .mockito .junit .MockitoRule ;
3130
4039import java .nio .charset .StandardCharsets ;
4140import java .nio .file .Files ;
4241import 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 )) {
0 commit comments