embulk-input-marketo 0.6.0 → 0.6.1.alpha.1

data/src/test/java/org/embulk/input/marketo/delegate/ActivityBulkExtractInputPluginTest.java

@@ -6,6 +6,7 @@ import org.embulk.base.restclient.record.ValueLocator;
 import org.embulk.config.ConfigLoader;
 import org.embulk.config.ConfigSource;
 import org.embulk.config.TaskReport;
+import org.embulk.input.marketo.model.BulkExtractRangeHeader;
 import org.embulk.input.marketo.rest.MarketoRestClient;
 import org.embulk.spi.Column;
 import org.embulk.spi.PageBuilder;
@@ -14,6 +15,7 @@ import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
+import org.mockito.Mockito;
 
 import java.io.IOException;
 import java.util.Arrays;
@@ -23,7 +25,6 @@ import java.util.Set;
 
 import static org.junit.Assert.assertEquals;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.*;
 
 /**
  * Created by khuutantaitai on 10/3/17.
@@ -42,11 +43,11 @@ public class ActivityBulkExtractInputPluginTest
     @Before
     public void prepare() throws IOException
     {
-        activityBulkExtractInputPlugin = spy(new ActivityBulkExtractInputPlugin());
+        activityBulkExtractInputPlugin = Mockito.spy(new ActivityBulkExtractInputPlugin());
         ConfigLoader configLoader = embulkTestRuntime.getInjector().getInstance(ConfigLoader.class);
         configSource = configLoader.fromYaml(this.getClass().getResourceAsStream("/config/activity_bulk_extract_config.yaml"));
-        mockMarketoRestclient = mock(MarketoRestClient.class);
-        doReturn(mockMarketoRestclient).when(activityBulkExtractInputPlugin).createMarketoRestClient(any(ActivityBulkExtractInputPlugin.PluginTask.class));
+        mockMarketoRestclient = Mockito.mock(MarketoRestClient.class);
+        Mockito.doReturn(mockMarketoRestclient).when(activityBulkExtractInputPlugin).createMarketoRestClient(any(ActivityBulkExtractInputPlugin.PluginTask.class));
     }
 
     @Test
@@ -54,25 +55,25 @@ public class ActivityBulkExtractInputPluginTest
     {
         ActivityBulkExtractInputPlugin.PluginTask task = configSource.loadConfig(ActivityBulkExtractInputPlugin.PluginTask.class);
         DateTime startDate = new DateTime(task.getFromDate());
-        PageBuilder pageBuilder = mock(PageBuilder.class);
+        PageBuilder pageBuilder = Mockito.mock(PageBuilder.class);
         String exportId1 = "exportId1";
         String exportId2 = "exportId2";
-        when(mockMarketoRestclient.createActivityExtract(any(Date.class), any(Date.class))).thenReturn(exportId1).thenReturn(exportId2).thenReturn(null);
-        when(mockMarketoRestclient.getActivitiesBulkExtractResult(eq(exportId1))).thenReturn(this.getClass().getResourceAsStream("/fixtures/activity_extract1.csv"));
-        when(mockMarketoRestclient.getActivitiesBulkExtractResult(eq(exportId2))).thenReturn(this.getClass().getResourceAsStream("/fixtures/activity_extract2.csv"));
+        Mockito.when(mockMarketoRestclient.createActivityExtract(any(Date.class), any(Date.class))).thenReturn(exportId1).thenReturn(exportId2).thenReturn(null);
+        Mockito.when(mockMarketoRestclient.getActivitiesBulkExtractResult(Mockito.eq(exportId1), any(BulkExtractRangeHeader.class))).thenReturn(this.getClass().getResourceAsStream("/fixtures/activity_extract1.csv"));
+        Mockito.when(mockMarketoRestclient.getActivitiesBulkExtractResult(Mockito.eq(exportId2), any(BulkExtractRangeHeader.class))).thenReturn(this.getClass().getResourceAsStream("/fixtures/activity_extract2.csv"));
         ServiceResponseMapper<? extends ValueLocator> mapper = activityBulkExtractInputPlugin.buildServiceResponseMapper(task);
         activityBulkExtractInputPlugin.validateInputTask(task);
         TaskReport taskReport = activityBulkExtractInputPlugin.ingestServiceData(task, mapper.createRecordImporter(), 1, pageBuilder);
         ArgumentCaptor<String> argumentCaptor = ArgumentCaptor.forClass(String.class);
         Column marketoGUID = mapper.getEmbulkSchema().lookupColumn("marketoGUID");
-        verify(pageBuilder, times(55)).setString(eq(marketoGUID), argumentCaptor.capture());
-        verify(mockMarketoRestclient, times(1)).startActitvityBulkExtract(eq(exportId1));
-        verify(mockMarketoRestclient, times(1)).waitActitvityExportJobComplete(eq(exportId1), eq(task.getPollingIntervalSecond()), eq(task.getBulkJobTimeoutSecond()));
-        verify(mockMarketoRestclient, times(1)).startActitvityBulkExtract(eq(exportId2));
-        verify(mockMarketoRestclient, times(1)).waitActitvityExportJobComplete(eq(exportId2), eq(task.getPollingIntervalSecond()), eq(task.getBulkJobTimeoutSecond()));
-        verify(mockMarketoRestclient, times(1)).createActivityExtract(startDate.toDate(), startDate.plusDays(30).toDate());
+        Mockito.verify(pageBuilder, Mockito.times(55)).setString(Mockito.eq(marketoGUID), argumentCaptor.capture());
+        Mockito.verify(mockMarketoRestclient, Mockito.times(1)).startActitvityBulkExtract(Mockito.eq(exportId1));
+        Mockito.verify(mockMarketoRestclient, Mockito.times(1)).waitActitvityExportJobComplete(Mockito.eq(exportId1), Mockito.eq(task.getPollingIntervalSecond()), Mockito.eq(task.getBulkJobTimeoutSecond()));
+        Mockito.verify(mockMarketoRestclient, Mockito.times(1)).startActitvityBulkExtract(Mockito.eq(exportId2));
+        Mockito.verify(mockMarketoRestclient, Mockito.times(1)).waitActitvityExportJobComplete(Mockito.eq(exportId2), Mockito.eq(task.getPollingIntervalSecond()), Mockito.eq(task.getBulkJobTimeoutSecond()));
+        Mockito.verify(mockMarketoRestclient, Mockito.times(1)).createActivityExtract(startDate.toDate(), startDate.plusDays(30).toDate());
         DateTime startDate2 = startDate.plusDays(30).plusSeconds(1);
-        verify(mockMarketoRestclient, times(1)).createActivityExtract(startDate2.toDate(), startDate.plusDays(task.getFetchDays()).toDate());
+        Mockito.verify(mockMarketoRestclient, Mockito.times(1)).createActivityExtract(startDate2.toDate(), startDate.plusDays(task.getFetchDays()).toDate());
         List<String> marketoUids = argumentCaptor.getAllValues();
         assertEquals(55, marketoUids.size());
         long latestFetchTime = taskReport.get(Long.class, "latest_fetch_time");

data/src/test/java/org/embulk/input/marketo/delegate/CampaignInputPluginTest.java

@@ -17,12 +17,12 @@ import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
+import org.mockito.Mockito;
 
 import java.io.IOException;
 import java.util.List;
 
 import static org.junit.Assert.assertArrayEquals;
-import static org.mockito.Mockito.*;
 
 /**
  * Created by tai.khuu on 10/10/17.
@@ -43,30 +43,30 @@ public class CampaignInputPluginTest
     @Before
     public void setUp() throws Exception
     {
-        campaignInputPlugin = spy(new CampaignInputPlugin());
+        campaignInputPlugin = Mockito.spy(new CampaignInputPlugin());
         ConfigLoader configLoader = embulkTestRuntime.getInjector().getInstance(ConfigLoader.class);
         configSource = configLoader.fromYaml(this.getClass().getResourceAsStream("/config/rest_config.yaml"));
-        mockMarketoRestClient = mock(MarketoRestClient.class);
-        doReturn(mockMarketoRestClient).when(campaignInputPlugin).createMarketoRestClient(any(CampaignInputPlugin.PluginTask.class));
+        mockMarketoRestClient = Mockito.mock(MarketoRestClient.class);
+        Mockito.doReturn(mockMarketoRestClient).when(campaignInputPlugin).createMarketoRestClient(Mockito.any(CampaignInputPlugin.PluginTask.class));
     }
 
     @Test
     public void testRun() throws IOException
     {
-        RecordPagingIterable<ObjectNode> mockRecordPagingIterable = mock(RecordPagingIterable.class);
+        RecordPagingIterable<ObjectNode> mockRecordPagingIterable = Mockito.mock(RecordPagingIterable.class);
         JavaType javaType = OBJECT_MAPPER.getTypeFactory().constructParametrizedType(List.class, List.class, ObjectNode.class);
         List<ObjectNode> objectNodeList = OBJECT_MAPPER.readValue(this.getClass().getResourceAsStream("/fixtures/campaign_response_full.json"), javaType);
-        when(mockRecordPagingIterable.iterator()).thenReturn(objectNodeList.iterator());
-        when(mockMarketoRestClient.getCampaign()).thenReturn(mockRecordPagingIterable);
+        Mockito.when(mockRecordPagingIterable.iterator()).thenReturn(objectNodeList.iterator());
+        Mockito.when(mockMarketoRestClient.getCampaign()).thenReturn(mockRecordPagingIterable);
         CampaignInputPlugin.PluginTask task = configSource.loadConfig(CampaignInputPlugin.PluginTask.class);
         ServiceResponseMapper<? extends ValueLocator> mapper = campaignInputPlugin.buildServiceResponseMapper(task);
         RecordImporter recordImporter = mapper.createRecordImporter();
-        PageBuilder mockPageBuilder = mock(PageBuilder.class);
+        PageBuilder mockPageBuilder = Mockito.mock(PageBuilder.class);
         campaignInputPlugin.ingestServiceData(task, recordImporter, 1, mockPageBuilder);
-        verify(mockMarketoRestClient, times(1)).getCampaign();
+        Mockito.verify(mockMarketoRestClient, Mockito.times(1)).getCampaign();
         Schema embulkSchema = mapper.getEmbulkSchema();
         ArgumentCaptor<Long> longArgumentCaptor = ArgumentCaptor.forClass(Long.class);
-        verify(mockPageBuilder, times(10)).setLong(eq(embulkSchema.lookupColumn("id")), longArgumentCaptor.capture());
+        Mockito.verify(mockPageBuilder, Mockito.times(10)).setLong(Mockito.eq(embulkSchema.lookupColumn("id")), longArgumentCaptor.capture());
         List<Long> allValues = longArgumentCaptor.getAllValues();
         assertArrayEquals(new Long[]{1003L, 1004L, 1005L, 1006L, 1007L, 1008L, 1029L, 1048L, 1051L, 1065L}, allValues.toArray());
     }

data/src/test/java/org/embulk/input/marketo/delegate/LeadBulkExtractInputPluginTest.java

@@ -9,25 +9,26 @@ import org.embulk.config.ConfigLoader;
 import org.embulk.config.ConfigSource;
 import org.embulk.config.TaskReport;
 import org.embulk.input.marketo.MarketoUtils;
+import org.embulk.input.marketo.model.BulkExtractRangeHeader;
 import org.embulk.input.marketo.model.MarketoField;
 import org.embulk.input.marketo.rest.MarketoRestClient;
 import org.embulk.spi.Column;
 import org.embulk.spi.PageBuilder;
 import org.joda.time.DateTime;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
+import org.mockito.Mockito;
 
 import java.io.IOException;
 import java.util.Date;
 import java.util.List;
 import java.util.Set;
 
-import static org.junit.Assert.*;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.*;
 
 /**
  * Created by khuutantaitai on 10/3/17.
@@ -48,11 +49,11 @@ public class LeadBulkExtractInputPluginTest
     @Before
     public void prepare() throws IOException
     {
-        bulkExtractInputPlugin = spy(new LeadBulkExtractInputPlugin());
+        bulkExtractInputPlugin = Mockito.spy(new LeadBulkExtractInputPlugin());
         ConfigLoader configLoader = embulkTestRuntime.getInjector().getInstance(ConfigLoader.class);
         configSource = configLoader.fromYaml(this.getClass().getResourceAsStream("/config/lead_bulk_extract_config.yaml"));
-        mockMarketoRestclient = mock(MarketoRestClient.class);
-        doReturn(mockMarketoRestclient).when(bulkExtractInputPlugin).createMarketoRestClient(any(LeadBulkExtractInputPlugin.PluginTask.class));
+        mockMarketoRestclient = Mockito.mock(MarketoRestClient.class);
+        Mockito.doReturn(mockMarketoRestclient).when(bulkExtractInputPlugin).createMarketoRestClient(any(LeadBulkExtractInputPlugin.PluginTask.class));
     }
 
     @Test
@@ -60,35 +61,35 @@ public class LeadBulkExtractInputPluginTest
     {
         LeadBulkExtractInputPlugin.PluginTask task = configSource.loadConfig(LeadBulkExtractInputPlugin.PluginTask.class);
         DateTime startDate = new DateTime(task.getFromDate());
-        PageBuilder pageBuilder = mock(PageBuilder.class);
+        PageBuilder pageBuilder = Mockito.mock(PageBuilder.class);
         String exportId1 = "exportId1";
         String exportId2 = "exportId2";
         JavaType javaType = OBJECT_MAPPER.getTypeFactory().constructParametrizedType(List.class, List.class, MarketoField.class);
         List<MarketoField> marketoFields = OBJECT_MAPPER.readValue(this.getClass().getResourceAsStream("/fixtures/lead_describe_marketo_fields_full.json"), javaType);
         List<String> fieldNameFromMarketoFields = MarketoUtils.getFieldNameFromMarketoFields(marketoFields);
-        when(mockMarketoRestclient.describeLead()).thenReturn(marketoFields);
-        when(mockMarketoRestclient.createLeadBulkExtract(any(Date.class), any(Date.class), any(List.class), any(String.class))).thenReturn(exportId1).thenReturn(exportId2).thenReturn(null);
-        when(mockMarketoRestclient.getLeadBulkExtractResult(eq(exportId1))).thenReturn(this.getClass().getResourceAsStream("/fixtures/lead_extract1.csv"));
-        when(mockMarketoRestclient.getLeadBulkExtractResult(eq(exportId2))).thenReturn(this.getClass().getResourceAsStream("/fixtures/leads_extract2.csv"));
+        Mockito.when(mockMarketoRestclient.describeLead()).thenReturn(marketoFields);
+        Mockito.when(mockMarketoRestclient.createLeadBulkExtract(any(Date.class), any(Date.class), any(List.class), any(String.class))).thenReturn(exportId1).thenReturn(exportId2).thenReturn(null);
+        Mockito.when(mockMarketoRestclient.getLeadBulkExtractResult(eq(exportId1), any(BulkExtractRangeHeader.class))).thenReturn(this.getClass().getResourceAsStream("/fixtures/lead_extract1.csv"));
+        Mockito.when(mockMarketoRestclient.getLeadBulkExtractResult(eq(exportId2), any(BulkExtractRangeHeader.class))).thenReturn(this.getClass().getResourceAsStream("/fixtures/leads_extract2.csv"));
         ServiceResponseMapper<? extends ValueLocator> mapper = bulkExtractInputPlugin.buildServiceResponseMapper(task);
         bulkExtractInputPlugin.validateInputTask(task);
         TaskReport taskReport = bulkExtractInputPlugin.ingestServiceData(task, mapper.createRecordImporter(), 1, pageBuilder);
         ArgumentCaptor<Long> argumentCaptor = ArgumentCaptor.forClass(Long.class);
         Column idColumn = mapper.getEmbulkSchema().lookupColumn("mk_id");
-        verify(pageBuilder, times(19)).setLong(eq(idColumn), argumentCaptor.capture());
-        verify(mockMarketoRestclient, times(1)).startLeadBulkExtract(eq(exportId1));
-        verify(mockMarketoRestclient, times(1)).waitLeadExportJobComplete(eq(exportId1), eq(task.getPollingIntervalSecond()), eq(task.getBulkJobTimeoutSecond()));
-        verify(mockMarketoRestclient, times(1)).startLeadBulkExtract(eq(exportId2));
-        verify(mockMarketoRestclient, times(1)).waitLeadExportJobComplete(eq(exportId2), eq(task.getPollingIntervalSecond()), eq(task.getBulkJobTimeoutSecond()));
+        Mockito.verify(pageBuilder, Mockito.times(19)).setLong(eq(idColumn), argumentCaptor.capture());
+        Mockito.verify(mockMarketoRestclient, Mockito.times(1)).startLeadBulkExtract(eq(exportId1));
+        Mockito.verify(mockMarketoRestclient, Mockito.times(1)).waitLeadExportJobComplete(eq(exportId1), eq(task.getPollingIntervalSecond()), eq(task.getBulkJobTimeoutSecond()));
+        Mockito.verify(mockMarketoRestclient, Mockito.times(1)).startLeadBulkExtract(eq(exportId2));
+        Mockito.verify(mockMarketoRestclient, Mockito.times(1)).waitLeadExportJobComplete(eq(exportId2), eq(task.getPollingIntervalSecond()), eq(task.getBulkJobTimeoutSecond()));
         String filterField = "updatedAt";
-        verify(mockMarketoRestclient, times(1)).createLeadBulkExtract(startDate.toDate(), startDate.plusDays(30).toDate(), fieldNameFromMarketoFields, filterField);
+        Mockito.verify(mockMarketoRestclient, Mockito.times(1)).createLeadBulkExtract(startDate.toDate(), startDate.plusDays(30).toDate(), fieldNameFromMarketoFields, filterField);
         DateTime startDate2 = startDate.plusDays(30).plusSeconds(1);
-        verify(mockMarketoRestclient, times(1)).createLeadBulkExtract(startDate2.toDate(), startDate.plusDays(task.getFetchDays()).toDate(), fieldNameFromMarketoFields, filterField);
+        Mockito.verify(mockMarketoRestclient, Mockito.times(1)).createLeadBulkExtract(startDate2.toDate(), startDate.plusDays(task.getFetchDays()).toDate(), fieldNameFromMarketoFields, filterField);
         List<Long> leadIds = argumentCaptor.getAllValues();
-        assertEquals(19, leadIds.size());
+        Assert.assertEquals(19, leadIds.size());
         long latestFetchTime = taskReport.get(Long.class, "latest_fetch_time");
-        assertTrue(taskReport.get(Set.class, "latest_uids").isEmpty());
-        assertEquals(1504888753000L, latestFetchTime);
-        assertArrayEquals(new Long[]{102488L, 102456L, 102445L, 102439L, 102471L, 102503L, 102424L, 102473L, 102505L, 102492L, 102495L, 102452L, 102435L, 102467L, 102420L, 102496L, 102448L, 102499L, 102431L}, leadIds.toArray());
+        Assert.assertTrue(taskReport.get(Set.class, "latest_uids").isEmpty());
+        Assert.assertEquals(1504888753000L, latestFetchTime);
+        Assert.assertArrayEquals(new Long[]{102488L, 102456L, 102445L, 102439L, 102471L, 102503L, 102424L, 102473L, 102505L, 102492L, 102495L, 102452L, 102435L, 102467L, 102420L, 102496L, 102448L, 102499L, 102431L}, leadIds.toArray());
     }
 }

data/src/test/java/org/embulk/input/marketo/delegate/LeadWithListInputPluginTest.java

@@ -3,6 +3,7 @@ package org.embulk.input.marketo.delegate;
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.apache.commons.lang3.StringUtils;
 import org.embulk.EmbulkTestRuntime;
 import org.embulk.base.restclient.ServiceResponseMapper;
 import org.embulk.base.restclient.record.RecordImporter;
@@ -19,6 +20,7 @@ import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
+import org.mockito.Mockito;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -27,7 +29,6 @@ import java.util.List;
 import static org.junit.Assert.assertEquals;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.*;
 
 /**
  * Created by tai.khuu on 10/10/17.
@@ -48,49 +49,50 @@ public class LeadWithListInputPluginTest
     @Before
     public void setUp() throws Exception
     {
-        leadWithListInputPlugin = spy(new LeadWithListInputPlugin());
+        leadWithListInputPlugin = Mockito.spy(new LeadWithListInputPlugin());
         ConfigLoader configLoader = embulkTestRuntime.getInjector().getInstance(ConfigLoader.class);
         configSource = configLoader.fromYaml(this.getClass().getResourceAsStream("/config/rest_config.yaml"));
-        mockMarketoRestClient = mock(MarketoRestClient.class);
-        doReturn(mockMarketoRestClient).when(leadWithListInputPlugin).createMarketoRestClient(any(LeadWithListInputPlugin.PluginTask.class));
+        mockMarketoRestClient = Mockito.mock(MarketoRestClient.class);
+        Mockito.doReturn(mockMarketoRestClient).when(leadWithListInputPlugin).createMarketoRestClient(any(LeadWithListInputPlugin.PluginTask.class));
     }
 
     @Test
     public void testRun() throws IOException
     {
-        RecordPagingIterable<ObjectNode> mockLeadRecordPagingIterable = mock(RecordPagingIterable.class);
-        RecordPagingIterable<ObjectNode> mockLeadEmptyRecordPagingIterable = mock(RecordPagingIterable.class);
-        RecordPagingIterable<ObjectNode> mocklistRecords = mock(RecordPagingIterable.class);
+        RecordPagingIterable<ObjectNode> mockLeadRecordPagingIterable = Mockito.mock(RecordPagingIterable.class);
+        RecordPagingIterable<ObjectNode> mockLeadEmptyRecordPagingIterable = Mockito.mock(RecordPagingIterable.class);
+        RecordPagingIterable<ObjectNode> mocklistRecords = Mockito.mock(RecordPagingIterable.class);
 
-        when(mockLeadEmptyRecordPagingIterable.iterator()).thenReturn(new ArrayList<ObjectNode>().iterator());
+        Mockito.when(mockLeadEmptyRecordPagingIterable.iterator()).thenReturn(new ArrayList<ObjectNode>().iterator());
         JavaType objectNodeListType = OBJECT_MAPPER.getTypeFactory().constructParametrizedType(List.class, List.class, ObjectNode.class);
         JavaType marketoFieldsType = OBJECT_MAPPER.getTypeFactory().constructParametrizedType(List.class, List.class, MarketoField.class);
         List<ObjectNode> leads = OBJECT_MAPPER.readValue(this.getClass().getResourceAsStream("/fixtures/lead_response_full.json"), objectNodeListType);
         List<ObjectNode> lists = OBJECT_MAPPER.readValue(this.getClass().getResourceAsStream("/fixtures/list_reponse_full.json"), objectNodeListType);
-        when(mocklistRecords.iterator()).thenReturn(lists.iterator());
+        Mockito.when(mocklistRecords.iterator()).thenReturn(lists.iterator());
         List<MarketoField> marketoFields = OBJECT_MAPPER.readValue(this.getClass().getResourceAsStream("/fixtures/lead_describe_marketo_fields_full.json"), marketoFieldsType);
-        when(mockLeadRecordPagingIterable.iterator()).thenReturn(leads.iterator());
-        when(mockMarketoRestClient.describeLead()).thenReturn(marketoFields);
-        when(mockMarketoRestClient.getLists()).thenReturn(mocklistRecords);
+        Mockito.when(mockLeadRecordPagingIterable.iterator()).thenReturn(leads.iterator());
+        Mockito.when(mockMarketoRestClient.describeLead()).thenReturn(marketoFields);
+        Mockito.when(mockMarketoRestClient.getLists()).thenReturn(mocklistRecords);
         List<String> fieldNameFromMarketoFields = MarketoUtils.getFieldNameFromMarketoFields(marketoFields);
-        when(mockMarketoRestClient.getLeadsByList(anyString(), eq(fieldNameFromMarketoFields))).thenReturn(mockLeadEmptyRecordPagingIterable);
-        when(mockMarketoRestClient.getLeadsByList("1009", fieldNameFromMarketoFields)).thenReturn(mockLeadRecordPagingIterable);
+        String fieldNameString = StringUtils.join(fieldNameFromMarketoFields, ",");
+        Mockito.when(mockMarketoRestClient.getLeadsByList(Mockito.anyString(), eq(fieldNameString))).thenReturn(mockLeadEmptyRecordPagingIterable);
+        Mockito.when(mockMarketoRestClient.getLeadsByList("1009", fieldNameString)).thenReturn(mockLeadRecordPagingIterable);
 
         LeadWithListInputPlugin.PluginTask task = configSource.loadConfig(LeadWithListInputPlugin.PluginTask.class);
         ServiceResponseMapper<? extends ValueLocator> mapper = leadWithListInputPlugin.buildServiceResponseMapper(task);
 
         RecordImporter recordImporter = mapper.createRecordImporter();
-        PageBuilder mockPageBuilder = mock(PageBuilder.class);
+        PageBuilder mockPageBuilder = Mockito.mock(PageBuilder.class);
         leadWithListInputPlugin.ingestServiceData(task, recordImporter, 1, mockPageBuilder);
-        verify(mockMarketoRestClient, times(1)).getLists();
-        verify(mockMarketoRestClient, times(24)).getLeadsByList(anyString(), eq(fieldNameFromMarketoFields));
-        verify(mockMarketoRestClient, times(1)).describeLead();
+        Mockito.verify(mockMarketoRestClient, Mockito.times(1)).getLists();
+        Mockito.verify(mockMarketoRestClient, Mockito.times(24)).getLeadsByList(Mockito.anyString(), eq(fieldNameString));
+        Mockito.verify(mockMarketoRestClient, Mockito.times(1)).describeLead();
 
         Schema embulkSchema = mapper.getEmbulkSchema();
         ArgumentCaptor<Long> longArgumentCaptor = ArgumentCaptor.forClass(Long.class);
 
-        verify(mockPageBuilder, times(300)).setLong(eq(embulkSchema.lookupColumn("mk_id")), longArgumentCaptor.capture());
-        verify(mockPageBuilder, times(300)).setString(eq(embulkSchema.lookupColumn("mk_listId")), eq("1009"));
+        Mockito.verify(mockPageBuilder, Mockito.times(300)).setLong(eq(embulkSchema.lookupColumn("mk_id")), longArgumentCaptor.capture());
+        Mockito.verify(mockPageBuilder, Mockito.times(300)).setString(eq(embulkSchema.lookupColumn("mk_listId")), eq("1009"));
 
         List<Long> allValues = longArgumentCaptor.getAllValues();
         long actualValue = allValues.get(0);

data/src/test/java/org/embulk/input/marketo/delegate/LeadWithProgramInputPluginTest.java

@@ -3,6 +3,7 @@ package org.embulk.input.marketo.delegate;
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.apache.commons.lang3.StringUtils;
 import org.embulk.EmbulkTestRuntime;
 import org.embulk.base.restclient.ServiceResponseMapper;
 import org.embulk.base.restclient.record.RecordImporter;
@@ -19,6 +20,7 @@ import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
+import org.mockito.Mockito;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -28,7 +30,6 @@ import static org.junit.Assert.assertEquals;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.*;
 
 /**
  * Created by tai.khuu on 10/10/17.
@@ -49,50 +50,51 @@ public class LeadWithProgramInputPluginTest
     @Before
     public void setUp() throws Exception
     {
-        leadWithProgramInputPlugin = spy(new LeadWithProgramInputPlugin());
+        leadWithProgramInputPlugin = Mockito.spy(new LeadWithProgramInputPlugin());
         ConfigLoader configLoader = embulkTestRuntime.getInjector().getInstance(ConfigLoader.class);
         configSource = configLoader.fromYaml(this.getClass().getResourceAsStream("/config/rest_config.yaml"));
-        mockMarketoRestClient = mock(MarketoRestClient.class);
-        doReturn(mockMarketoRestClient).when(leadWithProgramInputPlugin).createMarketoRestClient(any(LeadWithProgramInputPlugin.PluginTask.class));
+        mockMarketoRestClient = Mockito.mock(MarketoRestClient.class);
+        Mockito.doReturn(mockMarketoRestClient).when(leadWithProgramInputPlugin).createMarketoRestClient(any(LeadWithProgramInputPlugin.PluginTask.class));
     }
 
     @Test
     public void testRun() throws IOException
     {
-        RecordPagingIterable<ObjectNode> mockLeadRecordPagingIterable = mock(RecordPagingIterable.class);
-        RecordPagingIterable<ObjectNode> mockLeadEmptyRecordPagingIterable = mock(RecordPagingIterable.class);
-        RecordPagingIterable<ObjectNode> mockProgramRecords = mock(RecordPagingIterable.class);
+        RecordPagingIterable<ObjectNode> mockLeadRecordPagingIterable = Mockito.mock(RecordPagingIterable.class);
+        RecordPagingIterable<ObjectNode> mockLeadEmptyRecordPagingIterable = Mockito.mock(RecordPagingIterable.class);
+        RecordPagingIterable<ObjectNode> mockProgramRecords = Mockito.mock(RecordPagingIterable.class);
 
-        when(mockLeadEmptyRecordPagingIterable.iterator()).thenReturn(new ArrayList<ObjectNode>().iterator());
+        Mockito.when(mockLeadEmptyRecordPagingIterable.iterator()).thenReturn(new ArrayList<ObjectNode>().iterator());
         JavaType objectNodeListType = OBJECT_MAPPER.getTypeFactory().constructParametrizedType(List.class, List.class, ObjectNode.class);
         JavaType marketoFieldsType = OBJECT_MAPPER.getTypeFactory().constructParametrizedType(List.class, List.class, MarketoField.class);
         List<ObjectNode> leads = OBJECT_MAPPER.readValue(this.getClass().getResourceAsStream("/fixtures/lead_with_program_full.json"), objectNodeListType);
         List<ObjectNode> programs = OBJECT_MAPPER.readValue(this.getClass().getResourceAsStream("/fixtures/all_program_full.json"), objectNodeListType);
-        when(mockProgramRecords.iterator()).thenReturn(programs.iterator());
+        Mockito.when(mockProgramRecords.iterator()).thenReturn(programs.iterator());
         List<MarketoField> marketoFields = OBJECT_MAPPER.readValue(this.getClass().getResourceAsStream("/fixtures/lead_describe_marketo_fields_full.json"), marketoFieldsType);
-        when(mockLeadRecordPagingIterable.iterator()).thenReturn(leads.iterator());
-        when(mockMarketoRestClient.describeLead()).thenReturn(marketoFields);
-        when(mockMarketoRestClient.getPrograms()).thenReturn(mockProgramRecords);
+        Mockito.when(mockLeadRecordPagingIterable.iterator()).thenReturn(leads.iterator());
+        Mockito.when(mockMarketoRestClient.describeLead()).thenReturn(marketoFields);
+        Mockito.when(mockMarketoRestClient.getPrograms()).thenReturn(mockProgramRecords);
         List<String> fieldNameFromMarketoFields = MarketoUtils.getFieldNameFromMarketoFields(marketoFields);
-        when(mockMarketoRestClient.getLeadsByProgram(anyString(), eq(fieldNameFromMarketoFields))).thenReturn(mockLeadEmptyRecordPagingIterable);
-        when(mockMarketoRestClient.getLeadsByProgram("1003", fieldNameFromMarketoFields)).thenReturn(mockLeadRecordPagingIterable);
+        String fieldNameString = StringUtils.join(fieldNameFromMarketoFields, ",");
+        Mockito.when(mockMarketoRestClient.getLeadsByProgram(anyString(), eq(fieldNameString))).thenReturn(mockLeadEmptyRecordPagingIterable);
+        Mockito.when(mockMarketoRestClient.getLeadsByProgram("1003", fieldNameString)).thenReturn(mockLeadRecordPagingIterable);
 
         LeadWithProgramInputPlugin.PluginTask task = configSource.loadConfig(LeadWithProgramInputPlugin.PluginTask.class);
         ServiceResponseMapper<? extends ValueLocator> mapper = leadWithProgramInputPlugin.buildServiceResponseMapper(task);
 
         RecordImporter recordImporter = mapper.createRecordImporter();
-        PageBuilder mockPageBuilder = mock(PageBuilder.class);
+        PageBuilder mockPageBuilder = Mockito.mock(PageBuilder.class);
 
         leadWithProgramInputPlugin.ingestServiceData(task, recordImporter, 1, mockPageBuilder);
-        verify(mockMarketoRestClient, times(1)).getPrograms();
-        verify(mockMarketoRestClient, times(3)).getLeadsByProgram(anyString(), eq(fieldNameFromMarketoFields));
-        verify(mockMarketoRestClient, times(1)).describeLead();
+        Mockito.verify(mockMarketoRestClient, Mockito.times(1)).getPrograms();
+        Mockito.verify(mockMarketoRestClient, Mockito.times(3)).getLeadsByProgram(anyString(), eq(fieldNameString));
+        Mockito.verify(mockMarketoRestClient, Mockito.times(1)).describeLead();
 
         Schema embulkSchema = mapper.getEmbulkSchema();
         ArgumentCaptor<Long> longArgumentCaptor = ArgumentCaptor.forClass(Long.class);
 
-        verify(mockPageBuilder, times(1)).setLong(eq(embulkSchema.lookupColumn("mk_id")), longArgumentCaptor.capture());
-        verify(mockPageBuilder, times(1)).setString(eq(embulkSchema.lookupColumn("mk_programId")), eq("1003"));
+        Mockito.verify(mockPageBuilder, Mockito.times(1)).setLong(eq(embulkSchema.lookupColumn("mk_id")), longArgumentCaptor.capture());
+        Mockito.verify(mockPageBuilder, Mockito.times(1)).setString(eq(embulkSchema.lookupColumn("mk_programId")), eq("1003"));
 
         List<Long> allValues = longArgumentCaptor.getAllValues();
         long actualValue = allValues.get(0);

data/src/test/java/org/embulk/input/marketo/delegate/MarketoBaseBulkExtractInputPluginTest.java

@@ -23,7 +23,6 @@ import java.util.Date;
 import java.util.Set;
 
 import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.*;
 
 /**
  * Created by khuutantaitai on 10/3/17.
@@ -38,14 +37,14 @@ public class MarketoBaseBulkExtractInputPluginTest
     @Before
     public void prepare()
     {
-        baseBulkExtractInputPlugin = mock(MarketoBaseBulkExtractInputPlugin.class, Mockito.CALLS_REAL_METHODS);
+        baseBulkExtractInputPlugin = Mockito.mock(MarketoBaseBulkExtractInputPlugin.class, Mockito.CALLS_REAL_METHODS);
     }
 
     @Test(expected = ConfigException.class)
     public void validateInputTaskError()
     {
-        MarketoBaseBulkExtractInputPlugin.PluginTask pluginTask = mock(MarketoBaseBulkExtractInputPlugin.PluginTask.class);
-        when(pluginTask.getFromDate()).thenReturn(null);
+        MarketoBaseBulkExtractInputPlugin.PluginTask pluginTask = Mockito.mock(MarketoBaseBulkExtractInputPlugin.PluginTask.class);
+        Mockito.when(pluginTask.getFromDate()).thenReturn(null);
         baseBulkExtractInputPlugin.validateInputTask(pluginTask);
     }
 
@@ -53,12 +52,12 @@ public class MarketoBaseBulkExtractInputPluginTest
     public void validateInputTaskToDateLessThanJobStartTime()
     {
         Date fromDate = new Date(1504224000000L);
-        MarketoBaseBulkExtractInputPlugin.PluginTask pluginTask = mock(MarketoBaseBulkExtractInputPlugin.PluginTask.class);
-        when(pluginTask.getFromDate()).thenReturn(fromDate);
-        when(pluginTask.getFetchDays()).thenReturn(7);
+        MarketoBaseBulkExtractInputPlugin.PluginTask pluginTask = Mockito.mock(MarketoBaseBulkExtractInputPlugin.PluginTask.class);
+        Mockito.when(pluginTask.getFromDate()).thenReturn(fromDate);
+        Mockito.when(pluginTask.getFetchDays()).thenReturn(7);
         baseBulkExtractInputPlugin.validateInputTask(pluginTask);
         ArgumentCaptor<Optional<Date>> argumentCaptor = ArgumentCaptor.forClass(Optional.class);
-        verify(pluginTask, times(1)).setToDate(argumentCaptor.capture());
+        Mockito.verify(pluginTask, Mockito.times(1)).setToDate(argumentCaptor.capture());
         assertEquals(1504828800000L, argumentCaptor.getValue().get().getTime());
     }
 
@@ -67,13 +66,13 @@ public class MarketoBaseBulkExtractInputPluginTest
     {
         Date fromDate = new Date(1504224000000L);
         DateTime jobStartTime = new DateTime(1504396800000L);
-        MarketoBaseBulkExtractInputPlugin.PluginTask pluginTask = mock(MarketoBaseBulkExtractInputPlugin.PluginTask.class);
-        when(pluginTask.getFromDate()).thenReturn(fromDate);
-        when(pluginTask.getFetchDays()).thenReturn(7);
-        when(pluginTask.getJobStartTime()).thenReturn(jobStartTime);
+        MarketoBaseBulkExtractInputPlugin.PluginTask pluginTask = Mockito.mock(MarketoBaseBulkExtractInputPlugin.PluginTask.class);
+        Mockito.when(pluginTask.getFromDate()).thenReturn(fromDate);
+        Mockito.when(pluginTask.getFetchDays()).thenReturn(7);
+        Mockito.when(pluginTask.getJobStartTime()).thenReturn(jobStartTime);
         baseBulkExtractInputPlugin.validateInputTask(pluginTask);
         ArgumentCaptor<Optional<Date>> toDateArgumentCaptor = ArgumentCaptor.forClass(Optional.class);
-        verify(pluginTask, times(1)).setToDate(toDateArgumentCaptor.capture());
+        Mockito.verify(pluginTask, Mockito.times(1)).setToDate(toDateArgumentCaptor.capture());
         assertEquals(jobStartTime.minusHours(1).getMillis(), toDateArgumentCaptor.getValue().get().getTime());
     }
 
@@ -82,10 +81,10 @@ public class MarketoBaseBulkExtractInputPluginTest
     {
         DateTime date = new DateTime(1505033728000L);
         DateTime jobStartTime = new DateTime(1507625728000L);
-        MarketoBaseBulkExtractInputPlugin.PluginTask pluginTask = mock(MarketoInputPluginDelegate.PluginTask.class);
-        when(pluginTask.getFromDate()).thenReturn(date.toDate());
-        when(pluginTask.getFetchDays()).thenReturn(30);
-        when(pluginTask.getJobStartTime()).thenReturn(jobStartTime);
+        MarketoBaseBulkExtractInputPlugin.PluginTask pluginTask = Mockito.mock(MarketoInputPluginDelegate.PluginTask.class);
+        Mockito.when(pluginTask.getFromDate()).thenReturn(date.toDate());
+        Mockito.when(pluginTask.getFetchDays()).thenReturn(30);
+        Mockito.when(pluginTask.getJobStartTime()).thenReturn(jobStartTime);
         DateTime toDate = baseBulkExtractInputPlugin.getToDate(pluginTask);
         assertEquals(toDate, jobStartTime);
     }
@@ -93,18 +92,18 @@ public class MarketoBaseBulkExtractInputPluginTest
     @Test
     public void buildConfigDiff() throws Exception
     {
-        TaskReport taskReport1 = mock(TaskReport.class);
-        TaskReport taskReport2 = mock(TaskReport.class);
-        when(taskReport1.get(Set.class, "latest_uids")).thenReturn(Sets.newHashSet("id1", "id2"));
-        when(taskReport2.get(Set.class, "latest_uids")).thenReturn(Sets.newHashSet("id3", "id4"));
-        when(taskReport1.get(Long.class, "latest_fetch_time")).thenReturn(1507539328000L);
-        when(taskReport2.get(Long.class, "latest_fetch_time")).thenReturn(1507625728000L);
-        MarketoInputPluginDelegate.PluginTask task = mock(MarketoInputPluginDelegate.PluginTask.class);
-        when(task.getIncremental()).thenReturn(true);
-        when(task.getIncrementalColumn()).thenReturn(Optional.of("createdAt"));
+        TaskReport taskReport1 = Mockito.mock(TaskReport.class);
+        TaskReport taskReport2 = Mockito.mock(TaskReport.class);
+        Mockito.when(taskReport1.get(Set.class, "latest_uids")).thenReturn(Sets.newHashSet("id1", "id2"));
+        Mockito.when(taskReport2.get(Set.class, "latest_uids")).thenReturn(Sets.newHashSet("id3", "id4"));
+        Mockito.when(taskReport1.get(Long.class, "latest_fetch_time")).thenReturn(1507539328000L);
+        Mockito.when(taskReport2.get(Long.class, "latest_fetch_time")).thenReturn(1507625728000L);
+        MarketoInputPluginDelegate.PluginTask task = Mockito.mock(MarketoInputPluginDelegate.PluginTask.class);
+        Mockito.when(task.getIncremental()).thenReturn(true);
+        Mockito.when(task.getIncrementalColumn()).thenReturn(Optional.of("createdAt"));
         Date toDate = new Date(1507625728000L);
-        when(task.getToDate()).thenReturn(Optional.of(toDate));
-        ConfigDiff configDiff = baseBulkExtractInputPlugin.buildConfigDiff(task, mock(Schema.class), 1, Arrays.asList(taskReport1, taskReport2));
+        Mockito.when(task.getToDate()).thenReturn(Optional.of(toDate));
+        ConfigDiff configDiff = baseBulkExtractInputPlugin.buildConfigDiff(task, Mockito.mock(Schema.class), 1, Arrays.asList(taskReport1, taskReport2));
         long latestFetchTime = configDiff.get(Long.class, "latest_fetch_time");
         assertEquals(1507625728000L, latestFetchTime);
         assertEquals(Sets.newHashSet("id3", "id4"), configDiff.get(Set.class, "latest_uids"));