From c33644cff2a68dbcf3e65cd2877405a866ee38f9 Mon Sep 17 00:00:00 2001
From: jdesprez <jdesprez@google.com>
Date: Tue, 5 Dec 2017 05:46:53 -0800
Subject: [PATCH] Update unit tests to work in other timezone
Particular unit tests always expected PST timezone for the
time generated. Updated to use the current timezone.
Test: run unit tests when in GMT timezone (london)
Bug: None
Change-Id: Id7c5f12aabadf07373945a974a5791b092a63311
---
.../parser/BatteryStatsSummaryInfoParserTest.java | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/tests/src/com/android/loganalysis/parser/BatteryStatsSummaryInfoParserTest.java b/tests/src/com/android/loganalysis/parser/BatteryStatsSummaryInfoParserTest.java
index ad0c999..c6ba381 100644
--- a/tests/src/com/android/loganalysis/parser/BatteryStatsSummaryInfoParserTest.java
+++ b/tests/src/com/android/loganalysis/parser/BatteryStatsSummaryInfoParserTest.java
@@ -20,7 +20,9 @@ import com.android.loganalysis.item.BatteryStatsSummaryInfoItem;
import junit.framework.TestCase;
import java.util.Arrays;
+import java.util.GregorianCalendar;
import java.util.List;
+import java.util.TimeZone;
/**
* Unit tests for {@link BatteryStatsSummaryInfoParser}
@@ -83,8 +85,14 @@ public class BatteryStatsSummaryInfoParserTest extends TestCase {
assertEquals("The battery dropped a level 24 mins on average",
summary.getBatteryDischargeRate());
- assertEquals("The peak discharge time was during Tue Dec 09 16:31:07 PST 2014 to "
- + "Tue Dec 09 19:35:52 PST 2014 where battery dropped from 89 to 80",
+ // Get the current timezone short name (PST, GMT) to properly output the time as expected.
+ String timezone =
+ new GregorianCalendar().getTimeZone().getDisplayName(false, TimeZone.SHORT);
+ assertEquals(
+ String.format(
+ "The peak discharge time was during Tue Dec 09 16:31:07 %s 2014 to "
+ + "Tue Dec 09 19:35:52 %s 2014 where battery dropped from 89 to 80",
+ timezone, timezone),
summary.getPeakDischargeTime());
}
--
GitLab