From 8b9655b0427edd72e25d507973103222f7bccdcb Mon Sep 17 00:00:00 2001 From: James McMullan Date: Wed, 1 Nov 2023 09:09:50 -0400 Subject: [PATCH] HPCC4J-511 Test failures in containerized environment - Re-enabled tests that are now passing Signed-off-by: James McMullan James.McMullan@lexisnexis.com --- .../java/org/hpccsystems/dfs/client/DFSIndexTest.java | 1 + .../org/hpccsystems/ws/client/WSFileIOClientTest.java | 8 +------- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dfsclient/src/test/java/org/hpccsystems/dfs/client/DFSIndexTest.java b/dfsclient/src/test/java/org/hpccsystems/dfs/client/DFSIndexTest.java index d4abc553a..ecfada6ac 100644 --- a/dfsclient/src/test/java/org/hpccsystems/dfs/client/DFSIndexTest.java +++ b/dfsclient/src/test/java/org/hpccsystems/dfs/client/DFSIndexTest.java @@ -355,6 +355,7 @@ String createIndexOnDataset(String datasetName, FieldDef recordDef) throws Excep return indexName; } + @Test public void testBatchRandomAccess() throws Exception { try diff --git a/wsclient/src/test/java/org/hpccsystems/ws/client/WSFileIOClientTest.java b/wsclient/src/test/java/org/hpccsystems/ws/client/WSFileIOClientTest.java index 4b81cea1c..d2494eca0 100644 --- a/wsclient/src/test/java/org/hpccsystems/ws/client/WSFileIOClientTest.java +++ b/wsclient/src/test/java/org/hpccsystems/ws/client/WSFileIOClientTest.java @@ -70,6 +70,7 @@ public void copyFile() throws Exception { Assume.assumeFalse("Test not valid on containerized HPCC environment", client.isTargetHPCCContainerized()); assumeTrue("Ignoring test 'copyFile' because HPCC-30117 is not fixed", HPCC_30117.equalsIgnoreCase("fixed")); + String lzfile=System.currentTimeMillis() + "_csvtest.csv"; String hpccfilename="temp::" + lzfile; client.createHPCCFile(lzfile, targetLZ, true); @@ -145,8 +146,6 @@ public void copyFile() throws Exception @Test public void AcreateHPCCFile() throws Exception, ArrayOfEspExceptionWrapper { - Assume.assumeFalse("Test not valid on containerized HPCC environment", client.isTargetHPCCContainerized()); - assumeTrue("Ignoring test 'copyFile' because HPCC-30117 is not fixed", HPCC_30117.equalsIgnoreCase("fixed")); System.out.println("Creating file: '" + testfilename + "' on LandingZone: '" + targetLZ + "' on HPCC: '" + super.connString +"'"); Assert.assertTrue(client.createHPCCFile(testfilename, targetLZ, true)); } @@ -154,8 +153,6 @@ public void AcreateHPCCFile() throws Exception, ArrayOfEspExceptionWrapper @Test public void BwriteHPCCFile() throws Exception, ArrayOfEspExceptionWrapper { - assumeTrue("Ignoring test 'copyFile' because HPCC-30117 is not fixed", HPCC_30117.equalsIgnoreCase("fixed")); - System.out.println("Writing data to file: '" + testfilename + "' on LandingZone: '" + targetLZ + "' on HPCC: '" + super.connString +"'"); byte[] data = "HELLO MY DARLING, HELLO MY DEAR!1234567890ABCDEFGHIJKLMNOPQRSTUVXYZ".getBytes(); Assert.assertTrue(client.writeHPCCFileData(data, testfilename, targetLZ, true, 0, 20)); } @@ -163,9 +160,6 @@ public void BwriteHPCCFile() throws Exception, ArrayOfEspExceptionWrapper @Test public void CreadHPCCFile() throws Exception, ArrayOfEspExceptionWrapper { - Assume.assumeFalse("Test not valid on containerized HPCC environment", client.isTargetHPCCContainerized()); - assumeTrue("Ignoring test 'copyFile' because HPCC-30117 is not fixed", HPCC_30117.equalsIgnoreCase("fixed")); - System.out.println("reading data from file: '" + testfilename + "' on LandingZone: '" + targetLZ + "' on HPCC: '" + super.connString +"'"); byte[] data = "HELLO MY DARLING, HELLO MY DEAR!1234567890ABCDEFGHIJKLMNOPQRSTUVXYZ".getBytes(); String response = client.readFileData(targetLZ, testfilename, data.length, 0);