Repository: incubator-griffin Updated Branches: refs/heads/master 6b2ce3553 -> 3cfd0f880
update ut Author: Lionel Liu <bhlx3l...@163.com> Closes #162 from bhlx3lyx7/docker. Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/3cfd0f88 Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/3cfd0f88 Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/3cfd0f88 Branch: refs/heads/master Commit: 3cfd0f880075ad2b484940a97d332196d34725e1 Parents: 6b2ce35 Author: Lionel Liu <bhlx3l...@163.com> Authored: Thu Nov 2 18:10:07 2017 +0800 Committer: Lionel Liu <bhlx3l...@163.com> Committed: Thu Nov 2 18:10:07 2017 +0800 ---------------------------------------------------------------------- .../griffin/core/job/SparkSubmitJobTest.java | 2 +- .../core/measure/MeasureControllerTest.java | 16 ++++++++-------- .../core/measure/MeasureOrgControllerTest.java | 3 +++ .../core/measure/MeasureOrgServiceImplTest.java | 10 +++++++--- .../core/measure/MeasureServiceImplTest.java | 20 ++++++++++---------- .../core/metric/MetricControllerTest.java | 2 +- .../core/metric/MetricServiceImplTest.java | 2 +- 7 files changed, 31 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/3cfd0f88/service/src/test/java/org/apache/griffin/core/job/SparkSubmitJobTest.java ---------------------------------------------------------------------- diff --git a/service/src/test/java/org/apache/griffin/core/job/SparkSubmitJobTest.java b/service/src/test/java/org/apache/griffin/core/job/SparkSubmitJobTest.java index 130e66d..92072e3 100644 --- a/service/src/test/java/org/apache/griffin/core/job/SparkSubmitJobTest.java +++ b/service/src/test/java/org/apache/griffin/core/job/SparkSubmitJobTest.java @@ -86,7 +86,7 @@ public class SparkSubmitJobTest { JobExecutionContext context = mock(JobExecutionContext.class); JobDetail jd = createJobDetail(); given(context.getJobDetail()).willReturn(jd); - given(measureRepo.findOne(Long.valueOf(jd.getJobDataMap().getString("measureId")))).willReturn(createATestMeasure("view_item_hourly", "ebay")); + given(measureRepo.findOne(Long.valueOf(jd.getJobDataMap().getString("measureId")))).willReturn(createATestMeasure("view_item_hourly", "test")); given(restTemplate.postForObject(livyUri, new SparkJobDO(), String.class)).willReturn(result); given(jobInstanceRepo.save(new JobInstance())).willReturn(new JobInstance()); sparkSubmitJob.execute(context); http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/3cfd0f88/service/src/test/java/org/apache/griffin/core/measure/MeasureControllerTest.java ---------------------------------------------------------------------- diff --git a/service/src/test/java/org/apache/griffin/core/measure/MeasureControllerTest.java b/service/src/test/java/org/apache/griffin/core/measure/MeasureControllerTest.java index 5b9ca5b..2680298 100644 --- a/service/src/test/java/org/apache/griffin/core/measure/MeasureControllerTest.java +++ b/service/src/test/java/org/apache/griffin/core/measure/MeasureControllerTest.java @@ -59,7 +59,7 @@ public class MeasureControllerTest { @Test public void testGetAllMeasures() throws Exception { - Measure measure = createATestMeasure("view_item_hourly", "ebay"); + Measure measure = createATestMeasure("view_item_hourly", "test"); given(service.getAllAliveMeasures()).willReturn(Arrays.asList(measure)); mvc.perform(get(URLHelper.API_VERSION_PATH + "/measures").contentType(MediaType.APPLICATION_JSON)) @@ -70,7 +70,7 @@ public class MeasureControllerTest { @Test public void testGetMeasuresById() throws Exception { - Measure measure = createATestMeasure("view_item_hourly", "ebay"); + Measure measure = createATestMeasure("view_item_hourly", "test"); given(service.getMeasureById(1L)).willReturn(measure); mvc.perform(get(URLHelper.API_VERSION_PATH + "/measure/1").contentType(MediaType.APPLICATION_JSON)) @@ -111,7 +111,7 @@ public class MeasureControllerTest { @Test public void testUpdateMeasureForSuccess() throws Exception { - Measure measure = createATestMeasure("view_item_hourly", "ebay"); + Measure measure = createATestMeasure("view_item_hourly", "test"); String measureJson = new ObjectMapper().writeValueAsString(measure); given(service.updateMeasure(measure)).willReturn(GriffinOperationMessage.UPDATE_MEASURE_SUCCESS); @@ -123,7 +123,7 @@ public class MeasureControllerTest { @Test public void testUpdateMeasureForNotFound() throws Exception { - Measure measure = createATestMeasure("view_item_hourly", "ebay"); + Measure measure = createATestMeasure("view_item_hourly", "test"); String measureJson = new ObjectMapper().writeValueAsString(measure); given(service.updateMeasure(measure)).willReturn(GriffinOperationMessage.RESOURCE_NOT_FOUND); @@ -136,7 +136,7 @@ public class MeasureControllerTest { @Test public void testUpdateMeasureForFail() throws Exception { - Measure measure = createATestMeasure("view_item_hourly", "ebay"); + Measure measure = createATestMeasure("view_item_hourly", "test"); String measureJson = new ObjectMapper().writeValueAsString(measure); given(service.updateMeasure(measure)).willReturn(GriffinOperationMessage.UPDATE_MEASURE_FAIL); @@ -162,7 +162,7 @@ public class MeasureControllerTest { @Test public void testCreateNewMeasureForSuccess() throws Exception { - Measure measure = createATestMeasure("view_item_hourly", "ebay"); + Measure measure = createATestMeasure("view_item_hourly", "test"); String measureJson = new ObjectMapper().writeValueAsString(measure); given(service.createMeasure(measure)).willReturn(GriffinOperationMessage.CREATE_MEASURE_SUCCESS); @@ -174,7 +174,7 @@ public class MeasureControllerTest { @Test public void testCreateNewMeasureForFailWithDuplicate() throws Exception { - Measure measure = createATestMeasure("view_item_hourly", "ebay"); + Measure measure = createATestMeasure("view_item_hourly", "test"); String measureJson = new ObjectMapper().writeValueAsString(measure); given(service.createMeasure(measure)).willReturn(GriffinOperationMessage.CREATE_MEASURE_FAIL_DUPLICATE); @@ -186,7 +186,7 @@ public class MeasureControllerTest { @Test public void testCreateNewMeasureForFailWithSaveException() throws Exception { - Measure measure = createATestMeasure("view_item_hourly", "ebay"); + Measure measure = createATestMeasure("view_item_hourly", "test"); String measureJson = new ObjectMapper().writeValueAsString(measure); given(service.createMeasure(measure)).willReturn(GriffinOperationMessage.CREATE_MEASURE_FAIL); http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/3cfd0f88/service/src/test/java/org/apache/griffin/core/measure/MeasureOrgControllerTest.java ---------------------------------------------------------------------- diff --git a/service/src/test/java/org/apache/griffin/core/measure/MeasureOrgControllerTest.java b/service/src/test/java/org/apache/griffin/core/measure/MeasureOrgControllerTest.java index 17e7e85..372eac0 100644 --- a/service/src/test/java/org/apache/griffin/core/measure/MeasureOrgControllerTest.java +++ b/service/src/test/java/org/apache/griffin/core/measure/MeasureOrgControllerTest.java @@ -19,6 +19,7 @@ under the License. package org.apache.griffin.core.measure; +import org.apache.griffin.core.job.JobService; import org.apache.griffin.core.util.URLHelper; import org.junit.Test; import org.junit.runner.RunWith; @@ -50,6 +51,8 @@ public class MeasureOrgControllerTest { @MockBean private MeasureOrgService measureOrgService; + @MockBean + private JobService jobService; @Test public void testGetOrgs() throws Exception { http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/3cfd0f88/service/src/test/java/org/apache/griffin/core/measure/MeasureOrgServiceImplTest.java ---------------------------------------------------------------------- diff --git a/service/src/test/java/org/apache/griffin/core/measure/MeasureOrgServiceImplTest.java b/service/src/test/java/org/apache/griffin/core/measure/MeasureOrgServiceImplTest.java index d55121b..dfb49d6 100644 --- a/service/src/test/java/org/apache/griffin/core/measure/MeasureOrgServiceImplTest.java +++ b/service/src/test/java/org/apache/griffin/core/measure/MeasureOrgServiceImplTest.java @@ -20,6 +20,7 @@ under the License. package org.apache.griffin.core.measure; +import org.apache.griffin.core.measure.entity.Measure; import org.apache.griffin.core.measure.repo.MeasureRepo; import org.junit.Test; import org.junit.runner.RunWith; @@ -27,6 +28,7 @@ import org.mockito.InjectMocks; import org.mockito.Mock; import org.springframework.test.context.junit4.SpringRunner; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; @@ -65,9 +67,11 @@ public class MeasureOrgServiceImplTest { @Test public void testGetMeasureNamesGroupByOrg(){ - List<String> orgs = Arrays.asList("orgName"); - when(measureRepo.findOrganizations()).thenReturn(orgs); - when(measureRepo.findNameByOrganization(orgs.get(0))).thenReturn(Arrays.asList("measureName")); + Measure measure = new Measure("measure", "desc", "org", "proctype", "owner", null, null); + List<Measure> measures = new ArrayList<>(); + measures.add(measure); + + when(measureRepo.findByDeleted(false)).thenReturn(measures); Map<String,List<String>> map = service.getMeasureNamesGroupByOrg(); assertThat(map.size()).isEqualTo(1); http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/3cfd0f88/service/src/test/java/org/apache/griffin/core/measure/MeasureServiceImplTest.java ---------------------------------------------------------------------- diff --git a/service/src/test/java/org/apache/griffin/core/measure/MeasureServiceImplTest.java b/service/src/test/java/org/apache/griffin/core/measure/MeasureServiceImplTest.java index 524517a..d1e4cd4 100644 --- a/service/src/test/java/org/apache/griffin/core/measure/MeasureServiceImplTest.java +++ b/service/src/test/java/org/apache/griffin/core/measure/MeasureServiceImplTest.java @@ -59,7 +59,7 @@ public class MeasureServiceImplTest { @Test public void testGetAllMeasures() throws Exception { - Measure measure = createATestMeasure("view_item_hourly", "ebay"); + Measure measure = createATestMeasure("view_item_hourly", "test"); given(measureRepo.findByDeleted(false)).willReturn(Arrays.asList(measure)); List<Measure> measures = (List<Measure>) service.getAllAliveMeasures(); assertThat(measures.size()).isEqualTo(1); @@ -68,7 +68,7 @@ public class MeasureServiceImplTest { @Test public void testGetMeasuresById() throws Exception { - Measure measure = createATestMeasure("view_item_hourly", "ebay"); + Measure measure = createATestMeasure("view_item_hourly", "test"); given(measureRepo.findOne(1L)).willReturn(measure); Measure m = service.getMeasureById(1); assertEquals(m.getName(), measure.getName()); @@ -77,7 +77,7 @@ public class MeasureServiceImplTest { @Test public void testDeleteMeasuresByIdForSuccess() throws Exception { - Measure measure = createATestMeasure("view_item_hourly", "ebay"); + Measure measure = createATestMeasure("view_item_hourly", "test"); given(measureRepo.exists(1L)).willReturn(true); given(measureRepo.findOne(1L)).willReturn(measure); doNothing().when(jobService).deleteJobsRelateToMeasure(measure); @@ -96,7 +96,7 @@ public class MeasureServiceImplTest { @Test public void testCreateNewMeasureForSuccess() throws Exception { String measureName = "view_item_hourly"; - Measure measure = createATestMeasure(measureName, "ebay"); + Measure measure = createATestMeasure(measureName, "test"); given(measureRepo.findByNameAndDeleted(measureName, false)).willReturn(new LinkedList<>()); given(measureRepo.save(measure)).willReturn(measure); GriffinOperationMessage message = service.createMeasure(measure); @@ -106,7 +106,7 @@ public class MeasureServiceImplTest { @Test public void testCreateNewMeasureForFailWithDuplicate() throws Exception { String measureName = "view_item_hourly"; - Measure measure = createATestMeasure(measureName, "ebay"); + Measure measure = createATestMeasure(measureName, "test"); LinkedList<Measure> list = new LinkedList<>(); list.add(measure); given(measureRepo.findByNameAndDeleted(measureName, false)).willReturn(list); @@ -117,7 +117,7 @@ public class MeasureServiceImplTest { @Test public void testCreateNewMeasureForFailWithSaveException() throws Exception { String measureName = "view_item_hourly"; - Measure measure = createATestMeasure(measureName, "ebay"); + Measure measure = createATestMeasure(measureName, "test"); given(measureRepo.findByNameAndDeleted(measureName, false)).willReturn(new LinkedList<>()); given(measureRepo.save(measure)).willReturn(null); GriffinOperationMessage message = service.createMeasure(measure); @@ -127,7 +127,7 @@ public class MeasureServiceImplTest { @Test public void testGetAllMeasureByOwner() throws Exception { String owner = "test"; - Measure measure = createATestMeasure("view_item_hourly", "ebay"); + Measure measure = createATestMeasure("view_item_hourly", "test"); measure.setId(1L); given(measureRepo.findByOwnerAndDeleted(owner, false)).willReturn(Arrays.asList(measure)); List<Measure> list = service.getAliveMeasuresByOwner(owner); @@ -136,7 +136,7 @@ public class MeasureServiceImplTest { @Test public void testUpdateMeasureForSuccess() throws Exception { - Measure measure = createATestMeasure("view_item_hourly", "ebay"); + Measure measure = createATestMeasure("view_item_hourly", "test"); given(measureRepo.exists(measure.getId())).willReturn(true); given(measureRepo.save(measure)).willReturn(measure); GriffinOperationMessage message = service.updateMeasure(measure); @@ -145,7 +145,7 @@ public class MeasureServiceImplTest { @Test public void testUpdateMeasureForNotFound() throws Exception { - Measure measure = createATestMeasure("view_item_hourly", "ebay"); + Measure measure = createATestMeasure("view_item_hourly", "test"); given(measureRepo.exists(measure.getId())).willReturn(false); GriffinOperationMessage message = service.updateMeasure(measure); assertEquals(message, GriffinOperationMessage.RESOURCE_NOT_FOUND); @@ -153,7 +153,7 @@ public class MeasureServiceImplTest { @Test public void testUpdateMeasureForFailWithSaveException() throws Exception { - Measure measure = createATestMeasure("view_item_hourly", "ebay"); + Measure measure = createATestMeasure("view_item_hourly", "test"); given(measureRepo.exists(measure.getId())).willReturn(true); given(measureRepo.save(measure)).willThrow(Exception.class); GriffinOperationMessage message = service.updateMeasure(measure); http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/3cfd0f88/service/src/test/java/org/apache/griffin/core/metric/MetricControllerTest.java ---------------------------------------------------------------------- diff --git a/service/src/test/java/org/apache/griffin/core/metric/MetricControllerTest.java b/service/src/test/java/org/apache/griffin/core/metric/MetricControllerTest.java index eb4d981..0e521ba 100644 --- a/service/src/test/java/org/apache/griffin/core/metric/MetricControllerTest.java +++ b/service/src/test/java/org/apache/griffin/core/metric/MetricControllerTest.java @@ -54,7 +54,7 @@ public class MetricControllerTest { @Test public void testGetOrgByMeasureName() throws Exception { String measureName = "default"; - String org = "ebay"; + String org = "test"; given(service.getOrgByMeasureName(measureName)).willReturn(org); mvc.perform(get(URLHelper.API_VERSION_PATH + "/metrics/org").param("measureName", measureName)) http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/3cfd0f88/service/src/test/java/org/apache/griffin/core/metric/MetricServiceImplTest.java ---------------------------------------------------------------------- diff --git a/service/src/test/java/org/apache/griffin/core/metric/MetricServiceImplTest.java b/service/src/test/java/org/apache/griffin/core/metric/MetricServiceImplTest.java index c98f1e7..041e289 100644 --- a/service/src/test/java/org/apache/griffin/core/metric/MetricServiceImplTest.java +++ b/service/src/test/java/org/apache/griffin/core/metric/MetricServiceImplTest.java @@ -55,7 +55,7 @@ public class MetricServiceImplTest { @Test public void testGetOrgByMeasureName() { String measureName = "default"; - String org = "ebay"; + String org = "test"; given(measureRepo.findOrgByName("default")).willReturn(org); assertEquals(service.getOrgByMeasureName(measureName), org); }
