Upgrading robolectric-bazel.
Switching from using deprecated RuntimeEnvironment.application. Also adding explicit dependencies to Roboelectric libraries because robolectric-bazel upgrade. Also removing unused dependencies.
PiperOrigin-RevId: 242999621
Change-Id: I50519baf2227361f92616375685a109e90cf370a
diff --git a/WORKSPACE b/WORKSPACE
index 6ad50aa..fcfebc3 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -19,10 +19,12 @@
)
load("@rules_jvm_external//:defs.bzl", "maven_install")
+load("//third_party:dependencies.bzl", "get_robolectric_dependency")
maven_install(
artifacts = [
- "androidx.test:monitor:1.1.1",
+ "androidx.test:core:1.1.0",
+ "androidx.test:monitor:1.1.0",
"com.android.support:appcompat-v7:" + ANDROID_SUPPORT_LIBRARY_VERSION,
"com.android.support:collections:" + ANDROID_SUPPORT_LIBRARY_VERSION,
"com.android.support:interpolator:" + ANDROID_SUPPORT_LIBRARY_VERSION,
@@ -37,7 +39,12 @@
"com.google.guava:guava:27.0.1-android",
"com.google.guava:guava-testlib:27.0.1-android",
"com.google.truth:truth:0.42",
+ "junit:junit:4.12",
"org.mockito:mockito-core:2.24.0",
+ get_robolectric_dependency("annotations"),
+ get_robolectric_dependency("robolectric"),
+ get_robolectric_dependency("shadowapi"),
+ get_robolectric_dependency("shadows-framework"),
],
repositories = [
"http://central.maven.org/maven2/",
@@ -69,8 +76,9 @@
http_archive(
name = "robolectric",
- urls = ["https://github.com/robolectric/robolectric-bazel/archive/7020b9a7a4796d2dc5392d6385d83e384a01f9fd.tar.gz"],
- strip_prefix = "robolectric-bazel-7020b9a7a4796d2dc5392d6385d83e384a01f9fd",
+ urls = ["https://github.com/robolectric/robolectric-bazel/archive/4.1.tar.gz"],
+ sha256 = "2ee850ca521288db72b0dedb9ecbda55b64d11c470435a882f8daf615091253d",
+ strip_prefix = "robolectric-bazel-4.1",
)
load("@robolectric//bazel:robolectric.bzl", "robolectric_repositories")
diff --git a/src/main/java/com/google/android/libraries/feed/common/testing/BUILD b/src/main/java/com/google/android/libraries/feed/common/testing/BUILD
index 9613519..2186322 100644
--- a/src/main/java/com/google/android/libraries/feed/common/testing/BUILD
+++ b/src/main/java/com/google/android/libraries/feed/common/testing/BUILD
@@ -38,8 +38,8 @@
"//src/main/proto/search/now/wire/feed:feed_java_proto_lite",
"@com_google_code_findbugs_jsr305//jar",
"@com_google_protobuf_javalite//:protobuf_java_lite",
- "@junit_junit//jar",
"@maven//:com_google_guava_guava",
"@maven//:com_google_truth_truth",
+ "@maven//:junit_junit",
],
)
diff --git a/src/main/java/com/google/android/libraries/feed/feedsessionmanager/internal/testing/BUILD b/src/main/java/com/google/android/libraries/feed/feedsessionmanager/internal/testing/BUILD
index 1837236..022c770 100644
--- a/src/main/java/com/google/android/libraries/feed/feedsessionmanager/internal/testing/BUILD
+++ b/src/main/java/com/google/android/libraries/feed/feedsessionmanager/internal/testing/BUILD
@@ -15,8 +15,8 @@
"//src/main/java/com/google/android/libraries/feed/internalapi/store",
"//src/main/java/com/google/android/libraries/feed/testing/modelprovider",
"//src/main/proto/com/google/android/libraries/feed/api/proto:client_feed_java_proto_lite",
- "@junit_junit//jar",
"@maven//:com_google_truth_truth",
+ "@maven//:junit_junit",
"@maven//:org_mockito_mockito_core",
],
)
diff --git a/src/main/java/com/google/android/libraries/feed/feedstore/testing/BUILD b/src/main/java/com/google/android/libraries/feed/feedstore/testing/BUILD
index 6862e65..0a30e12 100644
--- a/src/main/java/com/google/android/libraries/feed/feedstore/testing/BUILD
+++ b/src/main/java/com/google/android/libraries/feed/feedstore/testing/BUILD
@@ -23,7 +23,7 @@
"//src/main/proto/search/now/wire/feed:feed_java_proto_lite",
"//src/test/proto/search/now/wire/feed:feed_test_java_proto_lite",
"@com_google_protobuf_javalite//:protobuf_java_lite",
- "@junit_junit//jar",
"@maven//:com_google_truth_truth",
+ "@maven//:junit_junit",
],
)
diff --git a/src/main/java/com/google/android/libraries/feed/testing/conformance/network/BUILD b/src/main/java/com/google/android/libraries/feed/testing/conformance/network/BUILD
index 139536a..64668c7 100644
--- a/src/main/java/com/google/android/libraries/feed/testing/conformance/network/BUILD
+++ b/src/main/java/com/google/android/libraries/feed/testing/conformance/network/BUILD
@@ -9,7 +9,7 @@
deps = [
"//src/main/java/com/google/android/libraries/feed/common/testing",
"//src/main/java/com/google/android/libraries/feed/host/network",
- "@junit_junit//jar",
"@maven//:com_google_truth_truth",
+ "@maven//:junit_junit",
],
)
diff --git a/src/main/java/com/google/android/libraries/feed/testing/conformance/scheduler/BUILD b/src/main/java/com/google/android/libraries/feed/testing/conformance/scheduler/BUILD
index a86236c..18cbb87 100644
--- a/src/main/java/com/google/android/libraries/feed/testing/conformance/scheduler/BUILD
+++ b/src/main/java/com/google/android/libraries/feed/testing/conformance/scheduler/BUILD
@@ -8,6 +8,6 @@
srcs = glob(["*.java"]),
deps = [
"//src/main/java/com/google/android/libraries/feed/host/scheduler",
- "@junit_junit//jar",
+ "@maven//:junit_junit",
],
)
diff --git a/src/main/java/com/google/android/libraries/feed/testing/conformance/storage/BUILD b/src/main/java/com/google/android/libraries/feed/testing/conformance/storage/BUILD
index feaf2f8..3762192 100644
--- a/src/main/java/com/google/android/libraries/feed/testing/conformance/storage/BUILD
+++ b/src/main/java/com/google/android/libraries/feed/testing/conformance/storage/BUILD
@@ -13,7 +13,7 @@
"//src/main/java/com/google/android/libraries/feed/host/storage",
"//src/main/proto/com/google/android/libraries/feed/api/proto:client_feed_java_proto_lite",
"@com_google_protobuf_javalite//:protobuf_java_lite",
- "@junit_junit//jar",
"@maven//:com_google_truth_truth",
+ "@maven//:junit_junit",
],
)
diff --git a/src/main/java/com/google/android/libraries/feed/testing/shadows/BUILD b/src/main/java/com/google/android/libraries/feed/testing/shadows/BUILD
index 38c377f..2765648 100644
--- a/src/main/java/com/google/android/libraries/feed/testing/shadows/BUILD
+++ b/src/main/java/com/google/android/libraries/feed/testing/shadows/BUILD
@@ -7,7 +7,7 @@
testonly = True,
srcs = glob(["*.java"]),
deps = [
+ "//third_party:robolectric",
"@maven//:com_android_support_recyclerview_v7",
- "@robolectric//bazel:robolectric",
],
)
diff --git a/src/test/java/com/google/android/libraries/feed/api/common/BUILD b/src/test/java/com/google/android/libraries/feed/api/common/BUILD
index ef2a49e..e39af1c 100644
--- a/src/test/java/com/google/android/libraries/feed/api/common/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/api/common/BUILD
@@ -12,9 +12,10 @@
deps = [
"//src/main/java/com/google/android/libraries/feed/api/common",
"//src/main/proto/com/google/android/libraries/feed/api/proto:client_feed_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -28,8 +29,9 @@
deps = [
"//src/main/java/com/google/android/libraries/feed/api/common",
"//src/main/java/com/google/android/libraries/feed/common/testing",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
diff --git a/src/test/java/com/google/android/libraries/feed/api/knowncontent/BUILD b/src/test/java/com/google/android/libraries/feed/api/knowncontent/BUILD
index 83859f2..e255daa 100644
--- a/src/test/java/com/google/android/libraries/feed/api/knowncontent/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/api/knowncontent/BUILD
@@ -12,8 +12,9 @@
deps = [
"//src/main/java/com/google/android/libraries/feed/api/knowncontent",
"//src/main/proto/search/now/ui/stream:stream_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
diff --git a/src/test/java/com/google/android/libraries/feed/api/modelprovider/BUILD b/src/test/java/com/google/android/libraries/feed/api/modelprovider/BUILD
index 1bd2074..159e15a 100644
--- a/src/test/java/com/google/android/libraries/feed/api/modelprovider/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/api/modelprovider/BUILD
@@ -15,10 +15,11 @@
"//src/main/java/com/google/android/libraries/feed/api/modelprovider",
"//src/main/java/com/google/android/libraries/feed/common/functional",
"//src/main/proto/com/google/android/libraries/feed/api/proto:client_feed_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -33,10 +34,11 @@
"//src/main/java/com/google/android/libraries/feed/api/common",
"//src/main/java/com/google/android/libraries/feed/api/modelprovider",
"//src/main/proto/com/google/android/libraries/feed/api/proto:client_feed_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_code_findbugs_jsr305//jar",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
diff --git a/src/test/java/com/google/android/libraries/feed/api/scope/BUILD b/src/test/java/com/google/android/libraries/feed/api/scope/BUILD
index 1d24be8..dc5b9c3 100644
--- a/src/test/java/com/google/android/libraries/feed/api/scope/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/api/scope/BUILD
@@ -18,11 +18,12 @@
"//src/main/java/com/google/android/libraries/feed/feedapplifecyclelistener",
"//src/main/java/com/google/android/libraries/feed/host/logging",
"//src/main/proto/com/google/android/libraries/feed/api/proto:client_feed_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_guava_guava",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -47,11 +48,12 @@
"//src/main/java/com/google/android/libraries/feed/host/scheduler",
"//src/main/java/com/google/android/libraries/feed/host/storage",
"//src/main/java/com/google/android/libraries/feed/host/stream",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_guava_guava",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -82,9 +84,10 @@
"//src/main/java/com/google/android/libraries/feed/host/stream",
"//src/main/java/com/google/android/libraries/feed/internalapi/actionmanager",
"//src/main/java/com/google/android/libraries/feed/piet/host",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
diff --git a/src/test/java/com/google/android/libraries/feed/basicstream/BUILD b/src/test/java/com/google/android/libraries/feed/basicstream/BUILD
index 5ec42cf..f842c08 100644
--- a/src/test/java/com/google/android/libraries/feed/basicstream/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/basicstream/BUILD
@@ -47,11 +47,12 @@
"//src/main/proto/com/google/android/libraries/feed/basicstream/internal/proto:stream_saved_instance_state_java_proto_lite",
"//src/main/proto/com/google/android/libraries/feed/sharedstream/proto:scroll_state_java_proto_lite",
"//src/main/proto/com/google/android/libraries/feed/sharedstream/proto:ui_refresh_reason_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_code_findbugs_jsr305//jar",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_android_support_recyclerview_v7",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
diff --git a/src/test/java/com/google/android/libraries/feed/basicstream/internal/BUILD b/src/test/java/com/google/android/libraries/feed/basicstream/internal/BUILD
index 0c33ba0..849cb5c 100644
--- a/src/test/java/com/google/android/libraries/feed/basicstream/internal/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/basicstream/internal/BUILD
@@ -13,10 +13,11 @@
"//src/main/java/com/google/android/libraries/feed/api/stream",
"//src/main/java/com/google/android/libraries/feed/basicstream/internal",
"//src/main/java/com/google/android/libraries/feed/basicstream/internal/viewholders",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -30,11 +31,12 @@
deps = [
"//src/main/java/com/google/android/libraries/feed/basicstream/internal",
"//src/main/java/com/google/android/libraries/feed/basicstream/internal/viewholders",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_android_support_recyclerview_v7",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -59,11 +61,12 @@
"//src/main/java/com/google/android/libraries/feed/sharedstream/piet",
"//src/main/java/com/google/android/libraries/feed/sharedstream/scroll",
"//src/main/java/com/google/android/libraries/feed/sharedstream/ui",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_android_support_recyclerview_v7",
"@maven//:com_google_guava_guava",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
diff --git a/src/test/java/com/google/android/libraries/feed/basicstream/internal/actions/BUILD b/src/test/java/com/google/android/libraries/feed/basicstream/internal/actions/BUILD
index bfc5345..3a87fa1 100644
--- a/src/test/java/com/google/android/libraries/feed/basicstream/internal/actions/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/basicstream/internal/actions/BUILD
@@ -27,10 +27,11 @@
"//src/main/proto/search/now/ui/action:feed_action_java_proto_lite",
"//src/main/proto/search/now/ui/action:feed_action_payload_java_proto_lite",
"//src/main/proto/search/now/wire/feed:feed_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_guava_guava",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
diff --git a/src/test/java/com/google/android/libraries/feed/basicstream/internal/drivers/BUILD b/src/test/java/com/google/android/libraries/feed/basicstream/internal/drivers/BUILD
index 4eb0222..84fe7c5 100644
--- a/src/test/java/com/google/android/libraries/feed/basicstream/internal/drivers/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/basicstream/internal/drivers/BUILD
@@ -31,11 +31,12 @@
"//src/main/proto/search/now/ui/action:feed_action_payload_java_proto_lite",
"//src/main/proto/search/now/ui/stream:stream_java_proto_lite",
"//src/main/proto/search/now/ui/stream:stream_swipe_extension_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_guava_guava",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -67,11 +68,12 @@
"//src/main/proto/com/google/android/libraries/feed/api/proto:client_feed_java_proto_lite",
"//src/main/proto/search/now/ui/action:feed_action_java_proto_lite",
"//src/main/proto/search/now/ui/stream:stream_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_guava_guava",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -110,13 +112,14 @@
"//src/main/proto/search/now/ui/piet:piet_java_proto_lite",
"//src/main/proto/search/now/ui/stream:stream_java_proto_lite",
"//src/main/proto/search/now/wire/feed:feed_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_code_findbugs_jsr305//jar",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_android_support_recyclerview_v7",
"@maven//:com_google_guava_guava",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -140,11 +143,12 @@
"//src/main/java/com/google/android/libraries/feed/host/stream",
"//src/main/java/com/google/android/libraries/feed/sharedstream/logging",
"//src/main/java/com/google/android/libraries/feed/testing/modelprovider",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_guava_guava",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -159,10 +163,11 @@
"//src/main/java/com/google/android/libraries/feed/api/stream",
"//src/main/java/com/google/android/libraries/feed/basicstream/internal/drivers",
"//src/main/java/com/google/android/libraries/feed/basicstream/internal/viewholders",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -176,10 +181,11 @@
deps = [
"//src/main/java/com/google/android/libraries/feed/basicstream/internal/drivers",
"//src/main/java/com/google/android/libraries/feed/basicstream/internal/viewholders",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -221,11 +227,12 @@
"//src/main/proto/com/google/android/libraries/feed/sharedstream/proto:ui_refresh_reason_java_proto_lite",
"//src/main/proto/search/now/ui/action:feed_action_java_proto_lite",
"//src/main/proto/search/now/ui/stream:stream_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_guava_guava",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -248,9 +255,10 @@
"//src/main/java/com/google/android/libraries/feed/sharedstream/logging",
"//src/main/proto/com/google/android/libraries/feed/api/proto:client_feed_java_proto_lite",
"//src/main/proto/com/google/android/libraries/feed/sharedstream/proto:ui_refresh_reason_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
diff --git a/src/test/java/com/google/android/libraries/feed/basicstream/internal/scroll/BUILD b/src/test/java/com/google/android/libraries/feed/basicstream/internal/scroll/BUILD
index cbac943..d8e9bce 100644
--- a/src/test/java/com/google/android/libraries/feed/basicstream/internal/scroll/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/basicstream/internal/scroll/BUILD
@@ -16,9 +16,10 @@
"//src/main/java/com/google/android/libraries/feed/common/time/testing",
"//src/main/java/com/google/android/libraries/feed/host/logging",
"//src/main/java/com/google/android/libraries/feed/sharedstream/scroll",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -35,10 +36,11 @@
"//src/main/java/com/google/android/libraries/feed/sharedstream/scroll",
"//src/main/java/com/google/android/libraries/feed/testing/android",
"//src/main/proto/com/google/android/libraries/feed/sharedstream/proto:scroll_state_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_android_support_recyclerview_v7",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
diff --git a/src/test/java/com/google/android/libraries/feed/basicstream/internal/viewholders/BUILD b/src/test/java/com/google/android/libraries/feed/basicstream/internal/viewholders/BUILD
index 19fa425..2d4bc59 100644
--- a/src/test/java/com/google/android/libraries/feed/basicstream/internal/viewholders/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/basicstream/internal/viewholders/BUILD
@@ -15,10 +15,11 @@
"//src/main/java/com/google/android/libraries/feed/host/stream",
"//src/main/java/com/google/android/libraries/feed/sharedstream/logging",
"//src/main/java/com/google/android/libraries/feed/testing/host/stream",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -32,10 +33,11 @@
deps = [
"//src/main/java/com/google/android/libraries/feed/api/stream",
"//src/main/java/com/google/android/libraries/feed/basicstream/internal/viewholders",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -49,10 +51,11 @@
deps = [
"//src/main/java/com/google/android/libraries/feed/basicstream/internal/viewholders",
"//src/main/java/com/google/android/libraries/feed/host/stream",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -84,11 +87,12 @@
"//src/main/proto/search/now/ui/action:feed_action_payload_java_proto_lite",
"//src/main/proto/search/now/ui/piet:piet_errors_java_proto_lite",
"//src/main/proto/search/now/ui/piet:piet_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_android_support_recyclerview_v7",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -103,9 +107,10 @@
"//src/main/java/com/google/android/libraries/feed/basicstream/internal/viewholders",
"//src/main/java/com/google/android/libraries/feed/host/stream",
"//src/main/java/com/google/android/libraries/feed/testing/host/stream",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
diff --git a/src/test/java/com/google/android/libraries/feed/basicstream/internal/viewloggingupdater/BUILD b/src/test/java/com/google/android/libraries/feed/basicstream/internal/viewloggingupdater/BUILD
index ea9e8d4..dfff6cf 100644
--- a/src/test/java/com/google/android/libraries/feed/basicstream/internal/viewloggingupdater/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/basicstream/internal/viewloggingupdater/BUILD
@@ -12,9 +12,10 @@
deps = [
"//src/main/java/com/google/android/libraries/feed/basicstream/internal/viewloggingupdater",
"//src/main/java/com/google/android/libraries/feed/sharedstream/logging",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -27,8 +28,9 @@
manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
deps = [
"//src/main/java/com/google/android/libraries/feed/basicstream/internal/viewloggingupdater",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
diff --git a/src/test/java/com/google/android/libraries/feed/common/BUILD b/src/test/java/com/google/android/libraries/feed/common/BUILD
index 30c840b..67f1411 100644
--- a/src/test/java/com/google/android/libraries/feed/common/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/common/BUILD
@@ -12,9 +12,10 @@
deps = [
"//src/main/java/com/google/android/libraries/feed/common",
"//src/main/java/com/google/android/libraries/feed/common/testing",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -28,8 +29,9 @@
deps = [
"//src/main/java/com/google/android/libraries/feed/common",
"//src/main/java/com/google/android/libraries/feed/common/testing",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
diff --git a/src/test/java/com/google/android/libraries/feed/common/concurrent/BUILD b/src/test/java/com/google/android/libraries/feed/common/concurrent/BUILD
index abe0b26..d3ba5d6 100644
--- a/src/test/java/com/google/android/libraries/feed/common/concurrent/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/common/concurrent/BUILD
@@ -11,9 +11,10 @@
manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
deps = [
"//src/main/java/com/google/android/libraries/feed/common/concurrent",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -27,9 +28,10 @@
deps = [
"//src/main/java/com/google/android/libraries/feed/common/concurrent",
"//src/main/java/com/google/android/libraries/feed/common/testing",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -46,10 +48,11 @@
"//src/main/java/com/google/android/libraries/feed/common/time/testing",
"//src/main/java/com/google/android/libraries/feed/host/logging",
"//src/main/java/com/google/android/libraries/feed/testing/host/logging",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_guava_guava",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
diff --git a/src/test/java/com/google/android/libraries/feed/common/feedobservable/BUILD b/src/test/java/com/google/android/libraries/feed/common/feedobservable/BUILD
index ef53368..99ce59d 100644
--- a/src/test/java/com/google/android/libraries/feed/common/feedobservable/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/common/feedobservable/BUILD
@@ -11,8 +11,9 @@
manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
deps = [
"//src/main/java/com/google/android/libraries/feed/common/feedobservable",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
diff --git a/src/test/java/com/google/android/libraries/feed/common/intern/BUILD b/src/test/java/com/google/android/libraries/feed/common/intern/BUILD
index 3c2c3c7..70cd4d8 100644
--- a/src/test/java/com/google/android/libraries/feed/common/intern/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/common/intern/BUILD
@@ -12,9 +12,10 @@
deps = [
"//src/main/java/com/google/android/libraries/feed/common/intern",
"//src/main/proto/search/now/ui/piet:piet_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -28,9 +29,10 @@
deps = [
"//src/main/java/com/google/android/libraries/feed/common/intern",
"//src/main/proto/com/google/android/libraries/feed/api/proto:client_feed_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -44,9 +46,10 @@
deps = [
"//src/main/java/com/google/android/libraries/feed/common/intern",
"//src/main/proto/com/google/android/libraries/feed/api/proto:client_feed_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -60,8 +63,9 @@
deps = [
"//src/main/java/com/google/android/libraries/feed/common/intern",
"//src/main/proto/com/google/android/libraries/feed/api/proto:client_feed_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
diff --git a/src/test/java/com/google/android/libraries/feed/common/locale/BUILD b/src/test/java/com/google/android/libraries/feed/common/locale/BUILD
index 74535ff..912aab0 100644
--- a/src/test/java/com/google/android/libraries/feed/common/locale/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/common/locale/BUILD
@@ -11,8 +11,9 @@
manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
deps = [
"//src/main/java/com/google/android/libraries/feed/common/locale",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
diff --git a/src/test/java/com/google/android/libraries/feed/common/locale/LocaleUtilsTest.java b/src/test/java/com/google/android/libraries/feed/common/locale/LocaleUtilsTest.java
index 6bd118b..d7667da 100644
--- a/src/test/java/com/google/android/libraries/feed/common/locale/LocaleUtilsTest.java
+++ b/src/test/java/com/google/android/libraries/feed/common/locale/LocaleUtilsTest.java
@@ -16,42 +16,50 @@
import static com.google.common.truth.Truth.assertThat;
+import android.app.Activity;
+import android.content.Context;
import android.os.Build.VERSION_CODES;
import java.util.Locale;
+import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.robolectric.Robolectric;
import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
/** Tests of the {@link LocaleUtils} class. */
@RunWith(RobolectricTestRunner.class)
public class LocaleUtilsTest {
+ private Context context;
+
+ @Before
+ public void setUp() {
+ context = Robolectric.buildActivity(Activity.class).get();
+ }
+
@Test
@Config(qualifiers = "fr-rCA", sdk = VERSION_CODES.N)
public void getLocale_byContext_postN() {
- assertThat(LocaleUtils.getLocale(RuntimeEnvironment.application))
- .isEqualTo(Locale.CANADA_FRENCH);
+ assertThat(LocaleUtils.getLocale(context)).isEqualTo(Locale.CANADA_FRENCH);
}
@Test
@Config(qualifiers = "fr-rCA", sdk = VERSION_CODES.LOLLIPOP)
public void getLoca_byContext_preN() {
- assertThat(LocaleUtils.getLocale(RuntimeEnvironment.application))
- .isEqualTo(Locale.CANADA_FRENCH);
+ assertThat(LocaleUtils.getLocale(context)).isEqualTo(Locale.CANADA_FRENCH);
}
@Test
@Config(qualifiers = "fr-rCA", sdk = VERSION_CODES.LOLLIPOP)
public void getLanguageTag_byContext_postLollipop() {
- assertThat(LocaleUtils.getLanguageTag(RuntimeEnvironment.application)).isEqualTo("fr-CA");
+ assertThat(LocaleUtils.getLanguageTag(context)).isEqualTo("fr-CA");
}
@Test
@Config(qualifiers = "fr-rCA", sdk = VERSION_CODES.KITKAT)
public void getLanguageTag_byContext_preLollipop() {
- assertThat(LocaleUtils.getLanguageTag(RuntimeEnvironment.application)).isEqualTo("fr-CA");
+ assertThat(LocaleUtils.getLanguageTag(context)).isEqualTo("fr-CA");
}
@Test
diff --git a/src/test/java/com/google/android/libraries/feed/common/logging/BUILD b/src/test/java/com/google/android/libraries/feed/common/logging/BUILD
index 15ddc40..3ef3f32 100644
--- a/src/test/java/com/google/android/libraries/feed/common/logging/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/common/logging/BUILD
@@ -11,10 +11,11 @@
manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
deps = [
"//src/main/java/com/google/android/libraries/feed/common/logging",
+ "//third_party:robolectric",
"@com_google_code_findbugs_jsr305//jar",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -27,9 +28,10 @@
manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
deps = [
"//src/main/java/com/google/android/libraries/feed/common/logging",
+ "//third_party:robolectric",
"@com_google_code_findbugs_jsr305//jar",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
diff --git a/src/test/java/com/google/android/libraries/feed/common/testing/BUILD b/src/test/java/com/google/android/libraries/feed/common/testing/BUILD
index ebc057b..3a98c11 100644
--- a/src/test/java/com/google/android/libraries/feed/common/testing/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/common/testing/BUILD
@@ -7,8 +7,8 @@
deps = [
"//src/main/java/com/google/android/libraries/feed/common/testing",
"@com_google_protobuf_javalite//:protobuf_java_lite",
- "@junit_junit//jar",
"@maven//:com_google_truth_truth",
+ "@maven//:junit_junit",
"@maven//:org_mockito_mockito_core",
],
)
@@ -20,7 +20,7 @@
deps = [
"//src/main/java/com/google/android/libraries/feed/common/testing",
"@com_google_protobuf_javalite//:protobuf_java_lite",
- "@junit_junit//jar",
"@maven//:com_google_truth_truth",
+ "@maven//:junit_junit",
],
)
diff --git a/src/test/java/com/google/android/libraries/feed/common/ui/BUILD b/src/test/java/com/google/android/libraries/feed/common/ui/BUILD
index 754aabd..d42fff0 100644
--- a/src/test/java/com/google/android/libraries/feed/common/ui/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/common/ui/BUILD
@@ -11,8 +11,10 @@
manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
deps = [
"//src/main/java/com/google/android/libraries/feed/common/ui",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
+ "@maven//:androidx_test_core",
"@maven//:com_google_truth_truth",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
diff --git a/src/test/java/com/google/android/libraries/feed/common/ui/LayoutUtilsTest.java b/src/test/java/com/google/android/libraries/feed/common/ui/LayoutUtilsTest.java
index c7f06d5..ef0c91c 100644
--- a/src/test/java/com/google/android/libraries/feed/common/ui/LayoutUtilsTest.java
+++ b/src/test/java/com/google/android/libraries/feed/common/ui/LayoutUtilsTest.java
@@ -19,10 +19,10 @@
import android.content.Context;
import android.os.Build.VERSION_CODES;
import android.widget.LinearLayout;
+import androidx.test.core.app.ApplicationProvider;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
/** Tests for {@link LayoutUtils}. */
@@ -35,7 +35,7 @@
private static final int END = 3;
private static final int BOTTOM = 4;
- private final Context context = RuntimeEnvironment.application;
+ private final Context context = ApplicationProvider.getApplicationContext();
@Test
@Config(sdk = VERSION_CODES.JELLY_BEAN)
diff --git a/src/test/java/com/google/android/libraries/feed/feedactionmanager/BUILD b/src/test/java/com/google/android/libraries/feed/feedactionmanager/BUILD
index 9315ee6..f604bfe 100644
--- a/src/test/java/com/google/android/libraries/feed/feedactionmanager/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/feedactionmanager/BUILD
@@ -21,10 +21,11 @@
"//src/main/java/com/google/android/libraries/feed/internalapi/store",
"//src/main/proto/com/google/android/libraries/feed/api/proto:client_feed_java_proto_lite",
"//src/main/proto/search/now/wire/feed:feed_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_guava_guava",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
diff --git a/src/test/java/com/google/android/libraries/feed/feedactionparser/BUILD b/src/test/java/com/google/android/libraries/feed/feedactionparser/BUILD
index 35ef70e..3a7f4a3 100644
--- a/src/test/java/com/google/android/libraries/feed/feedactionparser/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/feedactionparser/BUILD
@@ -25,10 +25,11 @@
"//src/main/proto/search/now/ui/action:piet_extensions_java_proto_lite",
"//src/main/proto/search/now/ui/piet:piet_java_proto_lite",
"//src/main/proto/search/now/wire/feed:feed_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_guava_guava",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
diff --git a/src/test/java/com/google/android/libraries/feed/feedactionreader/BUILD b/src/test/java/com/google/android/libraries/feed/feedactionreader/BUILD
index 8bd428b..d5c1c1d 100644
--- a/src/test/java/com/google/android/libraries/feed/feedactionreader/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/feedactionreader/BUILD
@@ -23,10 +23,11 @@
"//src/main/java/com/google/android/libraries/feed/internalapi/store",
"//src/main/proto/com/google/android/libraries/feed/api/proto:client_feed_java_proto_lite",
"//src/main/proto/search/now/wire/feed:feed_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_guava_guava",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
diff --git a/src/test/java/com/google/android/libraries/feed/feedapplifecyclelistener/BUILD b/src/test/java/com/google/android/libraries/feed/feedapplifecyclelistener/BUILD
index e4f286c..cde1a30 100644
--- a/src/test/java/com/google/android/libraries/feed/feedapplifecyclelistener/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/feedapplifecyclelistener/BUILD
@@ -12,8 +12,9 @@
deps = [
"//src/main/java/com/google/android/libraries/feed/api/common",
"//src/main/java/com/google/android/libraries/feed/feedapplifecyclelistener",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
diff --git a/src/test/java/com/google/android/libraries/feed/feedknowncontent/BUILD b/src/test/java/com/google/android/libraries/feed/feedknowncontent/BUILD
index 081a25d..52bf705 100644
--- a/src/test/java/com/google/android/libraries/feed/feedknowncontent/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/feedknowncontent/BUILD
@@ -19,9 +19,10 @@
"//src/main/java/com/google/android/libraries/feed/feedknowncontent",
"//src/main/proto/com/google/android/libraries/feed/api/proto:client_feed_java_proto_lite",
"//src/main/proto/search/now/ui/stream:stream_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
diff --git a/src/test/java/com/google/android/libraries/feed/feedmodelprovider/BUILD b/src/test/java/com/google/android/libraries/feed/feedmodelprovider/BUILD
index 67511d0..0d0fe74 100644
--- a/src/test/java/com/google/android/libraries/feed/feedmodelprovider/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/feedmodelprovider/BUILD
@@ -17,10 +17,11 @@
"//src/main/java/com/google/android/libraries/feed/common/time",
"//src/main/java/com/google/android/libraries/feed/feedmodelprovider",
"//src/main/java/com/google/android/libraries/feed/host/config",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -48,9 +49,10 @@
"//src/main/proto/com/google/android/libraries/feed/api/proto:client_feed_java_proto_lite",
"//src/main/proto/search/now/ui/stream:stream_java_proto_lite",
"//src/main/proto/search/now/wire/feed:feed_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
diff --git a/src/test/java/com/google/android/libraries/feed/feedmodelprovider/internal/BUILD b/src/test/java/com/google/android/libraries/feed/feedmodelprovider/internal/BUILD
index 68d45e3..6fe7952 100644
--- a/src/test/java/com/google/android/libraries/feed/feedmodelprovider/internal/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/feedmodelprovider/internal/BUILD
@@ -15,11 +15,12 @@
"//src/main/java/com/google/android/libraries/feed/api/modelprovider",
"//src/main/java/com/google/android/libraries/feed/feedmodelprovider/internal",
"//src/main/proto/com/google/android/libraries/feed/api/proto:client_feed_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_code_findbugs_jsr305//jar",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -34,10 +35,11 @@
"//src/main/java/com/google/android/libraries/feed/api/common/testing",
"//src/main/java/com/google/android/libraries/feed/api/modelprovider",
"//src/main/java/com/google/android/libraries/feed/feedmodelprovider/internal",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -53,11 +55,12 @@
"//src/main/java/com/google/android/libraries/feed/feedmodelprovider",
"//src/main/java/com/google/android/libraries/feed/feedmodelprovider/internal",
"//src/main/proto/com/google/android/libraries/feed/api/proto:client_feed_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_code_findbugs_jsr305//jar",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -73,10 +76,11 @@
"//src/main/java/com/google/android/libraries/feed/common/functional",
"//src/main/java/com/google/android/libraries/feed/feedmodelprovider/internal",
"//src/main/proto/com/google/android/libraries/feed/api/proto:client_feed_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -91,9 +95,10 @@
"//src/main/java/com/google/android/libraries/feed/api/modelprovider",
"//src/main/java/com/google/android/libraries/feed/feedmodelprovider/internal",
"//src/main/proto/com/google/android/libraries/feed/api/proto:client_feed_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
diff --git a/src/test/java/com/google/android/libraries/feed/feedprotocoladapter/BUILD b/src/test/java/com/google/android/libraries/feed/feedprotocoladapter/BUILD
index d7c8d16..17bdcce 100644
--- a/src/test/java/com/google/android/libraries/feed/feedprotocoladapter/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/feedprotocoladapter/BUILD
@@ -16,9 +16,10 @@
"//src/main/java/com/google/android/libraries/feed/feedprotocoladapter",
"//src/main/proto/com/google/android/libraries/feed/api/proto:client_feed_java_proto_lite",
"//src/main/proto/search/now/wire/feed:feed_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
diff --git a/src/test/java/com/google/android/libraries/feed/feedprotocoladapter/internal/transformers/BUILD b/src/test/java/com/google/android/libraries/feed/feedprotocoladapter/internal/transformers/BUILD
index a35b406..95b4d9c 100644
--- a/src/test/java/com/google/android/libraries/feed/feedprotocoladapter/internal/transformers/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/feedprotocoladapter/internal/transformers/BUILD
@@ -14,9 +14,10 @@
"//src/main/proto/com/google/android/libraries/feed/api/proto:client_feed_java_proto_lite",
"//src/main/proto/search/now/ui/stream:stream_java_proto_lite",
"//src/main/proto/search/now/wire/feed:feed_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -32,8 +33,9 @@
"//src/main/proto/com/google/android/libraries/feed/api/proto:client_feed_java_proto_lite",
"//src/main/proto/search/now/ui/stream:stream_java_proto_lite",
"//src/main/proto/search/now/wire/feed:feed_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
diff --git a/src/test/java/com/google/android/libraries/feed/feedrequestmanager/BUILD b/src/test/java/com/google/android/libraries/feed/feedrequestmanager/BUILD
index 4891933..ea2a306 100644
--- a/src/test/java/com/google/android/libraries/feed/feedrequestmanager/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/feedrequestmanager/BUILD
@@ -25,11 +25,12 @@
"//src/main/proto/com/google/android/libraries/feed/api/proto:client_feed_java_proto_lite",
"//src/main/proto/search/now/wire/feed:feed_java_proto_lite",
"//src/test/proto/search/now/wire/feed:feed_test_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_guava_guava",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -62,13 +63,14 @@
"//src/main/java/com/google/android/libraries/feed/testing/protocoladapter",
"//src/main/proto/com/google/android/libraries/feed/api/proto:client_feed_java_proto_lite",
"//src/main/proto/search/now/wire/feed:feed_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_code_findbugs_jsr305//jar",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@com_google_truth_liteproto_extension//jar",
"@maven//:com_google_guava_guava",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -86,9 +88,10 @@
"//src/main/proto/com/google/android/libraries/feed/api/proto:client_feed_java_proto_lite",
"//src/main/proto/search/now/wire/feed:feed_java_proto_lite",
"//src/test/proto/search/now/wire/feed:feed_test_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
diff --git a/src/test/java/com/google/android/libraries/feed/feedrequestmanager/FeedRequestManagerTest.java b/src/test/java/com/google/android/libraries/feed/feedrequestmanager/FeedRequestManagerTest.java
index c850fb9..0f47644 100644
--- a/src/test/java/com/google/android/libraries/feed/feedrequestmanager/FeedRequestManagerTest.java
+++ b/src/test/java/com/google/android/libraries/feed/feedrequestmanager/FeedRequestManagerTest.java
@@ -92,7 +92,6 @@
import org.mockito.Mock;
import org.robolectric.Robolectric;
import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
@@ -191,7 +190,7 @@
assertThat(fakeTooltipSupportedApi.getLatestFeatureName()).isNull();
HttpRequest httpRequest = fakeNetworkClient.getLatestRequest();
- assertHttpRequestFormattedCorrectly(httpRequest);
+ assertHttpRequestFormattedCorrectly(httpRequest, context);
Request request = getRequestFromHttpRequest(httpRequest);
Request expectedRequest =
@@ -256,7 +255,7 @@
requestManager.triggerRefresh(RequestReason.HOST_REQUESTED);
HttpRequest httpRequest = fakeNetworkClient.getLatestRequest();
- assertHttpRequestFormattedCorrectly(httpRequest);
+ assertHttpRequestFormattedCorrectly(httpRequest, context);
Request request = getRequestFromHttpRequest(httpRequest);
Request expectedRequest =
@@ -281,7 +280,7 @@
requestManager.triggerRefresh(RequestReason.HOST_REQUESTED, input -> {});
HttpRequest httpRequest = fakeNetworkClient.getLatestRequest();
- assertHttpRequestFormattedCorrectly(httpRequest);
+ assertHttpRequestFormattedCorrectly(httpRequest, context);
Request request = getRequestFromHttpRequest(httpRequest);
@@ -327,7 +326,7 @@
requestManager.triggerRefresh(RequestReason.HOST_REQUESTED, input -> {});
HttpRequest httpRequest = fakeNetworkClient.getLatestRequest();
- assertHttpRequestFormattedCorrectly(httpRequest);
+ assertHttpRequestFormattedCorrectly(httpRequest, context);
Request request = getRequestFromHttpRequest(httpRequest);
@@ -378,7 +377,7 @@
requestManager.triggerRefresh(RequestReason.HOST_REQUESTED, input -> {});
HttpRequest httpRequest = fakeNetworkClient.getLatestRequest();
- assertHttpRequestFormattedCorrectly(httpRequest);
+ assertHttpRequestFormattedCorrectly(httpRequest, context);
Request request = getRequestFromHttpRequest(httpRequest);
@@ -429,7 +428,7 @@
requestManager.triggerRefresh(RequestReason.HOST_REQUESTED, input -> {});
HttpRequest httpRequest = fakeNetworkClient.getLatestRequest();
- assertHttpRequestFormattedCorrectly(httpRequest);
+ assertHttpRequestFormattedCorrectly(httpRequest, context);
Request request = getRequestFromHttpRequest(httpRequest);
@@ -482,7 +481,7 @@
requestManager.triggerRefresh(RequestReason.HOST_REQUESTED, input -> {});
HttpRequest httpRequest = fakeNetworkClient.getLatestRequest();
- assertHttpRequestFormattedCorrectly(httpRequest);
+ assertHttpRequestFormattedCorrectly(httpRequest, context);
Request request = getRequestFromHttpRequest(httpRequest);
@@ -543,7 +542,7 @@
requestManager.triggerRefresh(RequestReason.HOST_REQUESTED, input -> {});
HttpRequest httpRequest = fakeNetworkClient.getLatestRequest();
- assertHttpRequestFormattedCorrectly(httpRequest);
+ assertHttpRequestFormattedCorrectly(httpRequest, context);
Request request = getRequestFromHttpRequest(httpRequest);
@@ -601,7 +600,7 @@
requestManager.triggerRefresh(RequestReason.HOST_REQUESTED, input -> {});
HttpRequest httpRequest = fakeNetworkClient.getLatestRequest();
- assertHttpRequestFormattedCorrectly(httpRequest);
+ assertHttpRequestFormattedCorrectly(httpRequest, context);
Request request = getRequestFromHttpRequest(httpRequest);
@@ -772,7 +771,7 @@
.setBuildType(BuildType.RELEASE)
.setApiVersion(VERSION_CODES.LOLLIPOP)
.build())
- .setLocale(LocaleUtils.getLanguageTag(RuntimeEnvironment.application))
+ .setLocale(LocaleUtils.getLanguageTag(context))
.setAppType(AppType.GSA)
.setAppVersion(
Version.newBuilder()
@@ -807,14 +806,15 @@
assertThat(fakeBasicLoggingApi.serverRequestReason).isEqualTo(reason);
}
- private static void assertHttpRequestFormattedCorrectly(HttpRequest httpRequest) {
+ private static void assertHttpRequestFormattedCorrectly(
+ HttpRequest httpRequest, Context context) {
assertThat(httpRequest.getBody()).hasLength(0);
assertThat(httpRequest.getMethod()).isEqualTo(HttpMethod.GET);
assertThat(httpRequest.getUri().getQueryParameter("fmt")).isEqualTo("bin");
assertThat(httpRequest.getUri().getQueryParameter(RequestHelper.MOTHERSHIP_PARAM_PAYLOAD))
.isNotNull();
assertThat(httpRequest.getUri().getQueryParameter(RequestHelper.LOCALE_PARAM))
- .isEqualTo(LocaleUtils.getLanguageTag(RuntimeEnvironment.application));
+ .isEqualTo(LocaleUtils.getLanguageTag(context));
}
private static HttpResponse createHttpResponse(int responseCode, Response response)
@@ -896,7 +896,7 @@
requestManager.triggerRefresh(RequestReason.HOST_REQUESTED, input -> {});
HttpRequest httpRequest = fakeNetworkClient.getLatestRequest();
- assertHttpRequestFormattedCorrectly(httpRequest);
+ assertHttpRequestFormattedCorrectly(httpRequest, context);
Set<Capability> expectedCap = EnumSet.of(Capability.BASE_UI);
if (capability != null) {
diff --git a/src/test/java/com/google/android/libraries/feed/feedrequestmanager/internal/BUILD b/src/test/java/com/google/android/libraries/feed/feedrequestmanager/internal/BUILD
index e4388c0..cac8d60 100644
--- a/src/test/java/com/google/android/libraries/feed/feedrequestmanager/internal/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/feedrequestmanager/internal/BUILD
@@ -12,9 +12,10 @@
deps = [
"//src/main/java/com/google/android/libraries/feed/feedrequestmanager/internal",
"//src/main/proto/search/now/wire/feed:feed_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@com_google_truth_liteproto_extension//jar",
"@maven//:com_google_truth_truth", # buildclean: keep
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
diff --git a/src/test/java/com/google/android/libraries/feed/feedsessionmanager/BUILD b/src/test/java/com/google/android/libraries/feed/feedsessionmanager/BUILD
index 6e49e4e..0dbd28c 100644
--- a/src/test/java/com/google/android/libraries/feed/feedsessionmanager/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/feedsessionmanager/BUILD
@@ -34,11 +34,12 @@
"//src/main/proto/search/now/ui/piet:piet_java_proto_lite",
"//src/main/proto/search/now/wire/feed:feed_java_proto_lite",
"//src/test/proto/search/now/wire/feed:feed_test_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_code_findbugs_jsr305//jar",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_guava_guava",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
diff --git a/src/test/java/com/google/android/libraries/feed/feedsessionmanager/internal/BUILD b/src/test/java/com/google/android/libraries/feed/feedsessionmanager/internal/BUILD
index 5569efc..e992d70 100644
--- a/src/test/java/com/google/android/libraries/feed/feedsessionmanager/internal/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/feedsessionmanager/internal/BUILD
@@ -13,10 +13,11 @@
"//src/main/java/com/google/android/libraries/feed/api/common/testing",
"//src/main/java/com/google/android/libraries/feed/feedsessionmanager/internal",
"//src/main/proto/com/google/android/libraries/feed/api/proto:client_feed_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -37,11 +38,12 @@
"//src/main/java/com/google/android/libraries/feed/internalapi/store",
"//src/main/java/com/google/android/libraries/feed/testing/store",
"//src/main/proto/com/google/android/libraries/feed/api/proto:client_feed_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_guava_guava",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -62,11 +64,12 @@
"//src/main/java/com/google/android/libraries/feed/internalapi/store",
"//src/main/java/com/google/android/libraries/feed/testing/store",
"//src/main/proto/com/google/android/libraries/feed/api/proto:client_feed_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_guava_guava",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -100,11 +103,12 @@
"//src/main/proto/com/google/android/libraries/feed/api/proto:client_feed_java_proto_lite",
"//src/main/proto/search/now/wire/feed:feed_java_proto_lite",
"//src/test/proto/search/now/wire/feed:feed_test_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_guava_guava",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -127,11 +131,12 @@
"//src/main/java/com/google/android/libraries/feed/testing/modelprovider",
"//src/main/java/com/google/android/libraries/feed/testing/store",
"//src/main/proto/com/google/android/libraries/feed/api/proto:client_feed_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_guava_guava",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -153,11 +158,12 @@
"//src/main/java/com/google/android/libraries/feed/feedsessionmanager/internal/testing",
"//src/main/java/com/google/android/libraries/feed/testing/modelprovider",
"//src/main/proto/com/google/android/libraries/feed/api/proto:client_feed_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_guava_guava",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -172,9 +178,10 @@
"//src/main/java/com/google/android/libraries/feed/api/common/testing",
"//src/main/java/com/google/android/libraries/feed/feedsessionmanager/internal",
"//src/main/proto/com/google/android/libraries/feed/api/proto:client_feed_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -196,10 +203,11 @@
"//src/main/java/com/google/android/libraries/feed/feedsessionmanager/internal/testing",
"//src/main/java/com/google/android/libraries/feed/testing/modelprovider",
"//src/main/proto/com/google/android/libraries/feed/api/proto:client_feed_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_guava_guava",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
diff --git a/src/test/java/com/google/android/libraries/feed/feedstore/BUILD b/src/test/java/com/google/android/libraries/feed/feedstore/BUILD
index b715ad6..6615d92 100644
--- a/src/test/java/com/google/android/libraries/feed/feedstore/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/feedstore/BUILD
@@ -20,10 +20,11 @@
"//src/main/java/com/google/android/libraries/feed/hostimpl/storage",
"//src/main/java/com/google/android/libraries/feed/internalapi/store",
"//src/main/java/com/google/android/libraries/feed/testing/host/logging",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_guava_guava",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -48,10 +49,11 @@
"//src/main/java/com/google/android/libraries/feed/hostimpl/storage",
"//src/main/java/com/google/android/libraries/feed/internalapi/store",
"//src/main/proto/com/google/android/libraries/feed/api/proto:client_feed_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_guava_guava",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
diff --git a/src/test/java/com/google/android/libraries/feed/feedstore/internal/BUILD b/src/test/java/com/google/android/libraries/feed/feedstore/internal/BUILD
index daada07..ba0aa3a 100644
--- a/src/test/java/com/google/android/libraries/feed/feedstore/internal/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/feedstore/internal/BUILD
@@ -15,10 +15,11 @@
"//src/main/java/com/google/android/libraries/feed/host/storage",
"//src/main/java/com/google/android/libraries/feed/internalapi/store",
"//src/main/proto/com/google/android/libraries/feed/api/proto:client_feed_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -36,10 +37,11 @@
"//src/main/java/com/google/android/libraries/feed/host/storage",
"//src/main/java/com/google/android/libraries/feed/internalapi/store",
"//src/main/proto/com/google/android/libraries/feed/api/proto:client_feed_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -55,9 +57,10 @@
"//src/main/java/com/google/android/libraries/feed/feedstore/internal",
"//src/main/java/com/google/android/libraries/feed/feedstore/testing",
"//src/main/java/com/google/android/libraries/feed/internalapi/store",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -82,9 +85,10 @@
"//src/main/proto/com/google/android/libraries/feed/api/proto:client_feed_java_proto_lite",
"//src/main/proto/search/now/wire/feed:feed_java_proto_lite",
"//src/test/proto/search/now/wire/feed:feed_test_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
diff --git a/src/test/java/com/google/android/libraries/feed/host/config/BUILD b/src/test/java/com/google/android/libraries/feed/host/config/BUILD
index dd19e34..d5272ed 100644
--- a/src/test/java/com/google/android/libraries/feed/host/config/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/host/config/BUILD
@@ -11,8 +11,9 @@
manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
deps = [
"//src/main/java/com/google/android/libraries/feed/host/config",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
diff --git a/src/test/java/com/google/android/libraries/feed/host/network/BUILD b/src/test/java/com/google/android/libraries/feed/host/network/BUILD
index 17da77c..69b7a53 100644
--- a/src/test/java/com/google/android/libraries/feed/host/network/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/host/network/BUILD
@@ -12,9 +12,10 @@
deps = [
"//src/main/java/com/google/android/libraries/feed/common/testing",
"//src/main/java/com/google/android/libraries/feed/host/network",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -28,9 +29,10 @@
deps = [
"//src/main/java/com/google/android/libraries/feed/common/testing",
"//src/main/java/com/google/android/libraries/feed/host/network",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
diff --git a/src/test/java/com/google/android/libraries/feed/host/storage/BUILD b/src/test/java/com/google/android/libraries/feed/host/storage/BUILD
index 37fe590..ef7211a 100644
--- a/src/test/java/com/google/android/libraries/feed/host/storage/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/host/storage/BUILD
@@ -11,9 +11,10 @@
manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
deps = [
"//src/main/java/com/google/android/libraries/feed/host/storage",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
diff --git a/src/test/java/com/google/android/libraries/feed/hostimpl/network/BUILD b/src/test/java/com/google/android/libraries/feed/hostimpl/network/BUILD
index fc44b45..096b0dc 100644
--- a/src/test/java/com/google/android/libraries/feed/hostimpl/network/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/hostimpl/network/BUILD
@@ -15,9 +15,10 @@
"//src/main/java/com/google/android/libraries/feed/common/functional",
"//src/main/java/com/google/android/libraries/feed/host/network",
"//src/main/java/com/google/android/libraries/feed/hostimpl/network",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
diff --git a/src/test/java/com/google/android/libraries/feed/hostimpl/scheduler/BUILD b/src/test/java/com/google/android/libraries/feed/hostimpl/scheduler/BUILD
index f12a7a7..17add3f 100644
--- a/src/test/java/com/google/android/libraries/feed/hostimpl/scheduler/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/hostimpl/scheduler/BUILD
@@ -14,9 +14,10 @@
"//src/main/java/com/google/android/libraries/feed/common/concurrent/testing",
"//src/main/java/com/google/android/libraries/feed/host/scheduler",
"//src/main/java/com/google/android/libraries/feed/hostimpl/scheduler",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
diff --git a/src/test/java/com/google/android/libraries/feed/hostimpl/storage/BUILD b/src/test/java/com/google/android/libraries/feed/hostimpl/storage/BUILD
index 06c5db1..9c867c3 100644
--- a/src/test/java/com/google/android/libraries/feed/hostimpl/storage/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/hostimpl/storage/BUILD
@@ -13,9 +13,10 @@
"//src/main/java/com/google/android/libraries/feed/feedstore/testing",
"//src/main/java/com/google/android/libraries/feed/hostimpl/storage",
"//src/main/java/com/google/android/libraries/feed/testing/conformance/storage",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -29,8 +30,9 @@
deps = [
"//src/main/java/com/google/android/libraries/feed/hostimpl/storage",
"//src/main/java/com/google/android/libraries/feed/testing/conformance/storage",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -45,8 +47,9 @@
"//src/main/java/com/google/android/libraries/feed/feedstore/testing",
"//src/main/java/com/google/android/libraries/feed/hostimpl/storage",
"//src/main/java/com/google/android/libraries/feed/testing/conformance/storage",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -60,8 +63,9 @@
deps = [
"//src/main/java/com/google/android/libraries/feed/hostimpl/storage",
"//src/main/java/com/google/android/libraries/feed/testing/conformance/storage",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -74,17 +78,14 @@
manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
deps = [
"//src/main/java/com/google/android/libraries/feed/api/common",
- "//src/main/java/com/google/android/libraries/feed/common",
- "//src/main/java/com/google/android/libraries/feed/common/testing",
- "//src/main/java/com/google/android/libraries/feed/host/storage",
"//src/main/java/com/google/android/libraries/feed/hostimpl/storage",
"//src/main/java/com/google/android/libraries/feed/testing/conformance/storage",
- "@com_google_code_findbugs_jsr305//jar",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
+ "@maven//:androidx_test_core",
"@maven//:com_google_guava_guava",
- "@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -99,10 +100,12 @@
"//src/main/java/com/google/android/libraries/feed/api/common",
"//src/main/java/com/google/android/libraries/feed/hostimpl/storage",
"//src/main/java/com/google/android/libraries/feed/testing/conformance/storage",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
+ "@maven//:androidx_test_core",
"@maven//:com_google_guava_guava",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -117,11 +120,13 @@
"//src/main/java/com/google/android/libraries/feed/api/common",
"//src/main/java/com/google/android/libraries/feed/hostimpl/storage",
"//src/main/java/com/google/android/libraries/feed/testing/conformance/storage",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
+ "@maven//:androidx_test_core",
"@maven//:com_google_guava_guava",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -136,10 +141,12 @@
"//src/main/java/com/google/android/libraries/feed/api/common",
"//src/main/java/com/google/android/libraries/feed/hostimpl/storage",
"//src/main/java/com/google/android/libraries/feed/testing/conformance/storage",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
+ "@maven//:androidx_test_core",
"@maven//:com_google_guava_guava",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
diff --git a/src/test/java/com/google/android/libraries/feed/hostimpl/storage/PersistentContentStorageDirectTest.java b/src/test/java/com/google/android/libraries/feed/hostimpl/storage/PersistentContentStorageDirectTest.java
index eb703f8..0dcb5e3 100644
--- a/src/test/java/com/google/android/libraries/feed/hostimpl/storage/PersistentContentStorageDirectTest.java
+++ b/src/test/java/com/google/android/libraries/feed/hostimpl/storage/PersistentContentStorageDirectTest.java
@@ -17,6 +17,7 @@
import static org.mockito.MockitoAnnotations.initMocks;
import android.content.Context;
+import androidx.test.core.app.ApplicationProvider;
import com.google.android.libraries.feed.api.common.ThreadUtils;
import com.google.android.libraries.feed.testing.conformance.storage.ContentStorageDirectConformanceTest;
import com.google.common.util.concurrent.MoreExecutors;
@@ -25,7 +26,6 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
/** Tests for {@link PersistentContentStorage}. */
@RunWith(RobolectricTestRunner.class)
@@ -37,7 +37,7 @@
@Before
public void setUp() {
initMocks(this);
- context = RuntimeEnvironment.application;
+ context = ApplicationProvider.getApplicationContext();
storage =
new PersistentContentStorage(
context, MoreExecutors.newDirectExecutorService(), threadUtils);
diff --git a/src/test/java/com/google/android/libraries/feed/hostimpl/storage/PersistentContentStorageTest.java b/src/test/java/com/google/android/libraries/feed/hostimpl/storage/PersistentContentStorageTest.java
index 712383c..ecb350a 100644
--- a/src/test/java/com/google/android/libraries/feed/hostimpl/storage/PersistentContentStorageTest.java
+++ b/src/test/java/com/google/android/libraries/feed/hostimpl/storage/PersistentContentStorageTest.java
@@ -17,6 +17,7 @@
import static org.mockito.MockitoAnnotations.initMocks;
import android.content.Context;
+import androidx.test.core.app.ApplicationProvider;
import com.google.android.libraries.feed.api.common.ThreadUtils;
import com.google.android.libraries.feed.testing.conformance.storage.ContentStorageConformanceTest;
import com.google.common.util.concurrent.MoreExecutors;
@@ -25,7 +26,6 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
/** Tests for {@link PersistentContentStorage}. */
@RunWith(RobolectricTestRunner.class)
@@ -37,7 +37,7 @@
@Before
public void setUp() {
initMocks(this);
- context = RuntimeEnvironment.application;
+ context = ApplicationProvider.getApplicationContext();
storage =
new PersistentContentStorage(
context, MoreExecutors.newDirectExecutorService(), threadUtils);
diff --git a/src/test/java/com/google/android/libraries/feed/hostimpl/storage/PersistentJournalStorageDirectTest.java b/src/test/java/com/google/android/libraries/feed/hostimpl/storage/PersistentJournalStorageDirectTest.java
index 3e385da..cf9ac1e 100644
--- a/src/test/java/com/google/android/libraries/feed/hostimpl/storage/PersistentJournalStorageDirectTest.java
+++ b/src/test/java/com/google/android/libraries/feed/hostimpl/storage/PersistentJournalStorageDirectTest.java
@@ -18,6 +18,7 @@
import static org.mockito.MockitoAnnotations.initMocks;
import android.content.Context;
+import androidx.test.core.app.ApplicationProvider;
import com.google.android.libraries.feed.api.common.ThreadUtils;
import com.google.android.libraries.feed.testing.conformance.storage.JournalStorageDirectConformanceTest;
import com.google.common.util.concurrent.MoreExecutors;
@@ -27,7 +28,6 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
/** Tests for {@link PersistentContentStorage}. */
@RunWith(RobolectricTestRunner.class)
@@ -39,7 +39,7 @@
@Before
public void setUp() throws Exception {
initMocks(this);
- context = RuntimeEnvironment.application;
+ context = ApplicationProvider.getApplicationContext();
journalStorage =
new PersistentJournalStorage(context, MoreExecutors.directExecutor(), threadUtils, null);
}
diff --git a/src/test/java/com/google/android/libraries/feed/hostimpl/storage/PersistentJournalStorageTest.java b/src/test/java/com/google/android/libraries/feed/hostimpl/storage/PersistentJournalStorageTest.java
index 3db9d04..eefae53 100644
--- a/src/test/java/com/google/android/libraries/feed/hostimpl/storage/PersistentJournalStorageTest.java
+++ b/src/test/java/com/google/android/libraries/feed/hostimpl/storage/PersistentJournalStorageTest.java
@@ -18,6 +18,7 @@
import static org.mockito.MockitoAnnotations.initMocks;
import android.content.Context;
+import androidx.test.core.app.ApplicationProvider;
import com.google.android.libraries.feed.api.common.ThreadUtils;
import com.google.android.libraries.feed.testing.conformance.storage.JournalStorageConformanceTest;
import com.google.common.util.concurrent.MoreExecutors;
@@ -27,7 +28,6 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
/** Tests for {@link PersistentContentStorage}. */
@RunWith(RobolectricTestRunner.class)
@@ -39,7 +39,7 @@
@Before
public void setUp() throws Exception {
initMocks(this);
- context = RuntimeEnvironment.application;
+ context = ApplicationProvider.getApplicationContext();
journalStorage =
new PersistentJournalStorage(context, MoreExecutors.directExecutor(), threadUtils, null);
}
diff --git a/src/test/java/com/google/android/libraries/feed/infraintegration/BUILD b/src/test/java/com/google/android/libraries/feed/infraintegration/BUILD
index d92513c..005ab7b 100644
--- a/src/test/java/com/google/android/libraries/feed/infraintegration/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/infraintegration/BUILD
@@ -19,10 +19,11 @@
"//src/main/java/com/google/android/libraries/feed/host/logging",
"//src/main/java/com/google/android/libraries/feed/testing/requestmanager",
"//src/main/proto/search/now/wire/feed:feed_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -42,10 +43,11 @@
"//src/main/java/com/google/android/libraries/feed/testing/requestmanager",
"//src/main/proto/com/google/android/libraries/feed/api/proto:client_feed_java_proto_lite",
"//src/main/proto/search/now/wire/feed:feed_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -66,10 +68,11 @@
"//src/main/java/com/google/android/libraries/feed/testing/requestmanager",
"//src/main/proto/com/google/android/libraries/feed/api/proto:client_feed_java_proto_lite",
"//src/main/proto/search/now/wire/feed:feed_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -90,9 +93,10 @@
"//src/main/java/com/google/android/libraries/feed/host/logging",
"//src/main/java/com/google/android/libraries/feed/testing/requestmanager",
"//src/main/proto/search/now/wire/feed:feed_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -113,10 +117,11 @@
"//src/main/java/com/google/android/libraries/feed/host/logging",
"//src/main/java/com/google/android/libraries/feed/testing/requestmanager",
"//src/main/proto/com/google/android/libraries/feed/api/proto:client_feed_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -135,10 +140,11 @@
"//src/main/java/com/google/android/libraries/feed/host/logging",
"//src/main/java/com/google/android/libraries/feed/testing/requestmanager",
"//src/main/proto/search/now/wire/feed:feed_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -158,11 +164,12 @@
"//src/main/java/com/google/android/libraries/feed/testing/requestmanager",
"//src/main/proto/com/google/android/libraries/feed/api/proto:client_feed_java_proto_lite",
"//src/main/proto/search/now/wire/feed:feed_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_code_findbugs_jsr305//jar",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -180,9 +187,10 @@
"//src/main/java/com/google/android/libraries/feed/host/config",
"//src/main/java/com/google/android/libraries/feed/host/logging",
"//src/main/proto/search/now/wire/feed:feed_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -202,9 +210,10 @@
"//src/main/java/com/google/android/libraries/feed/host/logging",
"//src/main/java/com/google/android/libraries/feed/testing/requestmanager",
"//src/main/proto/search/now/wire/feed:feed_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -224,10 +233,11 @@
"//src/main/java/com/google/android/libraries/feed/host/logging",
"//src/main/java/com/google/android/libraries/feed/testing/requestmanager",
"//src/main/proto/search/now/wire/feed:feed_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -250,11 +260,12 @@
"//src/main/java/com/google/android/libraries/feed/testing/requestmanager",
"//src/main/proto/com/google/android/libraries/feed/api/proto:client_feed_java_proto_lite",
"//src/main/proto/search/now/wire/feed:feed_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_code_findbugs_jsr305//jar",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -274,10 +285,11 @@
"//src/main/java/com/google/android/libraries/feed/testing/requestmanager",
"//src/main/proto/com/google/android/libraries/feed/api/proto:client_feed_java_proto_lite",
"//src/main/proto/search/now/wire/feed:feed_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -298,10 +310,11 @@
"//src/main/java/com/google/android/libraries/feed/internalapi/store",
"//src/main/java/com/google/android/libraries/feed/testing/requestmanager",
"//src/main/proto/search/now/wire/feed:feed_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -321,10 +334,11 @@
"//src/main/java/com/google/android/libraries/feed/host/logging",
"//src/main/java/com/google/android/libraries/feed/testing/requestmanager",
"//src/main/proto/com/google/android/libraries/feed/api/proto:client_feed_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -344,10 +358,11 @@
"//src/main/java/com/google/android/libraries/feed/host/logging",
"//src/main/java/com/google/android/libraries/feed/testing/requestmanager",
"//src/main/proto/search/now/wire/feed:feed_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -367,10 +382,11 @@
"//src/main/java/com/google/android/libraries/feed/host/logging",
"//src/main/java/com/google/android/libraries/feed/testing/requestmanager",
"//src/main/proto/search/now/wire/feed:feed_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -391,10 +407,11 @@
"//src/main/java/com/google/android/libraries/feed/testing/requestmanager",
"//src/main/proto/com/google/android/libraries/feed/api/proto:client_feed_java_proto_lite",
"//src/main/proto/search/now/wire/feed:feed_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -421,10 +438,11 @@
"//src/main/java/com/google/android/libraries/feed/testing/requestmanager",
"//src/main/proto/com/google/android/libraries/feed/api/proto:client_feed_java_proto_lite",
"//src/main/proto/search/now/wire/feed:feed_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -448,10 +466,11 @@
"//src/main/java/com/google/android/libraries/feed/testing/requestmanager",
"//src/main/proto/com/google/android/libraries/feed/api/proto:client_feed_java_proto_lite",
"//src/main/proto/search/now/wire/feed:feed_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -474,10 +493,11 @@
"//src/main/java/com/google/android/libraries/feed/testing/requestmanager",
"//src/main/proto/com/google/android/libraries/feed/api/proto:client_feed_java_proto_lite",
"//src/main/proto/search/now/wire/feed:feed_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -501,8 +521,9 @@
"//src/main/java/com/google/android/libraries/feed/testing/requestmanager",
"//src/main/proto/com/google/android/libraries/feed/api/proto:client_feed_java_proto_lite",
"//src/main/proto/search/now/wire/feed:feed_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
diff --git a/src/test/java/com/google/android/libraries/feed/mocknetworkclient/BUILD b/src/test/java/com/google/android/libraries/feed/mocknetworkclient/BUILD
index 61e7590..74e2fd7 100644
--- a/src/test/java/com/google/android/libraries/feed/mocknetworkclient/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/mocknetworkclient/BUILD
@@ -30,11 +30,12 @@
"//src/main/proto/com/google/android/libraries/feed/api/proto:client_feed_java_proto_lite",
"//src/main/proto/search/now/wire/feed:feed_java_proto_lite",
"//src/main/proto/search/now/wire/feed/mockserver:mock_server_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@com_google_truth_liteproto_extension//jar",
"@maven//:com_google_guava_guava",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
diff --git a/src/test/java/com/google/android/libraries/feed/piet/BUILD b/src/test/java/com/google/android/libraries/feed/piet/BUILD
index 9c0947d..b1d446f 100644
--- a/src/test/java/com/google/android/libraries/feed/piet/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/piet/BUILD
@@ -18,10 +18,11 @@
"//src/main/java/com/google/android/libraries/feed/piet/host",
"//src/main/proto/search/now/ui/piet:piet_errors_java_proto_lite",
"//src/main/proto/search/now/ui/piet:piet_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -39,10 +40,11 @@
"//src/main/java/com/google/android/libraries/feed/piet",
"//src/main/java/com/google/android/libraries/feed/piet/host",
"//src/main/proto/search/now/ui/piet:piet_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -57,10 +59,11 @@
"//src/main/java/com/google/android/libraries/feed/common/ui",
"//src/main/java/com/google/android/libraries/feed/piet",
"//src/main/proto/search/now/ui/piet:piet_errors_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -75,10 +78,11 @@
"//src/main/java/com/google/android/libraries/feed/common/testing",
"//src/main/java/com/google/android/libraries/feed/piet",
"//src/main/proto/search/now/ui/piet:piet_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -98,10 +102,11 @@
"//src/main/java/com/google/android/libraries/feed/piet/ui",
"//src/main/java/com/google/android/libraries/feed/testing/shadows",
"//src/main/proto/search/now/ui/piet:piet_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -119,10 +124,11 @@
"//src/main/java/com/google/android/libraries/feed/piet",
"//src/main/java/com/google/android/libraries/feed/piet/host",
"//src/main/proto/search/now/ui/piet:piet_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -141,10 +147,11 @@
"//src/main/java/com/google/android/libraries/feed/piet/host",
"//src/main/java/com/google/android/libraries/feed/testing/shadows",
"//src/main/proto/search/now/ui/piet:piet_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -161,10 +168,11 @@
"//src/main/java/com/google/android/libraries/feed/piet",
"//src/main/java/com/google/android/libraries/feed/piet/host",
"//src/main/proto/search/now/ui/piet:piet_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -184,10 +192,11 @@
"//src/main/java/com/google/android/libraries/feed/piet/ui",
"//src/main/proto/search/now/ui/piet:piet_errors_java_proto_lite",
"//src/main/proto/search/now/ui/piet:piet_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -206,10 +215,11 @@
"//src/main/java/com/google/android/libraries/feed/piet/host",
"//src/main/proto/search/now/ui/piet:piet_errors_java_proto_lite",
"//src/main/proto/search/now/ui/piet:piet_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -231,10 +241,11 @@
"//src/main/java/com/google/android/libraries/feed/piet/ui",
"//src/main/proto/search/now/ui/piet:piet_errors_java_proto_lite",
"//src/main/proto/search/now/ui/piet:piet_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -255,12 +266,13 @@
"//src/main/java/com/google/android/libraries/feed/piet/host",
"//src/main/java/com/google/android/libraries/feed/piet/ui",
"//src/main/proto/search/now/ui/piet:piet_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_code_findbugs_jsr305//jar",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_android_support_support_compat",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -275,11 +287,12 @@
"//src/main/java/com/google/android/libraries/feed/common/testing",
"//src/main/java/com/google/android/libraries/feed/piet",
"//src/main/proto/search/now/ui/piet:piet_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_code_findbugs_jsr305//jar",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -295,10 +308,11 @@
"//src/main/java/com/google/android/libraries/feed/piet",
"//src/main/java/com/google/android/libraries/feed/piet/host",
"//src/main/java/com/google/android/libraries/feed/piet/ui",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -314,10 +328,11 @@
"//src/main/java/com/google/android/libraries/feed/piet",
"//src/main/java/com/google/android/libraries/feed/piet/host",
"//src/main/proto/search/now/ui/piet:piet_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -330,7 +345,7 @@
"//src/main/java/com/google/android/libraries/feed/piet",
"//src/main/proto/search/now/ui/piet:piet_errors_java_proto_lite",
"@com_google_protobuf_javalite//:protobuf_java_lite",
- "@junit_junit//jar",
+ "@maven//:junit_junit",
],
)
@@ -346,11 +361,12 @@
"//src/main/java/com/google/android/libraries/feed/piet",
"//src/main/java/com/google/android/libraries/feed/piet/host",
"//src/main/proto/search/now/ui/piet:piet_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_code_findbugs_jsr305//jar",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -368,11 +384,12 @@
"//src/main/java/com/google/android/libraries/feed/piet/host",
"//src/main/proto/search/now/ui/piet:piet_errors_java_proto_lite",
"//src/main/proto/search/now/ui/piet:piet_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_code_findbugs_jsr305//jar",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -388,10 +405,11 @@
"//src/main/java/com/google/android/libraries/feed/piet",
"//src/main/java/com/google/android/libraries/feed/piet/host",
"//src/main/proto/search/now/ui/piet:piet_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -412,10 +430,11 @@
"//src/main/java/com/google/android/libraries/feed/piet/host",
"//src/main/java/com/google/android/libraries/feed/piet/ui",
"//src/main/proto/search/now/ui/piet:piet_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -431,11 +450,12 @@
"//src/main/java/com/google/android/libraries/feed/piet",
"//src/main/java/com/google/android/libraries/feed/piet/host",
"//src/main/proto/search/now/ui/piet:piet_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_guava_guava",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -449,11 +469,12 @@
deps = [
"//src/main/java/com/google/android/libraries/feed/common/testing",
"//src/main/java/com/google/android/libraries/feed/piet",
+ "//third_party:robolectric",
"@com_google_code_findbugs_jsr305//jar",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -471,10 +492,11 @@
"//src/main/java/com/google/android/libraries/feed/piet/host",
"//src/main/java/com/google/android/libraries/feed/piet/ui",
"//src/main/proto/search/now/ui/piet:piet_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -493,10 +515,11 @@
"//src/main/java/com/google/android/libraries/feed/piet",
"//src/main/java/com/google/android/libraries/feed/piet/host",
"//src/main/proto/search/now/ui/piet:piet_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -515,11 +538,12 @@
"//src/main/java/com/google/android/libraries/feed/piet/host",
"//src/main/proto/search/now/ui/piet:piet_errors_java_proto_lite",
"//src/main/proto/search/now/ui/piet:piet_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_code_findbugs_jsr305//jar",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -535,9 +559,10 @@
"//src/main/java/com/google/android/libraries/feed/piet/host",
"//src/main/java/com/google/android/libraries/feed/testing/shadows",
"//src/main/proto/search/now/ui/piet:piet_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
diff --git a/src/test/java/com/google/android/libraries/feed/piet/host/BUILD b/src/test/java/com/google/android/libraries/feed/piet/host/BUILD
index 7a8c811..3d32045 100644
--- a/src/test/java/com/google/android/libraries/feed/piet/host/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/piet/host/BUILD
@@ -14,9 +14,10 @@
"//src/main/java/com/google/android/libraries/feed/piet",
"//src/main/java/com/google/android/libraries/feed/piet/host",
"//src/main/proto/search/now/ui/piet:piet_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
diff --git a/src/test/java/com/google/android/libraries/feed/piet/ui/BUILD b/src/test/java/com/google/android/libraries/feed/piet/ui/BUILD
index d0743af..b5cebf4 100644
--- a/src/test/java/com/google/android/libraries/feed/piet/ui/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/piet/ui/BUILD
@@ -11,9 +11,10 @@
manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
deps = [
"//src/main/java/com/google/android/libraries/feed/piet/ui",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -28,9 +29,10 @@
"//src/main/java/com/google/android/libraries/feed/common/ui",
"//src/main/java/com/google/android/libraries/feed/piet/ui",
"//src/main/proto/search/now/ui/piet:piet_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -45,9 +47,10 @@
"//src/main/java/com/google/android/libraries/feed/common/functional",
"//src/main/java/com/google/android/libraries/feed/piet/ui",
"//src/main/proto/search/now/ui/piet:piet_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -62,9 +65,10 @@
"//src/main/java/com/google/android/libraries/feed/common/functional",
"//src/main/java/com/google/android/libraries/feed/common/testing",
"//src/main/java/com/google/android/libraries/feed/piet/ui",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -79,9 +83,10 @@
"//src/main/java/com/google/android/libraries/feed/common/functional",
"//src/main/java/com/google/android/libraries/feed/common/testing",
"//src/main/java/com/google/android/libraries/feed/piet/ui",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -95,9 +100,10 @@
deps = [
"//src/main/java/com/google/android/libraries/feed/piet/ui",
"//src/main/proto/search/now/ui/piet:piet_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -111,9 +117,10 @@
deps = [
"//src/main/java/com/google/android/libraries/feed/common/testing",
"//src/main/java/com/google/android/libraries/feed/piet/ui",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -128,9 +135,10 @@
"//src/main/java/com/google/android/libraries/feed/common/functional",
"//src/main/java/com/google/android/libraries/feed/piet/ui",
"//src/main/proto/search/now/ui/piet:piet_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
diff --git a/src/test/java/com/google/android/libraries/feed/sharedstream/contentchanged/BUILD b/src/test/java/com/google/android/libraries/feed/sharedstream/contentchanged/BUILD
index 0aa79e9..904d24d 100644
--- a/src/test/java/com/google/android/libraries/feed/sharedstream/contentchanged/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/sharedstream/contentchanged/BUILD
@@ -12,8 +12,9 @@
deps = [
"//src/main/java/com/google/android/libraries/feed/api/stream",
"//src/main/java/com/google/android/libraries/feed/sharedstream/contentchanged",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
diff --git a/src/test/java/com/google/android/libraries/feed/sharedstream/contextmenumanager/BUILD b/src/test/java/com/google/android/libraries/feed/sharedstream/contextmenumanager/BUILD
index fee489a..86a0212 100644
--- a/src/test/java/com/google/android/libraries/feed/sharedstream/contextmenumanager/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/sharedstream/contextmenumanager/BUILD
@@ -12,10 +12,11 @@
deps = [
"//src/main/java/com/google/android/libraries/feed/sharedstream/contextmenumanager",
"//src/main/java/com/google/android/libraries/feed/sharedstream/publicapi/menumeasurer",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -29,10 +30,11 @@
deps = [
"//src/main/java/com/google/android/libraries/feed/sharedstream/contextmenumanager",
"//src/main/java/com/google/android/libraries/feed/sharedstream/publicapi/menumeasurer",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_guava_guava",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
diff --git a/src/test/java/com/google/android/libraries/feed/sharedstream/contextmenumanager/ContextMenuManagerImplTest.java b/src/test/java/com/google/android/libraries/feed/sharedstream/contextmenumanager/ContextMenuManagerImplTest.java
index 618f511..92c6e42 100644
--- a/src/test/java/com/google/android/libraries/feed/sharedstream/contextmenumanager/ContextMenuManagerImplTest.java
+++ b/src/test/java/com/google/android/libraries/feed/sharedstream/contextmenumanager/ContextMenuManagerImplTest.java
@@ -23,7 +23,6 @@
import static org.robolectric.Shadows.shadowOf;
import android.app.Activity;
-import android.content.Context;
import android.view.View;
import android.view.View.MeasureSpec;
import android.view.ViewGroup;
@@ -43,7 +42,6 @@
import org.mockito.Mockito;
import org.robolectric.Robolectric;
import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
/** Tests for {@link ContextMenuManagerImpl}. */
@RunWith(RobolectricTestRunner.class)
@@ -54,7 +52,7 @@
@Mock private MenuMeasurer menuMeasurer;
@Mock private ContextMenuClickHandler clickHandler;
- private Context context;
+ private Activity context;
private ContextMenuManagerImpl contextMenuManager;
private FrameLayout parentView;
private View anchorView;
@@ -97,7 +95,7 @@
contextMenuManager.openContextMenu(anchorView, adapterItems, clickHandler);
assertThat(shadowOf(parentView).getDisallowInterceptTouchEvent()).isTrue();
- PopupWindow popupWindow = shadowOf(RuntimeEnvironment.application).getLatestPopupWindow();
+ PopupWindow popupWindow = shadowOf(context.getApplication()).getLatestPopupWindow();
ListView listView = (ListView) popupWindow.getContentView();
assertThat(listView.getAdapter().getItem(0)).isSameAs(adapterItems.get(0));
@@ -120,7 +118,7 @@
assertThat(contextMenuManager.openContextMenu(anchorView, adapterItems, clickHandler))
.isFalse();
- shadowOf(RuntimeEnvironment.application).getLatestPopupWindow().dismiss();
+ shadowOf(context.getApplication()).getLatestPopupWindow().dismiss();
// After the menu is dismissed another can be opened
assertThat(contextMenuManager.openContextMenu(anchorView, adapterItems, clickHandler)).isTrue();
@@ -130,20 +128,18 @@
public void testDismiss_fromLockingPhone() {
contextMenuManager.openContextMenu(anchorView, adapterItems, clickHandler);
- assertThat(shadowOf(RuntimeEnvironment.application).getLatestPopupWindow().isShowing())
- .isTrue();
+ assertThat(shadowOf(context.getApplication()).getLatestPopupWindow().isShowing()).isTrue();
contextMenuManager.dismissPopup();
- assertThat(shadowOf(RuntimeEnvironment.application).getLatestPopupWindow().isShowing())
- .isFalse();
+ assertThat(shadowOf(context.getApplication()).getLatestPopupWindow().isShowing()).isFalse();
}
@Test
public void testClosesMenuWhenDimensionsChange() {
contextMenuManager.openContextMenu(anchorView, adapterItems, clickHandler);
- PopupWindow popupWindow = shadowOf(RuntimeEnvironment.application).getLatestPopupWindow();
+ PopupWindow popupWindow = shadowOf(context.getApplication()).getLatestPopupWindow();
assertThat(popupWindow.isShowing()).isTrue();
contextMenuManager.dismissPopup();
@@ -155,7 +151,7 @@
public void testOpenContextMenu_hasShadow() {
contextMenuManager.openContextMenu(anchorView, adapterItems, clickHandler);
- PopupWindow popupWindow = shadowOf(RuntimeEnvironment.application).getLatestPopupWindow();
+ PopupWindow popupWindow = shadowOf(context.getApplication()).getLatestPopupWindow();
assertThat(popupWindow.getBackground()).isNotNull();
}
diff --git a/src/test/java/com/google/android/libraries/feed/sharedstream/deepestcontenttracker/BUILD b/src/test/java/com/google/android/libraries/feed/sharedstream/deepestcontenttracker/BUILD
index 8200f0b..3098676 100644
--- a/src/test/java/com/google/android/libraries/feed/sharedstream/deepestcontenttracker/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/sharedstream/deepestcontenttracker/BUILD
@@ -11,8 +11,9 @@
manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
deps = [
"//src/main/java/com/google/android/libraries/feed/sharedstream/deepestcontenttracker",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
diff --git a/src/test/java/com/google/android/libraries/feed/sharedstream/logging/BUILD b/src/test/java/com/google/android/libraries/feed/sharedstream/logging/BUILD
index 4f10e5c..212a9e5 100644
--- a/src/test/java/com/google/android/libraries/feed/sharedstream/logging/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/sharedstream/logging/BUILD
@@ -11,9 +11,10 @@
manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
deps = [
"//src/main/java/com/google/android/libraries/feed/sharedstream/logging",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -29,10 +30,11 @@
"//src/main/java/com/google/android/libraries/feed/common/time/testing",
"//src/main/java/com/google/android/libraries/feed/host/logging",
"//src/main/java/com/google/android/libraries/feed/sharedstream/logging",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -49,10 +51,11 @@
"//src/main/java/com/google/android/libraries/feed/host/logging",
"//src/main/java/com/google/android/libraries/feed/sharedstream/logging",
"//src/main/java/com/google/android/libraries/feed/testing/modelprovider",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -66,8 +69,9 @@
deps = [
"//src/main/java/com/google/android/libraries/feed/host/config",
"//src/main/java/com/google/android/libraries/feed/sharedstream/logging",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
diff --git a/src/test/java/com/google/android/libraries/feed/sharedstream/offlinemonitor/BUILD b/src/test/java/com/google/android/libraries/feed/sharedstream/offlinemonitor/BUILD
index 990b561..0a94927 100644
--- a/src/test/java/com/google/android/libraries/feed/sharedstream/offlinemonitor/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/sharedstream/offlinemonitor/BUILD
@@ -13,9 +13,10 @@
"//src/main/java/com/google/android/libraries/feed/common/functional",
"//src/main/java/com/google/android/libraries/feed/host/offlineindicator",
"//src/main/java/com/google/android/libraries/feed/sharedstream/offlinemonitor",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
diff --git a/src/test/java/com/google/android/libraries/feed/sharedstream/piet/BUILD b/src/test/java/com/google/android/libraries/feed/sharedstream/piet/BUILD
index 2b97d3a..9a9f99c 100644
--- a/src/test/java/com/google/android/libraries/feed/sharedstream/piet/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/sharedstream/piet/BUILD
@@ -14,10 +14,11 @@
"//src/main/java/com/google/android/libraries/feed/sharedstream/piet",
"//src/main/proto/search/now/ui/piet:piet_errors_java_proto_lite",
"//src/main/proto/search/now/ui/piet:piet_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -35,9 +36,10 @@
"//src/main/java/com/google/android/libraries/feed/host/stream",
"//src/main/java/com/google/android/libraries/feed/sharedstream/piet",
"//src/main/proto/search/now/ui/piet:piet_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -54,10 +56,11 @@
"//src/main/java/com/google/android/libraries/feed/sharedstream/piet",
"//src/main/proto/search/now/ui/piet:piet_java_proto_lite",
"//src/main/proto/search/now/ui/stream:stream_offline_extension_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -72,9 +75,10 @@
"//src/main/java/com/google/android/libraries/feed/piet/host",
"//src/main/java/com/google/android/libraries/feed/sharedstream/piet",
"//src/main/proto/search/now/ui/piet:piet_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
diff --git a/src/test/java/com/google/android/libraries/feed/sharedstream/publicapi/menumeasurer/BUILD b/src/test/java/com/google/android/libraries/feed/sharedstream/publicapi/menumeasurer/BUILD
index 9467df2..a219d85 100644
--- a/src/test/java/com/google/android/libraries/feed/sharedstream/publicapi/menumeasurer/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/sharedstream/publicapi/menumeasurer/BUILD
@@ -11,9 +11,10 @@
manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
deps = [
"//src/main/java/com/google/android/libraries/feed/sharedstream/publicapi/menumeasurer",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_guava_guava",
"@maven//:com_google_truth_truth",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
diff --git a/src/test/java/com/google/android/libraries/feed/sharedstream/removetrackingfactory/BUILD b/src/test/java/com/google/android/libraries/feed/sharedstream/removetrackingfactory/BUILD
index 071d50a..1cfb1dd 100644
--- a/src/test/java/com/google/android/libraries/feed/sharedstream/removetrackingfactory/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/sharedstream/removetrackingfactory/BUILD
@@ -16,9 +16,10 @@
"//src/main/java/com/google/android/libraries/feed/sharedstream/removetrackingfactory",
"//src/main/proto/com/google/android/libraries/feed/api/proto:client_feed_java_proto_lite",
"//src/main/proto/search/now/ui/stream:stream_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
diff --git a/src/test/java/com/google/android/libraries/feed/sharedstream/scroll/BUILD b/src/test/java/com/google/android/libraries/feed/sharedstream/scroll/BUILD
index 78bcaf7..f8dd032 100644
--- a/src/test/java/com/google/android/libraries/feed/sharedstream/scroll/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/sharedstream/scroll/BUILD
@@ -12,9 +12,10 @@
deps = [
"//src/main/java/com/google/android/libraries/feed/host/logging",
"//src/main/java/com/google/android/libraries/feed/sharedstream/scroll",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -30,10 +31,11 @@
"//src/main/java/com/google/android/libraries/feed/sharedstream/scroll",
"//src/main/java/com/google/android/libraries/feed/testing/android",
"//src/main/proto/com/google/android/libraries/feed/sharedstream/proto:scroll_state_java_proto_lite",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_android_support_recyclerview_v7",
"@maven//:com_google_truth_truth",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -48,10 +50,11 @@
"//src/main/java/com/google/android/libraries/feed/common/concurrent/testing",
"//src/main/java/com/google/android/libraries/feed/common/time/testing",
"//src/main/java/com/google/android/libraries/feed/sharedstream/scroll",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_truth_truth",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
@@ -67,9 +70,10 @@
"//src/main/java/com/google/android/libraries/feed/common/concurrent/testing",
"//src/main/java/com/google/android/libraries/feed/common/testing",
"//src/main/java/com/google/android/libraries/feed/sharedstream/scroll",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_android_support_recyclerview_v7",
"@maven//:org_mockito_mockito_core",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
diff --git a/src/test/java/com/google/android/libraries/feed/sharedstream/ui/BUILD b/src/test/java/com/google/android/libraries/feed/sharedstream/ui/BUILD
index 2baf16a..3e5ad4e 100644
--- a/src/test/java/com/google/android/libraries/feed/sharedstream/ui/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/sharedstream/ui/BUILD
@@ -11,9 +11,10 @@
manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
deps = [
"//src/main/java/com/google/android/libraries/feed/sharedstream/ui",
+ "//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_android_support_swiperefreshlayout",
"@maven//:com_google_truth_truth",
- "@robolectric//bazel:robolectric",
+ "@robolectric//bazel:android-all",
],
)
diff --git a/third_party/BUILD b/third_party/BUILD
index dbc4654..6358196 100644
--- a/third_party/BUILD
+++ b/third_party/BUILD
@@ -20,3 +20,13 @@
"@maven//:com_google_dagger_dagger_producers",
],
)
+
+java_library(
+ name = "robolectric",
+ exports = [
+ "@maven//:org_robolectric_annotations",
+ "@maven//:org_robolectric_robolectric",
+ "@maven//:org_robolectric_shadowapi",
+ "@maven//:org_robolectric_shadows_framework",
+ ],
+)
diff --git a/third_party/dependencies.bzl b/third_party/dependencies.bzl
new file mode 100644
index 0000000..85fe5cd
--- /dev/null
+++ b/third_party/dependencies.bzl
@@ -0,0 +1,41 @@
+# Copyright 2018 The Feed Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+""" This file contains functions to retrieve dependencies."""
+
+load("@rules_jvm_external//:specs.bzl", "maven")
+
+def get_robolectric_dependency(artifact):
+ """ Returns a maven.artifact for a Robolectric dependency.
+
+ This is used to ensure the same version of Robolectric is used and that
+ any exclusions are applied.
+
+ Args:
+ artifact: The name of the Robolectric artifact to load
+
+ Returns:
+ a maven.artifact representing the request Robolectric artifact
+
+ """
+ return maven.artifact(
+ group = "org.robolectric",
+ artifact = artifact,
+ version = "4.1",
+ exclusions = [
+ # The protobuf-java artifact is excluded in order to prevent the
+ # full java proto runtime from being pulled in.
+ "com.google.protobuf:protobuf-java",
+ ],
+ )
