Merge pull request #1207 from ashitsalesforce/master

include Bulk v2 in extractall tests
forcedotcom · Aug 6, 2024 · cbca161 · cbca161
2 parents d8dbb1f + a96dd5b
commit cbca161
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/src/test/java/com/salesforce/dataloader/process/CsvExtractAllProcessTest.java b/src/test/java/com/salesforce/dataloader/process/CsvExtractAllProcessTest.java
@@ -56,7 +56,7 @@ public static Collection<Object[]> getParameters() {
                 // Bulk API
                 TestVariant.forSettings(TestSetting.BULK_API_ENABLED, TestSetting.BULK_V2_API_DISABLED)
                 // Bulk V2 Query API does not support query_all
-                // TestVariant.forSettings(TestSetting.BULK_API_ENABLED, TestSetting.BULK_V2_API_ENABLED)
+                TestVariant.forSettings(TestSetting.BULK_API_ENABLED, TestSetting.BULK_V2_API_ENABLED)
             );
     }
 

diff --git a/src/test/java/com/salesforce/dataloader/process/ProcessExtractTestBase.java b/src/test/java/com/salesforce/dataloader/process/ProcessExtractTestBase.java
@@ -478,9 +478,4 @@ protected String[] insertExtractTestRecords(int numRecords, SObjectGenerator sOb
         }
         return ids;
     }
-
-    protected boolean isBulkV2APIEnabled(Map<String, String> argMap) {
-        // bulk v2 api is not used for query all
-        return !isExtractAll() && super.isBulkV2APIEnabled(argMap);
-    }
 }