Added tests and cleanup

Author: Devota Aabel

libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/AbbreviationCreator.java

@@ -21,14 +21,19 @@ class AbbreviationCreator extends NodeCreator<AbbreviationCreator.AbbreviationNo
   private Map<Integer, List<Integer>> abbreviations;
   private TextViewUtils textViewUtils;
 
-  AbbreviationCreator(TextViewUtils textViewUtils, AbbreviationVerifier abbreviationVerifier) {
+  AbbreviationCreator(AbbreviationVerifier abbreviationVerifier, TextViewUtils textViewUtils,
+                      HashMap abbreviations) {
     super(abbreviationVerifier);
-    this.abbreviations = new HashMap<>();
     this.textViewUtils = textViewUtils;
+    this.abbreviations = abbreviations;
+  }
+
+  AbbreviationCreator(AbbreviationVerifier abbreviationVerifier, TextViewUtils textViewUtils) {
+    this(abbreviationVerifier, textViewUtils, new HashMap());
   }
 
   AbbreviationCreator() {
-    this(new TextViewUtils(), new AbbreviationVerifier());
+    this(new AbbreviationVerifier(), new TextViewUtils());
   }
 
   /**
@@ -39,7 +44,7 @@ class AbbreviationCreator extends NodeCreator<AbbreviationCreator.AbbreviationNo
    * @param bannerComponents object holding the abbreviation information
    * @param index in the list of BannerComponentNodes
    */
-  void addPriorityInfo(BannerComponents bannerComponents, int index) {
+  private void addPriorityInfo(BannerComponents bannerComponents, int index) {
     Integer abbreviationPriority = bannerComponents.abbreviationPriority();
     if (abbreviations.get(abbreviationPriority) == null) {
       abbreviations.put(abbreviationPriority, new ArrayList<Integer>());
@@ -55,7 +60,8 @@ void addPriorityInfo(BannerComponents bannerComponents, int index) {
    * @param bannerComponentNodes containing the text to construct
    * @return the properly abbreviated string that will fit in the TextView
    */
-  String abbreviateBannerText(TextView textView, List<BannerComponentNode> bannerComponentNodes) {
+  private String abbreviateBannerText(TextView textView, List<BannerComponentNode>
+    bannerComponentNodes) {
     String bannerText = join(bannerComponentNodes);
 
     if (abbreviations.isEmpty()) {
@@ -146,7 +152,7 @@ void preProcess(TextView textView, List<BannerComponentNode> bannerComponentNode
    * Class used by InstructionLoader to determine that a BannerComponent contains an abbreviation
    */
   static class AbbreviationNode extends BannerComponentNode {
-    boolean abbreviate;
+    private boolean abbreviate;
 
     AbbreviationNode(BannerComponents bannerComponents, int startIndex) {
       super(bannerComponents, startIndex);
@@ -160,5 +166,10 @@ public String toString() {
     void setAbbreviate(boolean abbreviate) {
       this.abbreviate = abbreviate;
     }
+
+    boolean getAbbreviate() {
+      return abbreviate;
+    }
+
   }
 }

libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/BannerComponentTree.java

@@ -29,7 +29,7 @@ public class BannerComponentTree {
    * @param bannerComponents to parse
    * @return the list of nodes representing the bannerComponents
    */
-  List<BannerComponentNode> parseBannerComponents(List<BannerComponents> bannerComponents) {
+  private List<BannerComponentNode> parseBannerComponents(List<BannerComponents> bannerComponents) {
     int length = 0;
     List<BannerComponentNode> bannerComponentNodes = new ArrayList<>();
 
@@ -38,7 +38,7 @@ List<BannerComponentNode> parseBannerComponents(List<BannerComponents> bannerCom
 
       for (NodeCreator nodeCreator : nodeCreators) {
         if (nodeCreator.isNodeType(components)) {
-          node = nodeCreator.setupNode(components, bannerComponentNodes.size(), length - 1);
+          node = nodeCreator.setupNode(components, bannerComponentNodes.size(), length);
           break;
         }
       }

libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/instruction/AbbreviationCoordinatorTest.java renamed to libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/instruction/AbbreviationCreatorTest.java

@@ -8,18 +8,22 @@
 import org.junit.Test;
 
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
 
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-public class AbbreviationCoordinatorTest extends BaseTest {
+public class AbbreviationCreatorTest extends BaseTest {
+
   @Test
-  public void onAbbreviateBannerText_textIsAbbreviated() {
+  public void preProcess_abbreviate() {
     String abbreviation = "smtxt";
     BannerComponents bannerComponents =
-      BannerComponentsFaker.bannerComponents()
+      BannerComponentsFaker.bannerComponentsBuilder()
         .abbreviation(abbreviation)
         .abbreviationPriority(0)
         .build();
@@ -29,38 +33,40 @@ public void onAbbreviateBannerText_textIsAbbreviated() {
     when(abbreviationVerifier.isNodeType(bannerComponents)).thenReturn(true);
     when(textViewUtils.textFits(textView, abbreviation)).thenReturn(true);
     when(textViewUtils.textFits(textView, bannerComponents.text())).thenReturn(false);
-    AbbreviationCreator abbreviationCoordinator = new AbbreviationCreator(textViewUtils, abbreviationVerifier);
-    abbreviationCoordinator.addPriorityInfo(bannerComponents, 0);
-    List<BannerComponentNode> bannerComponentNodes = new ArrayList<>();
-    bannerComponentNodes.add(new AbbreviationCreator.AbbreviationNode(bannerComponents, 0));
+    BannerComponentNode node = mock(AbbreviationCreator.AbbreviationNode.class);
+    when(((AbbreviationCreator.AbbreviationNode) node).getAbbreviate()).thenReturn(true);
+    when(node.toString()).thenReturn(abbreviation);
+    AbbreviationCreator abbreviationCreator = new AbbreviationCreator(abbreviationVerifier, textViewUtils);
 
-    String abbreviatedTextFromCoordinator = abbreviationCoordinator.abbreviateBannerText(textView, bannerComponentNodes);
+    abbreviationCreator.preProcess(textView, Collections.singletonList(node));
 
-    assertEquals(abbreviation, abbreviatedTextFromCoordinator);
+    verify(textView).setText(abbreviation);
   }
 
   @Test
-  public void onAbbreviateBannerText_textIsNotAbbreviated() {
+  public void setupNode() {
     String abbreviation = "smtxt";
-    String text = "some text";
+    int abbreviationPriority = 0;
     BannerComponents bannerComponents =
-      BannerComponentsFaker.bannerComponents()
+      BannerComponentsFaker.bannerComponentsBuilder()
         .abbreviation(abbreviation)
-        .abbreviationPriority(0)
-        .text(text)
+        .abbreviationPriority(abbreviationPriority)
         .build();
     TextViewUtils textViewUtils = mock(TextViewUtils.class);
     TextView textView = mock(TextView.class);
     AbbreviationVerifier abbreviationVerifier = mock(AbbreviationVerifier.class);
     when(abbreviationVerifier.isNodeType(bannerComponents)).thenReturn(true);
-    when(textViewUtils.textFits(textView, bannerComponents.text())).thenReturn(true);
-    AbbreviationCreator abbreviationCoordinator = new AbbreviationCreator(textViewUtils, abbreviationVerifier);
-    abbreviationCoordinator.addPriorityInfo(bannerComponents, 0);
+    when(textViewUtils.textFits(textView, abbreviation)).thenReturn(true);
+    when(textViewUtils.textFits(textView, bannerComponents.text())).thenReturn(false);
+    HashMap<Integer, List<Integer>> abbreviations = new HashMap();
+    AbbreviationCreator abbreviationCreator = new AbbreviationCreator(abbreviationVerifier,
+      textViewUtils, abbreviations);
     List<BannerComponentNode> bannerComponentNodes = new ArrayList<>();
     bannerComponentNodes.add(new AbbreviationCreator.AbbreviationNode(bannerComponents, 0));
 
-    String abbreviatedTextFromCoordinator = abbreviationCoordinator.abbreviateBannerText(textView, bannerComponentNodes);
+    abbreviationCreator.setupNode(bannerComponents, 0, 0);
 
-    assertEquals(text, abbreviatedTextFromCoordinator);
+    assertEquals(abbreviations.size(), 1);
+    assertEquals(abbreviations.get(abbreviationPriority).get(0), Integer.valueOf(0));
   }
 }

libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/instruction/BannerComponentTreeTest.java

@@ -7,34 +7,46 @@
 import org.junit.Test;
 import org.mockito.InOrder;
 
-import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.Mockito.inOrder;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 
 public class BannerComponentTreeTest {
 
+  @Test
+  public void parseComponents() {
+    BannerComponents bannerComponents = BannerComponentsFaker.bannerComponents();
+    List<BannerComponents> bannerComponentsList = Collections.singletonList(bannerComponents);
+    TestCreator testCreator = mock(TestCreator.class);
+    when(testCreator.isNodeType(bannerComponents)).thenReturn(true);
+
+    new BannerComponentTree(bannerComponentsList, testCreator);
+
+    verify(testCreator).setupNode(bannerComponents, 0, 0);
+  }
+
   @Test
   public void loadInstruction() {
-    List<BannerComponents> bannerComponentsList = new ArrayList<>();
-    BannerComponents bannerComponents = BannerComponentsFaker.bannerComponentsWithAbbreviation();
-    bannerComponentsList.add(bannerComponents);
+    BannerComponents bannerComponents = BannerComponentsFaker.bannerComponents();
+    List<BannerComponents> bannerComponentsList = Collections.singletonList(bannerComponents);
     TestNode testNode = mock(TestNode.class);
-    TestCreator nodeCoordinator = mock(TestCreator.class);
-    when(nodeCoordinator.isNodeType(bannerComponents)).thenReturn(true);
-    when(nodeCoordinator.setupNode(any(BannerComponents.class), anyInt(), anyInt())).thenReturn(testNode);
+    TestCreator testCreator = mock(TestCreator.class);
+    when(testCreator.isNodeType(bannerComponents)).thenReturn(true);
+    when(testCreator.setupNode(bannerComponents, 0, 0)).thenReturn(testNode);
     TextView textView = mock(TextView.class);
-    BannerComponentTree bannerComponentTree = new BannerComponentTree(bannerComponentsList, nodeCoordinator);
+    BannerComponentTree bannerComponentTree = new BannerComponentTree(bannerComponentsList, testCreator);
+
     bannerComponentTree.loadInstruction(textView);
 
-    InOrder inOrder = inOrder(nodeCoordinator, nodeCoordinator);
-    inOrder.verify(nodeCoordinator).preProcess(any(TextView.class), any(List.class));
-    inOrder.verify(nodeCoordinator).postProcess(any(TextView.class), any(List.class));
+    InOrder inOrder = inOrder(testCreator, testCreator);
+    inOrder.verify(testCreator).preProcess(any(TextView.class), any(List.class));
+    inOrder.verify(testCreator).postProcess(any(TextView.class), any(List.class));
   }
 
   class TestNode extends BannerComponentNode {
@@ -51,7 +63,6 @@ boolean isNodeType(BannerComponents bannerComponents) {
     }
   }
 
-
   class TestCreator extends NodeCreator<TestNode, TestVerifier> {
     TestCreator(TestVerifier nodeVerifier) {
       super(nodeVerifier);
@@ -62,5 +73,4 @@ TestNode setupNode(BannerComponents components, int index, int startIndex) {
       return new TestNode(components, startIndex);
     }
   }
-
 }

libandroid-navigation-ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/instruction/BannerComponentsFaker.java

@@ -3,14 +3,18 @@
 import com.mapbox.api.directions.v5.models.BannerComponents;
 
 class BannerComponentsFaker {
-  static BannerComponents.Builder bannerComponents() {
+  static BannerComponents bannerComponents() {
+    return bannerComponentsBuilder().build();
+  }
+
+  static BannerComponents.Builder bannerComponentsBuilder() {
     return BannerComponents.builder()
       .type("some type")
       .text("some text");
   }
 
   static BannerComponents bannerComponentsWithAbbreviation() {
-    return bannerComponents()
+    return bannerComponentsBuilder()
       .abbreviationPriority(1)
       .abbreviation("abbreviation text")
       .build();