jira-595: revert test changes

hpcc-systems · May 16, 2024 · 3d47b98 · 3d47b98
1 parent 33b1823
commit 3d47b98
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 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
@@ -65,8 +65,12 @@
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class DFSReadWriteTest extends BaseRemoteTest
 {
-    private static final String[] datasets       = { "~benchmark::integer::20kb", "~benchmark::all_types::200kb"};//, "~unit_test::all_types::xml", "~unit_test::all_types::json", "~unit_test::all_types::csv" };
-    private static final int[]    expectedCounts = { 1250, 5600 };//, 10000, 10000, 10000, 10000};
+    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, 5600, 10000, 10000, 10000, 10000};
+
+    //use until standard test is working
+    //        private static final String[] datasets       = { "~benchmark::integer::20kb", "~benchmark::all_types::200kb"};//, "~unit_test::all_types::xml", "~unit_test::all_types::json", "~unit_test::all_types::csv" };
+    //        private static final int[]    expectedCounts = { 1250, 5600 };//, 10000, 10000, 10000, 10000};
     private static final Version newProtocolVersion = new Version(8,12,10);
 
 
@@ -141,7 +145,7 @@ public void nullCharTests() throws Exception
             writeFile(records, fileName, recordDef, connTO);
 
             HPCCFile file = new HPCCFile(fileName, connString , hpccUser, hpccPass);
-            List<HPCCRecord> readRecords = readFile(file, 100000, false, false, BinaryRecordReader.TRIM_STRINGS);
+            List<HPCCRecord> readRecords = readFile(file, 10000, false, false, BinaryRecordReader.TRIM_STRINGS);
 
             for (int i = 0; i < records.size(); i++)
             {
@@ -188,7 +192,7 @@ public void nullCharTests() throws Exception
             writeFile(records, fileName, recordDef, connTO);
 
             HPCCFile file = new HPCCFile(fileName, connString , hpccUser, hpccPass);
-            List<HPCCRecord> readRecords = readFile(file, 100000, false, false, BinaryRecordReader.TRIM_STRINGS);
+            List<HPCCRecord> readRecords = readFile(file, 10000, false, false, BinaryRecordReader.TRIM_STRINGS);
 
             for (int i = 0; i < records.size(); i++)
             {

diff --git a/wsclient/src/test/java/org/hpccsystems/ws/client/BaseRemoteTest.java b/wsclient/src/test/java/org/hpccsystems/ws/client/BaseRemoteTest.java
@@ -57,10 +57,10 @@ public abstract class BaseRemoteTest
 
     protected final static String connString = System.getProperty("hpccconn", "http://localhost:8010");
     protected static String thorClusterFileGroup = System.getProperty("thorgroupname");
-    protected final static String thorclustername = System.getProperty("thorclustername", "thor_120");
+    protected final static String thorclustername = System.getProperty("thorclustername", "thor");
 
     protected static String roxieClusterGroup = System.getProperty("roxiegroupname");
-    protected final static String roxieclustername = System.getProperty("roxieclustername", "roxie_120");
+    protected final static String roxieclustername = System.getProperty("roxieclustername", "roxie");
 
     protected final static String defaultUserName = "JunitUser";
     protected static Connection connection = null;
@@ -208,7 +208,7 @@ public boolean verify(String hostname,javax.net.ssl.SSLSession sslSession)
         // Run the generate-datasets.ecl script if present in the project resources
         try
         {
-        //    executeECLScript("generate-datasets.ecl");
+            executeECLScript("generate-datasets.ecl");
         }
         catch (Exception e)
         {