[incubator-skywalking-oal-tool] branch master updated: Adjust test case.

[wusheng]

This is an automated email from the ASF dual-hosted git repository.

wusheng pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/incubator-skywalking-oal-tool.git


The following commit(s) were added to refs/heads/master by this push:
     new 6873e44  Adjust test case.
6873e44 is described below

commit 6873e448a702c685c710a9ef3120cf072920ef24
Author: Wu Sheng <wu.sh...@foxmail.com>
AuthorDate: Wed Aug 15 14:26:35 2018 +0800

    Adjust test case.
---
 .../skywalking/oal/tool/output/FileGeneratorTest.java      |  1 +
 .../expectedFiles/IndicatorImplementorExpected.java        | 14 ++++++++------
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git 
a/oal-parser/src/test/java/org/apache/skywalking/oal/tool/output/FileGeneratorTest.java
 
b/oal-parser/src/test/java/org/apache/skywalking/oal/tool/output/FileGeneratorTest.java
index 9b3a62a..a90c394 100644
--- 
a/oal-parser/src/test/java/org/apache/skywalking/oal/tool/output/FileGeneratorTest.java
+++ 
b/oal-parser/src/test/java/org/apache/skywalking/oal/tool/output/FileGeneratorTest.java
@@ -50,6 +50,7 @@ public class FileGeneratorTest {
         result.addPersistentField("summation", "summation", long.class);
         result.addPersistentField("count", "count", int.class);
         result.addPersistentField("value", "value", long.class);
+        result.addPersistentField("timeBucket", "time_bucket", long.class);
         result.setFieldsFromSource(SourceColumnsFactory.getColumns("Service"));
         result.generateSerializeFields();
 
diff --git 
a/oal-parser/src/test/resources/expectedFiles/IndicatorImplementorExpected.java 
b/oal-parser/src/test/resources/expectedFiles/IndicatorImplementorExpected.java
index d9ff395..d599e3b 100644
--- 
a/oal-parser/src/test/resources/expectedFiles/IndicatorImplementorExpected.java
+++ 
b/oal-parser/src/test/resources/expectedFiles/IndicatorImplementorExpected.java
@@ -72,9 +72,9 @@ public class ServiceAvgIndicator extends AvgIndicator {
     @Override public RemoteData.Builder serialize() {
         RemoteData.Builder remoteBuilder = RemoteData.newBuilder();
 
-        remoteBuilder.setDataLongs(0, getTimeBucket());
-        remoteBuilder.setDataLongs(1, getSummation());
-        remoteBuilder.setDataLongs(2, getValue());
+        remoteBuilder.setDataLongs(0, getSummation());
+        remoteBuilder.setDataLongs(1, getValue());
+        remoteBuilder.setDataLongs(2, getTimeBucket());
 
 
         remoteBuilder.setDataIntegers(0, getId());
@@ -85,9 +85,9 @@ public class ServiceAvgIndicator extends AvgIndicator {
 
     @Override public void deserialize(RemoteData remoteData) {
 
-        setTimeBucket(remoteData.getDataLongs(0));
-        setSummation(remoteData.getDataLongs(1));
-        setValue(remoteData.getDataLongs(2));
+        setSummation(remoteData.getDataLongs(0));
+        setValue(remoteData.getDataLongs(1));
+        setTimeBucket(remoteData.getDataLongs(2));
 
 
         setId(remoteData.getDataIntegers(0));
@@ -102,6 +102,7 @@ public class ServiceAvgIndicator extends AvgIndicator {
             map.put("summation", storageData.getSummation());
             map.put("count", storageData.getCount());
             map.put("value", storageData.getValue());
+            map.put("time_bucket", storageData.getTimeBucket());
             return map;
         }
 
@@ -111,6 +112,7 @@ public class ServiceAvgIndicator extends AvgIndicator {
             indicator.setSummation((long)dbMap.get("summation"));
             indicator.setCount((int)dbMap.get("count"));
             indicator.setValue((long)dbMap.get("value"));
+            indicator.setTimeBucket((long)dbMap.get("time_bucket"));
             return indicator;
         }
     }