opt-in mocking of final classes/methods and fix voice instruction milestone tests

Author: Guardiola31337

libandroid-navigation/src/test/java/com/mapbox/services/android/navigation/v5/milestone/VoiceInstructionMilestoneTest.java

@@ -1,13 +1,15 @@
 package com.mapbox.services.android.navigation.v5.milestone;
 
 import com.mapbox.api.directions.v5.models.DirectionsRoute;
+import com.mapbox.navigator.VoiceInstruction;
 import com.mapbox.services.android.navigation.v5.routeprogress.RouteProgress;
 
 import org.junit.Test;
 
 import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertFalse;
 import static junit.framework.Assert.assertNotNull;
+import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -23,26 +25,25 @@ public void sanity() {
   @Test
   public void onSameInstructionOccurring_milestoneDoesNotTriggerTwice() {
     RouteProgress firstProgress = mock(RouteProgress.class);
-    when(firstProgress.currentAnnouncement()).thenReturn("instruction");
+    VoiceInstruction voiceInstruction = mock(VoiceInstruction.class);
+    when(firstProgress.voiceInstruction()).thenReturn(voiceInstruction, null);
+    when(voiceInstruction.getAnnouncement()).thenReturn("instruction");
     when(firstProgress.directionsRoute()).thenReturn(mock(DirectionsRoute.class));
-    RouteProgress secondProgress = mock(RouteProgress.class);
-    when(secondProgress.directionsRoute()).thenReturn(mock(DirectionsRoute.class));
-    when(secondProgress.currentAnnouncement()).thenReturn("instruction");
     VoiceInstructionMilestone milestone = buildVoiceInstructionMilestone();
 
     milestone.isOccurring(firstProgress, firstProgress);
-    boolean shouldNotBeOccurring = milestone.isOccurring(firstProgress, secondProgress);
+    boolean shouldNotBeOccurring = milestone.isOccurring(firstProgress, firstProgress);
 
     assertFalse(shouldNotBeOccurring);
   }
 
   @Test
   public void onOccurringMilestone_voiceSsmlInstructionsAreReturned() {
-    RouteProgress routeProgress = mock(RouteProgress.class);
+    RouteProgress routeProgress = mock(RouteProgress.class, RETURNS_DEEP_STUBS);
     when(routeProgress.directionsRoute()).thenReturn(mock(DirectionsRoute.class));
-    when(routeProgress.currentAnnouncement()).thenReturn("current announcement");
+    when(routeProgress.voiceInstruction().getAnnouncement()).thenReturn("current announcement");
     String currentSsmlAnnouncement = "current SSML announcement";
-    when(routeProgress.currentSsmlAnnouncement()).thenReturn(currentSsmlAnnouncement);
+    when(routeProgress.voiceInstruction().getSsmlAnnouncement()).thenReturn(currentSsmlAnnouncement);
     VoiceInstructionMilestone milestone = buildVoiceInstructionMilestone();
 
     milestone.isOccurring(routeProgress, routeProgress);
@@ -52,12 +53,12 @@ public void onOccurringMilestone_voiceSsmlInstructionsAreReturned() {
 
   @Test
   public void onOccurringMilestone_voiceInstructionsAreReturned() {
-    RouteProgress routeProgress = mock(RouteProgress.class);
+    RouteProgress routeProgress = mock(RouteProgress.class, RETURNS_DEEP_STUBS);
     when(routeProgress.directionsRoute()).thenReturn(mock(DirectionsRoute.class));
     String currentAnnouncement = "current announcement";
-    when(routeProgress.currentAnnouncement()).thenReturn(currentAnnouncement);
+    when(routeProgress.voiceInstruction().getAnnouncement()).thenReturn(currentAnnouncement);
     String currentSsmlAnnouncement = "current SSML announcement";
-    when(routeProgress.currentSsmlAnnouncement()).thenReturn(currentSsmlAnnouncement);
+    when(routeProgress.voiceInstruction().getSsmlAnnouncement()).thenReturn(currentSsmlAnnouncement);
     VoiceInstructionMilestone milestone = buildVoiceInstructionMilestone();
 
     milestone.isOccurring(routeProgress, routeProgress);
@@ -67,12 +68,12 @@ public void onOccurringMilestone_voiceInstructionsAreReturned() {
 
   @Test
   public void onOccurringMilestone_instructionsAreReturned() {
-    RouteProgress routeProgress = mock(RouteProgress.class);
+    RouteProgress routeProgress = mock(RouteProgress.class, RETURNS_DEEP_STUBS);
     when(routeProgress.directionsRoute()).thenReturn(mock(DirectionsRoute.class));
     String currentAnnouncement = "current announcement";
-    when(routeProgress.currentAnnouncement()).thenReturn(currentAnnouncement);
+    when(routeProgress.voiceInstruction().getAnnouncement()).thenReturn(currentAnnouncement);
     String currentSsmlAnnouncement = "current SSML announcement";
-    when(routeProgress.currentSsmlAnnouncement()).thenReturn(currentSsmlAnnouncement);
+    when(routeProgress.voiceInstruction().getSsmlAnnouncement()).thenReturn(currentSsmlAnnouncement);
     VoiceInstructionMilestone milestone = buildVoiceInstructionMilestone();
 
     milestone.isOccurring(routeProgress, routeProgress);

libandroid-navigation/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker

@@ -0,0 +1 @@
+mock-maker-inline