Try to use names from time zone strings if all else fails...

Change-Id: Ie417a6b27c731f24f0d8ccf5275df9c2fad37efd

1 files changed, 10 insertions, 0 deletions

diff --git a/tests/src/com/android/exchange/utility/CalendarUtilitiesTests.java b/tests/src/com/android/exchange/utility/CalendarUtilitiesTests.java
index 0ecdb8fd..77820a52 100644
--- a/tests/src/com/android/exchange/utility/CalendarUtilitiesTests.java
+++ b/tests/src/com/android/exchange/utility/CalendarUtilitiesTests.java
@@ -110,6 +110,13 @@ public class CalendarUtilitiesTests extends SyncAdapterTestCase<CalendarSyncAdap
         "AAAAAAAAAAsAAAABAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" +
         "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAACAAAAAAAAAAAAxP///w==";
 
+    // This string specifies "Europe/London" in the name, but otherwise is somewhat bogus
+    // in that it has unknown time zone dates with a 0 bias (GMT). (From a Zimbra server user)
+    private static final String EUROPE_LONDON_TIME_BY_NAME =
+        "AAAAAEV1cm9wZS9Mb25kb24AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" +
+        "AAAAAAAAAAoAAQAFAAIAAAAAAAAAAAAAAEV1cm9wZS9Mb25kb24AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" +
+        "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAQAFAAEAAAAAAAAAxP///w==";
+
     private static final String ORGANIZER = "organizer@server.com";
     private static final String ATTENDEE = "attendee@server.com";
 
@@ -140,6 +147,9 @@ public class CalendarUtilitiesTests extends SyncAdapterTestCase<CalendarSyncAdap
         tz = CalendarUtilities.tziStringToTimeZone(AUSTRALIA_ACT_TIME);
         assertEquals("Australia/ACT", tz.getID());
 
+        tz = CalendarUtilities.tziStringToTimeZone(EUROPE_LONDON_TIME_BY_NAME);
+        assertEquals("Europe/London", tz.getID());
+
         // Test peculiar MS sent EST data with and without lenient precision; send standard
         // precision + 1 (i.e. 1ms) to make sure the code doesn't automatically flip to lenient
         // when the tz isn't found