1 files changed, 15 insertions, 26 deletions

diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/MenuCellTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/MenuCellTests.java
index b0e703e33..8088538e1 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/MenuCellTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/MenuCellTests.java
@@ -43,13 +43,13 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 import static junit.framework.TestCase.assertEquals;
-import static junit.framework.TestCase.assertFalse;
 import static junit.framework.TestCase.assertNotNull;
 import static junit.framework.TestCase.assertNotSame;
-import static junit.framework.TestCase.assertTrue;
+import static org.junit.Assert.assertNotEquals;
 
 @RunWith(AndroidJUnit4.class)
 public class MenuCellTests {
@@ -63,7 +63,6 @@ public class MenuCellTests {
 
     @Test
     public void testSettersAndGetters() {
-
         // set everything
         MenuCell menuCell = new MenuCell(TestValues.GENERAL_STRING, null, null, menuSelectionListener);
         menuCell.setIcon(TestValues.GENERAL_ARTWORK);
@@ -91,7 +90,6 @@ public class MenuCellTests {
 
     @Test
     public void testConstructors() {
-
         // first constructor was tested in previous method, use the last two here
 
         MenuCell menuCell3 = new MenuCell(TestValues.GENERAL_STRING, TestValues.GENERAL_ARTWORK, TestValues.GENERAL_STRING_LIST, menuSelectionListener);
@@ -99,20 +97,16 @@ public class MenuCellTests {
         assertEquals(menuCell3.getIcon(), TestValues.GENERAL_ARTWORK);
         assertEquals(menuCell3.getVoiceCommands(), TestValues.GENERAL_STRING_LIST);
         assertEquals(menuCell3.getMenuSelectionListener(), menuSelectionListener);
-        assertEquals(menuCell3.getUniqueTitle(), TestValues.GENERAL_STRING);
 
         MenuCell menuCell4 = new MenuCell(TestValues.GENERAL_STRING, null, null, menuSelectionListener);
         assertEquals(menuCell4.getTitle(), TestValues.GENERAL_STRING);
         assertEquals(menuCell4.getMenuSelectionListener(), menuSelectionListener);
-        assertEquals(menuCell4.getUniqueTitle(), TestValues.GENERAL_STRING);
 
         MenuCell menuCell5 = new MenuCell(TestValues.GENERAL_STRING, TestValues.GENERAL_MENU_LAYOUT, TestValues.GENERAL_ARTWORK, TestValues.GENERAL_MENUCELL_LIST);
         assertEquals(menuCell5.getTitle(), TestValues.GENERAL_STRING);
         assertEquals(menuCell5.getIcon(), TestValues.GENERAL_ARTWORK);
         assertEquals(menuCell5.getSubMenuLayout(), TestValues.GENERAL_MENU_LAYOUT);
         assertEquals(menuCell5.getSubCells(), TestValues.GENERAL_MENUCELL_LIST);
-        assertEquals(menuCell5.getUniqueTitle(), TestValues.GENERAL_STRING);
-
 
         MenuCell menuCell6 = new MenuCell(TestValues.GENERAL_STRING, TestValues.GENERAL_STRING, TestValues.GENERAL_STRING, TestValues.GENERAL_ARTWORK, TestValues.GENERAL_ARTWORK, TestValues.GENERAL_STRING_LIST, menuSelectionListener);
         assertEquals(menuCell6.getTitle(), TestValues.GENERAL_STRING);
@@ -139,36 +133,34 @@ public class MenuCellTests {
 
     @Test
     public void testEquality() {
+        MenuCell menuCell1 = new MenuCell(TestValues.GENERAL_STRING, TestValues.GENERAL_ARTWORK, TestValues.GENERAL_STRING_LIST, menuSelectionListener);
+        MenuCell menuCell1_1 = new MenuCell(TestValues.GENERAL_STRING, TestValues.GENERAL_ARTWORK, TestValues.GENERAL_STRING_LIST, menuSelectionListener);
+        menuCell1.setSubCells(Collections.singletonList(menuCell1_1));
 
-        //We should use assertTrue (or assertFalse) because we want to use the overridden equals() method
-
-        MenuCell menuCell = new MenuCell(TestValues.GENERAL_STRING, TestValues.GENERAL_ARTWORK, TestValues.GENERAL_STRING_LIST, menuSelectionListener);
-        menuCell.setSecondaryText(TestValues.GENERAL_STRING);
-        menuCell.setTertiaryText(TestValues.GENERAL_STRING);
-        menuCell.setSecondaryArtwork(TestValues.GENERAL_ARTWORK);
         MenuCell menuCell2 = new MenuCell(TestValues.GENERAL_STRING, TestValues.GENERAL_ARTWORK, TestValues.GENERAL_STRING_LIST, menuSelectionListener);
-        menuCell2.setSecondaryText(TestValues.GENERAL_STRING);
-        menuCell2.setTertiaryText(TestValues.GENERAL_STRING);
-        menuCell2.setSecondaryArtwork(TestValues.GENERAL_ARTWORK);
+        MenuCell menuCell2_1 = new MenuCell(TestValues.GENERAL_STRING, TestValues.GENERAL_ARTWORK, TestValues.GENERAL_STRING_LIST, menuSelectionListener);
+        menuCell2.setSubCells(Collections.singletonList(menuCell2_1));
 
         // these are the same object, should be equal.
-        assertTrue(menuCell.equals(menuCell));
+        assertEquals(menuCell1, menuCell1);
 
         // Make sure these are marked as equals, even though they are different objects
-        assertTrue(menuCell.equals(menuCell2));
+        assertEquals(menuCell1, menuCell2);
 
         MenuCell menuCell3 = new MenuCell(TestValues.GENERAL_STRING, null, TestValues.GENERAL_STRING_LIST, menuSelectionListener);
 
         // these should be different
-        assertFalse(menuCell.equals(menuCell3));
+        assertNotEquals(menuCell1, menuCell3);
+
+        menuCell1_1.setTitle("new title");
+
+        // Make sure sub cells are not compared
+        assertEquals(menuCell1, menuCell2);
     }
 
     @Test
     public void testClone() {
         MenuCell original = new MenuCell(TestValues.GENERAL_STRING, TestValues.GENERAL_ARTWORK, TestValues.GENERAL_STRING_LIST, menuSelectionListener);
-        original.setSecondaryText(TestValues.GENERAL_STRING);
-        original.setTertiaryText(TestValues.GENERAL_STRING);
-        original.setSecondaryArtwork(TestValues.GENERAL_ARTWORK);
         MenuCell clone = original.clone();
 
         assertNotNull(clone);
@@ -208,8 +200,5 @@ public class MenuCellTests {
 
             assertNotSame(originalSubCells.get(i), cloneSubCells.get(i));
         }
-
-
     }
-
 }