Repository: incubator-griffin Updated Branches: refs/heads/master 0ae391057 -> 81c3a3c99
refactor some java codes including, 1.unused system.out statement 2.extra blank line in codes 3.same string constants used in multiple methods Author: Eugene <[email protected]> Closes #324 from toyboxman/refactor/testcases. Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/81c3a3c9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/81c3a3c9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/81c3a3c9 Branch: refs/heads/master Commit: 81c3a3c99cc2323557e213d9be8f5b66da6e107a Parents: 0ae3910 Author: Eugene <[email protected]> Authored: Tue Jun 26 13:45:26 2018 +0800 Committer: William Guo <[email protected]> Committed: Tue Jun 26 13:45:26 2018 +0800 ---------------------------------------------------------------------- .../griffin/core/measure/entity/DataConnector.java | 1 - .../org/apache/griffin/core/util/EntityHelper.java | 13 ++++++++----- .../org/apache/griffin/core/util/TimeUtilTest.java | 2 -- 3 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/81c3a3c9/service/src/main/java/org/apache/griffin/core/measure/entity/DataConnector.java ---------------------------------------------------------------------- diff --git a/service/src/main/java/org/apache/griffin/core/measure/entity/DataConnector.java b/service/src/main/java/org/apache/griffin/core/measure/entity/DataConnector.java index 916df33..9834c69 100644 --- a/service/src/main/java/org/apache/griffin/core/measure/entity/DataConnector.java +++ b/service/src/main/java/org/apache/griffin/core/measure/entity/DataConnector.java @@ -194,7 +194,6 @@ public class DataConnector extends AbstractAuditableEntity { } } - public DataConnector() { } http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/81c3a3c9/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 0595f55..685d7c0 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 @@ -19,7 +19,6 @@ under the License. package org.apache.griffin.core.util; - import com.fasterxml.jackson.core.JsonProcessingException; import org.apache.griffin.core.job.entity.BatchJob; import org.apache.griffin.core.job.entity.JobDataSegment; @@ -56,6 +55,10 @@ 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 final String CRON_EXPRESSION = "0 0/4 * * * ?"; + public static final String TIME_ZONE = "GMT+8:00"; + public static GriffinMeasure createGriffinMeasure(String name) throws Exception { DataConnector dcSource = createDataConnector("source_name", "default", "test_data_src", "dt=#YYYYMMdd# AND hour=#HH#"); @@ -128,7 +131,7 @@ public class EntityHelper { List<JobDataSegment> segments = new ArrayList<>(); segments.add(segment1); segments.add(segment2); - return new JobSchedule(1L, jobName, "0 0/4 * * * ?", "GMT+8:00", segments); + return new JobSchedule(1L, jobName, CRON_EXPRESSION, TIME_ZONE, segments); } public static JobSchedule createJobSchedule(String jobName, @@ -138,7 +141,7 @@ public class EntityHelper { List<JobDataSegment> segments = new ArrayList<>(); segments.add(segment1); segments.add(segment2); - return new JobSchedule(1L, jobName, "0 0/4 * * * ?", "GMT+8:00", segments); + return new JobSchedule(1L, jobName, CRON_EXPRESSION, TIME_ZONE, segments); } public static JobSchedule createJobSchedule(String jobName, @@ -147,7 +150,7 @@ public class EntityHelper { List<JobDataSegment> segments = new ArrayList<>(); segments.add(source); segments.add(target); - return new JobSchedule(1L, jobName, "0 0/4 * * * ?", "GMT+8:00", segments); + return new JobSchedule(1L, jobName, CRON_EXPRESSION, TIME_ZONE, segments); } public static JobDataSegment createJobDataSegment(String dataConnectorName, @@ -197,7 +200,7 @@ public class EntityHelper { detail.put("jobId", 1L); detail.put("jobName", "jobName"); detail.put("measureId", 1L); - detail.put("cronExpression", "0 0/4 * * * ?"); + detail.put("cronExpression", CRON_EXPRESSION); return detail; } http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/81c3a3c9/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 22e2d2f..fa80c6f 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 @@ -30,7 +30,6 @@ import static org.junit.Assert.assertEquals; @RunWith(SpringRunner.class) public class TimeUtilTest { - @Test public void testStr2LongWithPositive() { String time = "2hr3m4s"; @@ -52,7 +51,6 @@ public class TimeUtilTest { @Test public void testStr2LongWithDay() { String time = "1DAY"; - System.out.println(TimeUtil.str2Long(time)); assertEquals(String.valueOf(TimeUtil.str2Long(time)), "86400000"); }
