1 files changed, 20 insertions, 7 deletions
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/ChoiceCellTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/ChoiceCellTests.java
index 0dde875ea..a761b1f88 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/ChoiceCellTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/ChoiceCellTests.java
@@ -61,7 +61,7 @@ public class ChoiceCellTests {
         choiceCell.setVoiceCommands(TestValues.GENERAL_STRING_LIST);
         choiceCell.setArtwork(artwork);
         choiceCell.setSecondaryArtwork(artwork);
-        choiceCell.setUniqueText(TestValues.GENERAL_STRING);
+        choiceCell.setUniqueTextId(TestValues.GENERAL_INT);
 
         // use getters and assert equality
         assertEquals(choiceCell.getText(), TestValues.GENERAL_STRING);
@@ -71,7 +71,7 @@ public class ChoiceCellTests {
         assertEquals(choiceCell.getArtwork(), artwork);
         assertEquals(choiceCell.getSecondaryArtwork(), artwork);
         assertEquals(choiceCell.getChoiceId(), MAX_ID);
-        assertEquals(choiceCell.getUniqueText(), TestValues.GENERAL_STRING);
+        assertEquals(choiceCell.getUniqueTextId(), TestValues.GENERAL_INTEGER);
     }
 
     @Test
@@ -121,14 +121,27 @@ public class ChoiceCellTests {
         choiceCell3.setSecondaryText(TestValues.GENERAL_STRING);
         choiceCell3.setTertiaryText(TestValues.GENERAL_STRING);
 
-        //UniqueText should not be taken into consideration when checking equality
-        choiceCell.setUniqueText(TestValues.GENERAL_STRING);
-        choiceCell2.setUniqueText(TestValues.GENERAL_STRING);
-        choiceCell3.setUniqueText(TestValues.GENERAL_STRING);
-
         // Make sure our overridden method works, even though these are different objects in memory
         assertTrue(choiceCell.equals(choiceCell2));
         assertFalse(choiceCell.equals(choiceCell3));
 
     }
+
+    @Test
+    public void testGetUniqueCellText() {
+        ChoiceCell choiceCell = new ChoiceCell("Test");
+        ChoiceCell choiceCell2 = new ChoiceCell("Test");
+        choiceCell2.setUniqueTextId(2);
+        ChoiceCell choiceCell3 = new ChoiceCell("Test");
+        choiceCell3.setUniqueTextId(3);
+
+        assertEquals((int) choiceCell.getUniqueTextId(), 1);
+        assertEquals(choiceCell.getUniqueText(), "Test");
+
+        assertEquals((int) choiceCell2.getUniqueTextId(), 2);
+        assertEquals(choiceCell2.getUniqueText(), "Test (2)");
+
+        assertEquals((int) choiceCell3.getUniqueTextId(), 3);
+        assertEquals(choiceCell3.getUniqueText(), "Test (3)");
+    }
 }