diff --git a/src/test/java/io/github/spannm/jackcess/LinkedTableTest.java b/src/test/java/io/github/spannm/jackcess/LinkedTableTest.java index 5c7a1ec..aa32e68 100644 --- a/src/test/java/io/github/spannm/jackcess/LinkedTableTest.java +++ b/src/test/java/io/github/spannm/jackcess/LinkedTableTest.java @@ -61,8 +61,8 @@ void testLinkedTables() throws Exception { assertTrue(db.getLinkedDatabases().isEmpty()); - final String linkeeDbName = "Z:\\jackcess_test\\linkeeTest.accdb"; - final File linkeeFile = new File("src/test/data/linkeeTest.accdb"); + String linkeeDbName = "Z:\\jackcess_test\\linkeeTest.accdb"; + File linkeeFile = new File(DIR_TEST_DATA, "linkeeTest.accdb"); db.setLinkResolver((linkerdb, dbName) -> { assertEquals(linkeeDbName, dbName); return DatabaseBuilder.open(linkeeFile); diff --git a/src/test/java/io/github/spannm/jackcess/impl/LongValueTest.java b/src/test/java/io/github/spannm/jackcess/impl/LongValueTest.java index a2f5421..d42555a 100644 --- a/src/test/java/io/github/spannm/jackcess/impl/LongValueTest.java +++ b/src/test/java/io/github/spannm/jackcess/impl/LongValueTest.java @@ -54,7 +54,7 @@ void testReadLongValue() throws Exception { assertEquals("Project1", row.get("PROJ_PROP_TITLE")); byte[] foundBinaryData = row.getBytes("RESERVED_BINARY_DATA"); byte[] expectedBinaryData = - toByteArray(new File("src/test/data/test2BinData.dat")); + toByteArray(new File(DIR_TEST_DATA, "test2BinData.dat")); assertArrayEquals(expectedBinaryData, foundBinaryData); } } @@ -74,7 +74,7 @@ void testWriteLongValue(FileFormat fileFormat) throws Exception { String testStr = "This is a test"; String longMemo = createString(2030); - byte[] oleValue = toByteArray(new File("src/test/data/test2BinData.dat")); + byte[] oleValue = toByteArray(new File(DIR_TEST_DATA, "test2BinData.dat")); table.addRow(testStr, testStr, null); table.addRow(testStr, longMemo, oleValue); @@ -193,7 +193,7 @@ void testLongValueAsMiddleColumn(FileFormat fileFormat) throws Exception { @Test void testUnicodeCompression() throws Exception { - File dbFile = new File("src/test/data/V2003/testUnicodeCompV2003.mdb"); + File dbFile = new File(DIR_TEST_DATA, "V2003/testUnicodeCompV2003.mdb"); try (Database db = open(FileFormat.V2003, dbFile, true)) { StringBuilder sb = new StringBuilder(127); for (int i = 1; i <= 0xFF; ++i) { diff --git a/src/test/java/io/github/spannm/jackcess/impl/UsageMapTest.java b/src/test/java/io/github/spannm/jackcess/impl/UsageMapTest.java index 1208b4f..9b06b24 100644 --- a/src/test/java/io/github/spannm/jackcess/impl/UsageMapTest.java +++ b/src/test/java/io/github/spannm/jackcess/impl/UsageMapTest.java @@ -55,7 +55,7 @@ void testRead(TestDB testDB) throws Exception { void testGobalReferenceUsageMap() throws Exception { try (Database db = openCopy( FileFormat.V2000, - new File("src/test/data/V2000/testRefGlobalV2000.mdb"))) { + new File(DIR_TEST_DATA, "V2000/testRefGlobalV2000.mdb"))) { Table t = new TableBuilder("Test2") .addColumn(new ColumnBuilder("id", DataType.LONG)) .addColumn(new ColumnBuilder("data1", DataType.TEXT)) diff --git a/src/test/java/io/github/spannm/jackcess/util/ImportTest.java b/src/test/java/io/github/spannm/jackcess/util/ImportTest.java index c130f7c..9f4fa68 100644 --- a/src/test/java/io/github/spannm/jackcess/util/ImportTest.java +++ b/src/test/java/io/github/spannm/jackcess/util/ImportTest.java @@ -46,7 +46,7 @@ void testImportFromFile(FileFormat fileFormat) throws Exception { try (Database db = create(fileFormat)) { String tableName = new ImportUtil.Builder(db, "test") .withDelimiter("\\t") - .importFile(new File("src/test/data/sample-input.tab")); + .importFile(new File(DIR_TEST_DATA, "sample-input.tab")); Table t = db.getTable(tableName); List colNames = new ArrayList<>(); @@ -90,7 +90,7 @@ void testImportFromFile(FileFormat fileFormat) throws Exception { .withDelimiter("\\t") .withUseExistingTable(true) .withHeader(false) - .importFile(new File("src/test/data/sample-input.tab")); + .importFile(new File(DIR_TEST_DATA, "sample-input.tab")); expectedRows = createExpectedTable( @@ -136,7 +136,7 @@ public Object[] filterRow(Object[] row) { tableName = new ImportUtil.Builder(db, "test3") .withDelimiter("\\t") .withFilter(oddFilter) - .importFile(new File("src/test/data/sample-input.tab")); + .importFile(new File(DIR_TEST_DATA, "sample-input.tab")); t = db.getTable(tableName); colNames = new ArrayList<>(); @@ -169,7 +169,7 @@ void testImportFromFileWithOnlyHeaders(FileFormat fileFormat) throws Exception { try (Database db = create(fileFormat)) { String tableName = new ImportUtil.Builder(db, "test") .withDelimiter("\\t") - .importFile(new File("src/test/data/sample-input-only-headers.tab")); + .importFile(new File(DIR_TEST_DATA, "sample-input-only-headers.tab")); Table t = db.getTable(tableName); diff --git a/src/test/java/io/github/spannm/jackcess/util/MemFileChannelTest.java b/src/test/java/io/github/spannm/jackcess/util/MemFileChannelTest.java index 6eaa8ef..43d688b 100644 --- a/src/test/java/io/github/spannm/jackcess/util/MemFileChannelTest.java +++ b/src/test/java/io/github/spannm/jackcess/util/MemFileChannelTest.java @@ -35,7 +35,7 @@ class MemFileChannelTest extends AbstractBaseTest { @Test void testReadOnlyChannel() throws Exception { - File testFile = new File("src/test/data/V1997/compIndexTestV1997.mdb"); + File testFile = new File(DIR_TEST_DATA, "V1997/compIndexTestV1997.mdb"); MemFileChannel ch = MemFileChannel.newChannel(testFile, "r"); assertEquals(testFile.length(), ch.size()); assertEquals(0L, ch.position()); @@ -82,7 +82,7 @@ void testChannel() throws Exception { assertFalse(ch.isOpen()); - File testFile = new File("src/test/data/V1997/compIndexTestV1997.mdb"); + File testFile = new File(DIR_TEST_DATA, "V1997/compIndexTestV1997.mdb"); ch = MemFileChannel.newChannel(testFile, "r"); assertEquals(testFile.length(), ch.size()); assertEquals(0L, ch.position()); diff --git a/src/test/java/io/github/spannm/jackcess/util/OleBlobTest.java b/src/test/java/io/github/spannm/jackcess/util/OleBlobTest.java index 6655bf8..0d73824 100644 --- a/src/test/java/io/github/spannm/jackcess/util/OleBlobTest.java +++ b/src/test/java/io/github/spannm/jackcess/util/OleBlobTest.java @@ -47,7 +47,7 @@ class OleBlobTest extends AbstractBaseTest { @ParameterizedTest(name = "[{index}] {0}") @MethodSource("getSupportedFileformats") void testCreateBlob(FileFormat fileFormat) throws Exception { - File sampleFile = new File("src/test/data/sample-input.tab"); + File sampleFile = new File(DIR_TEST_DATA, "sample-input.tab"); String sampleFilePath = sampleFile.getAbsolutePath(); String sampleFileName = sampleFile.getName(); byte[] sampleFileBytes = toByteArray(sampleFile);