Add templateTitle unit tests

4 files changed, 25 insertions, 6 deletions

diff --git a/android/sdl_android/src/androidTest/assets/json/Show.json b/android/sdl_android/src/androidTest/assets/json/Show.json
index 97ef1f20f..db189b34a 100644
--- a/android/sdl_android/src/androidTest/assets/json/Show.json
+++ b/android/sdl_android/src/androidTest/assets/json/Show.json
@@ -17,6 +17,7 @@
       "mainField2":"Main Field 2",
       "mainField3":"Main Field 3",
       "mainField4":"Main Field 4",
+      "templateTitle":"Template Title",
       "statusBar":"Status",
       "mediaClock":"Media Clock",
       "alignment":"LEFT_ALIGNED",
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/ScreenManagerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/ScreenManagerTests.java
index c4e22af6f..bb930ac34 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/ScreenManagerTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/ScreenManagerTests.java
@@ -45,6 +45,7 @@ public class ScreenManagerTests extends AndroidTestCase2 {
 		assertNull(screenManager.getTextField2());
 		assertNull(screenManager.getTextField3());
 		assertNull(screenManager.getTextField4());
+		assertNull(screenManager.getTemplateTitle());
 		assertNull(screenManager.getMediaTrackTextField());
 		assertNull(screenManager.getPrimaryGraphic());
 		assertNull(screenManager.getSecondaryGraphic());
@@ -67,10 +68,12 @@ public class ScreenManagerTests extends AndroidTestCase2 {
 		screenManager.setTextField2("Wednesday");
 		screenManager.setTextField3("My");
 		screenManager.setTextField4("Dudes");
+		screenManager.setTemplateTitle("title");
 		assertEquals(screenManager.getTextField1(), "It is");
 		assertEquals(screenManager.getTextField2(), "Wednesday");
 		assertEquals(screenManager.getTextField3(), "My");
 		assertEquals(screenManager.getTextField4(), "Dudes");
+		assertEquals(screenManager.getTemplateTitle(), "title");
 	}
 
 	public void testMediaTrackTextFields() {
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/TextAndGraphicManagerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/TextAndGraphicManagerTests.java
index d063f52e3..cca75223e 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/TextAndGraphicManagerTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/TextAndGraphicManagerTests.java
@@ -96,6 +96,7 @@ public class TextAndGraphicManagerTests extends AndroidTestCase2 {
 		assertNull(textAndGraphicManager.getTextField2());
 		assertNull(textAndGraphicManager.getTextField3());
 		assertNull(textAndGraphicManager.getTextField4());
+		assertNull(textAndGraphicManager.getTemplateTitle());
 		assertNull(textAndGraphicManager.getMediaTrackTextField());
 		assertNull(textAndGraphicManager.getPrimaryGraphic());
 		assertNull(textAndGraphicManager.getSecondaryGraphic());
@@ -484,6 +485,13 @@ public class TextAndGraphicManagerTests extends AndroidTestCase2 {
 		assertEquals(textAndGraphicManager.getMediaTrackTextField(), songTitle);
 	}
 
+	public void testTemplateTitle() {
+
+		String title = "template title";
+		textAndGraphicManager.setTemplateTitle(title);
+		assertEquals(textAndGraphicManager.getTemplateTitle(), title);
+	}
+
 	public void testAlignment() {
 
 		textAndGraphicManager.setTextAlignment(TextAlignment.LEFT_ALIGNED);
@@ -534,6 +542,7 @@ public class TextAndGraphicManagerTests extends AndroidTestCase2 {
 		assertNull(textAndGraphicManager.getTextField2Type());
 		assertNull(textAndGraphicManager.getTextField3Type());
 		assertNull(textAndGraphicManager.getTextField4Type());
+		assertNull(textAndGraphicManager.getTemplateTitle());
 		assertNotNull(textAndGraphicManager.getBlankArtwork());
 		assertNull(textAndGraphicManager.currentScreenData);
 		assertNull(textAndGraphicManager.inProgressUpdate);
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ShowTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ShowTests.java
index 91f4c52d7..4f89763aa 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ShowTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ShowTests.java
@@ -27,17 +27,18 @@ import java.util.List;
  * {@link com.smartdevicelink.proxy.rpc.Show}
  */
 public class ShowTests extends BaseRpcTests {
-    
+
     @Override
 	protected RPCMessage createMessage() {
 		Show msg = new Show();
-		
+
 		msg.setMainField1(Test.GENERAL_STRING);
 		msg.setMainField2(Test.GENERAL_STRING);
 		msg.setMainField3(Test.GENERAL_STRING);
 		msg.setMainField4(Test.GENERAL_STRING);
 		msg.setStatusBar(Test.GENERAL_STRING);
 		msg.setMediaTrack(Test.GENERAL_STRING);
+		msg.setTemplateTitle(Test.GENERAL_STRING);
 		msg.setAlignment(Test.GENERAL_TEXTALIGNMENT);
 		msg.setGraphic(Test.GENERAL_IMAGE);
 		msg.setSecondaryGraphic(Test.GENERAL_IMAGE);
@@ -62,13 +63,14 @@ public class ShowTests extends BaseRpcTests {
 	protected JSONObject getExpectedParameters(int sdlVersion) {
 		JSONObject result = new JSONObject();
 
-		try { 
+		try {
 			result.put(Show.KEY_MAIN_FIELD_1, Test.GENERAL_STRING);
 			result.put(Show.KEY_MAIN_FIELD_2, Test.GENERAL_STRING);
 			result.put(Show.KEY_MAIN_FIELD_3, Test.GENERAL_STRING);
 			result.put(Show.KEY_MAIN_FIELD_4, Test.GENERAL_STRING);
 			result.put(Show.KEY_STATUS_BAR,  Test.GENERAL_STRING);
 			result.put(Show.KEY_MEDIA_TRACK, Test.GENERAL_STRING);
+			result.put(Show.KEY_TEMPLATE_TITLE, Test.GENERAL_STRING);
 			result.put(Show.KEY_GRAPHIC, Test.JSON_IMAGE);
 			result.put(Show.KEY_SECONDARY_GRAPHIC, Test.JSON_IMAGE);
 			result.put(Show.KEY_ALIGNMENT, Test.GENERAL_TEXTALIGNMENT);
@@ -81,10 +83,11 @@ public class ShowTests extends BaseRpcTests {
 
 		return result;
 	}
-		
+
 	public void testSoftButtons () {
 		// TestValues
 		String testTrack     = ( (Show) msg ).getMediaTrack();
+		String templateTitle     = ( (Show) msg ).getTemplateTitle();
 		Image  testGraphic2  = ( (Show) msg ).getSecondaryGraphic();
 		Image  testGraphic1  = ( (Show) msg ).getGraphic();
 		String testStatusBar = ( (Show) msg ).getStatusBar();
@@ -96,9 +99,10 @@ public class ShowTests extends BaseRpcTests {
 		List<SoftButton> testSoftButtons   = ( (Show) msg ).getSoftButtons();
 		List<String>     testCustomPresets = ( (Show) msg ).getCustomPresets();
 		MetadataTags testMetadata      = ( (Show) msg ).getMetadataTags();
-		
+
 		// Valid Tests
 		assertEquals(Test.MATCH, Test.GENERAL_STRING, testTrack);
+		assertEquals(Test.MATCH, Test.GENERAL_STRING, templateTitle);
 		assertEquals(Test.MATCH, Test.GENERAL_TEXTALIGNMENT, testAlignment);
 		assertEquals(Test.MATCH, Test.GENERAL_STRING, testStatusBar);
 		assertEquals(Test.MATCH, Test.GENERAL_STRING, testText1);
@@ -110,7 +114,7 @@ public class ShowTests extends BaseRpcTests {
 		assertTrue(Test.TRUE, Validator.validateSoftButtons(Test.GENERAL_SOFTBUTTON_LIST, testSoftButtons));
 		assertTrue(Test.TRUE, Validator.validateImage(Test.GENERAL_IMAGE, testGraphic2));
 		assertTrue(Test.TRUE, Validator.validateImage(Test.GENERAL_IMAGE, testGraphic1));
-	
+
 		// Invalid/Null Tests
 		Show msg = new Show();
 		assertNotNull(Test.NOT_NULL, msg);
@@ -126,6 +130,7 @@ public class ShowTests extends BaseRpcTests {
 		assertNull(Test.NULL, msg.getSecondaryGraphic());
 		assertNull(Test.NULL, msg.getCustomPresets());
 		assertNull(Test.NULL, msg.getMediaTrack());
+		assertNull(Test.NULL, msg.getTemplateTitle());
 		assertNull(Test.NULL, msg.getSoftButtons());
 		assertNull(Test.NULL, msg.getMetadataTags());
 	}
@@ -166,6 +171,7 @@ public class ShowTests extends BaseRpcTests {
 			assertEquals(Test.MATCH, JsonUtils.readStringFromJsonObject(parameters, Show.KEY_STATUS_BAR), cmd.getStatusBar());
 			assertEquals(Test.MATCH, JsonUtils.readStringFromJsonObject(parameters, Show.KEY_ALIGNMENT), cmd.getAlignment().toString());
 			assertEquals(Test.MATCH, JsonUtils.readStringFromJsonObject(parameters, Show.KEY_MEDIA_TRACK), cmd.getMediaTrack());
+			assertEquals(Test.MATCH, JsonUtils.readStringFromJsonObject(parameters, Show.KEY_TEMPLATE_TITLE), cmd.getTemplateTitle());
 			assertEquals(Test.MATCH, JsonUtils.readStringFromJsonObject(parameters, Show.KEY_METADATA_TAGS), cmd.getMetadataTags());
 
 			JSONObject secondaryGraphic = JsonUtils.readJsonObjectFromJsonObject(parameters, Show.KEY_SECONDARY_GRAPHIC);