From 816b04c12e83f533dc7e037107740a1fac4a6450 Mon Sep 17 00:00:00 2001 From: pengys5 <8082209@qq.com> Date: Fri, 7 Apr 2017 22:31:11 +0800 Subject: [PATCH] all testcase add system time zone property " user.timezone = UTC " --- .../worker/httpserver/AbstractGet.java | 2 +- .../worker/datamerge/JsonDataMerge.java | 11 +++++-- .../worker/datamerge/MetricDataMergeJson.java | 6 ++-- .../worker/datamerge/SpecialTimeColumn.java | 32 +++++++++++++++++++ .../analysis/GlobalTraceAnalysisTestCase.java | 5 +++ .../persistence/GlobalTraceAggTestCase.java | 5 +++ .../persistence/GlobalTraceSaveTestCase.java | 5 +++ ...GlobalTraceSearchWithGlobalIdTestCase.java | 5 +++ .../analysis/NodeCompAnalysisTestCase.java | 4 +++ .../NodeMappingDayAnalysisTestCase.java | 4 +++ .../NodeMappingHourAnalysisTestCase.java | 4 +++ .../NodeMappingMinuteAnalysisTestCase.java | 4 +++ .../node/persistence/NodeCompAggTestCase.java | 5 +++ .../persistence/NodeCompSaveTestCase.java | 5 +++ .../NodeMappingDayAggTestCase.java | 5 +++ .../NodeMappingDaySaveTestCase.java | 5 +++ .../NodeMappingHourAggTestCase.java | 5 +++ .../NodeMappingHourSaveTestCase.java | 5 +++ .../NodeMappingMinuteAggTestCase.java | 5 +++ .../NodeMappingMinuteSaveTestCase.java | 5 +++ ...efResSumGetGroupWithTimeSliceTestCase.java | 4 +++ .../analysis/NodeRefDayAnalysisTestCase.java | 5 +++ .../analysis/NodeRefHourAnalysisTestCase.java | 5 +++ .../NodeRefMinuteAnalysisTestCase.java | 5 +++ .../NodeRefResSumDayAnalysisTestCase.java | 5 +++ .../NodeRefResSumHourAnalysisTestCase.java | 5 +++ .../NodeRefResSumMinuteAnalysisTestCase.java | 5 +++ .../persistence/NodeRefDayAggTestCase.java | 5 +++ .../persistence/NodeRefDaySaveTestCase.java | 5 +++ .../persistence/NodeRefHourAggTestCase.java | 5 +++ .../persistence/NodeRefHourSaveTestCase.java | 5 +++ .../persistence/NodeRefMinuteAggTestCase.java | 5 +++ .../NodeRefMinuteSaveTestCase.java | 5 +++ .../NodeRefResSumDayAggTestCase.java | 5 +++ .../NodeRefResSumDaySaveTestCase.java | 5 +++ .../NodeRefResSumHourAggTestCase.java | 5 +++ .../NodeRefResSumHourSaveTestCase.java | 5 +++ .../NodeRefResSumMinuteAggTestCase.java | 5 +++ .../NodeRefResSumMinuteSaveTestCase.java | 5 +++ .../worker/segment/SegmentPostTestCase.java | 5 +++ ...egmentTopGetWithGlobalTraceIdTestCase.java | 4 +++ .../SegmentTopGetWithTimeSliceTestCase.java | 4 +++ .../persistence/SegmentCostSaveTestCase.java | 4 +++ .../SegmentExceptionSaveTestCase.java | 4 +++ .../persistence/SegmentSaveTestCase.java | 5 +++ .../worker/span/SpanGetWithIdTestCase.java | 4 +++ .../persistence/SpanSearchWithIdTestCase.java | 5 +++ .../TraceDagGetWithTimeSliceTestCase.java | 4 +++ 48 files changed, 254 insertions(+), 6 deletions(-) create mode 100644 skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/datamerge/SpecialTimeColumn.java diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/httpserver/AbstractGet.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/httpserver/AbstractGet.java index 176bf9bb3..b44cf7402 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/httpserver/AbstractGet.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/httpserver/AbstractGet.java @@ -14,7 +14,7 @@ import java.util.Map; */ public abstract class AbstractGet extends AbstractLocalSyncWorker { - public AbstractGet(Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) { + protected AbstractGet(Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) { super(role, clusterContext, selfContext); } diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/datamerge/JsonDataMerge.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/datamerge/JsonDataMerge.java index dd4c985b8..803fb69c6 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/datamerge/JsonDataMerge.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/datamerge/JsonDataMerge.java @@ -20,7 +20,7 @@ public enum JsonDataMerge { private String path = this.getClass().getResource("/").getPath(); - public void merge(String expectJsonFile, JsonArray actualData) throws FileNotFoundException{ + public void merge(String expectJsonFile, JsonArray actualData) throws FileNotFoundException { Gson gson = new Gson(); String jsonStrData = JsonFileReader.INSTANCE.read(path + expectJsonFile); JsonArray expectJsonArray = gson.fromJson(jsonStrData, JsonArray.class); @@ -45,10 +45,15 @@ public enum JsonDataMerge { if (entry.getValue().isJsonNull()) { Assert.assertEquals(true, actualData.get(key).isJsonNull()); } else { - if (key.equals("timeSlice") || key.equals("startTime") || key.equals("endTime") || key.equals("minute") || key.equals("hour") || key.equals("day")) { + if (key.equals("timeSlice") || key.equals("minute") || key.equals("hour") || key.equals("day")) { value = String.valueOf(DateTools.changeToUTCSlice(Long.valueOf(value))); } - Assert.assertEquals(value, actualData.get(key).getAsString()); + if (SpecialTimeColumn.INSTANCE.isSpecialTimeColumn(key)) { + String changedValue = SpecialTimeColumn.INSTANCE.specialTimeColumnChange(value); + Assert.assertEquals(changedValue, actualData.get(key).getAsString()); + } else { + Assert.assertEquals(value, actualData.get(key).getAsString()); + } } } } diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/datamerge/MetricDataMergeJson.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/datamerge/MetricDataMergeJson.java index 9c479fd65..73d14278b 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/datamerge/MetricDataMergeJson.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/datamerge/MetricDataMergeJson.java @@ -61,10 +61,12 @@ public enum MetricDataMergeJson { if (entry.getValue().isJsonNull()) { Assert.assertEquals(true, actualData.get(key).isJsonNull()); } else { + String actualValue = actualData.get(key).getAsString(); if (key.equals("timeSlice")) { value = String.valueOf(DateTools.changeToUTCSlice(Long.valueOf(value))); + actualValue = String.valueOf(DateTools.changeToUTCSlice(Long.valueOf(actualValue))); } - Assert.assertEquals(value, actualData.get(key).getAsString()); + Assert.assertEquals(value, actualValue); } } } @@ -74,7 +76,7 @@ public enum MetricDataMergeJson { Gson gson = new Gson(); for (MetricData metricData : recordDataList) { JsonObject jsonObject = gson.fromJson(gson.toJson(metricData.toMap()), JsonObject.class); - recordDataMap.put(metricData.getId(), jsonObject); + recordDataMap.put(id2UTCSlice(metricData.getId()), jsonObject); } return recordDataMap; } diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/datamerge/SpecialTimeColumn.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/datamerge/SpecialTimeColumn.java new file mode 100644 index 000000000..6257e5341 --- /dev/null +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/datamerge/SpecialTimeColumn.java @@ -0,0 +1,32 @@ +package com.a.eye.skywalking.collector.worker.datamerge; + +import com.a.eye.skywalking.collector.worker.Const; +import com.a.eye.skywalking.collector.worker.tools.DateTools; + +/** + * @author pengys5 + */ +public enum SpecialTimeColumn { + INSTANCE; + + public String specialTimeColumnChange(String value) { + String[] values = value.split(Const.IDS_SPLIT); + long changedTime = DateTools.changeToUTCSlice(Long.valueOf(values[0])); + + String changedValue = ""; + for (int i = 1; i < values.length; i++) { + changedValue = changedValue + Const.ID_SPLIT + values[i]; + } + return String.valueOf(changedTime) + changedValue; + } + + public boolean isSpecialTimeColumn(String columnName) { + String[] specialTimeColumns = {"nodeRefId"}; + for (String column : specialTimeColumns) { + if (column.equals(columnName)) { + return true; + } + } + return false; + } +} diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/globaltrace/analysis/GlobalTraceAnalysisTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/globaltrace/analysis/GlobalTraceAnalysisTestCase.java index 83e7f22f5..e6d1168a9 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/globaltrace/analysis/GlobalTraceAnalysisTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/globaltrace/analysis/GlobalTraceAnalysisTestCase.java @@ -19,6 +19,8 @@ import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; +import java.util.TimeZone; + import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.mock; import static org.powermock.api.mockito.PowerMockito.when; @@ -38,6 +40,9 @@ public class GlobalTraceAnalysisTestCase { @Before public void init() throws Exception { + System.setProperty("user.timezone", "UTC"); + TimeZone.setDefault(TimeZone.getTimeZone("UTC")); + clusterWorkerContext = PowerMockito.mock(ClusterWorkerContext.class); WorkerRefs workerRefs = mock(WorkerRefs.class); answer = new MergeDataAnswer(); diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/globaltrace/persistence/GlobalTraceAggTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/globaltrace/persistence/GlobalTraceAggTestCase.java index b8f87262f..ac1d4413f 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/globaltrace/persistence/GlobalTraceAggTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/globaltrace/persistence/GlobalTraceAggTestCase.java @@ -20,6 +20,8 @@ import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; +import java.util.TimeZone; + import static org.mockito.Mockito.*; /** @@ -36,6 +38,9 @@ public class GlobalTraceAggTestCase { @Before public void init() throws Exception { + System.setProperty("user.timezone", "UTC"); + TimeZone.setDefault(TimeZone.getTimeZone("UTC")); + clusterWorkerContext = PowerMockito.mock(ClusterWorkerContext.class); LocalWorkerContext localWorkerContext = PowerMockito.mock(LocalWorkerContext.class); diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/globaltrace/persistence/GlobalTraceSaveTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/globaltrace/persistence/GlobalTraceSaveTestCase.java index 2a56ae1fa..6b5021208 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/globaltrace/persistence/GlobalTraceSaveTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/globaltrace/persistence/GlobalTraceSaveTestCase.java @@ -9,6 +9,8 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import java.util.TimeZone; + /** * @author pengys5 */ @@ -18,6 +20,9 @@ public class GlobalTraceSaveTestCase { @Before public void init() { + System.setProperty("user.timezone", "UTC"); + TimeZone.setDefault(TimeZone.getTimeZone("UTC")); + ClusterWorkerContext cluster = new ClusterWorkerContext(null); LocalWorkerContext local = new LocalWorkerContext(); save = new GlobalTraceSave(GlobalTraceSave.Role.INSTANCE, cluster, local); diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/globaltrace/persistence/GlobalTraceSearchWithGlobalIdTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/globaltrace/persistence/GlobalTraceSearchWithGlobalIdTestCase.java index c597e3122..8a46e425e 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/globaltrace/persistence/GlobalTraceSearchWithGlobalIdTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/globaltrace/persistence/GlobalTraceSearchWithGlobalIdTestCase.java @@ -18,6 +18,8 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.reflect.Whitebox; +import java.util.TimeZone; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -36,6 +38,9 @@ public class GlobalTraceSearchWithGlobalIdTestCase { @Before public void init() { + System.setProperty("user.timezone", "UTC"); + TimeZone.setDefault(TimeZone.getTimeZone("UTC")); + getResponseFromEs = PowerMockito.mock(GetResponseFromEs.class); Whitebox.setInternalState(GetResponseFromEs.class, "INSTANCE", getResponseFromEs); } diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/analysis/NodeCompAnalysisTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/analysis/NodeCompAnalysisTestCase.java index 750afa7c7..0f659026a 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/analysis/NodeCompAnalysisTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/analysis/NodeCompAnalysisTestCase.java @@ -21,6 +21,7 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import java.util.List; +import java.util.TimeZone; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.mock; @@ -41,6 +42,9 @@ public class NodeCompAnalysisTestCase { @Before public void init() throws Exception { + System.setProperty("user.timezone", "UTC"); + TimeZone.setDefault(TimeZone.getTimeZone("UTC")); + clusterWorkerContext = PowerMockito.mock(ClusterWorkerContext.class); WorkerRefs workerRefs = mock(WorkerRefs.class); answer = new RecordDataAnswer(); diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/analysis/NodeMappingDayAnalysisTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/analysis/NodeMappingDayAnalysisTestCase.java index 2b547d042..976fbda80 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/analysis/NodeMappingDayAnalysisTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/analysis/NodeMappingDayAnalysisTestCase.java @@ -23,6 +23,7 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import java.util.List; +import java.util.TimeZone; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.mock; @@ -43,6 +44,9 @@ public class NodeMappingDayAnalysisTestCase { @Before public void init() throws Exception { + System.setProperty("user.timezone", "UTC"); + TimeZone.setDefault(TimeZone.getTimeZone("UTC")); + clusterWorkerContext = PowerMockito.mock(ClusterWorkerContext.class); WorkerRefs workerRefs = mock(WorkerRefs.class); answer = new RecordDataAnswer(); diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/analysis/NodeMappingHourAnalysisTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/analysis/NodeMappingHourAnalysisTestCase.java index 090b48cb3..c10f67b46 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/analysis/NodeMappingHourAnalysisTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/analysis/NodeMappingHourAnalysisTestCase.java @@ -21,6 +21,7 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import java.util.List; +import java.util.TimeZone; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.mock; @@ -40,6 +41,9 @@ public class NodeMappingHourAnalysisTestCase { @Before public void init() throws Exception { + System.setProperty("user.timezone", "UTC"); + TimeZone.setDefault(TimeZone.getTimeZone("UTC")); + ClusterWorkerContext clusterWorkerContext = PowerMockito.mock(ClusterWorkerContext.class); WorkerRefs workerRefs = mock(WorkerRefs.class); answer = new RecordDataAnswer(); diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/analysis/NodeMappingMinuteAnalysisTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/analysis/NodeMappingMinuteAnalysisTestCase.java index 5494eec40..64368a33a 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/analysis/NodeMappingMinuteAnalysisTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/analysis/NodeMappingMinuteAnalysisTestCase.java @@ -21,6 +21,7 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import java.util.List; +import java.util.TimeZone; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.mock; @@ -40,6 +41,9 @@ public class NodeMappingMinuteAnalysisTestCase { @Before public void init() throws Exception { + System.setProperty("user.timezone", "UTC"); + TimeZone.setDefault(TimeZone.getTimeZone("UTC")); + ClusterWorkerContext clusterWorkerContext = PowerMockito.mock(ClusterWorkerContext.class); WorkerRefs workerRefs = mock(WorkerRefs.class); answer = new RecordDataAnswer(); diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeCompAggTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeCompAggTestCase.java index 3302ffc01..c49583b8f 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeCompAggTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeCompAggTestCase.java @@ -22,6 +22,8 @@ import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; +import java.util.TimeZone; + import static org.mockito.Mockito.*; /** @@ -39,6 +41,9 @@ public class NodeCompAggTestCase { @Before public void init() throws Exception { + System.setProperty("user.timezone", "UTC"); + TimeZone.setDefault(TimeZone.getTimeZone("UTC")); + clusterWorkerContext = PowerMockito.mock(ClusterWorkerContext.class); localWorkerContext = PowerMockito.mock(LocalWorkerContext.class); diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeCompSaveTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeCompSaveTestCase.java index 3319e25b4..24014f7e1 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeCompSaveTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeCompSaveTestCase.java @@ -10,6 +10,8 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import java.util.TimeZone; + /** * @author pengys5 */ @@ -19,6 +21,9 @@ public class NodeCompSaveTestCase { @Before public void init() { + System.setProperty("user.timezone", "UTC"); + TimeZone.setDefault(TimeZone.getTimeZone("UTC")); + ClusterWorkerContext cluster = new ClusterWorkerContext(null); LocalWorkerContext local = new LocalWorkerContext(); save = new NodeCompSave(NodeCompSave.Role.INSTANCE, cluster, local); diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingDayAggTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingDayAggTestCase.java index 47b3b26bb..f28e415b8 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingDayAggTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingDayAggTestCase.java @@ -20,6 +20,8 @@ import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; +import java.util.TimeZone; + import static org.mockito.Mockito.*; /** @@ -36,6 +38,9 @@ public class NodeMappingDayAggTestCase { @Before public void init() throws Exception { + System.setProperty("user.timezone", "UTC"); + TimeZone.setDefault(TimeZone.getTimeZone("UTC")); + clusterWorkerContext = PowerMockito.mock(ClusterWorkerContext.class); LocalWorkerContext localWorkerContext = PowerMockito.mock(LocalWorkerContext.class); diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingDaySaveTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingDaySaveTestCase.java index 84cd013b4..6c3ef0694 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingDaySaveTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingDaySaveTestCase.java @@ -9,6 +9,8 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import java.util.TimeZone; + /** * @author pengys5 */ @@ -18,6 +20,9 @@ public class NodeMappingDaySaveTestCase { @Before public void init() { + System.setProperty("user.timezone", "UTC"); + TimeZone.setDefault(TimeZone.getTimeZone("UTC")); + ClusterWorkerContext cluster = new ClusterWorkerContext(null); LocalWorkerContext local = new LocalWorkerContext(); save = new NodeMappingDaySave(NodeMappingDaySave.Role.INSTANCE, cluster, local); diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingHourAggTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingHourAggTestCase.java index 8a89af8ec..123dbcd6c 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingHourAggTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingHourAggTestCase.java @@ -20,6 +20,8 @@ import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; +import java.util.TimeZone; + import static org.mockito.Mockito.*; /** @@ -36,6 +38,9 @@ public class NodeMappingHourAggTestCase { @Before public void init() throws Exception { + System.setProperty("user.timezone", "UTC"); + TimeZone.setDefault(TimeZone.getTimeZone("UTC")); + clusterWorkerContext = PowerMockito.mock(ClusterWorkerContext.class); LocalWorkerContext localWorkerContext = PowerMockito.mock(LocalWorkerContext.class); diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingHourSaveTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingHourSaveTestCase.java index bfb1307e0..f32e25e9a 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingHourSaveTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingHourSaveTestCase.java @@ -9,6 +9,8 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import java.util.TimeZone; + /** * @author pengys5 */ @@ -18,6 +20,9 @@ public class NodeMappingHourSaveTestCase { @Before public void init() { + System.setProperty("user.timezone", "UTC"); + TimeZone.setDefault(TimeZone.getTimeZone("UTC")); + ClusterWorkerContext cluster = new ClusterWorkerContext(null); LocalWorkerContext local = new LocalWorkerContext(); save = new NodeMappingHourSave(NodeMappingHourSave.Role.INSTANCE, cluster, local); diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingMinuteAggTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingMinuteAggTestCase.java index fefbc5c38..6437ed704 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingMinuteAggTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingMinuteAggTestCase.java @@ -20,6 +20,8 @@ import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; +import java.util.TimeZone; + import static org.mockito.Mockito.*; /** @@ -36,6 +38,9 @@ public class NodeMappingMinuteAggTestCase { @Before public void init() throws Exception { + System.setProperty("user.timezone", "UTC"); + TimeZone.setDefault(TimeZone.getTimeZone("UTC")); + clusterWorkerContext = PowerMockito.mock(ClusterWorkerContext.class); LocalWorkerContext localWorkerContext = PowerMockito.mock(LocalWorkerContext.class); diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingMinuteSaveTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingMinuteSaveTestCase.java index 2be7106ba..55dcd3726 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingMinuteSaveTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingMinuteSaveTestCase.java @@ -9,6 +9,8 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import java.util.TimeZone; + /** * @author pengys5 */ @@ -18,6 +20,9 @@ public class NodeMappingMinuteSaveTestCase { @Before public void init() { + System.setProperty("user.timezone", "UTC"); + TimeZone.setDefault(TimeZone.getTimeZone("UTC")); + ClusterWorkerContext cluster = new ClusterWorkerContext(null); LocalWorkerContext local = new LocalWorkerContext(); save = new NodeMappingMinuteSave(NodeMappingMinuteSave.Role.INSTANCE, cluster, local); diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/NodeRefResSumGetGroupWithTimeSliceTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/NodeRefResSumGetGroupWithTimeSliceTestCase.java index ab094fe17..13016686f 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/NodeRefResSumGetGroupWithTimeSliceTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/NodeRefResSumGetGroupWithTimeSliceTestCase.java @@ -22,6 +22,7 @@ import org.powermock.modules.junit4.PowerMockRunner; import java.util.HashMap; import java.util.Map; +import java.util.TimeZone; import static org.mockito.Mockito.*; @@ -39,6 +40,9 @@ public class NodeRefResSumGetGroupWithTimeSliceTestCase { @Before public void init() throws Exception { + System.setProperty("user.timezone", "UTC"); + TimeZone.setDefault(TimeZone.getTimeZone("UTC")); + clusterWorkerContext = PowerMockito.mock(ClusterWorkerContext.class); LocalWorkerContext localWorkerContext = PowerMockito.mock(LocalWorkerContext.class); diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefDayAnalysisTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefDayAnalysisTestCase.java index 88063f5f0..c699d75d7 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefDayAnalysisTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefDayAnalysisTestCase.java @@ -20,6 +20,8 @@ import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; +import java.util.TimeZone; + import static org.mockito.Mockito.*; import static org.powermock.api.mockito.PowerMockito.when; @@ -38,6 +40,9 @@ public class NodeRefDayAnalysisTestCase { @Before public void init() throws Exception { + System.setProperty("user.timezone", "UTC"); + TimeZone.setDefault(TimeZone.getTimeZone("UTC")); + clusterWorkerContext = PowerMockito.mock(ClusterWorkerContext.class); WorkerRefs workerRefs = mock(WorkerRefs.class); answer = new RecordDataAnswer(); diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefHourAnalysisTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefHourAnalysisTestCase.java index 0bc08dc2e..4994ad2e9 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefHourAnalysisTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefHourAnalysisTestCase.java @@ -20,6 +20,8 @@ import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; +import java.util.TimeZone; + import static org.mockito.Mockito.*; import static org.powermock.api.mockito.PowerMockito.when; @@ -38,6 +40,9 @@ public class NodeRefHourAnalysisTestCase { @Before public void init() throws Exception { + System.setProperty("user.timezone", "UTC"); + TimeZone.setDefault(TimeZone.getTimeZone("UTC")); + clusterWorkerContext = PowerMockito.mock(ClusterWorkerContext.class); WorkerRefs workerRefs = mock(WorkerRefs.class); answer = new RecordDataAnswer(); diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefMinuteAnalysisTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefMinuteAnalysisTestCase.java index 48d51b4fb..b1209144a 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefMinuteAnalysisTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefMinuteAnalysisTestCase.java @@ -20,6 +20,8 @@ import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; +import java.util.TimeZone; + import static org.mockito.Mockito.*; import static org.powermock.api.mockito.PowerMockito.when; @@ -38,6 +40,9 @@ public class NodeRefMinuteAnalysisTestCase { @Before public void init() throws Exception { + System.setProperty("user.timezone", "UTC"); + TimeZone.setDefault(TimeZone.getTimeZone("UTC")); + clusterWorkerContext = PowerMockito.mock(ClusterWorkerContext.class); WorkerRefs workerRefs = mock(WorkerRefs.class); answer = new RecordDataAnswer(); diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefResSumDayAnalysisTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefResSumDayAnalysisTestCase.java index 94fe89329..a5bccb3b2 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefResSumDayAnalysisTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefResSumDayAnalysisTestCase.java @@ -18,6 +18,8 @@ import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; +import java.util.TimeZone; + import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.mock; import static org.powermock.api.mockito.PowerMockito.when; @@ -35,6 +37,9 @@ public class NodeRefResSumDayAnalysisTestCase { @Before public void init() throws Exception { + System.setProperty("user.timezone", "UTC"); + TimeZone.setDefault(TimeZone.getTimeZone("UTC")); + ClusterWorkerContext clusterWorkerContext = PowerMockito.mock(ClusterWorkerContext.class); WorkerRefs workerRefs = mock(WorkerRefs.class); answer = new MetricDataAnswer(); diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefResSumHourAnalysisTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefResSumHourAnalysisTestCase.java index c13965b2a..f1f8a0640 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefResSumHourAnalysisTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefResSumHourAnalysisTestCase.java @@ -18,6 +18,8 @@ import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; +import java.util.TimeZone; + import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.mock; import static org.powermock.api.mockito.PowerMockito.when; @@ -35,6 +37,9 @@ public class NodeRefResSumHourAnalysisTestCase { @Before public void init() throws Exception { + System.setProperty("user.timezone", "UTC"); + TimeZone.setDefault(TimeZone.getTimeZone("UTC")); + ClusterWorkerContext clusterWorkerContext = PowerMockito.mock(ClusterWorkerContext.class); WorkerRefs workerRefs = mock(WorkerRefs.class); answer = new MetricDataAnswer(); diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefResSumMinuteAnalysisTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefResSumMinuteAnalysisTestCase.java index d968c5f78..36ac1203b 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefResSumMinuteAnalysisTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefResSumMinuteAnalysisTestCase.java @@ -18,6 +18,8 @@ import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; +import java.util.TimeZone; + import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.mock; import static org.powermock.api.mockito.PowerMockito.when; @@ -35,6 +37,9 @@ public class NodeRefResSumMinuteAnalysisTestCase { @Before public void init() throws Exception { + System.setProperty("user.timezone", "UTC"); + TimeZone.setDefault(TimeZone.getTimeZone("UTC")); + ClusterWorkerContext clusterWorkerContext = PowerMockito.mock(ClusterWorkerContext.class); WorkerRefs workerRefs = mock(WorkerRefs.class); answer = new MetricDataAnswer(); diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefDayAggTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefDayAggTestCase.java index 0e8fb2859..2e8b5a94d 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefDayAggTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefDayAggTestCase.java @@ -20,6 +20,8 @@ import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; +import java.util.TimeZone; + import static org.mockito.Mockito.*; /** @@ -37,6 +39,9 @@ public class NodeRefDayAggTestCase { @Before public void init() throws Exception { + System.setProperty("user.timezone", "UTC"); + TimeZone.setDefault(TimeZone.getTimeZone("UTC")); + clusterWorkerContext = PowerMockito.mock(ClusterWorkerContext.class); localWorkerContext = PowerMockito.mock(LocalWorkerContext.class); diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefDaySaveTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefDaySaveTestCase.java index df08b5501..ac995ce91 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefDaySaveTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefDaySaveTestCase.java @@ -9,6 +9,8 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import java.util.TimeZone; + /** * @author pengys5 */ @@ -18,6 +20,9 @@ public class NodeRefDaySaveTestCase { @Before public void init() { + System.setProperty("user.timezone", "UTC"); + TimeZone.setDefault(TimeZone.getTimeZone("UTC")); + ClusterWorkerContext cluster = new ClusterWorkerContext(null); LocalWorkerContext local = new LocalWorkerContext(); save = new NodeRefDaySave(NodeRefDaySave.Role.INSTANCE, cluster, local); diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefHourAggTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefHourAggTestCase.java index f012d2f83..e726adaee 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefHourAggTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefHourAggTestCase.java @@ -20,6 +20,8 @@ import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; +import java.util.TimeZone; + import static org.mockito.Mockito.*; /** @@ -37,6 +39,9 @@ public class NodeRefHourAggTestCase { @Before public void init() throws Exception { + System.setProperty("user.timezone", "UTC"); + TimeZone.setDefault(TimeZone.getTimeZone("UTC")); + clusterWorkerContext = PowerMockito.mock(ClusterWorkerContext.class); localWorkerContext = PowerMockito.mock(LocalWorkerContext.class); diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefHourSaveTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefHourSaveTestCase.java index 7d166c58c..7779e93e9 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefHourSaveTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefHourSaveTestCase.java @@ -9,6 +9,8 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import java.util.TimeZone; + /** * @author pengys5 */ @@ -18,6 +20,9 @@ public class NodeRefHourSaveTestCase { @Before public void init() { + System.setProperty("user.timezone", "UTC"); + TimeZone.setDefault(TimeZone.getTimeZone("UTC")); + ClusterWorkerContext cluster = new ClusterWorkerContext(null); LocalWorkerContext local = new LocalWorkerContext(); save = new NodeRefHourSave(NodeRefHourSave.Role.INSTANCE, cluster, local); diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefMinuteAggTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefMinuteAggTestCase.java index b5f95309e..68e0927af 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefMinuteAggTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefMinuteAggTestCase.java @@ -20,6 +20,8 @@ import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; +import java.util.TimeZone; + import static org.mockito.Mockito.*; /** @@ -37,6 +39,9 @@ public class NodeRefMinuteAggTestCase { @Before public void init() throws Exception { + System.setProperty("user.timezone", "UTC"); + TimeZone.setDefault(TimeZone.getTimeZone("UTC")); + clusterWorkerContext = PowerMockito.mock(ClusterWorkerContext.class); localWorkerContext = PowerMockito.mock(LocalWorkerContext.class); diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefMinuteSaveTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefMinuteSaveTestCase.java index 417997add..d06237232 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefMinuteSaveTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefMinuteSaveTestCase.java @@ -9,6 +9,8 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import java.util.TimeZone; + /** * @author pengys5 */ @@ -18,6 +20,9 @@ public class NodeRefMinuteSaveTestCase { @Before public void init() { + System.setProperty("user.timezone", "UTC"); + TimeZone.setDefault(TimeZone.getTimeZone("UTC")); + ClusterWorkerContext cluster = new ClusterWorkerContext(null); LocalWorkerContext local = new LocalWorkerContext(); save = new NodeRefMinuteSave(NodeRefMinuteSave.Role.INSTANCE, cluster, local); diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumDayAggTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumDayAggTestCase.java index a6d91c5e1..d71af51b3 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumDayAggTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumDayAggTestCase.java @@ -20,6 +20,8 @@ import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; +import java.util.TimeZone; + import static org.mockito.Mockito.*; /** @@ -37,6 +39,9 @@ public class NodeRefResSumDayAggTestCase { @Before public void init() throws Exception { + System.setProperty("user.timezone", "UTC"); + TimeZone.setDefault(TimeZone.getTimeZone("UTC")); + clusterWorkerContext = PowerMockito.mock(ClusterWorkerContext.class); localWorkerContext = PowerMockito.mock(LocalWorkerContext.class); diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumDaySaveTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumDaySaveTestCase.java index 2ec229fba..e0fedfb21 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumDaySaveTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumDaySaveTestCase.java @@ -9,6 +9,8 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import java.util.TimeZone; + /** * @author pengys5 */ @@ -17,6 +19,9 @@ public class NodeRefResSumDaySaveTestCase { @Before public void init() { + System.setProperty("user.timezone", "UTC"); + TimeZone.setDefault(TimeZone.getTimeZone("UTC")); + ClusterWorkerContext cluster = new ClusterWorkerContext(null); LocalWorkerContext local = new LocalWorkerContext(); save = new NodeRefResSumDaySave(NodeRefResSumDaySave.Role.INSTANCE, cluster, local); diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumHourAggTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumHourAggTestCase.java index 95b7ceda1..c670a26ce 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumHourAggTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumHourAggTestCase.java @@ -20,6 +20,8 @@ import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; +import java.util.TimeZone; + import static org.mockito.Mockito.*; /** @@ -37,6 +39,9 @@ public class NodeRefResSumHourAggTestCase { @Before public void init() throws Exception { + System.setProperty("user.timezone", "UTC"); + TimeZone.setDefault(TimeZone.getTimeZone("UTC")); + clusterWorkerContext = PowerMockito.mock(ClusterWorkerContext.class); localWorkerContext = PowerMockito.mock(LocalWorkerContext.class); diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumHourSaveTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumHourSaveTestCase.java index 74f853043..dfee15ad1 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumHourSaveTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumHourSaveTestCase.java @@ -9,6 +9,8 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import java.util.TimeZone; + /** * @author pengys5 */ @@ -18,6 +20,9 @@ public class NodeRefResSumHourSaveTestCase { @Before public void init() { + System.setProperty("user.timezone", "UTC"); + TimeZone.setDefault(TimeZone.getTimeZone("UTC")); + ClusterWorkerContext cluster = new ClusterWorkerContext(null); LocalWorkerContext local = new LocalWorkerContext(); save = new NodeRefResSumHourSave(NodeRefResSumHourSave.Role.INSTANCE, cluster, local); diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumMinuteAggTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumMinuteAggTestCase.java index ddf3184fe..057a9fe4e 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumMinuteAggTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumMinuteAggTestCase.java @@ -20,6 +20,8 @@ import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; +import java.util.TimeZone; + import static org.mockito.Mockito.*; /** @@ -37,6 +39,9 @@ public class NodeRefResSumMinuteAggTestCase { @Before public void init() throws Exception { + System.setProperty("user.timezone", "UTC"); + TimeZone.setDefault(TimeZone.getTimeZone("UTC")); + clusterWorkerContext = PowerMockito.mock(ClusterWorkerContext.class); localWorkerContext = PowerMockito.mock(LocalWorkerContext.class); diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumMinuteSaveTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumMinuteSaveTestCase.java index db56a16f2..ad228572e 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumMinuteSaveTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumMinuteSaveTestCase.java @@ -10,6 +10,8 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import java.util.TimeZone; + /** * @author pengys5 */ @@ -19,6 +21,9 @@ public class NodeRefResSumMinuteSaveTestCase { @Before public void init() { + System.setProperty("user.timezone", "UTC"); + TimeZone.setDefault(TimeZone.getTimeZone("UTC")); + ClusterWorkerContext cluster = new ClusterWorkerContext(null); LocalWorkerContext local = new LocalWorkerContext(); save = new NodeRefResSumMinuteSave(NodeRefResSumMinuteSave.Role.INSTANCE, cluster, local); diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/segment/SegmentPostTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/segment/SegmentPostTestCase.java index 8bcedbbd1..e9748373e 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/segment/SegmentPostTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/segment/SegmentPostTestCase.java @@ -32,6 +32,8 @@ import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; +import java.util.TimeZone; + import static org.mockito.Mockito.*; import static org.mockito.Mockito.when; import static org.powermock.api.mockito.PowerMockito.doAnswer; @@ -55,6 +57,9 @@ public class SegmentPostTestCase { @Before public void init() throws Exception { + System.setProperty("user.timezone", "UTC"); + TimeZone.setDefault(TimeZone.getTimeZone("UTC")); + segmentMock = new SegmentMock(); clusterWorkerContext = PowerMockito.mock(ClusterWorkerContext.class); localWorkerContext = new LocalWorkerContext(); diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/segment/SegmentTopGetWithGlobalTraceIdTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/segment/SegmentTopGetWithGlobalTraceIdTestCase.java index 0f6ed7812..80506b224 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/segment/SegmentTopGetWithGlobalTraceIdTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/segment/SegmentTopGetWithGlobalTraceIdTestCase.java @@ -23,6 +23,7 @@ import org.powermock.modules.junit4.PowerMockRunner; import java.util.HashMap; import java.util.Map; +import java.util.TimeZone; import static org.mockito.Mockito.*; @@ -40,6 +41,9 @@ public class SegmentTopGetWithGlobalTraceIdTestCase { @Before public void init() throws Exception { + System.setProperty("user.timezone", "UTC"); + TimeZone.setDefault(TimeZone.getTimeZone("UTC")); + clusterWorkerContext = PowerMockito.mock(ClusterWorkerContext.class); LocalWorkerContext localWorkerContext = PowerMockito.mock(LocalWorkerContext.class); diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/segment/SegmentTopGetWithTimeSliceTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/segment/SegmentTopGetWithTimeSliceTestCase.java index a6e64ad52..5c193cd92 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/segment/SegmentTopGetWithTimeSliceTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/segment/SegmentTopGetWithTimeSliceTestCase.java @@ -23,6 +23,7 @@ import org.powermock.modules.junit4.PowerMockRunner; import java.util.HashMap; import java.util.Map; +import java.util.TimeZone; import static org.mockito.Mockito.*; @@ -40,6 +41,9 @@ public class SegmentTopGetWithTimeSliceTestCase { @Before public void init() throws Exception { + System.setProperty("user.timezone", "UTC"); + TimeZone.setDefault(TimeZone.getTimeZone("UTC")); + clusterWorkerContext = PowerMockito.mock(ClusterWorkerContext.class); LocalWorkerContext localWorkerContext = PowerMockito.mock(LocalWorkerContext.class); diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/segment/persistence/SegmentCostSaveTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/segment/persistence/SegmentCostSaveTestCase.java index d4957db8f..04ee8fb56 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/segment/persistence/SegmentCostSaveTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/segment/persistence/SegmentCostSaveTestCase.java @@ -25,6 +25,7 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import java.util.List; +import java.util.TimeZone; import static org.powermock.api.mockito.PowerMockito.when; @@ -44,6 +45,9 @@ public class SegmentCostSaveTestCase { @Before public void init() throws Exception { + System.setProperty("user.timezone", "UTC"); + TimeZone.setDefault(TimeZone.getTimeZone("UTC")); + mockEsBulkClient.createMock(); saveToEsSourceAnswer = new SaveToEsSourceAnswer(); diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/segment/persistence/SegmentExceptionSaveTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/segment/persistence/SegmentExceptionSaveTestCase.java index 8fd8eeb86..9e5464cc0 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/segment/persistence/SegmentExceptionSaveTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/segment/persistence/SegmentExceptionSaveTestCase.java @@ -27,6 +27,7 @@ import org.powermock.modules.junit4.PowerMockRunner; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.TimeZone; import static org.powermock.api.mockito.PowerMockito.when; @@ -47,6 +48,9 @@ public class SegmentExceptionSaveTestCase { @Before public void init() { + System.setProperty("user.timezone", "UTC"); + TimeZone.setDefault(TimeZone.getTimeZone("UTC")); + mockEsBulkClient.createMock(); saveToEsSource = new SaveToEsSource(); diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/segment/persistence/SegmentSaveTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/segment/persistence/SegmentSaveTestCase.java index 5f187f1c1..1facf78fa 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/segment/persistence/SegmentSaveTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/segment/persistence/SegmentSaveTestCase.java @@ -21,6 +21,8 @@ import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; +import java.util.TimeZone; + import static org.powermock.api.mockito.PowerMockito.when; /** @@ -37,6 +39,9 @@ public class SegmentSaveTestCase { @Before public void init() { + System.setProperty("user.timezone", "UTC"); + TimeZone.setDefault(TimeZone.getTimeZone("UTC")); + mockEsBulkClient.createMock(); saveToEsSource = new SaveToEsSource(); diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/span/SpanGetWithIdTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/span/SpanGetWithIdTestCase.java index 4f6d985b0..fc43052be 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/span/SpanGetWithIdTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/span/SpanGetWithIdTestCase.java @@ -22,6 +22,7 @@ import org.powermock.modules.junit4.PowerMockRunner; import java.util.HashMap; import java.util.Map; +import java.util.TimeZone; import static org.mockito.Mockito.*; @@ -39,6 +40,9 @@ public class SpanGetWithIdTestCase { @Before public void init() throws Exception { + System.setProperty("user.timezone", "UTC"); + TimeZone.setDefault(TimeZone.getTimeZone("UTC")); + clusterWorkerContext = PowerMockito.mock(ClusterWorkerContext.class); LocalWorkerContext localWorkerContext = PowerMockito.mock(LocalWorkerContext.class); diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/span/persistence/SpanSearchWithIdTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/span/persistence/SpanSearchWithIdTestCase.java index 57a55a0fd..d3be21abe 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/span/persistence/SpanSearchWithIdTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/span/persistence/SpanSearchWithIdTestCase.java @@ -21,6 +21,8 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.reflect.Whitebox; +import java.util.TimeZone; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -36,6 +38,9 @@ public class SpanSearchWithIdTestCase { @Before public void init() { + System.setProperty("user.timezone", "UTC"); + TimeZone.setDefault(TimeZone.getTimeZone("UTC")); + getResponseFromEs = PowerMockito.mock(GetResponseFromEs.class); Whitebox.setInternalState(GetResponseFromEs.class, "INSTANCE", getResponseFromEs); } diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/tracedag/TraceDagGetWithTimeSliceTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/tracedag/TraceDagGetWithTimeSliceTestCase.java index 364a2b00b..6f50b4169 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/tracedag/TraceDagGetWithTimeSliceTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/tracedag/TraceDagGetWithTimeSliceTestCase.java @@ -24,6 +24,7 @@ import org.powermock.modules.junit4.PowerMockRunner; import java.util.HashMap; import java.util.Map; +import java.util.TimeZone; import static org.mockito.Mockito.*; @@ -40,6 +41,9 @@ public class TraceDagGetWithTimeSliceTestCase { @Before public void init() throws Exception { + System.setProperty("user.timezone", "UTC"); + TimeZone.setDefault(TimeZone.getTimeZone("UTC")); + clusterWorkerContext = PowerMockito.mock(ClusterWorkerContext.class); LocalWorkerContext localWorkerContext = PowerMockito.mock(LocalWorkerContext.class);