summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrettyWhite <geekman3454@protonmail.com>2019-05-28 09:48:47 -0400
committerBrettyWhite <geekman3454@protonmail.com>2019-05-28 09:48:47 -0400
commitdf7a87d3cdd069d0190ff3967881c0a01413a12f (patch)
tree1821093f7a5838e501dad24f4dcf8a74c3e73943
parent9942b4b662136e22b99039123ca4b00d29b360e9 (diff)
downloadsdl_android-df7a87d3cdd069d0190ff3967881c0a01413a12f.tar.gz
adding tests for run score object
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/RunScoreTests.java12
-rw-r--r--base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseMenuManager.java4
2 files changed, 16 insertions, 0 deletions
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/RunScoreTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/RunScoreTests.java
index 1eef07622..15128293c 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/RunScoreTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/RunScoreTests.java
@@ -33,6 +33,7 @@
package com.smartdevicelink.managers.screen.menu;
import com.smartdevicelink.AndroidTestCase2;
+import com.smartdevicelink.test.Test;
public class RunScoreTests extends AndroidTestCase2 {
@@ -47,4 +48,15 @@ public class RunScoreTests extends AndroidTestCase2 {
super.tearDown();
}
+ public void testSettersAndGetters(){
+
+ // set everything - we only use the constructor to set variables in the Menu Manager
+ RunScore runScore = new RunScore(Test.GENERAL_INT, Test.GENERAL_INTEGER_LIST, Test.GENERAL_INTEGER_LIST);
+
+ // use getters and assert equality
+ assertEquals(runScore.getScore(), Test.GENERAL_INT);
+ assertEquals(runScore.getCurrentMenu(), Test.GENERAL_INTEGER_LIST);
+ assertEquals(runScore.getOldMenu(), Test.GENERAL_INTEGER_LIST);
+ }
+
}
diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseMenuManager.java b/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseMenuManager.java
index 737463a49..2ca15377b 100644
--- a/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseMenuManager.java
+++ b/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseMenuManager.java
@@ -246,6 +246,9 @@ abstract class BaseMenuManager extends BaseSubManager {
return;
}
+ // Checks against what the developer set for update mode and against the display type
+ // to determine how the menu will be updated. This has the ability to be changed during
+ // a session.
if (checkUpdateMode(dynamicMenuUpdatesMode, displayType)) {
// run the lists through the new algorithm
RunScore rootScore = runMenuCompareAlgorithm(oldMenuCells, menuCells);
@@ -259,6 +262,7 @@ abstract class BaseMenuManager extends BaseSubManager {
this.oldMenuCells = new ArrayList<>(menuCells);
createAndSendEntireMenu();
} else {
+ DebugTool.logInfo("Dynamically Updating Menu");
if (menuCells.size() == 0 && (oldMenuCells != null && oldMenuCells.size() > 0)) {
// the dev wants to clear the menu. We have old cells and an empty array of new ones.
deleteMenuWhenNewCellsEmpty();