Skip to content

Commit d032f81

Browse files
author
Julian Kast
committed
Merge branch 'develop' into bugfix/issue_1736_multi_file_upload
2 parents c511de2 + 6834f99 commit d032f81

22 files changed

Lines changed: 3031 additions & 2054 deletions

‎android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/file/filetypes/SdlArtworkTests.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ public void testClone() {
3737
}
3838

3939
public static boolean equalTest(SdlArtwork original, SdlArtwork clone) {
40+
if (original == null && clone == null) {
41+
return true;
42+
}
4043

4144
assertNotNull(original);
4245
assertNotNull(clone);

‎android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/ScreenManagerTests.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,14 +68,15 @@ public void testInstantiation() {
6868
assertNull(screenManager.getTextField2Type());
6969
assertNull(screenManager.getTextField3Type());
7070
assertNull(screenManager.getTextField4Type());
71-
assertNull(screenManager.getMenu());
71+
assertTrue(screenManager.getMenu().isEmpty());
7272
assertNull(screenManager.getVoiceCommands());
7373
assertTrue(screenManager.getSoftButtonObjects().isEmpty());
7474
assertNull(screenManager.getSoftButtonObjectByName("test"));
7575
assertNull(screenManager.getSoftButtonObjectById(1));
7676
assertEquals(screenManager.getDynamicMenuUpdatesMode(), DynamicMenuUpdatesMode.ON_WITH_COMPAT_MODE);
7777
assertEquals(screenManager.getState(), BaseSubManager.READY);
78-
assertNull(screenManager.getMenuConfiguration());
78+
assertNull(screenManager.getMenuConfiguration().getMenuLayout());
79+
assertNull(screenManager.getMenuConfiguration().getSubMenuLayout());
7980
}
8081

8182
@Test
@@ -147,10 +148,9 @@ public void testSetMenuManagerFields() {
147148
screenManager.setMenu(TestValues.GENERAL_MENUCELL_LIST);
148149
screenManager.setMenuConfiguration(TestValues.GENERAL_MENU_CONFIGURATION);
149150

150-
assertEquals(screenManager.getMenu(), TestValues.GENERAL_MENUCELL_LIST);
151151
assertEquals(screenManager.getDynamicMenuUpdatesMode(), DynamicMenuUpdatesMode.FORCE_ON);
152-
// Should not set because of improper RAI response and improper HMI states
153-
assertNull(screenManager.getMenuConfiguration());
152+
assertEquals(screenManager.getMenu(), TestValues.GENERAL_MENUCELL_LIST);
153+
assertEquals(screenManager.getMenuConfiguration(), TestValues.GENERAL_MENU_CONFIGURATION);
154154
}
155155

156156
@Test

android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/RunScoreTests.java renamed to android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/DynamicMenuUpdateRunScoreTests.java

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,21 +39,29 @@
3939
import org.junit.Test;
4040
import org.junit.runner.RunWith;
4141

42+
import java.util.Arrays;
43+
import java.util.List;
44+
45+
import static com.smartdevicelink.managers.screen.menu.DynamicMenuUpdateAlgorithm.MenuCellState.ADD;
46+
import static com.smartdevicelink.managers.screen.menu.DynamicMenuUpdateAlgorithm.MenuCellState.DELETE;
47+
import static com.smartdevicelink.managers.screen.menu.DynamicMenuUpdateAlgorithm.MenuCellState.KEEP;
4248
import static junit.framework.TestCase.assertEquals;
4349

4450
@RunWith(AndroidJUnit4.class)
45-
public class RunScoreTests {
51+
public class DynamicMenuUpdateRunScoreTests {
4652

4753
@Test
4854
public void testSettersAndGetters() {
4955

5056
// set everything - we only use the constructor to set variables in the Menu Manager
51-
RunScore runScore = new RunScore(TestValues.GENERAL_INT, TestValues.GENERAL_INTEGER_LIST, TestValues.GENERAL_INTEGER_LIST);
57+
List<DynamicMenuUpdateAlgorithm.MenuCellState> oldStatus = Arrays.asList(KEEP, DELETE);
58+
List<DynamicMenuUpdateAlgorithm.MenuCellState> updatedStatus = Arrays.asList(KEEP, ADD);
59+
DynamicMenuUpdateRunScore runScore = new DynamicMenuUpdateRunScore(oldStatus, updatedStatus, TestValues.GENERAL_INT);
5260

5361
// use getters and assert equality
5462
assertEquals(runScore.getScore(), TestValues.GENERAL_INT);
55-
assertEquals(runScore.getCurrentMenu(), TestValues.GENERAL_INTEGER_LIST);
56-
assertEquals(runScore.getOldMenu(), TestValues.GENERAL_INTEGER_LIST);
63+
assertEquals(runScore.getOldStatus(), oldStatus);
64+
assertEquals(runScore.getUpdatedStatus(), updatedStatus);
5765
}
5866

5967
}

‎android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/MenuCellTests.java‎

Lines changed: 15 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,13 @@
4343
import org.junit.runner.RunWith;
4444

4545
import java.util.ArrayList;
46+
import java.util.Collections;
4647
import java.util.List;
4748

4849
import static junit.framework.TestCase.assertEquals;
49-
import static junit.framework.TestCase.assertFalse;
5050
import static junit.framework.TestCase.assertNotNull;
5151
import static junit.framework.TestCase.assertNotSame;
52-
import static junit.framework.TestCase.assertTrue;
52+
import static org.junit.Assert.assertNotEquals;
5353

5454
@RunWith(AndroidJUnit4.class)
5555
public class MenuCellTests {
@@ -63,7 +63,6 @@ public void onTriggered(TriggerSource trigger) {
6363

6464
@Test
6565
public void testSettersAndGetters() {
66-
6766
// set everything
6867
MenuCell menuCell = new MenuCell(TestValues.GENERAL_STRING, null, null, menuSelectionListener);
6968
menuCell.setIcon(TestValues.GENERAL_ARTWORK);
@@ -91,28 +90,23 @@ public void testSettersAndGetters() {
9190

9291
@Test
9392
public void testConstructors() {
94-
9593
// first constructor was tested in previous method, use the last two here
9694

9795
MenuCell menuCell3 = new MenuCell(TestValues.GENERAL_STRING, TestValues.GENERAL_ARTWORK, TestValues.GENERAL_STRING_LIST, menuSelectionListener);
9896
assertEquals(menuCell3.getTitle(), TestValues.GENERAL_STRING);
9997
assertEquals(menuCell3.getIcon(), TestValues.GENERAL_ARTWORK);
10098
assertEquals(menuCell3.getVoiceCommands(), TestValues.GENERAL_STRING_LIST);
10199
assertEquals(menuCell3.getMenuSelectionListener(), menuSelectionListener);
102-
assertEquals(menuCell3.getUniqueTitle(), TestValues.GENERAL_STRING);
103100

104101
MenuCell menuCell4 = new MenuCell(TestValues.GENERAL_STRING, null, null, menuSelectionListener);
105102
assertEquals(menuCell4.getTitle(), TestValues.GENERAL_STRING);
106103
assertEquals(menuCell4.getMenuSelectionListener(), menuSelectionListener);
107-
assertEquals(menuCell4.getUniqueTitle(), TestValues.GENERAL_STRING);
108104

109105
MenuCell menuCell5 = new MenuCell(TestValues.GENERAL_STRING, TestValues.GENERAL_MENU_LAYOUT, TestValues.GENERAL_ARTWORK, TestValues.GENERAL_MENUCELL_LIST);
110106
assertEquals(menuCell5.getTitle(), TestValues.GENERAL_STRING);
111107
assertEquals(menuCell5.getIcon(), TestValues.GENERAL_ARTWORK);
112108
assertEquals(menuCell5.getSubMenuLayout(), TestValues.GENERAL_MENU_LAYOUT);
113109
assertEquals(menuCell5.getSubCells(), TestValues.GENERAL_MENUCELL_LIST);
114-
assertEquals(menuCell5.getUniqueTitle(), TestValues.GENERAL_STRING);
115-
116110

117111
MenuCell menuCell6 = new MenuCell(TestValues.GENERAL_STRING, TestValues.GENERAL_STRING, TestValues.GENERAL_STRING, TestValues.GENERAL_ARTWORK, TestValues.GENERAL_ARTWORK, TestValues.GENERAL_STRING_LIST, menuSelectionListener);
118112
assertEquals(menuCell6.getTitle(), TestValues.GENERAL_STRING);
@@ -139,36 +133,34 @@ public void testConstructors() {
139133

140134
@Test
141135
public void testEquality() {
136+
MenuCell menuCell1 = new MenuCell(TestValues.GENERAL_STRING, TestValues.GENERAL_ARTWORK, TestValues.GENERAL_STRING_LIST, menuSelectionListener);
137+
MenuCell menuCell1_1 = new MenuCell(TestValues.GENERAL_STRING, TestValues.GENERAL_ARTWORK, TestValues.GENERAL_STRING_LIST, menuSelectionListener);
138+
menuCell1.setSubCells(Collections.singletonList(menuCell1_1));
142139

143-
//We should use assertTrue (or assertFalse) because we want to use the overridden equals() method
144-
145-
MenuCell menuCell = new MenuCell(TestValues.GENERAL_STRING, TestValues.GENERAL_ARTWORK, TestValues.GENERAL_STRING_LIST, menuSelectionListener);
146-
menuCell.setSecondaryText(TestValues.GENERAL_STRING);
147-
menuCell.setTertiaryText(TestValues.GENERAL_STRING);
148-
menuCell.setSecondaryArtwork(TestValues.GENERAL_ARTWORK);
149140
MenuCell menuCell2 = new MenuCell(TestValues.GENERAL_STRING, TestValues.GENERAL_ARTWORK, TestValues.GENERAL_STRING_LIST, menuSelectionListener);
150-
menuCell2.setSecondaryText(TestValues.GENERAL_STRING);
151-
menuCell2.setTertiaryText(TestValues.GENERAL_STRING);
152-
menuCell2.setSecondaryArtwork(TestValues.GENERAL_ARTWORK);
141+
MenuCell menuCell2_1 = new MenuCell(TestValues.GENERAL_STRING, TestValues.GENERAL_ARTWORK, TestValues.GENERAL_STRING_LIST, menuSelectionListener);
142+
menuCell2.setSubCells(Collections.singletonList(menuCell2_1));
153143

154144
// these are the same object, should be equal.
155-
assertTrue(menuCell.equals(menuCell));
145+
assertEquals(menuCell1, menuCell1);
156146

157147
// Make sure these are marked as equals, even though they are different objects
158-
assertTrue(menuCell.equals(menuCell2));
148+
assertEquals(menuCell1, menuCell2);
159149

160150
MenuCell menuCell3 = new MenuCell(TestValues.GENERAL_STRING, null, TestValues.GENERAL_STRING_LIST, menuSelectionListener);
161151

162152
// these should be different
163-
assertFalse(menuCell.equals(menuCell3));
153+
assertNotEquals(menuCell1, menuCell3);
154+
155+
menuCell1_1.setTitle("new title");
156+
157+
// Make sure sub cells are not compared
158+
assertEquals(menuCell1, menuCell2);
164159
}
165160

166161
@Test
167162
public void testClone() {
168163
MenuCell original = new MenuCell(TestValues.GENERAL_STRING, TestValues.GENERAL_ARTWORK, TestValues.GENERAL_STRING_LIST, menuSelectionListener);
169-
original.setSecondaryText(TestValues.GENERAL_STRING);
170-
original.setTertiaryText(TestValues.GENERAL_STRING);
171-
original.setSecondaryArtwork(TestValues.GENERAL_ARTWORK);
172164
MenuCell clone = original.clone();
173165

174166
assertNotNull(clone);
@@ -208,8 +200,5 @@ public void testClone() {
208200

209201
assertNotSame(originalSubCells.get(i), cloneSubCells.get(i));
210202
}
211-
212-
213203
}
214-
215204
}

0 commit comments

Comments
 (0)