From 18f2ca2b74ca9ca67ede08b45b9fea0d19cf3ffe Mon Sep 17 00:00:00 2001 From: Colin Alworth Date: Fri, 14 Jun 2024 09:59:20 -0500 Subject: [PATCH 1/3] Correct call to get input table value columns --- .../java/io/deephaven/web/client/api/InputTableTestGwt.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/web/client-api/src/test/java/io/deephaven/web/client/api/InputTableTestGwt.java b/web/client-api/src/test/java/io/deephaven/web/client/api/InputTableTestGwt.java index 1d2457858c9..bd60bc1725d 100644 --- a/web/client-api/src/test/java/io/deephaven/web/client/api/InputTableTestGwt.java +++ b/web/client-api/src/test/java/io/deephaven/web/client/api/InputTableTestGwt.java @@ -34,7 +34,7 @@ public void testInputTable() { JsArray keyColumns = Js.uncheckedCast(inputTable.getKeyColumns()); assertEquals(2, keyColumns.filter((col, idx) -> col.getName() == "A" || col.getName() == "B").length); - JsArray valueColumns = Js.uncheckedCast(inputTable.getValues()); + JsArray valueColumns = Js.uncheckedCast(inputTable.getValueColumns()); assertEquals(4, valueColumns.filter((col, idx) -> col.getName() == "C" || col.getName() == "D" || col.getName() == "E" || col.getName() == "F").length); return null; @@ -47,7 +47,7 @@ public void testInputTable() { .then(inputTable -> { JsArray keyColumns = Js.uncheckedCast(inputTable.getKeyColumns()); assertEquals(1, keyColumns.filter((col, idx) -> col.getName() == "C").length); - JsArray valueColumns = Js.uncheckedCast(inputTable.getValues()); + JsArray valueColumns = Js.uncheckedCast(inputTable.getValueColumns()); assertEquals(5, valueColumns.filter((col, idx) -> col.getName() == "A" || col.getName() == "B" || col.getName() == "D" || col.getName() == "E" || col.getName() == "F").length); return null; @@ -61,7 +61,7 @@ public void testInputTable() { JsArray keyColumns = Js.uncheckedCast(inputTable.getKeyColumns()); assertEquals(2, keyColumns.filter((col, idx) -> col.getName() == "E" || col.getName() == "F").length); - JsArray valueColumns = Js.uncheckedCast(inputTable.getValues()); + JsArray valueColumns = Js.uncheckedCast(inputTable.getValueColumns()); assertEquals(4, valueColumns.filter((col, idx) -> col.getName() == "A" || col.getName() == "B" || col.getName() == "C" || col.getName() == "D").length); return null; From d5458ce4285baf99a6714a7a7374d3568ca70076 Mon Sep 17 00:00:00 2001 From: Colin Alworth Date: Fri, 14 Jun 2024 10:37:37 -0500 Subject: [PATCH 2/3] One test per connect+finish pair --- .../deephaven/web/client/api/InputTableTestGwt.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/web/client-api/src/test/java/io/deephaven/web/client/api/InputTableTestGwt.java b/web/client-api/src/test/java/io/deephaven/web/client/api/InputTableTestGwt.java index bd60bc1725d..20c5b393390 100644 --- a/web/client-api/src/test/java/io/deephaven/web/client/api/InputTableTestGwt.java +++ b/web/client-api/src/test/java/io/deephaven/web/client/api/InputTableTestGwt.java @@ -16,7 +16,7 @@ public class InputTableTestGwt extends AbstractAsyncGwtTestCase { .script("result3", "input_table(init_table=source, key_cols=[\"C\"])") .script("result4", "input_table(init_table=source, key_cols=[\"E\" , \"F\" ])"); - public void testInputTable() { + public void testNoKeyCols() { connect(tables) .then(table("result1")) .then(JsTable::inputTable) @@ -26,7 +26,8 @@ public void testInputTable() { return null; }) .then(this::finish).catch_(this::report); - + } + public void testFirstColsAreKeyCols() { connect(tables) .then(table("result2")) .then(JsTable::inputTable) @@ -40,7 +41,8 @@ public void testInputTable() { return null; }) .then(this::finish).catch_(this::report); - + } + public void testOneKeyCol() { connect(tables) .then(table("result3")) .then(JsTable::inputTable) @@ -53,7 +55,8 @@ public void testInputTable() { return null; }) .then(this::finish).catch_(this::report); - + } + public void testLaterColsAreKeyCols() { connect(tables) .then(table("result4")) .then(JsTable::inputTable) From 429a94fd9c50264522daa9f47a4faf3efd1aedc3 Mon Sep 17 00:00:00 2001 From: Colin Alworth Date: Fri, 14 Jun 2024 11:09:44 -0500 Subject: [PATCH 3/3] spotless --- .../java/io/deephaven/web/client/api/InputTableTestGwt.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/web/client-api/src/test/java/io/deephaven/web/client/api/InputTableTestGwt.java b/web/client-api/src/test/java/io/deephaven/web/client/api/InputTableTestGwt.java index 20c5b393390..843e9435ed3 100644 --- a/web/client-api/src/test/java/io/deephaven/web/client/api/InputTableTestGwt.java +++ b/web/client-api/src/test/java/io/deephaven/web/client/api/InputTableTestGwt.java @@ -27,6 +27,7 @@ public void testNoKeyCols() { }) .then(this::finish).catch_(this::report); } + public void testFirstColsAreKeyCols() { connect(tables) .then(table("result2")) @@ -42,6 +43,7 @@ public void testFirstColsAreKeyCols() { }) .then(this::finish).catch_(this::report); } + public void testOneKeyCol() { connect(tables) .then(table("result3")) @@ -56,6 +58,7 @@ public void testOneKeyCol() { }) .then(this::finish).catch_(this::report); } + public void testLaterColsAreKeyCols() { connect(tables) .then(table("result4"))