You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@griffin.apache.org by gu...@apache.org on 2017/06/16 07:45:07 UTC
incubator-griffin git commit: 20170616 1105pationtion modify
Repository: incubator-griffin
Updated Branches:
refs/heads/master df287331a -> ab3456876
20170616 1105pationtion modify
Author: Chen <xi...@lm-shc-16501061.corp.ebay.com>
Closes #80 from justACT/20170616-1105pationtionModify.
Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/ab345687
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/ab345687
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/ab345687
Branch: refs/heads/master
Commit: ab345687672b2e5a9dbe9a71ae636784f5f3fdc5
Parents: df28733
Author: Chen <xi...@lm-shc-16501061.corp.ebay.com>
Authored: Fri Jun 16 15:44:50 2017 +0800
Committer: William Guo <gu...@icloud.com>
Committed: Fri Jun 16 15:44:50 2017 +0800
----------------------------------------------------------------------
.../griffin/core/schedule/SparkSubmitJobTest.java | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/ab345687/service/src/test/java/org/apache/griffin/core/schedule/SparkSubmitJobTest.java
----------------------------------------------------------------------
diff --git a/service/src/test/java/org/apache/griffin/core/schedule/SparkSubmitJobTest.java b/service/src/test/java/org/apache/griffin/core/schedule/SparkSubmitJobTest.java
index ce59858..f852893 100644
--- a/service/src/test/java/org/apache/griffin/core/schedule/SparkSubmitJobTest.java
+++ b/service/src/test/java/org/apache/griffin/core/schedule/SparkSubmitJobTest.java
@@ -116,11 +116,9 @@ public class SparkSubmitJobTest{
public void test_genPartitions(){
String[] patternItemSet={"YYYYMMDD","HH"};
String[] partitionItemSet={"date","hour"};
-// long timestamp=1460174400000l;
long timestamp=System.currentTimeMillis();
Map<String,String> par=ssj.genPartitions(patternItemSet,partitionItemSet,timestamp);
Map<String,String> verifyMap=new HashMap<>();
-// verifyMap.put("date","20160409");
SimpleDateFormat sdf = new SimpleDateFormat("YYYYMMdd");
verifyMap.put("date",sdf.format(new Date(timestamp)));
SimpleDateFormat sdf1 = new SimpleDateFormat("HH");
@@ -133,11 +131,12 @@ public class SparkSubmitJobTest{
DataConnector dc=mock(DataConnector.class);
String[] patternItemSet={"YYYYMMDD","HH"};
String[] partitionItemSet={"date","hour"};
- long timestamp=1460174400000l;
+ long timestamp=System.currentTimeMillis();
ssj.setDataConnectorPartitions(dc,patternItemSet,partitionItemSet,timestamp);
-// doNothing().when(ssj).setDataConnectorPartitions(dataConnector,patternItemSet,partitionItemSet,timestamp);
Map<String,String> map=new HashMap<>();
- map.put("partitions","date=20160409, hour=12");
+ SimpleDateFormat sdf = new SimpleDateFormat("YYYYMMdd");
+ SimpleDateFormat sdf1 = new SimpleDateFormat("HH");
+ map.put("partitions","date="+sdf.format(new Date(timestamp))+", hour="+sdf1.format(new Date(timestamp)));
try {
verify(dc).setConfig(map);
} catch (JsonProcessingException e) {
@@ -150,8 +149,8 @@ public class SparkSubmitJobTest{
long timestamp=System.currentTimeMillis();
ssj.eachJoblastTimestamp="";
System.out.println(ssj.setCurrentTimestamp(timestamp));
- ssj.eachJoblastTimestamp="1494297256667";
- ssj.periodTime="10";
+ ssj.eachJoblastTimestamp=(timestamp-1000)+"";
+ ssj.periodTime="1000";
System.out.println(ssj.setCurrentTimestamp(timestamp));
}