Skip to content

Update current screen data in T&G manager with template config #1834

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JulianKast merged 5 commits into from
Sep 21, 2022
Merged

Update current screen data in T&G manager with template config #1834

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
25ceb3f
update current screen data in T&G manager with template config
JulianKast Sep 16, 2022
8c45e0b
Fix unit test to cover template config change
JulianKast Sep 19, 2022
e68c5fb
Remove line form unit test that didn't make sense
JulianKast Sep 19, 2022
a80e179
Merge branch 'develop' into bugfix/issue_1833
JulianKast Sep 21, 2022
368fb92
Fix unitTest from mergConflicts
JulianKast Sep 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions ...droidTest/java/com/smartdevicelink/managers/screen/TextAndGraphicUpdateOperationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ public class TextAndGraphicUpdateOperationTest {
private CompletionListener listener;
private TextAndGraphicManager.CurrentScreenDataUpdatedListener currentScreenDataUpdatedListener;
private SdlArtwork blankArtwork;
private TemplateConfiguration configuration, configurationFail;
private TemplateConfiguration configuration, configurationFail, configurationOld;
ISdl internalInterface;
FileManager fileManager;

Expand Down Expand Up @@ -246,6 +246,8 @@ public void setUp() throws Exception {
configuration = new TemplateConfiguration();
configuration.setTemplate(PredefinedLayout.GRAPHIC_WITH_TEXT.toString());

configurationOld = new TemplateConfiguration();
configurationOld.setTemplate(PredefinedLayout.TEXT_WITH_GRAPHIC.toString());
configurationFail = new TemplateConfiguration();
configurationFail.setTemplate("failConfiguration");

Expand Down Expand Up @@ -276,7 +278,7 @@ public void setUp() throws Exception {

currentScreenData.setPrimaryGraphic(testArtwork1);
currentScreenData.setSecondaryGraphic(testArtwork2);
currentScreenData.setTemplateConfiguration(configuration);
currentScreenData.setTemplateConfiguration(configurationOld);

currentScreenDataUpdatedListener = new TextAndGraphicManager.CurrentScreenDataUpdatedListener() {
@Override
Expand Down Expand Up @@ -1047,7 +1049,6 @@ public void testOnShowFail() {
mediaTrackField, title, testArtwork3, testArtwork4, textAlignment, textField1Type, textField2Type, textField3Type, textField4Type, configuration);
textAndGraphicUpdateOperation = new TextAndGraphicUpdateOperation(internalInterface, fileManager, defaultMainWindowCapability, currentScreenData, textsAndGraphicsState, listener, currentScreenDataUpdatedListener);
textAndGraphicUpdateOperation.onExecute();
assertEquals(textAndGraphicUpdateOperation.getCurrentScreenData().getTemplateConfiguration().getStore(), configuration.getStore());

// Verifies that uploadArtworks does not get called because a sendShow failed with text and layout change
verify(fileManager, times(0)).uploadArtworks(any(List.class), any(MultipleFileCompletionListener.class));
Expand Down Expand Up @@ -1080,7 +1081,7 @@ public void testOnShowFailBadDataDoesNotUpdateScreen(){
TestCase.assertNull(textAndGraphicUpdateOperation.getCurrentScreenData().getTextField2Type());
TestCase.assertNull(textAndGraphicUpdateOperation.getCurrentScreenData().getTextField3Type());
TestCase.assertNull(textAndGraphicUpdateOperation.getCurrentScreenData().getTextField4Type());
assertEquals(configuration, textAndGraphicUpdateOperation.getCurrentScreenData().getTemplateConfiguration());
assertEquals(configurationOld, textAndGraphicUpdateOperation.getCurrentScreenData().getTemplateConfiguration());
}

@Test
Expand Down Expand Up @@ -1120,7 +1121,7 @@ public void testUpdateTargetStateWithErrorStateNullDoesNotUpdateCurrentScreen()
TestCase.assertNull(textAndGraphicUpdateOperation.getCurrentScreenData().getTextField2Type());
TestCase.assertNull(textAndGraphicUpdateOperation.getCurrentScreenData().getTextField3Type());
TestCase.assertNull(textAndGraphicUpdateOperation.getCurrentScreenData().getTextField4Type());
assertEquals(configuration, textAndGraphicUpdateOperation.getCurrentScreenData().getTemplateConfiguration());
assertEquals(configurationOld, textAndGraphicUpdateOperation.getCurrentScreenData().getTemplateConfiguration());
}

@Test
Expand Down Expand Up @@ -1160,7 +1161,7 @@ public void testUpdateTargetStateWithErrorBadDataDoesNotUpdateCurrentScreen() {
TestCase.assertNull(textAndGraphicUpdateOperation.getCurrentScreenData().getTextField2Type());
TestCase.assertNull(textAndGraphicUpdateOperation.getCurrentScreenData().getTextField3Type());
TestCase.assertNull(textAndGraphicUpdateOperation.getCurrentScreenData().getTextField4Type());
assertEquals(configuration, textAndGraphicUpdateOperation.getCurrentScreenData().getTemplateConfiguration());
assertEquals(configurationOld, textAndGraphicUpdateOperation.getCurrentScreenData().getTemplateConfiguration());
}

@Test
Expand Down Expand Up @@ -1200,6 +1201,6 @@ public void testUpdateTargetStateWithErrorBadDataAndGoodData() {
TestCase.assertNull(textAndGraphicUpdateOperation.getCurrentScreenData().getTextField2Type());
TestCase.assertNull(textAndGraphicUpdateOperation.getCurrentScreenData().getTextField3Type());
TestCase.assertNull(textAndGraphicUpdateOperation.getCurrentScreenData().getTextField4Type());
assertEquals(configuration, textAndGraphicUpdateOperation.getCurrentScreenData().getTemplateConfiguration());
assertEquals(configurationOld, textAndGraphicUpdateOperation.getCurrentScreenData().getTemplateConfiguration());
}
}
3 changes: 3 additions & 0 deletions base/src/main/java/com/smartdevicelink/managers/screen/TextAndGraphicUpdateOperation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -633,6 +633,9 @@ private void updateCurrentScreenDataFromShow(Show show) {
if (show.getSecondaryGraphic() != null) {
currentScreenData.setSecondaryGraphic(updatedState.getSecondaryGraphic());
}
if (show.getTemplateConfiguration() != null) {
currentScreenData.setTemplateConfiguration(updatedState.getTemplateConfiguration());
}
if (currentScreenDataUpdateListener != null) {
currentScreenDataUpdateListener.onUpdate(currentScreenData);
}
Expand Down