KdbTable: Use Java 8 forEach in buildFromRowList and more tests

Author: jasraj

src/main/java/com/buabook/kdb/data/KdbTable.java

@@ -289,11 +289,10 @@ public KdbDict getRow(int rowNumber) throws ArrayIndexOutOfBoundsException {
 	 * @return The new table
 	 * @see #addRow(KdbDict)
 	 */
-	public static KdbTable buildFromRowList(String name, List<KdbDict> rows) {
+	public static KdbTable buildFromRowList(String name, List<KdbDict> rows) throws TableSchemaMismatchException {
 		KdbTable table = new KdbTable(name);
 
-		for(KdbDict row : rows)
-			table.addRow(row);
+		rows.forEach(table::addRow);
 
 		return table;
 	}

src/test/java/com/buabook/kdb/data/test/KdbTableTest.java

@@ -17,6 +17,7 @@
 import com.buabook.kdb.exceptions.TableColumnAlreadyExistsException;
 import com.buabook.kdb.exceptions.TableSchemaMismatchException;
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
 import com.kx.c.Dict;
 import com.kx.c.Flip;
 
@@ -196,9 +197,11 @@ public void testAddRowMapAddsNewRow() {
 	@Test
 	public void testAddRowMapAddsConvertsListAndEnumTypesCorrectly() {
 		KdbTable table = new KdbTable("my-test-table");
-		KdbDict newRow = new KdbDict()
-									.add("nested-list", ImmutableList.of(1, 2, 3))
-									.add("enum", TestEnum.VALUE_1);
+		
+		Map<String, Object> newRow = ImmutableMap.<String, Object>builder()
+																		.put("nested-list", ImmutableList.of(1, 2, 3))
+																		.put("enum", TestEnum.VALUE_1)
+																		.build();
 
 		table.addRow(newRow);
 
@@ -245,6 +248,16 @@ public void testAppendAppendsTableToEndOfTable() {
 		assertThat(table.getRowCount(), is(equalTo(6)));
 	}
 
+	@Test
+	public void testAppendAppendsToEmptyTable() {
+		KdbTable empty = new KdbTable("my-test-table");
+		KdbTable toAppend = new KdbTable("my-test-table", getTable());
+		
+		empty.append(toAppend);
+		
+		assertThat(empty.getRowCount(), is(equalTo(3)));
+	}
+	
 	// KdbTable.getTableName
 
 	@Test
@@ -321,6 +334,69 @@ public void testChangeTableNameChangesTableName() {
 		assertThat(table.getTableName(), is(equalTo("some-other-table-name")));
 	}
 
+	// KdbTable.getRow
+	
+	@Test(expected=ArrayIndexOutOfBoundsException.class)
+	public void testGetRowThrowsExceptionIfRowNumberIsNegative() {
+		new KdbTable("my-table").getRow(-1);
+	}
+	
+	@Test(expected=ArrayIndexOutOfBoundsException.class)
+	public void testGetRowThrowsExceptionIfRowNumberGreaterThanRowCount() {
+		new KdbTable("my-table", getTable()).getRow(10);
+	}
+	
+	// KdbTable.fromObject
+	
+	@Test
+	public void testFromObjectReturnsNullIfNullObject() {
+		KdbTable fromFlip = KdbTable.fromObject(null);
+		
+		assertThat(fromFlip, is(nullValue()));
+	}
+	
+	@Test
+	public void testFromObjectReturnsNewObjectWithFlipData() {
+		KdbTable fromFlip = KdbTable.fromObject(getTable());
+		
+		assertThat(fromFlip.isEmpty(), is(equalTo(false)));
+		assertThat(fromFlip.getRowCount(), is(equalTo(3)));
+		assertThat(fromFlip.getTableName(), is(equalTo("table")));
+	}
+	
+	// KdbTable.iterator
+	
+	@Test
+	public void testIteratorIteratesOverAllRowsOfTable() {
+		KdbTable toIterate = new KdbTable("a-table", getTable());
+		
+		int iterateCount = 0;
+		
+		for(KdbDict row : toIterate) {
+			assertThat(row.getDataStore(), hasKey("key1"));
+			assertThat(row.getDataStore(), hasKey("key2"));
+			assertThat(row.getDataStore(), hasKey("key3"));
+			
+			iterateCount++;
+		}
+			
+		assertThat(iterateCount, is(equalTo(toIterate.getRowCount())));
+	}
+	
+	// KdbTable.stream
+	
+	@Test
+	public void testStreamIteratesOverAllRowsOfTable() {
+		KdbTable toIterate = new KdbTable("a-table", getTable());
+		
+		toIterate.stream()
+						.forEach((row) -> {
+							assertThat(row.getDataStore(), hasKey("key1"));
+							assertThat(row.getDataStore(), hasKey("key2"));
+							assertThat(row.getDataStore(), hasKey("key3"));
+						});
+	}
+	
 
 	private Flip getTable() {
 		String[] keys = { "key1", "key2", "key3" };