summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/src/java/com/healthmarketscience/jackcess/ComplexColumnTest.java10
-rw-r--r--test/src/java/com/healthmarketscience/jackcess/CursorTest.java253
-rw-r--r--test/src/java/com/healthmarketscience/jackcess/RowFilterTest.java2
3 files changed, 217 insertions, 48 deletions
diff --git a/test/src/java/com/healthmarketscience/jackcess/ComplexColumnTest.java b/test/src/java/com/healthmarketscience/jackcess/ComplexColumnTest.java
index 09ec547..019dd74 100644
--- a/test/src/java/com/healthmarketscience/jackcess/ComplexColumnTest.java
+++ b/test/src/java/com/healthmarketscience/jackcess/ComplexColumnTest.java
@@ -97,7 +97,7 @@ public class ComplexColumnTest extends TestCase
"row8-memo", upTime);
Cursor cursor = Cursor.createCursor(t1);
- assertTrue(cursor.findRow(t1.getColumn("id"), "row3"));
+ assertTrue(cursor.findFirstRow(t1.getColumn("id"), "row3"));
ComplexValueForeignKey row3ValFk = (ComplexValueForeignKey)
cursor.getCurrentRowValue(verCol);
cursor.setCurrentRowValue(col, "new-value");
@@ -191,7 +191,7 @@ public class ComplexColumnTest extends TestCase
checkAttachments(row8ValFk.get(), row8ValFk, "test_data.txt");
Cursor cursor = Cursor.createCursor(t1);
- assertTrue(cursor.findRow(t1.getColumn("id"), "row4"));
+ assertTrue(cursor.findFirstRow(t1.getColumn("id"), "row4"));
ComplexValueForeignKey row4ValFk = (ComplexValueForeignKey)
cursor.getCurrentRowValue(col);
Attachment a = row4ValFk.addAttachment(null, "test_data.txt", "txt",
@@ -216,7 +216,7 @@ public class ComplexColumnTest extends TestCase
row4ValFk.getAttachments().get(0).delete();
checkAttachments(4, row4ValFk);
- assertTrue(cursor.findRow(t1.getColumn("id"), "row2"));
+ assertTrue(cursor.findFirstRow(t1.getColumn("id"), "row2"));
ComplexValueForeignKey row2ValFk = (ComplexValueForeignKey)
cursor.getCurrentRowValue(col);
row2ValFk.deleteAllValues();
@@ -267,7 +267,7 @@ public class ComplexColumnTest extends TestCase
checkMultiValues(row8ValFk.get(), row8ValFk, "value1", "value2");
Cursor cursor = Cursor.createCursor(t1);
- assertTrue(cursor.findRow(t1.getColumn("id"), "row2"));
+ assertTrue(cursor.findFirstRow(t1.getColumn("id"), "row2"));
ComplexValueForeignKey row2ValFk = (ComplexValueForeignKey)
cursor.getCurrentRowValue(col);
SingleValue v = row2ValFk.addMultiValue("value2");
@@ -287,7 +287,7 @@ public class ComplexColumnTest extends TestCase
row2ValFk.getMultiValues().get(0).delete();
checkMultiValues(2, row2ValFk);
- assertTrue(cursor.findRow(t1.getColumn("id"), "row3"));
+ assertTrue(cursor.findFirstRow(t1.getColumn("id"), "row3"));
ComplexValueForeignKey row3ValFk = (ComplexValueForeignKey)
cursor.getCurrentRowValue(col);
row3ValFk.deleteAllValues();
diff --git a/test/src/java/com/healthmarketscience/jackcess/CursorTest.java b/test/src/java/com/healthmarketscience/jackcess/CursorTest.java
index dc79685..897cf53 100644
--- a/test/src/java/com/healthmarketscience/jackcess/CursorTest.java
+++ b/test/src/java/com/healthmarketscience/jackcess/CursorTest.java
@@ -46,6 +46,10 @@ import junit.framework.TestCase;
*/
public class CursorTest extends TestCase {
+ static final List<TestDB> INDEX_CURSOR_DBS =
+ TestDB.getSupportedForBasename(Basename.INDEX_CURSOR);
+
+
public CursorTest(String name) throws Exception {
super(name);
}
@@ -101,9 +105,6 @@ public class CursorTest extends TestCase {
return expectedRows;
}
- static final List<TestDB> INDEX_CURSOR_DBS =
- TestDB.getSupportedForBasename(Basename.INDEX_CURSOR);
-
static Database createTestIndexTable(final TestDB indexCursorDB)
throws Exception
{
@@ -118,6 +119,52 @@ public class CursorTest extends TestCase {
return db;
}
+ private static List<Map<String,Object>> createDupeTestTableData()
+ throws Exception
+ {
+ List<Map<String,Object>> expectedRows =
+ new ArrayList<Map<String,Object>>();
+ int[] ids = new int[]{3, 7, 6, 1, 2, 9, 0, 5, 4, 8};
+ for(int i : ids) {
+ expectedRows.add(createExpectedRow("id", i, "value", "data" + (i % 3)));
+ }
+ for(int i : ids) {
+ expectedRows.add(createExpectedRow("id", i, "value", "data" + (i % 5)));
+ }
+ return expectedRows;
+ }
+
+ private static Database createDupeTestTable(final FileFormat fileFormat)
+ throws Exception
+ {
+ Database db = create(fileFormat);
+
+ Table table = new TableBuilder("test")
+ .addColumn(new ColumnBuilder("id", DataType.LONG))
+ .addColumn(new ColumnBuilder("value", DataType.TEXT))
+ .toTable(db);
+
+ for(Map<String,Object> row : createDupeTestTableData()) {
+ table.addRow(row.get("id"), row.get("value"));
+ }
+
+ return db;
+ }
+
+ static Database createDupeTestTable(final TestDB indexCursorDB)
+ throws Exception
+ {
+ Database db = openCopy(indexCursorDB);
+
+ Table table = db.getTable("test");
+
+ for(Map<String,Object> row : createDupeTestTableData()) {
+ table.addRow(row.get("id"), row.get("value"));
+ }
+
+ return db;
+ }
+
private static Cursor createIndexSubRangeCursor(Table table,
Index idx,
int type)
@@ -158,8 +205,8 @@ public class CursorTest extends TestCase {
}
}
- private void doTestSimple(Cursor cursor,
- List<Map<String, Object>> expectedRows)
+ private static void doTestSimple(Cursor cursor,
+ List<Map<String, Object>> expectedRows)
throws Exception
{
if(expectedRows == null) {
@@ -186,8 +233,8 @@ public class CursorTest extends TestCase {
}
}
- private void doTestMove(Cursor cursor,
- List<Map<String, Object>> expectedRows)
+ private static void doTestMove(Cursor cursor,
+ List<Map<String, Object>> expectedRows)
throws Exception
{
if(expectedRows == null) {
@@ -245,47 +292,47 @@ public class CursorTest extends TestCase {
}
}
- private void doTestSearch(Table table, Cursor cursor, Index index,
- Integer... outOfRangeValues)
+ private static void doTestSearch(Table table, Cursor cursor, Index index,
+ Integer... outOfRangeValues)
throws Exception
{
- assertTrue(cursor.findRow(table.getColumn("id"), 3));
+ assertTrue(cursor.findFirstRow(table.getColumn("id"), 3));
assertEquals(createExpectedRow("id", 3,
"value", "data" + 3),
cursor.getCurrentRow());
- assertTrue(cursor.findRow(createExpectedRow(
+ assertTrue(cursor.findFirstRow(createExpectedRow(
"id", 6,
"value", "data" + 6)));
assertEquals(createExpectedRow("id", 6,
"value", "data" + 6),
cursor.getCurrentRow());
- assertFalse(cursor.findRow(createExpectedRow(
+ assertFalse(cursor.findFirstRow(createExpectedRow(
"id", 8,
"value", "data" + 13)));
- assertFalse(cursor.findRow(table.getColumn("id"), 13));
+ assertFalse(cursor.findFirstRow(table.getColumn("id"), 13));
assertEquals(createExpectedRow("id", 6,
"value", "data" + 6),
cursor.getCurrentRow());
- assertTrue(cursor.findRow(createExpectedRow(
+ assertTrue(cursor.findFirstRow(createExpectedRow(
"value", "data" + 7)));
assertEquals(createExpectedRow("id", 7,
"value", "data" + 7),
cursor.getCurrentRow());
- assertTrue(cursor.findRow(table.getColumn("value"), "data" + 4));
+ assertTrue(cursor.findFirstRow(table.getColumn("value"), "data" + 4));
assertEquals(createExpectedRow("id", 4,
"value", "data" + 4),
cursor.getCurrentRow());
for(Integer outOfRangeValue : outOfRangeValues) {
- assertFalse(cursor.findRow(table.getColumn("id"),
+ assertFalse(cursor.findFirstRow(table.getColumn("id"),
outOfRangeValue));
- assertFalse(cursor.findRow(table.getColumn("value"),
+ assertFalse(cursor.findFirstRow(table.getColumn("value"),
"data" + outOfRangeValue));
- assertFalse(cursor.findRow(createExpectedRow(
+ assertFalse(cursor.findFirstRow(createExpectedRow(
"id", outOfRangeValue,
"value", "data" + outOfRangeValue)));
}
@@ -329,8 +376,8 @@ public class CursorTest extends TestCase {
}
}
- private void doTestReverse(Cursor cursor,
- List<Map<String, Object>> expectedRows)
+ private static void doTestReverse(Cursor cursor,
+ List<Map<String, Object>> expectedRows)
throws Exception
{
if(expectedRows == null) {
@@ -360,10 +407,10 @@ public class CursorTest extends TestCase {
}
}
- private void doTestLiveAddition(Table table,
- Cursor cursor1,
- Cursor cursor2,
- Integer newRowNum) throws Exception
+ private static void doTestLiveAddition(Table table,
+ Cursor cursor1,
+ Cursor cursor2,
+ Integer newRowNum) throws Exception
{
cursor1.moveNextRows(11);
cursor2.moveNextRows(11);
@@ -403,7 +450,7 @@ public class CursorTest extends TestCase {
}
}
- private void doTestLiveDeletion(
+ private static void doTestLiveDeletion(
Cursor cursor1,
Cursor cursor2,
Cursor cursor3,
@@ -682,6 +729,128 @@ public class CursorTest extends TestCase {
}
}
+ public void testFindAllIndex() throws Exception {
+ for (final FileFormat fileFormat : JetFormatTest.SUPPORTED_FILEFORMATS) {
+ Database db = createDupeTestTable(fileFormat);
+
+ Table table = db.getTable("test");
+ Cursor cursor = Cursor.createCursor(table);
+
+ doTestFindAll(table, cursor, null);
+
+ db.close();
+ }
+ }
+
+ public void testFindAll() throws Exception {
+ for (final TestDB indexCursorDB : INDEX_CURSOR_DBS) {
+ Database db = createDupeTestTable(indexCursorDB);
+
+ Table table = db.getTable("test");
+ Index idx = table.getIndexes().get(0);
+ Cursor cursor = Cursor.createIndexCursor(table, idx);
+
+ doTestFindAll(table, cursor, idx);
+
+ db.close();
+ }
+ }
+
+ private static void doTestFindAll(Table table, Cursor cursor, Index index)
+ throws Exception
+ {
+ Column valCol = table.getColumn("value");
+ List<Map<String,Object>> rows = RowFilterTest.toList(
+ cursor.columnMatchIterable(valCol, "data2"));
+
+ List<Map<String, Object>> expectedRows = null;
+
+ if(index == null) {
+ expectedRows =
+ createExpectedTable(
+ createExpectedRow(
+ "id", 2, "value", "data2"),
+ createExpectedRow(
+ "id", 5, "value", "data2"),
+ createExpectedRow(
+ "id", 8, "value", "data2"),
+ createExpectedRow(
+ "id", 7, "value", "data2"),
+ createExpectedRow(
+ "id", 2, "value", "data2"));
+ } else {
+ expectedRows =
+ createExpectedTable(
+ createExpectedRow(
+ "id", 2, "value", "data2"),
+ createExpectedRow(
+ "id", 2, "value", "data2"),
+ createExpectedRow(
+ "id", 5, "value", "data2"),
+ createExpectedRow(
+ "id", 7, "value", "data2"),
+ createExpectedRow(
+ "id", 8, "value", "data2"));
+ }
+ assertEquals(expectedRows, rows);
+
+ rows = RowFilterTest.toList(
+ cursor.columnMatchIterable(valCol, "data4"));
+
+ if(index == null) {
+ expectedRows =
+ createExpectedTable(
+ createExpectedRow(
+ "id", 9, "value", "data4"),
+ createExpectedRow(
+ "id", 4, "value", "data4"));
+ } else {
+ expectedRows =
+ createExpectedTable(
+ createExpectedRow(
+ "id", 4, "value", "data4"),
+ createExpectedRow(
+ "id", 9, "value", "data4"));
+ }
+ assertEquals(expectedRows, rows);
+
+ rows = RowFilterTest.toList(
+ cursor.columnMatchIterable(valCol, "data9"));
+
+ assertTrue(rows.isEmpty());
+
+ rows = RowFilterTest.toList(
+ cursor.rowMatchIterable(Collections.singletonMap("id", 8)));
+
+ expectedRows =
+ createExpectedTable(
+ createExpectedRow(
+ "id", 8, "value", "data2"),
+ createExpectedRow(
+ "id", 8, "value", "data3"));
+ assertEquals(expectedRows, rows);
+
+ for(Map<String,Object> row : table) {
+
+ expectedRows = new ArrayList<Map<String,Object>>();
+ for(Map<String,Object> tmpRow : cursor) {
+ if(row.equals(tmpRow)) {
+ expectedRows.add(tmpRow);
+ }
+ }
+ assertFalse(expectedRows.isEmpty());
+
+ rows = RowFilterTest.toList(cursor.rowMatchIterable(row));
+
+ assertEquals(expectedRows, rows);
+ }
+
+ rows = RowFilterTest.toList(
+ cursor.rowMatchIterable(createExpectedRow(
+ "id", 8, "value", "data13")));
+ assertTrue(rows.isEmpty());
+ }
+
public void testId() throws Exception
{
for (final TestDB indexCursorDB : INDEX_CURSOR_DBS) {
@@ -742,8 +911,8 @@ public class CursorTest extends TestCase {
}
}
- private void doTestMatchers(Table table, ColumnMatcher columnMatcher,
- boolean caseInsensitive)
+ private static void doTestMatchers(Table table, ColumnMatcher columnMatcher,
+ boolean caseInsensitive)
throws Exception
{
assertTrue(columnMatcher.matches(table, "value", null, null));
@@ -758,26 +927,26 @@ public class CursorTest extends TestCase {
assertTrue(columnMatcher.matches(table, "value", 13, 13));
}
- private void doTestMatcher(Table table, Cursor cursor,
- ColumnMatcher columnMatcher,
- boolean caseInsensitive)
+ private static void doTestMatcher(Table table, Cursor cursor,
+ ColumnMatcher columnMatcher,
+ boolean caseInsensitive)
throws Exception
{
cursor.setColumnMatcher(columnMatcher);
- assertTrue(cursor.findRow(table.getColumn("id"), 3));
+ assertTrue(cursor.findFirstRow(table.getColumn("id"), 3));
assertEquals(createExpectedRow("id", 3,
"value", "data" + 3),
cursor.getCurrentRow());
- assertTrue(cursor.findRow(createExpectedRow(
+ assertTrue(cursor.findFirstRow(createExpectedRow(
"id", 6,
"value", "data" + 6)));
assertEquals(createExpectedRow("id", 6,
"value", "data" + 6),
cursor.getCurrentRow());
- assertTrue(cursor.findRow(createExpectedRow(
+ assertTrue(cursor.findFirstRow(createExpectedRow(
"id", 6,
"value", "Data" + 6)) == caseInsensitive);
if(caseInsensitive) {
@@ -786,21 +955,21 @@ public class CursorTest extends TestCase {
cursor.getCurrentRow());
}
- assertFalse(cursor.findRow(createExpectedRow(
+ assertFalse(cursor.findFirstRow(createExpectedRow(
"id", 8,
"value", "data" + 13)));
- assertFalse(cursor.findRow(table.getColumn("id"), 13));
+ assertFalse(cursor.findFirstRow(table.getColumn("id"), 13));
assertEquals(createExpectedRow("id", 6,
"value", "data" + 6),
cursor.getCurrentRow());
- assertTrue(cursor.findRow(createExpectedRow(
+ assertTrue(cursor.findFirstRow(createExpectedRow(
"value", "data" + 7)));
assertEquals(createExpectedRow("id", 7,
"value", "data" + 7),
cursor.getCurrentRow());
- assertTrue(cursor.findRow(createExpectedRow(
+ assertTrue(cursor.findFirstRow(createExpectedRow(
"value", "Data" + 7)) == caseInsensitive);
if(caseInsensitive) {
assertEquals(createExpectedRow("id", 7,
@@ -808,12 +977,12 @@ public class CursorTest extends TestCase {
cursor.getCurrentRow());
}
- assertTrue(cursor.findRow(table.getColumn("value"), "data" + 4));
+ assertTrue(cursor.findFirstRow(table.getColumn("value"), "data" + 4));
assertEquals(createExpectedRow("id", 4,
"value", "data" + 4),
cursor.getCurrentRow());
- assertTrue(cursor.findRow(table.getColumn("value"), "Data" + 4)
+ assertTrue(cursor.findFirstRow(table.getColumn("value"), "Data" + 4)
== caseInsensitive);
if(caseInsensitive) {
assertEquals(createExpectedRow("id", 4,
@@ -831,17 +1000,17 @@ public class CursorTest extends TestCase {
Index idx = t1.getIndex(IndexBuilder.PRIMARY_KEY_NAME);
IndexCursor cursor = IndexCursor.createCursor(t1, idx);
- assertFalse(cursor.findRowByEntry(-1));
+ assertFalse(cursor.findFirstRowByEntry(-1));
cursor.findClosestRowByEntry(-1);
assertEquals(0, cursor.getCurrentRow().get("id"));
- assertTrue(cursor.findRowByEntry(1));
+ assertTrue(cursor.findFirstRowByEntry(1));
assertEquals(1, cursor.getCurrentRow().get("id"));
cursor.findClosestRowByEntry(2);
assertEquals(2, cursor.getCurrentRow().get("id"));
- assertFalse(cursor.findRowByEntry(4));
+ assertFalse(cursor.findFirstRowByEntry(4));
cursor.findClosestRowByEntry(4);
assertTrue(cursor.isAfterLast());
diff --git a/test/src/java/com/healthmarketscience/jackcess/RowFilterTest.java b/test/src/java/com/healthmarketscience/jackcess/RowFilterTest.java
index 8d9b510..586ad9a 100644
--- a/test/src/java/com/healthmarketscience/jackcess/RowFilterTest.java
+++ b/test/src/java/com/healthmarketscience/jackcess/RowFilterTest.java
@@ -100,7 +100,7 @@ public class RowFilterTest extends TestCase
rows)));
}
- private List<Map<String,Object>> toList(Iterable<Map<String,Object>> rows)
+ static List<Map<String,Object>> toList(Iterable<Map<String,Object>> rows)
{
List<Map<String,Object>> rowList = new ArrayList<Map<String,Object>>();
for(Map<String,Object> row : rows) {
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-23 15:59:25 +0000