Fix unit tests

4 files changed, 2 insertions, 37 deletions

diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/MenuManagerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/MenuManagerTests.java
index 7aef97e56..b76964ce2 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/MenuManagerTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/MenuManagerTests.java
@@ -71,7 +71,6 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
-import static com.smartdevicelink.managers.screen.menu.BaseMenuManager.menuCellIdMin;
 import static com.smartdevicelink.managers.screen.menu.DynamicMenuUpdateAlgorithm.MenuCellState;
 import static com.smartdevicelink.managers.screen.menu.DynamicMenuUpdateAlgorithm.MenuCellState.ADD;
 import static com.smartdevicelink.managers.screen.menu.DynamicMenuUpdateAlgorithm.MenuCellState.DELETE;
@@ -187,7 +186,6 @@ public class MenuManagerTests {
         assertEquals(BaseSubManager.SETTING_UP, menuManager.getState());
         assertEquals(SystemContext.SYSCTXT_MAIN, menuManager.currentSystemContext);
         assertEquals(DynamicMenuUpdatesMode.ON_WITH_COMPAT_MODE, menuManager.dynamicMenuUpdatesMode);
-        assertEquals(menuCellIdMin, menuManager.lastMenuId);
         assertTrue(menuManager.menuCells.isEmpty());
         assertTrue(menuManager.currentMenuCells.isEmpty());
         assertNull(menuManager.menuConfiguration.getMenuLayout());
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/MenuReplaceOperationTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/MenuReplaceOperationTests.java
index f49b455fb..0079a6a99 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/MenuReplaceOperationTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/MenuReplaceOperationTests.java
@@ -63,8 +63,8 @@ import java.util.List;
 import java.util.Random;
 
 import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
-import static com.smartdevicelink.managers.screen.menu.BaseMenuManager.menuCellIdMin;
 import static com.smartdevicelink.managers.screen.menu.BaseMenuManager.parentIdNotFound;
+import static com.smartdevicelink.managers.screen.menu.MenuReplaceUtilities.updateIdsOnMenuCells;
 import static junit.framework.TestCase.assertEquals;
 import static junit.framework.TestCase.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
@@ -75,8 +75,6 @@ import static org.mockito.Mockito.when;
 
 @RunWith(AndroidJUnit4.class)
 public class MenuReplaceOperationTests {
-    static int lastMenuId = menuCellIdMin;
-
     private Handler mainHandler;
     private Taskmaster taskmaster;
     private Queue transactionQueue;
@@ -176,18 +174,6 @@ public class MenuReplaceOperationTests {
         return windowCapability;
     }
 
-    private void updateIdsOnMenuCells(List<MenuCell> menuCells, int parentId) {
-        for (MenuCell cell : menuCells) {
-            cell.setCellId(lastMenuId++);
-            if (parentId != parentIdNotFound) {
-                cell.setParentCellId(parentId);
-            }
-            if (cell.getSubCells() != null && !cell.getSubCells().isEmpty()) {
-                updateIdsOnMenuCells(cell.getSubCells(), cell.getCellId());
-            }
-        }
-    }
-
     // Asserts on Taskmaster threads will fail silently so we need to do the assertions on main thread if the code is triggered from Taskmaster
     private void assertOnMainThread(Runnable runnable) {
         mainHandler.post(runnable);
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/MenuReplaceUtilitiesTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/MenuReplaceUtilitiesTests.java
index 795fd66cc..85e57fee0 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/MenuReplaceUtilitiesTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/MenuReplaceUtilitiesTests.java
@@ -50,8 +50,8 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import static com.smartdevicelink.managers.screen.menu.BaseMenuManager.menuCellIdMin;
 import static com.smartdevicelink.managers.screen.menu.BaseMenuManager.parentIdNotFound;
+import static com.smartdevicelink.managers.screen.menu.MenuReplaceUtilities.updateIdsOnMenuCells;
 import static junit.framework.TestCase.assertEquals;
 import static junit.framework.TestCase.assertFalse;
 import static junit.framework.TestCase.assertTrue;
@@ -64,8 +64,6 @@ import static org.mockito.Mockito.when;
  */
 @RunWith(AndroidJUnit4.class)
 public class MenuReplaceUtilitiesTests {
-    static int lastMenuId = menuCellIdMin;
-
     @Before
     public void setUp() throws Exception {
     }
@@ -342,16 +340,4 @@ public class MenuReplaceUtilitiesTests {
 
         return newMenuList ;
     }
-
-    private  void updateIdsOnMenuCells(List<MenuCell> menuCells, int parentId) {
-        for (MenuCell cell : menuCells) {
-            cell.setCellId(lastMenuId++);
-            if (parentId != parentIdNotFound) {
-                cell.setParentCellId(parentId);
-            }
-            if (cell.getSubCells() != null && !cell.getSubCells().isEmpty()) {
-                updateIdsOnMenuCells(cell.getSubCells(), cell.getCellId());
-            }
-        }
-    }
 }
diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/menu/MenuReplaceUtilities.java b/base/src/main/java/com/smartdevicelink/managers/screen/menu/MenuReplaceUtilities.java
index e1eb75302..3579425ca 100644
--- a/base/src/main/java/com/smartdevicelink/managers/screen/menu/MenuReplaceUtilities.java
+++ b/base/src/main/java/com/smartdevicelink/managers/screen/menu/MenuReplaceUtilities.java
@@ -31,11 +31,6 @@ import java.util.Map;
  */
 class MenuReplaceUtilities {
     private static int menuId = 0;
-
-    static void setNextMenuId(int nextMenuId) {
-        menuId = nextMenuId;
-    }
-
     static int getNextMenuId() {
         return ++menuId;
     }