From aff5f29339d57c7d5ae3d03c6ffa13c2be37c6b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Paczos?= Date: Tue, 15 Jan 2019 12:10:56 +0100 Subject: [PATCH 1/3] bump to v7.1.1 --- gradle/dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index 8bae027b3..2274d48ce 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -7,7 +7,7 @@ ext { ] version = [ - mapboxMapSdk : '7.0.1', + mapboxMapSdk : '7.1.1', mapboxJava : '4.3.0', playLocation : '16.0.0', autoValue : '1.5.4', From 09633f82455215a946ea9499e85e8a058627e336 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Paczos?= Date: Tue, 22 Jan 2019 13:06:44 +0100 Subject: [PATCH 2/3] [traffic] mock logger definition --- .../mapboxsdk/plugins/traffic/TrafficPluginTest.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/plugin-traffic/src/test/java/com/mapbox/mapboxsdk/plugins/traffic/TrafficPluginTest.java b/plugin-traffic/src/test/java/com/mapbox/mapboxsdk/plugins/traffic/TrafficPluginTest.java index 4507db215..985037511 100644 --- a/plugin-traffic/src/test/java/com/mapbox/mapboxsdk/plugins/traffic/TrafficPluginTest.java +++ b/plugin-traffic/src/test/java/com/mapbox/mapboxsdk/plugins/traffic/TrafficPluginTest.java @@ -1,5 +1,7 @@ package com.mapbox.mapboxsdk.plugins.traffic; +import com.mapbox.mapboxsdk.log.Logger; +import com.mapbox.mapboxsdk.log.LoggerDefinition; import com.mapbox.mapboxsdk.maps.MapView; import com.mapbox.mapboxsdk.maps.MapboxMap; import com.mapbox.mapboxsdk.maps.Style; @@ -7,12 +9,13 @@ import org.junit.Rule; import org.junit.Test; import org.mockito.Mock; -import org.mockito.Mockito; import org.mockito.junit.MockitoJUnit; import org.mockito.junit.MockitoRule; import static junit.framework.TestCase.assertFalse; import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; public class TrafficPluginTest { @@ -35,13 +38,14 @@ public void testNonNullAnnotatedArgs() { @Test public void testSanity() { - Mockito.when(style.isFullyLoaded()).thenReturn(true); + when(style.isFullyLoaded()).thenReturn(true); new TrafficPlugin(mapView, mapboxMap, style); } @Test public void testToggle() { - Mockito.when(style.isFullyLoaded()).thenReturn(true); + Logger.setLoggerDefinition(mock(LoggerDefinition.class)); + when(style.isFullyLoaded()).thenReturn(true); TrafficPlugin trafficPlugin = new TrafficPlugin(mapView, mapboxMap, style); assertFalse(trafficPlugin.isVisible()); trafficPlugin.setVisibility(true); @@ -50,7 +54,7 @@ public void testToggle() { @Test(expected = RuntimeException.class) public void testNotLoadedStyle() { - Mockito.when(style.isFullyLoaded()).thenReturn(false); + when(style.isFullyLoaded()).thenReturn(false); new TrafficPlugin(mapView, mapboxMap, style); } } From 12083e8964fd81b4cd0818bfcc2d433ba361b6fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Paczos?= Date: Mon, 4 Feb 2019 13:31:35 +0100 Subject: [PATCH 3/3] [offline][places] include missing Timber dependency --- plugin-offline/build.gradle | 3 +++ plugin-places/build.gradle | 3 +++ 2 files changed, 6 insertions(+) diff --git a/plugin-offline/build.gradle b/plugin-offline/build.gradle index facc5efd0..6c7012ba1 100644 --- a/plugin-offline/build.gradle +++ b/plugin-offline/build.gradle @@ -37,6 +37,9 @@ dependencies { annotationProcessor dependenciesList.autoValue compileOnly dependenciesList.autoValue + // Timber + implementation dependenciesList.timber + // Unit testing testImplementation dependenciesList.junit testImplementation dependenciesList.mockito diff --git a/plugin-places/build.gradle b/plugin-places/build.gradle index 5301e719d..62ebdef53 100644 --- a/plugin-places/build.gradle +++ b/plugin-places/build.gradle @@ -51,6 +51,9 @@ dependencies { implementation dependenciesList.supportV4 implementation dependenciesList.supportDesign + // Timber + implementation dependenciesList.timber + // AutoValues annotationProcessor dependenciesList.autoValuesParcel annotationProcessor dependenciesList.autoValue