[GitHub] wu-sheng closed pull request #1138: Fix data ttl keeper timer test case bug

[GitBox <gi...@apache.org>]

wu-sheng closed pull request #1138: Fix data ttl keeper timer test case bug
URL: https://github.com/apache/incubator-skywalking/pull/1138
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/test/java/org/apache/skywalking/apm/collector/storage/es/DataTTLKeeperTimerTestCase.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/test/java/org/apache/skywalking/apm/collector/storage/es/DataTTLKeeperTimerTestCase.java
index e6426bea7..20ad34f74 100644
--- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/test/java/org/apache/skywalking/apm/collector/storage/es/DataTTLKeeperTimerTestCase.java
+++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/test/java/org/apache/skywalking/apm/collector/storage/es/DataTTLKeeperTimerTestCase.java
@@ -22,47 +22,64 @@
 import org.junit.*;
 import org.powermock.reflect.Whitebox;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+
 /**
  * @author peng-yongsheng
  */
 public class DataTTLKeeperTimerTestCase {
 
     @Test
-    public void testConvertTimeBucket() {
+    public void testConvertTimeBucket() throws ParseException {
         DataTTLKeeperTimer timer = new DataTTLKeeperTimer(null, null, null, 8);
         DataTTLKeeperTimer.TimeBuckets timeBuckets = timer.convertTimeBucket();
 
         long minuteTimeBucket = TimeBucketUtils.INSTANCE.getMinuteTimeBucket(System.currentTimeMillis());
         long dayTimeBucket = TimeBucketUtils.INSTANCE.minuteToDay(minuteTimeBucket);
 
+        Date dayTimeBucketSource = new SimpleDateFormat("yyyyMMdd").parse(String.valueOf(dayTimeBucket));
+
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(dayTimeBucketSource);
+        calendar.add(Calendar.DAY_OF_MONTH, -8);
+        calendar.set(Calendar.HOUR_OF_DAY, 0);
+        calendar.set(Calendar.MINUTE, 0);
+        calendar.set(Calendar.SECOND, 0);
+
+        long newMinuteTimeBucket = TimeBucketUtils.INSTANCE.getMinuteTimeBucket(calendar.getTimeInMillis());
+        long newDayTimeBucket = TimeBucketUtils.INSTANCE.minuteToDay(newMinuteTimeBucket);
+
         long startSecondTimeBucket = Whitebox.getInternalState(timeBuckets, "startSecondTimeBucket");
-        Assert.assertEquals((dayTimeBucket - 8) * 1000000, startSecondTimeBucket);
+        Assert.assertEquals(newDayTimeBucket * 1000000, startSecondTimeBucket);
 
         long endSecondTimeBucket = Whitebox.getInternalState(timeBuckets, "endSecondTimeBucket");
-        Assert.assertEquals((dayTimeBucket - 8) * 1000000 + 235959, endSecondTimeBucket);
+        Assert.assertEquals(newDayTimeBucket * 1000000 + 235959, endSecondTimeBucket);
 
         long startMinuteTimeBucket = Whitebox.getInternalState(timeBuckets, "startMinuteTimeBucket");
-        Assert.assertEquals((dayTimeBucket - 8) * 10000, startMinuteTimeBucket);
+        Assert.assertEquals(newDayTimeBucket * 10000, startMinuteTimeBucket);
 
         long endMinuteTimeBucket = Whitebox.getInternalState(timeBuckets, "endMinuteTimeBucket");
-        Assert.assertEquals((dayTimeBucket - 8) * 10000 + 2359, endMinuteTimeBucket);
+        Assert.assertEquals(newDayTimeBucket * 10000 + 2359, endMinuteTimeBucket);
 
         long startHourTimeBucket = Whitebox.getInternalState(timeBuckets, "startHourTimeBucket");
-        Assert.assertEquals((dayTimeBucket - 8) * 100, startHourTimeBucket);
+        Assert.assertEquals(newDayTimeBucket * 100, startHourTimeBucket);
 
         long endHourTimeBucket = Whitebox.getInternalState(timeBuckets, "endHourTimeBucket");
-        Assert.assertEquals((dayTimeBucket - 8) * 100 + 23, endHourTimeBucket);
+        Assert.assertEquals(newDayTimeBucket * 100 + 23, endHourTimeBucket);
 
         long startDayTimeBucket = Whitebox.getInternalState(timeBuckets, "startDayTimeBucket");
-        Assert.assertEquals(dayTimeBucket - 8, startDayTimeBucket);
+        Assert.assertEquals(newDayTimeBucket, startDayTimeBucket);
 
         long endDayTimeBucket = Whitebox.getInternalState(timeBuckets, "endDayTimeBucket");
-        Assert.assertEquals(dayTimeBucket - 8, endDayTimeBucket);
+        Assert.assertEquals(newDayTimeBucket, endDayTimeBucket);
 
         long startMonthTimeBucket = Whitebox.getInternalState(timeBuckets, "startMonthTimeBucket");
-        Assert.assertEquals((dayTimeBucket - 8) / 100, startMonthTimeBucket);
+        Assert.assertEquals(newDayTimeBucket / 100, startMonthTimeBucket);
 
         long endMonthTimeBucket = Whitebox.getInternalState(timeBuckets, "endMonthTimeBucket");
-        Assert.assertEquals((dayTimeBucket - 8) / 100, endMonthTimeBucket);
+        Assert.assertEquals(newDayTimeBucket / 100, endMonthTimeBucket);
     }
 }


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services