Repository: incubator-griffin Updated Branches: refs/heads/master 865cd3149 -> 0db4baedb
Refactor/update cases refactor JsonUtilTest codes including: 1.remove unusual assert keyword instead of Assert 2.trim and clean codes Author: Eugene <[email protected]> Closes #317 from toyboxman/refactor/update-cases. Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/0db4baed Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/0db4baed Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/0db4baed Branch: refs/heads/master Commit: 0db4baedb2aa2848be97c8359850b28e3085f95a Parents: 865cd31 Author: Eugene <[email protected]> Authored: Thu Jun 21 09:35:52 2018 +0800 Committer: Lionel Liu <[email protected]> Committed: Thu Jun 21 09:35:52 2018 +0800 ---------------------------------------------------------------------- measure/pom.xml | 9 ++- .../apache/griffin/core/util/EntityHelper.java | 82 +++++++++++++++----- .../apache/griffin/core/util/JsonUtilTest.java | 23 +++--- 3 files changed, 80 insertions(+), 34 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/0db4baed/measure/pom.xml ---------------------------------------------------------------------- diff --git a/measure/pom.xml b/measure/pom.xml index c4906f6..83794ed 100644 --- a/measure/pom.xml +++ b/measure/pom.xml @@ -187,9 +187,9 @@ under the License. <build> <plugins> <plugin> - <groupId>org.scala-tools</groupId> - <artifactId>maven-scala-plugin</artifactId> - <version>2.15.2</version> + <groupId>net.alchim31.maven</groupId> + <artifactId>scala-maven-plugin</artifactId> + <version>3.3.1</version> <executions> <execution> <id>compile</id> @@ -200,6 +200,9 @@ under the License. <phase>compile</phase> </execution> </executions> + <configuration> + <scalaVersion>${scala.version}</scalaVersion> + </configuration> </plugin> <!-- enable scalatest --> <plugin> http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/0db4baed/service/src/test/java/org/apache/griffin/core/util/EntityHelper.java ---------------------------------------------------------------------- diff --git a/service/src/test/java/org/apache/griffin/core/util/EntityHelper.java b/service/src/test/java/org/apache/griffin/core/util/EntityHelper.java index e7185e0..0595f55 100644 --- a/service/src/test/java/org/apache/griffin/core/util/EntityHelper.java +++ b/service/src/test/java/org/apache/griffin/core/util/EntityHelper.java @@ -21,8 +21,20 @@ package org.apache.griffin.core.util; import com.fasterxml.jackson.core.JsonProcessingException; -import org.apache.griffin.core.job.entity.*; -import org.apache.griffin.core.measure.entity.*; +import org.apache.griffin.core.job.entity.BatchJob; +import org.apache.griffin.core.job.entity.JobDataSegment; +import org.apache.griffin.core.job.entity.JobInstanceBean; +import org.apache.griffin.core.job.entity.JobSchedule; +import org.apache.griffin.core.job.entity.LivySessionStates; +import org.apache.griffin.core.job.entity.SegmentPredicate; +import org.apache.griffin.core.job.entity.SegmentRange; +import org.apache.griffin.core.job.entity.VirtualJob; +import org.apache.griffin.core.measure.entity.DataConnector; +import org.apache.griffin.core.measure.entity.DataSource; +import org.apache.griffin.core.measure.entity.EvaluateRule; +import org.apache.griffin.core.measure.entity.ExternalMeasure; +import org.apache.griffin.core.measure.entity.GriffinMeasure; +import org.apache.griffin.core.measure.entity.Rule; import org.quartz.JobDataMap; import org.quartz.JobKey; import org.quartz.SimpleTrigger; @@ -30,26 +42,41 @@ import org.quartz.impl.JobDetailImpl; import org.quartz.impl.triggers.SimpleTriggerImpl; import java.io.IOException; -import java.util.*; - -import static org.apache.griffin.core.job.JobInstance.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import static org.apache.griffin.core.job.JobInstance.MEASURE_KEY; +import static org.apache.griffin.core.job.JobInstance.PREDICATES_KEY; +import static org.apache.griffin.core.job.JobInstance.PREDICATE_JOB_NAME; import static org.apache.griffin.core.job.JobServiceImpl.GRIFFIN_JOB_ID; import static org.apache.hadoop.mapreduce.MRJobConfig.JOB_NAME; public class EntityHelper { public static GriffinMeasure createGriffinMeasure(String name) throws Exception { - DataConnector dcSource = createDataConnector("source_name", "default", "test_data_src", "dt=#YYYYMMdd# AND hour=#HH#"); - DataConnector dcTarget = createDataConnector("target_name", "default", "test_data_tgt", "dt=#YYYYMMdd# AND hour=#HH#"); + DataConnector dcSource = createDataConnector("source_name", "default", + "test_data_src", "dt=#YYYYMMdd# AND hour=#HH#"); + DataConnector dcTarget = createDataConnector("target_name", "default", + "test_data_tgt", "dt=#YYYYMMdd# AND hour=#HH#"); return createGriffinMeasure(name, dcSource, dcTarget); } - public static GriffinMeasure createGriffinMeasure(String name, SegmentPredicate srcPredicate, SegmentPredicate tgtPredicate) throws Exception { - DataConnector dcSource = createDataConnector("source_name", "default", "test_data_src", "dt=#YYYYMMdd# AND hour=#HH#", srcPredicate); - DataConnector dcTarget = createDataConnector("target_name", "default", "test_data_tgt", "dt=#YYYYMMdd# AND hour=#HH#", tgtPredicate); + public static GriffinMeasure createGriffinMeasure(String name, + SegmentPredicate srcPredicate, + SegmentPredicate tgtPredicate) throws Exception { + DataConnector dcSource = createDataConnector("source_name", "default", + "test_data_src", "dt=#YYYYMMdd# AND hour=#HH#", srcPredicate); + DataConnector dcTarget = createDataConnector("target_name", "default", + "test_data_tgt", "dt=#YYYYMMdd# AND hour=#HH#", tgtPredicate); return createGriffinMeasure(name, dcSource, dcTarget); } - public static GriffinMeasure createGriffinMeasure(String name, DataConnector dcSource, DataConnector dcTarget) throws Exception { + public static GriffinMeasure createGriffinMeasure(String name, + DataConnector dcSource, + DataConnector dcTarget) throws Exception { DataSource dataSource = new DataSource("source", Arrays.asList(dcSource)); DataSource targetSource = new DataSource("target", Arrays.asList(dcTarget)); List<DataSource> dataSources = new ArrayList<>(); @@ -63,7 +90,10 @@ public class EntityHelper { return new GriffinMeasure(name, "test", dataSources, evaluateRule); } - public static DataConnector createDataConnector(String name, String database, String table, String where) throws IOException { + public static DataConnector createDataConnector(String name, + String database, + String table, + String where) throws IOException { HashMap<String, String> config = new HashMap<>(); config.put("database", database); config.put("table.name", table); @@ -71,7 +101,11 @@ public class EntityHelper { return new DataConnector(name, "1h", config, null); } - public static DataConnector createDataConnector(String name, String database, String table, String where, SegmentPredicate predicate) throws IOException { + public static DataConnector createDataConnector(String name, + String database, + String table, + String where, + SegmentPredicate predicate) throws IOException { HashMap<String, String> config = new HashMap<>(); config.put("database", database); config.put("table.name", table); @@ -80,7 +114,8 @@ public class EntityHelper { } public static ExternalMeasure createExternalMeasure(String name) { - return new ExternalMeasure(name, "description", "org", "test", "metricName", new VirtualJob()); + return new ExternalMeasure(name, "description", "org", "test", + "metricName", new VirtualJob()); } public static JobSchedule createJobSchedule() throws JsonProcessingException { @@ -96,7 +131,8 @@ public class EntityHelper { return new JobSchedule(1L, jobName, "0 0/4 * * * ?", "GMT+8:00", segments); } - public static JobSchedule createJobSchedule(String jobName, SegmentRange range) throws JsonProcessingException { + public static JobSchedule createJobSchedule(String jobName, + SegmentRange range) throws JsonProcessingException { JobDataSegment segment1 = createJobDataSegment("source_name", true, range); JobDataSegment segment2 = createJobDataSegment("target_name", false, range); List<JobDataSegment> segments = new ArrayList<>(); @@ -105,18 +141,23 @@ public class EntityHelper { return new JobSchedule(1L, jobName, "0 0/4 * * * ?", "GMT+8:00", segments); } - public static JobSchedule createJobSchedule(String jobName, JobDataSegment source, JobDataSegment target) throws JsonProcessingException { + public static JobSchedule createJobSchedule(String jobName, + JobDataSegment source, + JobDataSegment target) throws JsonProcessingException { List<JobDataSegment> segments = new ArrayList<>(); segments.add(source); segments.add(target); return new JobSchedule(1L, jobName, "0 0/4 * * * ?", "GMT+8:00", segments); } - public static JobDataSegment createJobDataSegment(String dataConnectorName, Boolean baseline, SegmentRange range) { + public static JobDataSegment createJobDataSegment(String dataConnectorName, + Boolean baseline, + SegmentRange range) { return new JobDataSegment(dataConnectorName, baseline, range); } - public static JobDataSegment createJobDataSegment(String dataConnectorName, Boolean baseline) { + public static JobDataSegment createJobDataSegment(String dataConnectorName, + Boolean baseline) { return new JobDataSegment(dataConnectorName, baseline); } @@ -129,7 +170,8 @@ public class EntityHelper { return jobBean; } - public static JobDetailImpl createJobDetail(String measureJson, String predicatesJson) { + public static JobDetailImpl createJobDetail(String measureJson, + String predicatesJson) { JobDetailImpl jobDetail = new JobDetailImpl(); JobKey jobKey = new JobKey("name", "group"); jobDetail.setKey(jobKey); @@ -169,7 +211,7 @@ public class EntityHelper { public static BatchJob createGriffinJob() { return new BatchJob(1L, 1L, "jobName", - "quartzJobName", "quartzGroupName", false); + "quartzJobName", "quartzGroupName", false); } } http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/0db4baed/service/src/test/java/org/apache/griffin/core/util/JsonUtilTest.java ---------------------------------------------------------------------- diff --git a/service/src/test/java/org/apache/griffin/core/util/JsonUtilTest.java b/service/src/test/java/org/apache/griffin/core/util/JsonUtilTest.java index 7d30526..0c9bcb8 100644 --- a/service/src/test/java/org/apache/griffin/core/util/JsonUtilTest.java +++ b/service/src/test/java/org/apache/griffin/core/util/JsonUtilTest.java @@ -28,29 +28,31 @@ import java.io.IOException; import java.util.HashMap; import java.util.Map; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertNull; public class JsonUtilTest { + public static final String JOB_HEALTH_JSON = "{\"healthyJobCount\":5,\"jobCount\":10}"; + @Test public void testToJson() throws JsonProcessingException { JobHealth jobHealth = new JobHealth(5, 10); String jobHealthStr = JsonUtil.toJson(jobHealth); - System.out.println(jobHealthStr); - assertEquals(jobHealthStr, "{\"healthyJobCount\":5,\"jobCount\":10}"); + assertEquals(jobHealthStr, JOB_HEALTH_JSON); } @Test public void testToJsonWithFormat() throws JsonProcessingException { JobHealth jobHealth = new JobHealth(5, 10); String jobHealthStr = JsonUtil.toJsonWithFormat(jobHealth); - System.out.println(jobHealthStr); + assertNotEquals(jobHealthStr, JOB_HEALTH_JSON); } @Test public void testToEntityWithParamClass() throws IOException { - String str = "{\"healthyJobCount\":5,\"jobCount\":10}"; - JobHealth jobHealth = JsonUtil.toEntity(str, JobHealth.class); + JobHealth jobHealth = JsonUtil.toEntity(JOB_HEALTH_JSON, JobHealth.class); assertEquals(jobHealth.getJobCount(), 10); assertEquals(jobHealth.getHealthyJobCount(), 5); } @@ -59,16 +61,15 @@ public class JsonUtilTest { public void testToEntityWithNullParamClass() throws IOException { String str = null; JobHealth jobHealth = JsonUtil.toEntity(str, JobHealth.class); - assert jobHealth == null; + assertNull(jobHealth); } @Test public void testToEntityWithParamTypeReference() throws IOException { - String str = "{\"aaa\":12, \"bbb\":13}"; TypeReference<HashMap<String, Integer>> type = new TypeReference<HashMap<String, Integer>>() { }; - Map map = JsonUtil.toEntity(str, type); - assertEquals(map.get("aaa"), 12); + Map map = JsonUtil.toEntity(JOB_HEALTH_JSON, type); + assertEquals(map.get("jobCount"), 10); } @Test @@ -77,6 +78,6 @@ public class JsonUtilTest { TypeReference<HashMap<String, Integer>> type = new TypeReference<HashMap<String, Integer>>() { }; Map map = JsonUtil.toEntity(str, type); - assert map == null; + assertNull(map); } } \ No newline at end of file
