Fix bug #2519159 (com.android.providers.calendar.CalendarProvider2Test:testChangeTimezoneDB is failing)
- update visibility for method getTimezoneDatabaseVersion()
- update CalendarProvider2 make file (add guava) and clean tests make files
Change-Id: I61a0f1a8fb164e6f28137eb816555b3a96dc8a80
diff --git a/Android.mk b/Android.mk
index d13fbe0..3dea6da 100644
--- a/Android.mk
+++ b/Android.mk
@@ -18,6 +18,8 @@
LOCAL_MODULE_TAGS := optional
+LOCAL_STATIC_JAVA_LIBRARIES := guava
+
LOCAL_SRC_FILES := $(call all-java-files-under,src)
LOCAL_PACKAGE_NAME := CalendarProvider
diff --git a/src/com/android/providers/calendar/CalendarProvider2.java b/src/com/android/providers/calendar/CalendarProvider2.java
index ced68df..d94a6a7 100644
--- a/src/com/android/providers/calendar/CalendarProvider2.java
+++ b/src/com/android/providers/calendar/CalendarProvider2.java
@@ -55,6 +55,7 @@
import android.util.Log;
import android.util.TimeFormatException;
import android.util.TimeUtils;
+import com.google.common.annotations.VisibleForTesting;
import java.util.ArrayList;
import java.util.Arrays;
@@ -516,6 +517,7 @@
return TextUtils.equals(timezoneDatabaseVersion, TimeUtils.getTimeZoneDatabaseVersion());
}
+ @VisibleForTesting
protected String getTimezoneDatabaseVersion() {
String timezoneDatabaseVersion = null;
try {
diff --git a/tests/src/com/android/providers/calendar/CalendarProvider2Test.java b/tests/src/com/android/providers/calendar/CalendarProvider2Test.java
index 59e1285..065244f 100644
--- a/tests/src/com/android/providers/calendar/CalendarProvider2Test.java
+++ b/tests/src/com/android/providers/calendar/CalendarProvider2Test.java
@@ -40,6 +40,14 @@
/**
* Runs various tests on an isolated Calendar provider with its own database.
+ *
+ * You can run the tests with the following command line:
+ *
+ * adb shell am instrument
+ * -e debug false
+ * -w
+ * -e class com.android.providers.calendar.CalendarProvider2Test
+ * com.android.providers.calendar.tests/android.test.InstrumentationTestRunner
*/
@LargeTest
public class CalendarProvider2Test extends ProviderTestCase2<CalendarProvider2ForTesting> {