extract duplicated code to Resources.open

Author: rzymek

e2e/src/test/java/org.dhatim.fastexcel.benchmarks/BenchmarkLauncher.java

@@ -8,7 +8,6 @@
 import org.openjdk.jmh.runner.options.Options;
 import org.openjdk.jmh.runner.options.OptionsBuilder;
 
-import java.util.concurrent.TimeUnit;
 import java.util.regex.Pattern;
 
 @BenchmarkMode(Mode.SingleShotTime)

fastexcel-reader/src/test/java/org/dhatim/fastexcel/reader/FastExcelReaderTest.java

@@ -17,6 +17,7 @@
 
 import static java.util.stream.Collectors.toList;
 import static org.assertj.core.api.Assertions.*;
+import static org.dhatim.fastexcel.reader.Resources.open;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -215,14 +216,6 @@ private static String toODT(Date date) {
         return FORMAT.format(date);
     }
 
-    private static InputStream open(String name) {
-        InputStream result = FastExcelReaderTest.class.getResourceAsStream(name);
-        if (result == null) {
-            throw new IllegalStateException("Cannot read resource " + name);
-        }
-        return result;
-    }
-
     private static String getRawValue(org.apache.poi.ss.usermodel.Cell cell) {
         XSSFCell xcell = ((XSSFCell) cell);
         return xcell == null ? null : xcell.getRawValue();

fastexcel-reader/src/test/java/org/dhatim/fastexcel/reader/HeaderTest.java

@@ -46,7 +46,7 @@ void testOOXMLZipFile() throws IOException {
     }
 
     private static byte[] readFirstBytes(String name, int length) throws IOException {
-        try (InputStream is = open(name)) {
+        try (InputStream is = Resources.open(name)) {
             byte[] bytes = new byte[length];
             readNBytes(is, bytes, 0, length);
             return bytes;
@@ -66,12 +66,4 @@ private static int readNBytes(InputStream is, byte[] b, int off, int len) throws
         return n;
     }
 
-    private static InputStream open(String name) {
-        InputStream result = HeaderTest.class.getResourceAsStream(name);
-        if (result == null) {
-            throw new IllegalStateException("Cannot read resource " + name);
-        }
-        return result;
-    }
-
 }

fastexcel-reader/src/test/java/org/dhatim/fastexcel/reader/Resources.java

@@ -0,0 +1,13 @@
+package org.dhatim.fastexcel.reader;
+
+import java.io.InputStream;
+
+public class Resources {
+    static InputStream open(String name) {
+        InputStream result = Resources.class.getResourceAsStream(name);
+        if (result == null) {
+            throw new IllegalStateException("Cannot read resource " + name);
+        }
+        return result;
+    }
+}

fastexcel-reader/src/test/java/org/dhatim/fastexcel/reader/SimpleReaderTest.java

@@ -42,7 +42,7 @@ class SimpleReaderTest {
 
     @Test
     void test() throws IOException {
-        try (InputStream is = openResource("/xlsx/simple.xlsx"); ReadableWorkbook wb = new ReadableWorkbook(is)) {
+        try (InputStream is = Resources.open("/xlsx/simple.xlsx"); ReadableWorkbook wb = new ReadableWorkbook(is)) {
             Sheet sheet = wb.getFirstSheet();
             try (Stream<Row> rows = sheet.openStream()) {
                 rows.forEach(r -> {
@@ -61,14 +61,6 @@ void test() throws IOException {
         }
     }
 
-    private static InputStream openResource(String name) {
-        InputStream result = SimpleReaderTest.class.getResourceAsStream(name);
-        if (result == null) {
-            throw new IllegalStateException("Cannot read resource " + name);
-        }
-        return result;
-    }
-
     private static LocalDateTime date(int year, int month, int day) {
         return LocalDateTime.of(year, month, day, 0, 0);
     }