commit ef2377dd929c4b6304e70da99b2a13bebd4d923e
author Julien Desprez <jdesprez@google.com> Wed Feb 06 15:59:42 2019 -0800
committer Julien Desprez <jdesprez@google.com> Tue Feb 26 09:43:18 2019 -0800
tree 4cc72655407883b2f74445c5f29c87f09bced675
parent 3284bb52c7e3d4b660e76ab1254400d37711dd60

Avoid date issue in getLogcatSinceTest

Convert the date to whatever it is for the host, so the
test doesn't care about host timezone to run.

Test: unit tests
Bug: 126360330
Change-Id: I6b4644c6b36f6a2c05bee7e52456bdd0c4e17093
Merged-In: I6b4644c6b36f6a2c05bee7e52456bdd0c4e17093

tests/src/com/android/tradefed/device/NativeDeviceTest.java

diff --git a/tests/src/com/android/tradefed/device/NativeDeviceTest.java b/tests/src/com/android/tradefed/device/NativeDeviceTest.java
index d9329fa..23f0e94 100644
--- a/tests/src/com/android/tradefed/device/NativeDeviceTest.java
+++ b/tests/src/com/android/tradefed/device/NativeDeviceTest.java
@@ -54,6 +54,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.text.SimpleDateFormat;
 import java.time.Clock;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -2276,8 +2277,13 @@
         SettableFuture<String> value = SettableFuture.create();
         value.set("23");
         EasyMock.expect(mMockIDevice.getSystemProperty("ro.build.version.sdk")).andReturn(value);
+
+        SimpleDateFormat format = new SimpleDateFormat("MM-dd HH:mm:ss.mmm");
+        String dateFormatted = format.format(new Date(date));
+
         mMockIDevice.executeShellCommand(
-                EasyMock.eq("logcat -v threadtime -t '12-11 03:15:42.015'"), EasyMock.anyObject());
+                EasyMock.eq(String.format("logcat -v threadtime -t '%s'", dateFormatted)),
+                EasyMock.anyObject());
         EasyMock.replay(mMockIDevice);
         mTestDevice.getLogcatSince(date);
         EasyMock.verify(mMockIDevice);