Add SetMediaClockTimer initializers testsfeature/issue_856

2 files changed, 73 insertions, 3 deletions

diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/StartTimeTest.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/StartTimeTest.java
index f84ca3ec3..7d1c7361b 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/StartTimeTest.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/StartTimeTest.java
@@ -13,7 +13,7 @@ import com.smartdevicelink.test.Test;
 
 /**
  * This is a unit test class for the SmartDeviceLink library project class : 
- * {@link com.smartdevicelink.rpc.StartTime}
+ * {@link com.smartdevicelink.proxy.rpc.StartTime}
  */
 public class StartTimeTest extends TestCase {
 	
@@ -41,11 +41,16 @@ public class StartTimeTest extends TestCase {
 		assertEquals(Test.MATCH, (Integer) Test.GENERAL_INT, hours);
 		assertEquals(Test.MATCH, (Integer) Test.GENERAL_INT, minutes);
 		assertEquals(Test.MATCH, (Integer) Test.GENERAL_INT, seconds);
-		
+
+		// TimeInterval constructor test
+		StartTime startTime = new StartTime(7000);
+		assertEquals(Test.MATCH, (Integer) 1, startTime.getHours());
+		assertEquals(Test.MATCH, (Integer) 56, startTime.getMinutes());
+		assertEquals(Test.MATCH, (Integer) 40, startTime.getSeconds());
+
 		// Invalid/Null Tests
 		StartTime msg = new StartTime();
 		assertNotNull(Test.NOT_NULL, msg);
-
 		assertNull(Test.NULL, msg.getHours());
 		assertNull(Test.NULL, msg.getMinutes());
 		assertNull(Test.NULL, msg.getSeconds());
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetMediaClockTimerTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetMediaClockTimerTests.java
index a90bd31b9..8083c65ed 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetMediaClockTimerTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetMediaClockTimerTests.java
@@ -88,6 +88,71 @@ public class SetMediaClockTimerTests extends BaseRpcTests {
 		assertNull(Test.NULL, msg.getUpdateMode());
 		assertNull(Test.NULL, msg.getAudioStreamingIndicator());
 	}
+
+	/**
+	 * Test static initializers
+	 */
+	public void testInitializers(){
+		Integer timeInterval1 = 5000;
+		StartTime startTime1 = new StartTime(timeInterval1);
+		Integer timeInterval2 = 7000;
+		StartTime startTime2 = new StartTime(timeInterval2);
+		SetMediaClockTimer msg;
+
+		msg = SetMediaClockTimer.countUpFromStartTimeInterval(timeInterval1, timeInterval2, Test.GENERAL_AUDIO_STREAMING_INDICATOR);
+		assertEquals(Test.MATCH, msg.getUpdateMode(), UpdateMode.COUNTUP);
+		assertTrue(Test.TRUE, Validator.validateStartTime(startTime1, msg.getStartTime()));
+		assertTrue(Test.TRUE, Validator.validateStartTime(startTime2, msg.getEndTime()));
+		assertEquals(Test.MATCH, Test.GENERAL_AUDIO_STREAMING_INDICATOR, msg.getAudioStreamingIndicator());
+
+		msg = SetMediaClockTimer.countUpFromStartTime(startTime1, startTime2, Test.GENERAL_AUDIO_STREAMING_INDICATOR);
+		assertEquals(Test.MATCH, msg.getUpdateMode(), UpdateMode.COUNTUP);
+		assertTrue(Test.TRUE, Validator.validateStartTime(startTime1, msg.getStartTime()));
+		assertTrue(Test.TRUE, Validator.validateStartTime(startTime2, msg.getEndTime()));
+		assertEquals(Test.MATCH, Test.GENERAL_AUDIO_STREAMING_INDICATOR, msg.getAudioStreamingIndicator());
+
+		msg = SetMediaClockTimer.countDownFromStartTimeInterval(timeInterval1, timeInterval2, Test.GENERAL_AUDIO_STREAMING_INDICATOR);
+		assertEquals(Test.MATCH, msg.getUpdateMode(), UpdateMode.COUNTDOWN);
+		assertTrue(Test.TRUE, Validator.validateStartTime(startTime1, msg.getStartTime()));
+		assertTrue(Test.TRUE, Validator.validateStartTime(startTime2, msg.getEndTime()));
+		assertEquals(Test.MATCH, Test.GENERAL_AUDIO_STREAMING_INDICATOR, msg.getAudioStreamingIndicator());
+
+		msg = SetMediaClockTimer.countDownFromStartTime(startTime1, startTime2, Test.GENERAL_AUDIO_STREAMING_INDICATOR);
+		assertEquals(Test.MATCH, msg.getUpdateMode(), UpdateMode.COUNTDOWN);
+		assertTrue(Test.TRUE, Validator.validateStartTime(startTime1, msg.getStartTime()));
+		assertTrue(Test.TRUE, Validator.validateStartTime(startTime2, msg.getEndTime()));
+		assertEquals(Test.MATCH, Test.GENERAL_AUDIO_STREAMING_INDICATOR, msg.getAudioStreamingIndicator());
+
+		msg = SetMediaClockTimer.pauseWithPlayPauseIndicator(Test.GENERAL_AUDIO_STREAMING_INDICATOR);
+		assertEquals(Test.MATCH, msg.getUpdateMode(), UpdateMode.PAUSE);
+		assertNull(Test.NULL, msg.getStartTime());
+		assertNull(Test.NULL, msg.getEndTime());
+		assertEquals(Test.MATCH, Test.GENERAL_AUDIO_STREAMING_INDICATOR, msg.getAudioStreamingIndicator());
+
+		msg = SetMediaClockTimer.updatePauseWithNewStartTimeInterval(timeInterval1, timeInterval2, Test.GENERAL_AUDIO_STREAMING_INDICATOR);
+		assertEquals(Test.MATCH, msg.getUpdateMode(), UpdateMode.PAUSE);
+		assertTrue(Test.TRUE, Validator.validateStartTime(startTime1, msg.getStartTime()));
+		assertTrue(Test.TRUE, Validator.validateStartTime(startTime2, msg.getEndTime()));
+		assertEquals(Test.MATCH, Test.GENERAL_AUDIO_STREAMING_INDICATOR, msg.getAudioStreamingIndicator());
+
+		msg = SetMediaClockTimer.updatePauseWithNewStartTime(startTime1, startTime2, Test.GENERAL_AUDIO_STREAMING_INDICATOR);
+		assertEquals(Test.MATCH, msg.getUpdateMode(), UpdateMode.PAUSE);
+		assertTrue(Test.TRUE, Validator.validateStartTime(startTime1, msg.getStartTime()));
+		assertTrue(Test.TRUE, Validator.validateStartTime(startTime2, msg.getEndTime()));
+		assertEquals(Test.MATCH, Test.GENERAL_AUDIO_STREAMING_INDICATOR, msg.getAudioStreamingIndicator());
+
+		msg = SetMediaClockTimer.resumeWithPlayPauseIndicator(Test.GENERAL_AUDIO_STREAMING_INDICATOR);
+		assertEquals(Test.MATCH, msg.getUpdateMode(), UpdateMode.RESUME);
+		assertNull(Test.NULL, msg.getStartTime());
+		assertNull(Test.NULL, msg.getEndTime());
+		assertEquals(Test.MATCH, Test.GENERAL_AUDIO_STREAMING_INDICATOR, msg.getAudioStreamingIndicator());
+
+		msg = SetMediaClockTimer.clearWithPlayPauseIndicator(Test.GENERAL_AUDIO_STREAMING_INDICATOR);
+		assertEquals(Test.MATCH, msg.getUpdateMode(), UpdateMode.CLEAR);
+		assertNull(Test.NULL, msg.getStartTime());
+		assertNull(Test.NULL, msg.getEndTime());
+		assertEquals(Test.MATCH, Test.GENERAL_AUDIO_STREAMING_INDICATOR, msg.getAudioStreamingIndicator());
+	}
 	
 	/**
      * Tests a valid JSON construction of this RPC message.