Repository: incubator-griffin Updated Branches: refs/heads/master 0f5d7421e -> fd31809a6
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/fd31809a/service/src/test/java/org/apache/griffin/core/config/PropertiesConfigTest.java ---------------------------------------------------------------------- diff --git a/service/src/test/java/org/apache/griffin/core/config/PropertiesConfigTest.java b/service/src/test/java/org/apache/griffin/core/config/PropertiesConfigTest.java index 65a8a1d..c3e35b6 100644 --- a/service/src/test/java/org/apache/griffin/core/config/PropertiesConfigTest.java +++ b/service/src/test/java/org/apache/griffin/core/config/PropertiesConfigTest.java @@ -30,7 +30,7 @@ import org.springframework.test.context.junit4.SpringRunner; import java.io.FileNotFoundException; import java.util.Properties; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; @RunWith(SpringRunner.class) //@TestPropertySource("classpath") @@ -96,65 +96,43 @@ public class PropertiesConfigTest { private PropertiesConfig quartzNotFoundConfig; @Test - public void appConf() throws Exception { + public void appConf() { Properties conf = noLivyConf.appConf(); - assertEquals(conf.get("spring.datasource.username"),"test"); + assertEquals(conf.get("spring.datasource.username"), "test"); } @Test public void livyConfWithLocationNotNull() throws Exception { Properties conf = livyConf.livyConf(); - assertEquals(conf.get("sparkJob.name"),"test"); + assertEquals(conf.get("sparkJob.name"), "test"); } @Test public void livyConfWithLocationNull() throws Exception { Properties conf = noLivyConf.livyConf(); - assertEquals(conf.get("sparkJob.name"),"test"); + assertEquals(conf.get("sparkJob.name"), "test"); } - @Test - public void livyConfWithFileNotFoundException() throws Exception { - FileNotFoundException e = livyFileNotFoundException(); - assert e != null; + @Test(expected = FileNotFoundException.class) + public void livyConfWithFileNotFoundException() throws FileNotFoundException { + livyNotFoundConfig.livyConf(); } @Test public void quartzConfWithLocationNotNull() throws Exception { Properties conf = quartzConf.quartzConf(); - assertEquals(conf.get("org.quartz.scheduler.instanceName"),"spring-boot-quartz-test"); + assertEquals(conf.get("org.quartz.scheduler.instanceName"), "spring-boot-quartz-test"); } @Test public void quartzConfWithLocationNull() throws Exception { Properties conf = noQuartzConf.quartzConf(); - assertEquals(conf.get("org.quartz.scheduler.instanceName"),"spring-boot-quartz-test"); - } - - @Test - public void quartzConfWithFileNotFoundException() throws Exception { - FileNotFoundException e = quartzFileNotFoundException(); - assert e != null; + assertEquals(conf.get("org.quartz.scheduler.instanceName"), "spring-boot-quartz-test"); } - private FileNotFoundException livyFileNotFoundException() { - FileNotFoundException exception = null; - try { - livyNotFoundConfig.livyConf(); - } catch (FileNotFoundException e) { - exception = e; - } - return exception; - } - - private FileNotFoundException quartzFileNotFoundException() { - FileNotFoundException exception = null; - try { - quartzNotFoundConfig.livyConf(); - } catch (FileNotFoundException e) { - exception = e; - } - return exception; + @Test(expected = FileNotFoundException.class) + public void quartzConfWithFileNotFoundException() throws FileNotFoundException { + quartzNotFoundConfig.livyConf(); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/fd31809a/service/src/test/java/org/apache/griffin/core/job/JobControllerTest.java ---------------------------------------------------------------------- diff --git a/service/src/test/java/org/apache/griffin/core/job/JobControllerTest.java b/service/src/test/java/org/apache/griffin/core/job/JobControllerTest.java index 90a522b..ecd15f0 100644 --- a/service/src/test/java/org/apache/griffin/core/job/JobControllerTest.java +++ b/service/src/test/java/org/apache/griffin/core/job/JobControllerTest.java @@ -89,8 +89,7 @@ public class JobControllerTest { mvc.perform(post(URLHelper.API_VERSION_PATH + "/jobs") .contentType(MediaType.APPLICATION_JSON) .content(JsonUtil.toJson(jobSchedule))) - .andExpect(status().isCreated()) - .andExpect(jsonPath("$.id", is(1))); + .andExpect(status().isCreated()); } @Test http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/fd31809a/service/src/test/java/org/apache/griffin/core/job/JobInstanceTest.java ---------------------------------------------------------------------- diff --git a/service/src/test/java/org/apache/griffin/core/job/JobInstanceTest.java b/service/src/test/java/org/apache/griffin/core/job/JobInstanceTest.java index 6a39685..cec6965 100644 --- a/service/src/test/java/org/apache/griffin/core/job/JobInstanceTest.java +++ b/service/src/test/java/org/apache/griffin/core/job/JobInstanceTest.java @@ -105,7 +105,7 @@ public class JobInstanceTest { given(jobScheduleRepo.findOne(Matchers.anyLong())).willReturn(jobSchedule); given(measureRepo.findOne(Matchers.anyLong())).willReturn(measure); given(jobRepo.findOne(Matchers.anyLong())).willReturn(job); - given(factory.getObject()).willReturn(scheduler); + given(factory.getScheduler()).willReturn(scheduler); given((List<Trigger>)scheduler.getTriggersOfJob(Matchers.any(JobKey.class))).willReturn(triggers); given(scheduler.checkExists(Matchers.any(TriggerKey.class))).willReturn(false); given(jobRepo.save(Matchers.any(GriffinJob.class))).willReturn(job); @@ -126,7 +126,7 @@ public class JobInstanceTest { given(jobScheduleRepo.findOne(Matchers.anyLong())).willReturn(jobSchedule); given(measureRepo.findOne(Matchers.anyLong())).willReturn(measure); given(jobRepo.findOne(Matchers.anyLong())).willReturn(job); - given(factory.getObject()).willReturn(scheduler); + given(factory.getScheduler()).willReturn(scheduler); given((List<Trigger>)scheduler.getTriggersOfJob(Matchers.any(JobKey.class))).willReturn(triggers); given(scheduler.checkExists(Matchers.any(TriggerKey.class))).willReturn(false); given(jobRepo.save(Matchers.any(GriffinJob.class))).willReturn(job); @@ -147,7 +147,7 @@ public class JobInstanceTest { given(jobScheduleRepo.findOne(Matchers.anyLong())).willReturn(jobSchedule); given(measureRepo.findOne(Matchers.anyLong())).willReturn(measure); given(jobRepo.findOne(Matchers.anyLong())).willReturn(job); - given(factory.getObject()).willReturn(scheduler); + given(factory.getScheduler()).willReturn(scheduler); given((List<Trigger>)scheduler.getTriggersOfJob(Matchers.any(JobKey.class))).willReturn(triggers); given(scheduler.checkExists(Matchers.any(TriggerKey.class))).willReturn(false); given(jobRepo.save(Matchers.any(GriffinJob.class))).willReturn(job); @@ -168,7 +168,7 @@ public class JobInstanceTest { given(jobScheduleRepo.findOne(Matchers.anyLong())).willReturn(jobSchedule); given(measureRepo.findOne(Matchers.anyLong())).willReturn(measure); given(jobRepo.findOne(Matchers.anyLong())).willReturn(job); - given(factory.getObject()).willReturn(scheduler); + given(factory.getScheduler()).willReturn(scheduler); given((List<Trigger>)scheduler.getTriggersOfJob(Matchers.any(JobKey.class))).willReturn(triggers); given(scheduler.checkExists(Matchers.any(TriggerKey.class))).willReturn(false); given(jobRepo.save(Matchers.any(GriffinJob.class))).willReturn(job); http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/fd31809a/service/src/test/java/org/apache/griffin/core/job/JobServiceImplTest.java ---------------------------------------------------------------------- diff --git a/service/src/test/java/org/apache/griffin/core/job/JobServiceImplTest.java b/service/src/test/java/org/apache/griffin/core/job/JobServiceImplTest.java index ba2afaa..3e6eab0 100644 --- a/service/src/test/java/org/apache/griffin/core/job/JobServiceImplTest.java +++ b/service/src/test/java/org/apache/griffin/core/job/JobServiceImplTest.java @@ -102,7 +102,7 @@ public class JobServiceImplTest { public void testGetAliveJobsForSuccess() throws SchedulerException { Scheduler scheduler = Mockito.mock(Scheduler.class); GriffinJob job = createGriffinJob(); - given(factory.getObject()).willReturn(scheduler); + given(factory.getScheduler()).willReturn(scheduler); given(jobRepo.findByDeleted(false)).willReturn(Arrays.asList(job)); SimpleTrigger trigger = new SimpleTriggerImpl(); given((List<Trigger>) scheduler.getTriggersOfJob(Matchers.any(JobKey.class))).willReturn(Arrays.asList(trigger)); @@ -114,7 +114,7 @@ public class JobServiceImplTest { public void testGetAliveJobsForNoJobsWithTriggerEmpty() throws SchedulerException { Scheduler scheduler = Mockito.mock(Scheduler.class); GriffinJob job = createGriffinJob(); - given(factory.getObject()).willReturn(scheduler); + given(factory.getScheduler()).willReturn(scheduler); given(jobRepo.findByDeleted(false)).willReturn(Arrays.asList(job)); given((List<Trigger>) scheduler.getTriggersOfJob(Matchers.any(JobKey.class))).willReturn(new ArrayList<>()); @@ -125,7 +125,7 @@ public class JobServiceImplTest { public void testGetAliveJobsForNoJobsWithException() throws SchedulerException { Scheduler scheduler = Mockito.mock(Scheduler.class); GriffinJob job = createGriffinJob(); - given(factory.getObject()).willReturn(scheduler); + given(factory.getScheduler()).willReturn(scheduler); given(jobRepo.findByDeleted(false)).willReturn(Arrays.asList(job)); given(scheduler.getTriggersOfJob(Matchers.any(JobKey.class))).willThrow(new SchedulerException()); @@ -140,7 +140,7 @@ public class JobServiceImplTest { GriffinMeasure measure = createGriffinMeasure("measureName"); GriffinJob job = createGriffinJob(); Scheduler scheduler = Mockito.mock(Scheduler.class); - given(factory.getObject()).willReturn(scheduler); + given(factory.getScheduler()).willReturn(scheduler); given(griffinMeasureRepo.findByIdAndDeleted(js.getMeasureId(), false)).willReturn(measure); given(jobRepo.countByJobNameAndDeleted(js.getJobName(), false)).willReturn(0); given(jobScheduleRepo.save(js)).willReturn(js); @@ -228,7 +228,7 @@ public class JobServiceImplTest { JobDataSegment target = createJobDataSegment("target_name", false); JobSchedule js = createJobSchedule("jobName", source, target); Scheduler scheduler = Mockito.mock(Scheduler.class); - given(factory.getObject()).willReturn(scheduler); + given(factory.getScheduler()).willReturn(scheduler); given(griffinMeasureRepo.findByIdAndDeleted(js.getMeasureId(), false)).willReturn(measure); given(scheduler.checkExists(Matchers.any(TriggerKey.class))).willReturn(true); @@ -243,7 +243,7 @@ public class JobServiceImplTest { job.setJobInstances(Arrays.asList(instance)); Scheduler scheduler = Mockito.mock(Scheduler.class); given(jobRepo.findByIdAndDeleted(jobId, false)).willReturn(job); - given(factory.getObject()).willReturn(scheduler); + given(factory.getScheduler()).willReturn(scheduler); given(scheduler.checkExists(Matchers.any(JobKey.class))).willReturn(true); service.deleteJob(jobId); @@ -260,7 +260,7 @@ public class JobServiceImplTest { JobInstanceBean instance = new JobInstanceBean(LivySessionStates.State.finding, "pName", "pGroup", null, null); job.setJobInstances(Arrays.asList(instance)); Scheduler scheduler = Mockito.mock(Scheduler.class); - given(factory.getObject()).willReturn(scheduler); + given(factory.getScheduler()).willReturn(scheduler); given(jobRepo.findByIdAndDeleted(jobId, false)).willReturn(job); given(scheduler.checkExists(Matchers.any(JobKey.class))).willReturn(false); @@ -283,7 +283,7 @@ public class JobServiceImplTest { Long jobId = 1L; GriffinJob job = createGriffinJob(); Scheduler scheduler = Mockito.mock(Scheduler.class); - given(factory.getObject()).willReturn(scheduler); + given(factory.getScheduler()).willReturn(scheduler); given(jobRepo.findByIdAndDeleted(jobId, false)).willReturn(job); given(scheduler.checkExists(Matchers.any(JobKey.class))).willReturn(true); doThrow(SchedulerException.class).when(scheduler).pauseJob(Matchers.any(JobKey.class)); @@ -298,7 +298,7 @@ public class JobServiceImplTest { job.setJobInstances(Arrays.asList(instance)); Scheduler scheduler = Mockito.mock(Scheduler.class); given(jobRepo.findByJobNameAndDeleted(job.getJobName(), false)).willReturn(Arrays.asList(job)); - given(factory.getObject()).willReturn(scheduler); + given(factory.getScheduler()).willReturn(scheduler); given(scheduler.checkExists(Matchers.any(JobKey.class))).willReturn(true); doNothing().when(scheduler).pauseJob(Matchers.any(JobKey.class)); given(scheduler.deleteJob(Matchers.any(JobKey.class))).willReturn(true); @@ -317,7 +317,7 @@ public class JobServiceImplTest { JobInstanceBean instance = new JobInstanceBean(LivySessionStates.State.finding, "pName", "pGroup", null, null); job.setJobInstances(Arrays.asList(instance)); Scheduler scheduler = Mockito.mock(Scheduler.class); - given(factory.getObject()).willReturn(scheduler); + given(factory.getScheduler()).willReturn(scheduler); given(jobRepo.findByJobNameAndDeleted(job.getJobName(), false)).willReturn(Arrays.asList(job)); given(scheduler.checkExists(Matchers.any(JobKey.class))).willReturn(false); @@ -340,7 +340,7 @@ public class JobServiceImplTest { public void testDeleteJobByJobNameForFailureWithException() throws SchedulerException { GriffinJob job = createGriffinJob(); Scheduler scheduler = Mockito.mock(Scheduler.class); - given(factory.getObject()).willReturn(scheduler); + given(factory.getScheduler()).willReturn(scheduler); given(jobRepo.findByJobNameAndDeleted(job.getJobName(), false)).willReturn(Arrays.asList(job)); given(scheduler.checkExists(Matchers.any(JobKey.class))).willReturn(true); doThrow(SchedulerException.class).when(scheduler).pauseJob(Matchers.any(JobKey.class)); @@ -355,7 +355,7 @@ public class JobServiceImplTest { job.setJobInstances(Arrays.asList(instance)); Scheduler scheduler = Mockito.mock(Scheduler.class); given(jobRepo.findByMeasureIdAndDeleted(1L, false)).willReturn(Arrays.asList(job)); - given(factory.getObject()).willReturn(scheduler); + given(factory.getScheduler()).willReturn(scheduler); given(scheduler.checkExists(Matchers.any(JobKey.class))).willReturn(true); service.deleteJobsRelateToMeasure(1L); @@ -372,7 +372,7 @@ public class JobServiceImplTest { job.setJobInstances(Arrays.asList(instance)); Scheduler scheduler = Mockito.mock(Scheduler.class); given(jobRepo.findByMeasureIdAndDeleted(1L, false)).willReturn(Arrays.asList(job)); - given(factory.getObject()).willReturn(scheduler); + given(factory.getScheduler()).willReturn(scheduler); given(scheduler.checkExists(Matchers.any(JobKey.class))).willReturn(false); service.deleteJobsRelateToMeasure(1L); @@ -389,7 +389,7 @@ public class JobServiceImplTest { service.deleteJobsRelateToMeasure(measureId); verify(jobRepo, times(1)).findByMeasureIdAndDeleted(measureId, false); - verify(factory, times(0)).getObject(); + verify(factory, times(0)).getScheduler(); } @Test(expected = GriffinException.ServiceException.class) @@ -400,7 +400,7 @@ public class JobServiceImplTest { job.setJobInstances(Arrays.asList(instance)); Scheduler scheduler = Mockito.mock(Scheduler.class); given(jobRepo.findByMeasureIdAndDeleted(measureId, false)).willReturn(Arrays.asList(job)); - given(factory.getObject()).willReturn(scheduler); + given(factory.getScheduler()).willReturn(scheduler); given(scheduler.checkExists(Matchers.any(JobKey.class))).willReturn(true); doThrow(SchedulerException.class).when(scheduler).pauseJob(Matchers.any(JobKey.class)); @@ -434,7 +434,7 @@ public class JobServiceImplTest { JobInstanceBean jobInstance = new JobInstanceBean(LivySessionStates.State.dead, "pName", "pGroup", null, null); given(jobInstanceRepo.findByExpireTmsLessThanEqual(Matchers.any())).willReturn(Arrays.asList(jobInstance)); Scheduler scheduler = Mockito.mock(Scheduler.class); - given(factory.getObject()).willReturn(scheduler); + given(factory.getScheduler()).willReturn(scheduler); given(scheduler.checkExists(Matchers.any(JobKey.class))).willReturn(true); service.deleteExpiredJobInstance(); @@ -447,7 +447,7 @@ public class JobServiceImplTest { JobInstanceBean jobInstance = new JobInstanceBean(LivySessionStates.State.dead, "pName", "pGroup", null, null); given(jobInstanceRepo.findByExpireTmsLessThanEqual(Matchers.any())).willReturn(Arrays.asList(jobInstance)); Scheduler scheduler = Mockito.mock(Scheduler.class); - given(factory.getObject()).willReturn(scheduler); + given(factory.getScheduler()).willReturn(scheduler); given(scheduler.checkExists(Matchers.any(JobKey.class))).willReturn(false); service.deleteExpiredJobInstance(); @@ -469,7 +469,7 @@ public class JobServiceImplTest { JobInstanceBean jobInstance = new JobInstanceBean(LivySessionStates.State.dead, "pName", "pGroup", null, null); given(jobInstanceRepo.findByExpireTmsLessThanEqual(Matchers.any())).willReturn(Arrays.asList(jobInstance)); Scheduler scheduler = Mockito.mock(Scheduler.class); - given(factory.getObject()).willReturn(scheduler); + given(factory.getScheduler()).willReturn(scheduler); given(scheduler.checkExists(Matchers.any(JobKey.class))).willReturn(true); doThrow(SchedulerException.class).when(scheduler).pauseJob(Matchers.any(JobKey.class)); @@ -541,7 +541,7 @@ public class JobServiceImplTest { public void testGetHealthInfoWithHealthy() throws SchedulerException { Scheduler scheduler = Mockito.mock(Scheduler.class); GriffinJob job = createGriffinJob(); - given(factory.getObject()).willReturn(scheduler); + given(factory.getScheduler()).willReturn(scheduler); given(jobRepo.findByDeleted(false)).willReturn(Arrays.asList(job)); List<Trigger> triggers = Collections.singletonList(new SimpleTriggerImpl()); given((List<Trigger>) scheduler.getTriggersOfJob(Matchers.any(JobKey.class))).willReturn(triggers); @@ -556,7 +556,7 @@ public class JobServiceImplTest { public void testGetHealthInfoWithUnhealthy() throws SchedulerException { Scheduler scheduler = Mockito.mock(Scheduler.class); GriffinJob job = createGriffinJob(); - given(factory.getObject()).willReturn(scheduler); + given(factory.getScheduler()).willReturn(scheduler); given(jobRepo.findByDeleted(false)).willReturn(Collections.singletonList(job)); List<Trigger> triggers = Collections.singletonList(new SimpleTriggerImpl()); given((List<Trigger>) scheduler.getTriggersOfJob(Matchers.any(JobKey.class))).willReturn(triggers); @@ -573,7 +573,7 @@ public class JobServiceImplTest { public void testGetHealthInfoWithException() throws SchedulerException { Scheduler scheduler = Mockito.mock(Scheduler.class); GriffinJob job = createGriffinJob(); - given(factory.getObject()).willReturn(scheduler); + given(factory.getScheduler()).willReturn(scheduler); given(jobRepo.findByDeleted(false)).willReturn(Collections.singletonList(job)); given((List<Trigger>) scheduler.getTriggersOfJob(Matchers.any(JobKey.class))) .willThrow(new SchedulerException()); http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/fd31809a/service/src/test/java/org/apache/griffin/core/measure/GriffinMeasureOperationImplTest.java ---------------------------------------------------------------------- diff --git a/service/src/test/java/org/apache/griffin/core/measure/GriffinMeasureOperationImplTest.java b/service/src/test/java/org/apache/griffin/core/measure/GriffinMeasureOperationImplTest.java index 47f218a..097d1aa 100644 --- a/service/src/test/java/org/apache/griffin/core/measure/GriffinMeasureOperationImplTest.java +++ b/service/src/test/java/org/apache/griffin/core/measure/GriffinMeasureOperationImplTest.java @@ -33,8 +33,6 @@ import org.mockito.InjectMocks; import org.mockito.Mock; import org.springframework.test.context.junit4.SpringRunner; -import java.util.Arrays; - import static org.apache.griffin.core.util.EntityHelper.createDataConnector; import static org.apache.griffin.core.util.EntityHelper.createGriffinMeasure; import static org.junit.Assert.assertEquals; @@ -69,15 +67,6 @@ public class GriffinMeasureOperationImplTest { } @Test(expected = GriffinException.BadRequestException.class) - public void testCreateForFailureWithConnectorExist() throws Exception { - Measure measure = createGriffinMeasure("view_item_hourly"); - DataConnector dc = new DataConnector("source_name", "1h", "1.2", null); - given(dcRepo.findByConnectorNames(Arrays.asList("source_name", "target_name"))).willReturn(Arrays.asList(dc)); - - operation.create(measure); - } - - @Test(expected = GriffinException.BadRequestException.class) public void testCreateForFailureWithConnectorNull() throws Exception { String measureName = "view_item_hourly"; DataConnector dcSource = createDataConnector(null, "default", "test_data_src", "dt=#YYYYMMdd# AND hour=#HH#"); http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/fd31809a/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 c564333..863c252 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 @@ -92,7 +92,7 @@ public class MeasureControllerTest { } @Test - public void testDeleteMeasuresByIdForSuccess() throws Exception { + public void testDeleteMeasureByIdForSuccess() throws Exception { doNothing().when(service).deleteMeasureById(1L); mvc.perform(delete(URLHelper.API_VERSION_PATH + "/measures/1")) @@ -100,7 +100,7 @@ public class MeasureControllerTest { } @Test - public void testDeleteMeasuresByIdForNotFound() throws Exception { + public void testDeleteMeasureByIdForNotFound() throws Exception { doThrow(new GriffinException.NotFoundException(GriffinExceptionMessage.MEASURE_ID_DOES_NOT_EXIST)) .when(service).deleteMeasureById(1L); @@ -109,7 +109,7 @@ public class MeasureControllerTest { } @Test - public void testDeleteMeasuresByIdForGriffinFailureWithException() throws Exception { + public void testDeleteMeasureByIdForGriffinFailureWithException() throws Exception { doThrow(new GriffinException.ServiceException("Failed to delete job", new Exception())) .when(service).deleteMeasureById(1L); @@ -118,6 +118,32 @@ public class MeasureControllerTest { } @Test + public void testDeleteMeasuresForSuccess() throws Exception { + doNothing().when(service).deleteMeasures(); + + mvc.perform(delete(URLHelper.API_VERSION_PATH + "/measures")) + .andExpect(status().isNoContent()); + } + + @Test + public void testDeleteMeasuresForNotFound() throws Exception { + doThrow(new GriffinException.NotFoundException(GriffinExceptionMessage.MEASURE_ID_DOES_NOT_EXIST)) + .when(service).deleteMeasures(); + + mvc.perform(delete(URLHelper.API_VERSION_PATH + "/measures")) + .andExpect(status().isNotFound()); + } + + @Test + public void testDeleteMeasuresForGriffinFailureWithException() throws Exception { + doThrow(new GriffinException.ServiceException("Failed to delete job", new Exception())) + .when(service).deleteMeasures(); + + mvc.perform(delete(URLHelper.API_VERSION_PATH + "/measures")) + .andExpect(status().isInternalServerError()); + } + + @Test public void testUpdateMeasureForSuccess() throws Exception { Measure measure = createGriffinMeasure("view_item_hourly"); String measureJson = JsonUtil.toJson(measure); @@ -203,5 +229,4 @@ public class MeasureControllerTest { .andExpect(status().isBadRequest()); } - } http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/fd31809a/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 16e235a..7dc979f 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 @@ -32,7 +32,9 @@ import org.mockito.InjectMocks; import org.mockito.Mock; import org.springframework.test.context.junit4.SpringRunner; +import java.io.FileNotFoundException; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; import java.util.List; @@ -80,6 +82,12 @@ public class MeasureServiceImplTest { assertEquals(m.getName(), measure.getName()); } + @Test(expected = GriffinException.NotFoundException.class) + public void testGetMeasuresByIdWithFileNotFoundException(){ + given(measureRepo.findByIdAndDeleted(1L, false)).willReturn(null); + service.getMeasureById(1); + } + @Test public void testGetAliveMeasuresByOwner() throws Exception { String owner = "test"; @@ -92,7 +100,7 @@ public class MeasureServiceImplTest { @Test - public void testDeleteMeasuresByIdForGriffinSuccess() throws Exception { + public void testDeleteMeasureByIdForGriffinSuccess() throws Exception { GriffinMeasure measure = createGriffinMeasure("view_item_hourly"); measure.setId(1L); given(measureRepo.findByIdAndDeleted(measure.getId(), false)).willReturn(measure); @@ -103,7 +111,7 @@ public class MeasureServiceImplTest { } @Test - public void testDeleteMeasuresByIdForExternalSuccess() { + public void testDeleteMeasureByIdForExternalSuccess() { ExternalMeasure measure = createExternalMeasure("externalMeasure"); measure.setId(1L); given(measureRepo.findByIdAndDeleted(measure.getId(), false)).willReturn(measure); @@ -114,24 +122,50 @@ public class MeasureServiceImplTest { } @Test(expected = GriffinException.NotFoundException.class) - public void testDeleteMeasuresByIdFailureWithNotFound() { + public void testDeleteMeasureByIdFailureWithNotFound() { given(measureRepo.findByIdAndDeleted(1L, false)).willReturn(null); - service.deleteMeasureById(1L); } @Test(expected = GriffinException.ServiceException.class) - public void testDeleteMeasuresByIdForGriffinFailureWithException() throws Exception { + public void testDeleteMeasureByIdForGriffinFailureWithException() throws Exception { GriffinMeasure measure = createGriffinMeasure("externalMeasure"); measure.setId(1L); given(measureRepo.findByIdAndDeleted(measure.getId(), false)).willReturn(measure); doThrow(new GriffinException.ServiceException("Failed to delete job", new Exception())) .when(griffinOp).delete(measure); - service.deleteMeasureById(1L); } @Test + public void testDeleteMeasuresForGriffinSuccess() throws Exception { + GriffinMeasure measure = createGriffinMeasure("view_item_hourly"); + measure.setId(1L); + given(measureRepo.findByDeleted(false)).willReturn(Arrays.asList(measure)); + doNothing().when(griffinOp).delete(measure); + service.deleteMeasures(); + } + + @Test + public void testDeleteMeasuresForExternalSuccess() { + ExternalMeasure measure = createExternalMeasure("externalMeasure"); + measure.setId(1L); + given(measureRepo.findByDeleted(false)).willReturn(Arrays.asList(measure)); + doNothing().when(externalOp).delete(measure); + service.deleteMeasures(); + } + + @Test(expected = GriffinException.ServiceException.class) + public void testDeleteMeasuresForGriffinFailureWithException() throws Exception { + GriffinMeasure measure = createGriffinMeasure("externalMeasure"); + measure.setId(1L); + given(measureRepo.findByDeleted(false)).willReturn(Arrays.asList(measure)); + doThrow(new GriffinException.ServiceException("Failed to delete job", new Exception())) + .when(griffinOp).delete(measure); + service.deleteMeasures(); + } + + @Test public void testCreateMeasureForGriffinSuccess() throws Exception { String measureName = "view_item_hourly"; GriffinMeasure griffinMeasure = createGriffinMeasure(measureName); http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/fd31809a/service/src/test/java/org/apache/griffin/core/util/PropertiesUtilTest.java ---------------------------------------------------------------------- diff --git a/service/src/test/java/org/apache/griffin/core/util/PropertiesUtilTest.java b/service/src/test/java/org/apache/griffin/core/util/PropertiesUtilTest.java index ca57369..80481b3 100644 --- a/service/src/test/java/org/apache/griffin/core/util/PropertiesUtilTest.java +++ b/service/src/test/java/org/apache/griffin/core/util/PropertiesUtilTest.java @@ -22,9 +22,11 @@ package org.apache.griffin.core.util; import org.junit.Test; import org.springframework.core.io.ClassPathResource; +import java.io.FileNotFoundException; import java.util.Properties; -import static org.junit.Assert.*; +import static org.apache.griffin.core.util.PropertiesUtil.getConf; +import static org.junit.Assert.assertEquals; public class PropertiesUtilTest { @@ -42,4 +44,38 @@ public class PropertiesUtilTest { assertEquals(properties, null); } + @Test + public void testGetConfWithLocation() throws FileNotFoundException { + String name = "sparkJob.properties"; + String defaultPath = "/" + name; + String location = "src/test/resources"; + Properties properties = getConf(name, defaultPath, location); + assert properties != null; + } + + @Test + public void testGetConfWithLocationEmpty() throws FileNotFoundException { + String name = "sparkJob.properties"; + String defaultPath = "/" + name; + String location = "src/main"; + Properties properties = getConf(name, defaultPath, location); + assert properties != null; + } + + @Test(expected = FileNotFoundException.class) + public void testGetConfWithLocationWrong() throws FileNotFoundException { + String name = "sparkJob.properties"; + String defaultPath = "/" + name; + String location = "wrong/path"; + getConf(name, defaultPath, location); + } + + @Test + public void testGetConfWithNoLocation() throws FileNotFoundException { + String name = "sparkJob.properties"; + String defaultPath = "/" + name; + Properties properties = getConf(name, defaultPath, null); + assert properties != null; + } + } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/fd31809a/service/src/test/java/org/apache/griffin/core/util/TimeUtilTest.java ---------------------------------------------------------------------- diff --git a/service/src/test/java/org/apache/griffin/core/util/TimeUtilTest.java b/service/src/test/java/org/apache/griffin/core/util/TimeUtilTest.java index a4b722d..22e2d2f 100644 --- a/service/src/test/java/org/apache/griffin/core/util/TimeUtilTest.java +++ b/service/src/test/java/org/apache/griffin/core/util/TimeUtilTest.java @@ -23,6 +23,8 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.junit4.SpringRunner; +import java.util.TimeZone; + import static org.junit.Assert.assertEquals; @RunWith(SpringRunner.class) @@ -31,13 +33,13 @@ public class TimeUtilTest { @Test public void testStr2LongWithPositive() { - String time = "2h3m4s"; + String time = "2hr3m4s"; assertEquals(String.valueOf(TimeUtil.str2Long(time)), "7384000"); } @Test public void testStr2LongWithNegative() { - String time = "-2h3m4s"; + String time = "-2hr3min4s"; assertEquals(String.valueOf(TimeUtil.str2Long(time)), "-7384000"); } @@ -49,7 +51,7 @@ public class TimeUtilTest { @Test public void testStr2LongWithDay() { - String time = "1d"; + String time = "1DAY"; System.out.println(TimeUtil.str2Long(time)); assertEquals(String.valueOf(TimeUtil.str2Long(time)), "86400000"); } @@ -89,7 +91,7 @@ public class TimeUtilTest { String format = "dt=#YYYYMMdd#"; Long time = 1516186620155L; String timeZone = "GMT+8:00"; - assertEquals(TimeUtil.format(format, time, timeZone), "dt=20180117"); + assertEquals(TimeUtil.format(format, time, TimeZone.getTimeZone(timeZone)), "dt=20180117"); } @Test @@ -97,26 +99,15 @@ public class TimeUtilTest { String format = "dt=#YYYYMMdd#/hour=#HH#"; Long time = 1516186620155L; String timeZone = "GMT+8:00"; - assertEquals(TimeUtil.format(format, time, timeZone), "dt=20180117/hour=18"); + assertEquals(TimeUtil.format(format, time, TimeZone.getTimeZone(timeZone)), "dt=20180117/hour=18"); } - @Test + @Test(expected = IllegalArgumentException.class) public void testFormatWithIllegalException() { String format = "\\#YYYYMMdd\\#"; Long time = 1516186620155L; String timeZone = "GMT+8:00"; - IllegalArgumentException exception = formatException(format, time, timeZone); - assert exception != null; - } - - private IllegalArgumentException formatException(String format, Long time, String timeZone) { - IllegalArgumentException exception = null; - try { - TimeUtil.format(format, time, timeZone); - } catch (IllegalArgumentException e) { - exception = e; - } - return exception; + TimeUtil.format(format, time, TimeZone.getTimeZone(timeZone)); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/fd31809a/service/src/test/resources/sparkJob.properties ---------------------------------------------------------------------- diff --git a/service/src/test/resources/sparkJob.properties b/service/src/test/resources/sparkJob.properties index 4b36826..5872319 100644 --- a/service/src/test/resources/sparkJob.properties +++ b/service/src/test/resources/sparkJob.properties @@ -18,27 +18,26 @@ # # spark required -sparkJob.file=hdfs://apollo-phx-nn-ha/apps/hdmi-technology/b_des/griffin/jar/griffin-measure.jar +sparkJob.file=hdfs:///griffin/griffin-measure.jar sparkJob.className=org.apache.griffin.measure.Application -sparkJob.args_1=hdfs://apollo-phx-nn-ha/apps/hdmi-technology/b_des/griffin/conf/env.json +sparkJob.args_1=hdfs:///griffin/json/env.json sparkJob.args_3=hdfs,raw sparkJob.name=test -sparkJob.queue=hdlq-gdi-sla +sparkJob.queue=default # options -sparkJob.numExecutors=10 +sparkJob.numExecutors=2 sparkJob.executorCores=1 -sparkJob.driverMemory=2g -sparkJob.executorMemory=2g +sparkJob.driverMemory=1g +sparkJob.executorMemory=1g # shouldn't config in server, but in -sparkJob.jars = hdfs://apollo-phx-nn-ha/apps/hdmi-technology/b_des/griffin/livy/spark-avro_2.11-2.0.1.jar;\ - hdfs://apollo-phx-nn-ha/apps/hdmi-technology/b_des/griffin/livy/datanucleus-api-jdo-3.2.6.jar;\ - hdfs://apollo-phx-nn-ha/apps/hdmi-technology/b_des/griffin/livy/datanucleus-core-3.2.10.jar;\ - hdfs://apollo-phx-nn-ha/apps/hdmi-technology/b_des/griffin/livy/datanucleus-rdbms-3.2.9.jar +sparkJob.jars = hdfs:///livy/datanucleus-api-jdo-3.2.6.jar;\ + hdfs:///livy/datanucleus-core-3.2.10.jar;\ + hdfs:///livy/datanucleus-rdbms-3.2.9.jar -spark.yarn.dist.files = hdfs://apollo-phx-nn-ha/apps/hdmi-technology/b_des/griffin/livy/hive-site.xml +spark.yarn.dist.files = hdfs:///home/spark_conf/hive-site.xml # livy # livy.uri=http://10.9.246.187:8998/batches
