bug 2825: media track import exception handling per track; wait for and count tracks; refresh panel

Change-Id: Ic7172a4279bc2793ae540ee7ff1de99becbb25bb
This commit is contained in:
Axel Uhl committed 2017-03-24 17:52:07 +01:00
1 parent 3e14d8ef1e
commit fcecb68660
22 files changed
+108 -80

No files matched your search

@@ -68,7 +68,7 @@ public class MasterDataImporterMediaTest {
@Test
public void testEmptyImportList_NoOverride() throws Exception {
createRacingEventService();
racingEventService.mediaTracksImported(mediaTracksToImport, NO_OVERRIDE);
racingEventService.mediaTracksImported(mediaTracksToImport, creationCount, NO_OVERRIDE);
verify(racingEventService, never()).mediaTrackAdded(any(MediaTrack.class));
verify(racingEventService, never()).mediaTrackDeleted(any(MediaTrack.class));
@@ -81,7 +81,7 @@ public class MasterDataImporterMediaTest {
@Test
public void testEmptyImportList_WithOverride() throws Exception {
createRacingEventService();
racingEventService.mediaTracksImported(mediaTracksToImport, OVERRIDE);
racingEventService.mediaTracksImported(mediaTracksToImport, creationCount, OVERRIDE);
verify(racingEventService, never()).mediaTrackAdded(any(MediaTrack.class));
verify(racingEventService, never()).mediaTrackDeleted(any(MediaTrack.class));
@@ -101,7 +101,7 @@ public class MasterDataImporterMediaTest {
MediaTrack mediaTrackToImport = new MediaTrack(dbId, "title", "url", MillisecondsTimePoint.now(),
MillisecondsDurationImpl.ONE_HOUR, MimeType.mp3, assignedRaces);
mediaTracksToImport.add(mediaTrackToImport);
racingEventService.mediaTracksImported(mediaTracksToImport, OVERRIDE);
racingEventService.mediaTracksImported(mediaTracksToImport, creationCount, OVERRIDE);
Iterable<MediaTrack> allMediaTracks = racingEventService.getAllMediaTracks();
assertThat(Util.size(allMediaTracks), is(1));
@@ -132,7 +132,7 @@ public class MasterDataImporterMediaTest {
MediaTrack mediaTrackToImport = new MediaTrack(existingMediaTrack.dbId, existingMediaTrack.title,
existingMediaTrack.url, existingMediaTrack.startTime, existingMediaTrack.duration, mimeType, existingMediaTrack.assignedRaces);
mediaTracksToImport.add(mediaTrackToImport);
racingEventService.mediaTracksImported(mediaTracksToImport, OVERRIDE);
racingEventService.mediaTracksImported(mediaTracksToImport, creationCount, OVERRIDE);
Iterable<MediaTrack> allMediaTracksAfterImport = racingEventService.getAllMediaTracks();
assertThat(allMediaTracksAfterImport, is(allMediaTracksBeforeImport));
@@ -160,7 +160,7 @@ public class MasterDataImporterMediaTest {
MediaTrack mediaTrackToImport = new MediaTrack(dbId2, existingMediaTrack.title, existingMediaTrack.url,
existingMediaTrack.startTime, existingMediaTrack.duration, mimeType, existingMediaTrack.assignedRaces);
mediaTracksToImport.add(mediaTrackToImport);
racingEventService.mediaTracksImported(mediaTracksToImport, OVERRIDE);
racingEventService.mediaTracksImported(mediaTracksToImport, creationCount, OVERRIDE);
Iterable<MediaTrack> allMediaTracksAfterImport = racingEventService.getAllMediaTracks();
assertThat(Util.size(allMediaTracksAfterImport), is(2));
@@ -189,7 +189,7 @@ public class MasterDataImporterMediaTest {
assertThat(existingMediaTrack.title, is(not(mediaTrackToImport.title)));
mediaTracksToImport.add(mediaTrackToImport);
racingEventService.mediaTracksImported(mediaTracksToImport, OVERRIDE);
racingEventService.mediaTracksImported(mediaTracksToImport, creationCount, OVERRIDE);
Iterable<MediaTrack> allMediaTracksAfterImport = racingEventService.getAllMediaTracks();
assertThat(Util.size(allMediaTracksAfterImport), is(1));
@@ -220,7 +220,7 @@ public class MasterDataImporterMediaTest {
assertThat(existingMediaTrack.title, is(not(mediaTrackToImport.title)));
mediaTracksToImport.add(mediaTrackToImport);
racingEventService.mediaTracksImported(mediaTracksToImport, OVERRIDE);
racingEventService.mediaTracksImported(mediaTracksToImport, creationCount, OVERRIDE);
Iterable<MediaTrack> allMediaTracksAfterImport = racingEventService.getAllMediaTracks();
assertThat(Util.size(allMediaTracksAfterImport), is(1));
@@ -251,7 +251,7 @@ public class MasterDataImporterMediaTest {
assertThat(existingMediaTrack.title, is(not(mediaTrackToImport.title)));
mediaTracksToImport.add(mediaTrackToImport);
racingEventService.mediaTracksImported(mediaTracksToImport, NO_OVERRIDE);
racingEventService.mediaTracksImported(mediaTracksToImport, creationCount, NO_OVERRIDE);
Iterable<MediaTrack> allMediaTracksAfterImport = racingEventService.getAllMediaTracks();
assertThat(Util.size(allMediaTracksAfterImport), is(1));
@@ -282,7 +282,7 @@ public class MasterDataImporterMediaTest {
assertThat(existingMediaTrack.url, is(not(mediaTrackToImport.url)));
mediaTracksToImport.add(mediaTrackToImport);
racingEventService.mediaTracksImported(mediaTracksToImport, OVERRIDE);
racingEventService.mediaTracksImported(mediaTracksToImport, creationCount, OVERRIDE);
Iterable<MediaTrack> allMediaTracksAfterImport = racingEventService.getAllMediaTracks();
assertThat(Util.size(allMediaTracksAfterImport), is(1));
@@ -313,7 +313,7 @@ public class MasterDataImporterMediaTest {
assertThat(existingMediaTrack.startTime, is(not(mediaTrackToImport.startTime)));
mediaTracksToImport.add(mediaTrackToImport);
racingEventService.mediaTracksImported(mediaTracksToImport, OVERRIDE);
racingEventService.mediaTracksImported(mediaTracksToImport, creationCount, OVERRIDE);
Iterable<MediaTrack> allMediaTracksAfterImport = racingEventService.getAllMediaTracks();
assertThat(Util.size(allMediaTracksAfterImport), is(1));
@@ -343,7 +343,7 @@ public class MasterDataImporterMediaTest {
assertThat(existingMediaTrack.duration, is(not(mediaTrackToImport.duration)));
mediaTracksToImport.add(mediaTrackToImport);
racingEventService.mediaTracksImported(mediaTracksToImport, OVERRIDE);
racingEventService.mediaTracksImported(mediaTracksToImport, creationCount, OVERRIDE);
Iterable<MediaTrack> allMediaTracksAfterImport = racingEventService.getAllMediaTracks();
assertThat(Util.size(allMediaTracksAfterImport), is(1));
@@ -376,7 +376,7 @@ public class MasterDataImporterMediaTest {
assertThat(mediaTrackToImport.assignedRaces.size(), is(2));
mediaTracksToImport.add(mediaTrackToImport);
racingEventService.mediaTracksImported(mediaTracksToImport, OVERRIDE);
racingEventService.mediaTracksImported(mediaTracksToImport, creationCount, OVERRIDE);
Iterable<MediaTrack> allMediaTracksAfterImport = racingEventService.getAllMediaTracks();
assertThat(Util.size(allMediaTracksAfterImport), is(1));