From 51ed0ef4d56973721380105092a4117221ff958d Mon Sep 17 00:00:00 2001 From: James McMullan Date: Wed, 11 Sep 2024 16:22:30 -0400 Subject: [PATCH] HPCC4J-641 DFSClient test suite dataset fix - Fixed issue with DFSClient test suite using incorrect datasets - Removed XML dataset from tests Signed-off-by: James McMullan James.McMullan@lexisnexis.com --- .../java/org/hpccsystems/dfs/client/DFSReadWriteTest.java | 5 +++-- dfsclient/src/test/resources/generate-datasets.ecl | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dfsclient/src/test/java/org/hpccsystems/dfs/client/DFSReadWriteTest.java b/dfsclient/src/test/java/org/hpccsystems/dfs/client/DFSReadWriteTest.java index 42912b843..4fd85ec15 100644 --- a/dfsclient/src/test/java/org/hpccsystems/dfs/client/DFSReadWriteTest.java +++ b/dfsclient/src/test/java/org/hpccsystems/dfs/client/DFSReadWriteTest.java @@ -63,8 +63,9 @@ @FixMethodOrder(MethodSorters.NAME_ASCENDING) public class DFSReadWriteTest extends BaseRemoteTest { - private static final String[] datasets = { "~benchmark::integer::20kb", "~unit_test::all_types::thor", "~unit_test::all_types::xml", "~unit_test::all_types::json", "~unit_test::all_types::csv" }; - private static final int[] expectedCounts = { 1250, 10000, 10000, 10000, 10000, 10000}; + // Note: These datasets are generated by dfsclient/src/target/resources/generate-datasets.ecl + private static final String[] datasets = { "~benchmark::integer::20kb", "~unit_test::all_types::thor", "~unit_test::all_types::json", "~unit_test::all_types::csv" }; + private static final int[] expectedCounts = { 1250, 100000, 100000, 100000}; private static final Version newProtocolVersion = new Version(8,12,10); diff --git a/dfsclient/src/test/resources/generate-datasets.ecl b/dfsclient/src/test/resources/generate-datasets.ecl index 26ffa5ad8..9daadec07 100644 --- a/dfsclient/src/test/resources/generate-datasets.ecl +++ b/dfsclient/src/test/resources/generate-datasets.ecl @@ -2,7 +2,7 @@ IMPORT Std; unique_keys := 100000; // Should be less than number of records unique_values := 10212; // Should be less than number of records -totalrecs1 := 10000; +totalrecs1 := 100000; childRec := {STRING8 childField1, INTEGER8 childField2, REAL8 childField3};