Skip to content

Commit e1a2b80

Browse files
NadaharNadahar
committed
Reorganized and slightly extended tests
1 parent 914e1bf commit e1a2b80

12 files changed

+146
-31
lines changed

‎src/test/java/org/digitalmediaserver/cast/ChannelTest.java‎

Lines changed: 92 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -698,11 +698,98 @@ public void onEvent(CastEvent<?> event) {
698698
assertFalse(volume.getMuted().booleanValue());
699699

700700
message = message.toBuilder().setPayloadUtf8(
701-
FixtureHelper.fixtureAsString("/timetick.json").replaceFirst("\"type\"", "\"responseType\"")
701+
FixtureHelper.fixtureAsString("/mediaStatuses2.json").replaceFirst("\"type\"", "\"responseType\"")
702702
).build();
703703
handler.processStringMessage((ImmutableStringCastMessage) ImmutableCastMessage.create(message), message.getPayloadUtf8());
704704
assertEquals(11, events.size());
705705
event = events.get(10);
706+
assertEquals(CastEventType.MEDIA_STATUS, event.getEventType());
707+
response = (MediaStatusResponse) event.getData();
708+
assertEquals(CastEventType.MEDIA_STATUS, response.getEventType());
709+
assertEquals(4L, response.getRequestId());
710+
assertEquals(1, response.getStatuses().size());
711+
mediaStatus = response.getStatuses().get(0);
712+
assertNotNull(mediaStatus);
713+
assertTrue(mediaStatus.getActiveTrackIds().isEmpty());
714+
assertEquals(1, mediaStatus.getCurrentItemId().intValue());
715+
assertEquals(207.909, mediaStatus.getCurrentTime(), 0.0);
716+
assertTrue(mediaStatus.getCustomData().isEmpty());
717+
assertNull(mediaStatus.getExtendedStatus());
718+
assertNull(mediaStatus.getIdleReason());
719+
items = mediaStatus.getItems();
720+
assertEquals(1, items.size());
721+
QueueItem item = items.get(0);
722+
assertTrue(item.getActiveTrackIds().isEmpty());
723+
assertNull(item.getAutoplay());
724+
assertTrue(item.getCustomData().isEmpty());
725+
assertEquals(Integer.valueOf(1), item.getItemId());
726+
media = item.getMedia();
727+
assertNotNull(media);
728+
assertEquals("", media.getContentId());
729+
assertNull(media.getContentType());
730+
assertNull(media.getContentUrl());
731+
assertTrue(media.getCustomData().isEmpty());
732+
assertEquals(0.0, media.getDuration(), 0.0);
733+
assertNull(media.getEntity());
734+
assertNull(media.getHlsSegmentFormat());
735+
assertNull(media.getHlsVideoSegmentFormat());
736+
assertTrue(media.getImages().isEmpty());
737+
assertNull(media.getMediaCategory());
738+
metadata = media.getMetadata();
739+
assertNotNull(metadata);
740+
assertEquals(2, metadata.size());
741+
assertEquals(0, metadata.get("metadataType"));
742+
assertEquals("De nieuwe generaties van Suriname", metadata.get("title"));
743+
assertEquals(MetadataType.GENERIC, media.getMetadataType());
744+
assertNull(media.getStartAbsoluteTime());
745+
assertEquals(StreamType.BUFFERED, media.getStreamType());
746+
assertNull(media.getTextTrackStyle());
747+
assertTrue(media.getTracks().isEmpty());
748+
assertEquals("", media.getUrl());
749+
assertNull(item.getOrderId());
750+
assertNull(item.getPreloadTime());
751+
assertNull(item.getStartTime());
752+
assertNull(mediaStatus.getLiveSeekableRange());
753+
assertNull(mediaStatus.getLoadingItemId());
754+
media = mediaStatus.getMedia();
755+
assertNotNull(media);
756+
assertEquals("", media.getContentId());
757+
assertNull(media.getContentType());
758+
assertNull(media.getContentUrl());
759+
assertTrue(media.getCustomData().isEmpty());
760+
assertEquals(0.0, media.getDuration(), 0.0);
761+
assertNull(media.getEntity());
762+
assertNull(media.getHlsSegmentFormat());
763+
assertNull(media.getHlsVideoSegmentFormat());
764+
assertTrue(media.getImages().isEmpty());
765+
assertNull(media.getMediaCategory());
766+
metadata = media.getMetadata();
767+
assertNotNull(metadata);
768+
assertEquals(2, metadata.size());
769+
assertEquals(0, metadata.get("metadataType"));
770+
assertEquals("De nieuwe generaties van Suriname", metadata.get("title"));
771+
assertEquals(MetadataType.GENERIC, media.getMetadataType());
772+
assertNull(media.getStartAbsoluteTime());
773+
assertEquals(StreamType.BUFFERED, media.getStreamType());
774+
assertNull(media.getTextTrackStyle());
775+
assertTrue(media.getTracks().isEmpty());
776+
assertEquals("", media.getUrl());
777+
assertEquals(4, mediaStatus.getMediaSessionId());
778+
assertEquals(1.0, mediaStatus.getPlaybackRate(), 0.0);
779+
assertEquals(PlayerState.PLAYING, mediaStatus.getPlayerState());
780+
assertNull(mediaStatus.getPreloadedItemId());
781+
assertNull(mediaStatus.getQueueData());
782+
assertEquals(RepeatMode.REPEAT_OFF, mediaStatus.getRepeatMode());
783+
assertEquals(205, mediaStatus.getSupportedMediaCommands());
784+
assertNull(mediaStatus.getVideoInfo());
785+
assertNull(mediaStatus.getVolume());
786+
787+
message = message.toBuilder().setPayloadUtf8(
788+
FixtureHelper.fixtureAsString("/timetick.json").replaceFirst("\"type\"", "\"responseType\"")
789+
).build();
790+
handler.processStringMessage((ImmutableStringCastMessage) ImmutableCastMessage.create(message), message.getPayloadUtf8());
791+
assertEquals(12, events.size());
792+
event = events.get(11);
706793
assertEquals(CastEventType.CUSTOM_MESSAGE, event.getEventType());
707794
CustomMessageEvent custom = event.getData(CustomMessageEvent.class);
708795
assertEquals("namespace", custom.getNamespace());
@@ -719,8 +806,8 @@ public void onEvent(CastEvent<?> event) {
719806
.setPayloadUtf8(jsonMapper.writeValueAsString(customMessage))
720807
.build();
721808
handler.processStringMessage((ImmutableStringCastMessage) ImmutableCastMessage.create(message), message.getPayloadUtf8());
722-
assertEquals(12, events.size());
723-
event = events.get(11);
809+
assertEquals(13, events.size());
810+
event = events.get(12);
724811
assertEquals(CastEventType.CUSTOM_MESSAGE, event.getEventType());
725812
custom = event.getData(CustomMessageEvent.class);
726813
assertEquals("urn:x-cast:com.example.app", custom.getNamespace());
@@ -732,8 +819,8 @@ public void onEvent(CastEvent<?> event) {
732819
ReceiverStatusResponse receiverStatus = new ReceiverStatusResponse(0L, new ReceiverStatus(deviceVolume, null, false, false));
733820
message = message.toBuilder().setPayloadUtf8(jsonMapper.writeValueAsString(receiverStatus)).build();
734821
handler.processStringMessage((ImmutableStringCastMessage) ImmutableCastMessage.create(message), message.getPayloadUtf8());
735-
assertEquals(13, events.size());
736-
event = events.get(12);
822+
assertEquals(14, events.size());
823+
event = events.get(13);
737824
assertEquals(CastEventType.RECEIVER_STATUS, event.getEventType());
738825
assertEquals(deviceVolume, event.getData(ReceiverStatusResponse.class).getStatus().getVolume());
739826

‎src/test/java/org/digitalmediaserver/cast/FixtureHelper.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@
2020
import java.io.InputStream;
2121
import java.io.InputStreamReader;
2222

23-
final class FixtureHelper {
23+
public final class FixtureHelper {
2424

2525
private FixtureHelper() {
2626
}
2727

28-
static String fixtureAsString(final String res) throws IOException {
28+
public static String fixtureAsString(final String res) throws IOException {
2929
final InputStream is = FixtureHelper.class.getResourceAsStream(res);
3030
try {
3131
final BufferedReader reader = new BufferedReader(new InputStreamReader(is));

src/test/java/org/digitalmediaserver/cast/MediaStatusTest.java renamed to src/test/java/org/digitalmediaserver/cast/message/MediaStatusTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,10 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.digitalmediaserver.cast;
16+
package org.digitalmediaserver.cast.message;
1717

1818
import com.fasterxml.jackson.databind.ObjectMapper;
19+
import org.digitalmediaserver.cast.FixtureHelper;
1920
import org.digitalmediaserver.cast.message.entity.Media;
2021
import org.digitalmediaserver.cast.message.entity.MediaStatus;
2122
import org.digitalmediaserver.cast.message.entity.MediaVolume;

src/test/java/org/digitalmediaserver/cast/MediaTest.java renamed to src/test/java/org/digitalmediaserver/cast/message/MediaTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.digitalmediaserver.cast;
16+
package org.digitalmediaserver.cast.message;
1717

1818
import com.fasterxml.jackson.databind.ObjectMapper;
1919
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;

src/test/java/org/digitalmediaserver/cast/AppAvailabilityResponseTest.java renamed to src/test/java/org/digitalmediaserver/cast/message/response/AppAvailabilityResponseTest.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
package org.digitalmediaserver.cast;
1+
package org.digitalmediaserver.cast.message.response;
22

33
import com.fasterxml.jackson.core.JsonProcessingException;
44
import com.fasterxml.jackson.databind.ObjectMapper;
5-
import org.digitalmediaserver.cast.message.response.AppAvailabilityResponse;
6-
import org.digitalmediaserver.cast.message.response.StandardResponse;
75
import org.digitalmediaserver.cast.util.JacksonHelper;
86
import org.junit.Test;
97

src/test/java/org/digitalmediaserver/cast/InvalidResponseTest.java renamed to src/test/java/org/digitalmediaserver/cast/message/response/InvalidResponseTest.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.digitalmediaserver.cast;
1+
package org.digitalmediaserver.cast.message.response;
22

33
import com.fasterxml.jackson.core.JsonProcessingException;
44
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -7,8 +7,6 @@
77
import static org.junit.Assert.assertEquals;
88
import org.digitalmediaserver.cast.message.enumeration.ErrorReason;
99
import org.digitalmediaserver.cast.message.enumeration.ErrorType;
10-
import org.digitalmediaserver.cast.message.response.ErrorResponse;
11-
import org.digitalmediaserver.cast.message.response.StandardResponse;
1210
import org.digitalmediaserver.cast.util.JacksonHelper;
1311

1412
public class InvalidResponseTest {

src/test/java/org/digitalmediaserver/cast/LaunchErrorResponseTest.java renamed to src/test/java/org/digitalmediaserver/cast/message/response/LaunchErrorResponseTest.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
package org.digitalmediaserver.cast;
1+
package org.digitalmediaserver.cast.message.response;
22

33
import com.fasterxml.jackson.core.JsonProcessingException;
44
import com.fasterxml.jackson.databind.ObjectMapper;
55
import org.junit.Test;
66

77
import static org.junit.Assert.assertEquals;
8-
import org.digitalmediaserver.cast.message.response.LaunchErrorResponse;
9-
import org.digitalmediaserver.cast.message.response.StandardResponse;
108
import org.digitalmediaserver.cast.util.JacksonHelper;
119

1210
public class LaunchErrorResponseTest {

src/test/java/org/digitalmediaserver/cast/MediaStatusResponseTest.java renamed to src/test/java/org/digitalmediaserver/cast/message/response/MediaStatusResponseTest.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.digitalmediaserver.cast;
1+
package org.digitalmediaserver.cast.message.response;
22

33
import com.fasterxml.jackson.core.JsonProcessingException;
44
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -19,8 +19,6 @@
1919
import org.digitalmediaserver.cast.message.enumeration.QueueType;
2020
import org.digitalmediaserver.cast.message.enumeration.RepeatMode;
2121
import org.digitalmediaserver.cast.message.enumeration.StreamType;
22-
import org.digitalmediaserver.cast.message.response.MediaStatusResponse;
23-
import org.digitalmediaserver.cast.message.response.StandardResponse;
2422
import org.digitalmediaserver.cast.util.JacksonHelper;
2523
import org.junit.Test;
2624
import static org.junit.Assert.*;

src/test/java/org/digitalmediaserver/cast/MultizoneStatusTest.java renamed to src/test/java/org/digitalmediaserver/cast/message/response/MultizoneStatusResponseTest.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,10 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.digitalmediaserver.cast;
16+
package org.digitalmediaserver.cast.message.response;
1717

1818
import com.fasterxml.jackson.databind.ObjectMapper;
19-
import org.digitalmediaserver.cast.message.response.MultizoneStatusResponse;
20-
import org.digitalmediaserver.cast.message.response.StandardResponse;
19+
import org.digitalmediaserver.cast.FixtureHelper;
2120
import org.digitalmediaserver.cast.util.JacksonHelper;
2221
import org.junit.Test;
2322

@@ -27,7 +26,7 @@
2726
import static org.junit.Assert.assertFalse;
2827
import static org.junit.Assert.assertNotNull;
2928

30-
public class MultizoneStatusTest {
29+
public class MultizoneStatusResponseTest {
3130

3231
final ObjectMapper jsonMapper = JacksonHelper.createJSONMapper();
3332

src/test/java/org/digitalmediaserver/cast/StatusTest.java renamed to src/test/java/org/digitalmediaserver/cast/message/response/ReceiverStatusResponseTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.digitalmediaserver.cast;
16+
package org.digitalmediaserver.cast.message.response;
1717

1818
import com.fasterxml.jackson.databind.ObjectMapper;
1919
import org.junit.Test;
@@ -23,14 +23,14 @@
2323
import static org.junit.Assert.assertNotNull;
2424
import static org.junit.Assert.assertNull;
2525
import static org.junit.Assert.assertTrue;
26+
import org.digitalmediaserver.cast.FixtureHelper;
2627
import org.digitalmediaserver.cast.message.entity.Application;
2728
import org.digitalmediaserver.cast.message.entity.ReceiverStatus;
2829
import org.digitalmediaserver.cast.message.entity.Volume;
2930
import org.digitalmediaserver.cast.message.enumeration.VolumeControlType;
30-
import org.digitalmediaserver.cast.message.response.ReceiverStatusResponse;
3131
import org.digitalmediaserver.cast.util.JacksonHelper;
3232

33-
public class StatusTest {
33+
public class ReceiverStatusResponseTest {
3434

3535
final ObjectMapper jsonMapper = JacksonHelper.createJSONMapper();
3636

0 commit comments

Comments
 (0)