enabled test for table.lookup. Throws more specific exceptions. Non-breaking as they are subclasses of RuntimeException

mekjaer · mekjaer · commit a2f48ffea2dc · 2013-11-12T12:41:39.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -104,3 +104,5 @@ tightdb_jni/src/java/lib/l*
 java/share/java/*.jar
 
 
+# when building lib on mac
+tightdb_jni/src/*.dylib
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     
 	<groupId>com.tightdb</groupId>
 	<artifactId>tightdb-parent</artifactId>
-	<version>0.1.2</version>
+	<version>0.1.3</version>
 	<packaging>pom</packaging>
 
 	<properties>
diff --git a/tightdb-java-core/src/main/java/com/tightdb/Table.java b/tightdb-java-core/src/main/java/com/tightdb/Table.java
@@ -1146,9 +1146,9 @@ public TableView findAllString(long columnIndex, String value) {
     @Override
     public long lookup(String value) {
         if (value == null)
-            throw new RuntimeException("String must not be null");
+            throw new NullPointerException("String must not be null");
         if (this.getColumnType(0) != ColumnType.STRING)
-            throw new RuntimeException("lookup() requires a String column.");
+            throw new UnsupportedOperationException("lookup() requires a String column.");
         return nativeLookup(nativePtr, value);
     }
 
diff --git a/tightdb-java-test/src/test/java/com/tightdb/JNITableTest.java b/tightdb-java-test/src/test/java/com/tightdb/JNITableTest.java
@@ -121,41 +121,46 @@ public void tableBinaryTest() {
         try { t.setBinaryByteArray(0, 2, nullByte); fail("Inserting null array"); } catch(NullPointerException e) { }
     }
     
-    /*
+    
     @Test
     public void lookupTableTest() {
         Table t = new Table();
       
-        t.addColumn(ColumnType.STRING, "col0");
-        t.addColumn(ColumnType.INTEGER, "col1");
+        long STRING_COL_INDEX = t.addColumn(ColumnType.STRING, "col0");
+        long INT_COL_INDEX = t.addColumn(ColumnType.INTEGER, "col1");
         
         t.add("s", 1);
         t.add("s", 2);
         t.add("ss",1);
         t.add("ss", 2);
+        t.add("", 2);
         
-        // Currently lookup works, even if no index has been set on first string column. Shouldn't there be an index? TODO
-        // try {  t.lookup("ss"); fail("Index not set"); } catch (RuntimeException r) { };
-        
+        assertEquals(0, t.lookup("s"));
         assertEquals(2, t.lookup("ss"));
+        assertEquals(4, t.lookup(""));
+        
+        assertEquals(false, t.hasIndex(STRING_COL_INDEX));
         
+        //try setting an index
         t.setIndex(0);
-        long rowIndex = t.lookup("ss");
-        assertEquals(1, t.getLong(1, rowIndex));
+        assertEquals(0, t.lookup("s"));
+        assertEquals(2, t.lookup("ss"));
+        assertEquals(4, t.lookup(""));
         
-        Table t2 = new Table();
+        // null lookup value
+        try {  t.lookup(null); fail("lookup value is null"); } catch (NullPointerException r) { };
+
         
+        // Try with non string column
+        Table t2 = new Table();
         t2.addColumn(ColumnType.INTEGER, "col0");
         t2.addColumn(ColumnType.INTEGER, "col1");
-        
         t2.add(1, 2);
         t2.add(3, 4);
         
-        try {  t2.lookup("ss"); fail("Column not String"); } catch (RuntimeException r) { };
+        try {  t2.lookup("ss"); fail("Column not String"); } catch (UnsupportedOperationException r) { };
     }
     
-*/
-    
     
     @Test
     public void getValuesFromNonExistingColumn() {

Original file line number	Diff line number	Diff line change
`@@ -104,3 +104,5 @@ tightdb_jni/src/java/lib/l*`
`104`	`104`	`java/share/java/*.jar`
`105`	`105`
`106`	`106`
	`107`	`+# when building lib on mac`
	`108`	`+tightdb_jni/src/*.dylib`