src/test/java/org/embulk/input/marketo/MarketoServiceImplTest.java in embulk-input-marketo-0.6.15 vs src/test/java/org/embulk/input/marketo/MarketoServiceImplTest.java in embulk-input-marketo-0.6.16

@@ -20,10 +20,12 @@
 import java.util.Arrays;
 import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
 
+import static org.mockito.ArgumentMatchers.any;
+
 /**
  * Created by tai.khuu on 10/9/17.
  */
 public class MarketoServiceImplTest
 {
@@ -43,16 +45,16 @@
     @Test
     public void extractLead() throws Exception
     {
         Date startDate = new Date(1507223374000L);
         Date endDate = new Date(1507655374000L);
-        List<String> extractedFields = Arrays.asList("field1", "field2");
+        List<String> extractedFields = Arrays.asList("field1", "fActivityBulkExtractInputPluginTest.java:78ield2");
         String filerField = "field1";
         String exportId = "exportId";
         Mockito.when(mockMarketoRestClient.createLeadBulkExtract(Mockito.eq(startDate), Mockito.eq(endDate), Mockito.eq(extractedFields), Mockito.eq(filerField))).thenReturn(exportId);
         ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream("Test File Content".getBytes());
-        Mockito.when(mockMarketoRestClient.getLeadBulkExtractResult(Mockito.eq(exportId), Mockito.any(BulkExtractRangeHeader.class))).thenReturn(byteArrayInputStream);
+        Mockito.when(mockMarketoRestClient.getLeadBulkExtractResult(Mockito.eq(exportId), any(BulkExtractRangeHeader.class))).thenReturn(byteArrayInputStream);
         File file = marketoService.extractLead(startDate, endDate, extractedFields, filerField, 1, 3);
         Assert.assertEquals("Test File Content", new String(ByteStreams.toByteArray(new FileInputStream(file))));
         Mockito.verify(mockMarketoRestClient, Mockito.times(1)).startLeadBulkExtract(Mockito.eq(exportId));
         Mockito.verify(mockMarketoRestClient, Mockito.times(1)).waitLeadExportJobComplete(Mockito.eq(exportId), Mockito.eq(1), Mockito.eq(3));
     }
@@ -60,14 +62,15 @@
     @Test
     public void extractAllActivity() throws Exception
     {
         Date startDate = new Date(1507223374000L);
         Date endDate = new Date(1507655374000L);
+        List<Integer> activityTypeIds = new ArrayList<>();
         String exportId = "exportId";
-        Mockito.when(mockMarketoRestClient.createActivityExtract(Mockito.eq(startDate), Mockito.eq(endDate))).thenReturn(exportId);
+        Mockito.when(mockMarketoRestClient.createActivityExtract(any(List.class), Mockito.eq(startDate), Mockito.eq(endDate))).thenReturn(exportId);
         ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream("Test File Content".getBytes());
-        Mockito.when(mockMarketoRestClient.getActivitiesBulkExtractResult(Mockito.eq(exportId), Mockito.any(BulkExtractRangeHeader.class))).thenReturn(byteArrayInputStream);
-        File file = marketoService.extractAllActivity(startDate, endDate, 1, 3);
+        Mockito.when(mockMarketoRestClient.getActivitiesBulkExtractResult(Mockito.eq(exportId), any(BulkExtractRangeHeader.class))).thenReturn(byteArrayInputStream);
+        File file = marketoService.extractAllActivity(activityTypeIds, startDate, endDate, 1, 3);
         Assert.assertEquals("Test File Content", new String(ByteStreams.toByteArray(new FileInputStream(file))));
         Mockito.verify(mockMarketoRestClient, Mockito.times(1)).startActitvityBulkExtract(Mockito.eq(exportId));
         Mockito.verify(mockMarketoRestClient, Mockito.times(1)).waitActitvityExportJobComplete(Mockito.eq(exportId), Mockito.eq(1), Mockito.eq(3));
     }