fix unit tests

git-svn-id: https://svn.code.sf.net/p/jackcess/code/jackcess/branches/jackcess-2@678 f203690c-595d-4dc9-a70b-905162fa7fd2

diff --git a/src/java/com/healthmarketscience/jackcess/ColumnImpl.java b/src/java/com/healthmarketscience/jackcess/ColumnImpl.java
index 2abbad4aca95a43207fd253102c51a8426739097..db84233b4b0eda428f5eb55d5b07f74538825b4e 100644 (file)
--- a/src/java/com/healthmarketscience/jackcess/ColumnImpl.java
+++ b/src/java/com/healthmarketscience/jackcess/ColumnImpl.java
@@ -225,7 +225,8 @@ public class ColumnImpl implements Column, Comparable<ColumnImpl> {
     _autoNumber = false;
     _autoNumberGenerator = null;
     _columnNumber = (short)colNumber;
-    _displayIndex = 0;
+    _columnIndex = colNumber;
+    _displayIndex = colNumber;
     _fixedDataOffset = fixedOffset;
     _varLenTableIndex = varLenIndex;
   }

diff --git a/test/src/java/com/healthmarketscience/jackcess/BigIndexTest.java b/test/src/java/com/healthmarketscience/jackcess/BigIndexTest.java
index d8cb5cb778b2e7941eec72d4834038e0230a21cd..91b51416145612e8b997dea0a46e3cd6517b58cf 100644 (file)
--- a/test/src/java/com/healthmarketscience/jackcess/BigIndexTest.java
+++ b/test/src/java/com/healthmarketscience/jackcess/BigIndexTest.java
@@ -85,9 +85,6 @@ public class BigIndexTest extends TestCase {
         t = (TableImpl)db.getTable("Table1");
         index = t.getIndex("col1");
 
-        System.out.println("BigIndexTest: Index type: " + 
-                           index.getIndexData().getClass());
-
         // add 2,000 (pseudo) random entries to the table
         Random rand = new Random(13L);
         for(int i = 0; i < 2000; ++i) {

diff --git a/test/src/java/com/healthmarketscience/jackcess/ErrorHandlerTest.java b/test/src/java/com/healthmarketscience/jackcess/ErrorHandlerTest.java
index 28c628ed894664808b4abed46d7501cc887fa242..13228384161feb3a0e8ea42dea32e3446a8f1577 100644 (file)
--- a/test/src/java/com/healthmarketscience/jackcess/ErrorHandlerTest.java
+++ b/test/src/java/com/healthmarketscience/jackcess/ErrorHandlerTest.java
@@ -143,14 +143,15 @@ public class ErrorHandlerTest extends TestCase
   }
 
   @SuppressWarnings("unchecked")
-  private void replaceColumn(Table t, String colName) throws Exception
+  private static void replaceColumn(Table t, String colName) throws Exception
   {
-    Field colsField = Table.class.getDeclaredField("_columns");
+    Field colsField = TableImpl.class.getDeclaredField("_columns");
     colsField.setAccessible(true);
     List<Column> cols = (List<Column>)colsField.get(t);
 
     Column srcCol = null;
-    Column destCol = new BogusColumn(t);
+    ColumnImpl destCol = new BogusColumn(t);
+    destCol.setName(colName);
     for(int i = 0; i < cols.size(); ++i) {
       srcCol = cols.get(i);
       if(srcCol.getName().equals(colName)) {
@@ -172,7 +173,7 @@ public class ErrorHandlerTest extends TestCase
   private static class BogusColumn extends ColumnImpl
   {
     private BogusColumn(Table table) {
-      super((TableImpl)table, DataType.TEXT, 0, 0, 0);
+      super((TableImpl)table, DataType.LONG, 1, 0, 0);
     }
     
     @Override

diff --git a/test/src/java/com/healthmarketscience/jackcess/FKEnforcerTest.java b/test/src/java/com/healthmarketscience/jackcess/FKEnforcerTest.java
index c640dbbc0ba36e3cf6b767bd6f713553d02732f5..30625dd6926dbd0e2c94e25de6180858cb69dfc0 100644 (file)
--- a/test/src/java/com/healthmarketscience/jackcess/FKEnforcerTest.java
+++ b/test/src/java/com/healthmarketscience/jackcess/FKEnforcerTest.java
@@ -43,6 +43,7 @@ public class FKEnforcerTest extends TestCase
     for (final TestDB testDB : TestDB.getSupportedForBasename(Basename.INDEX)) {
 
       Database db = openCopy(testDB);
+      db.setEnforceForeignKeys(false);
       Table t1 = db.getTable("Table1");
       Table t2 = db.getTable("Table2");
       Table t3 = db.getTable("Table3");
@@ -66,7 +67,6 @@ public class FKEnforcerTest extends TestCase
     for (final TestDB testDB : TestDB.getSupportedForBasename(Basename.INDEX)) {
 
       Database db = openCopy(testDB);
-      db.setEnforceForeignKeys(true);
       Table t1 = db.getTable("Table1");
       Table t2 = db.getTable("Table2");
       Table t3 = db.getTable("Table3");

diff --git a/test/src/java/com/healthmarketscience/jackcess/RowFilterTest.java b/test/src/java/com/healthmarketscience/jackcess/RowFilterTest.java
index 5542049d77003ac732bf375b62c95129e9f50fc6..d96ded82feb919261455779e4396fc2e01d11205 100644 (file)
--- a/test/src/java/com/healthmarketscience/jackcess/RowFilterTest.java
+++ b/test/src/java/com/healthmarketscience/jackcess/RowFilterTest.java
@@ -64,14 +64,15 @@ public class RowFilterTest extends TestCase
 
     List<Map<String,Object>> rows = Arrays.asList(row0, row1, row2, row3, row4, row5);
 
+    ColumnImpl testCol = new ColumnImpl(null, DataType.TEXT, 0, 0, 0);
+    testCol.setName(COL1);
     assertEquals(Arrays.asList(row0, row2, row4), 
-                 toList(RowFilter.matchPattern(
-                            new ColumnImpl(null, DataType.TEXT, 0, 0, 0),
+                 toList(RowFilter.matchPattern(testCol,
                             "foo").apply(rows)));
     assertEquals(Arrays.asList(row1, row3, row5), 
                  toList(RowFilter.invert(
                             RowFilter.matchPattern(
-                                new ColumnImpl(null, DataType.TEXT, 0, 0, 0),
+                                testCol,
                                 "foo")).apply(rows)));
 
     assertEquals(Arrays.asList(row0, row2, row4), 

diff --git a/test/src/java/com/healthmarketscience/jackcess/TableTest.java b/test/src/java/com/healthmarketscience/jackcess/TableTest.java
index 63d3faad97adad5019668d68c61cf14fdf3bc6dd..fe6596b18ae8388fbdba40d1e71eff8502bb8046 100644 (file)
--- a/test/src/java/com/healthmarketscience/jackcess/TableTest.java
+++ b/test/src/java/com/healthmarketscience/jackcess/TableTest.java
@@ -62,6 +62,7 @@ public class TableTest extends TestCase {
   }
   
   public void testCreateRow() throws Exception {
+    reset();
     newTestColumn(DataType.INT, false);
     newTestColumn(DataType.TEXT, false);
     newTestColumn(DataType.TEXT, false);
@@ -81,6 +82,7 @@ public class TableTest extends TestCase {
   }
 
   public void testUnicodeCompression() throws Exception {
+    reset();
     newTestColumn(DataType.TEXT, false);
     newTestColumn(DataType.MEMO, false);
     newTestTable();