bug5867: removed course areas from LeaderboardBase again; Event still has getLeaderboards()

This commit is contained in:
Axel Uhl
2023-07-28 16:40:15 +02:00
parent 89fb5f184c
commit 365415b635
8 changed files with 18 additions and 46 deletions
@@ -357,14 +357,14 @@ public class SearchServiceTest {
LeaderboardSearchResultJsonSerializer serializer = new LeaderboardSearchResultJsonSerializer(
new EventBaseJsonSerializer(new VenueJsonSerializer(courseAreaSerializer),
leaderboardGroupBaseJsonSerializer, new TrackingConnectorInfoJsonSerializer()),
leaderboardGroupBaseJsonSerializer, courseAreaSerializer);
leaderboardGroupBaseJsonSerializer);
LeaderboardGroupBaseJsonDeserializer leaderboardGroupBaseJsonDeserializer = new LeaderboardGroupBaseJsonDeserializer();
final CourseAreaJsonDeserializer courseAreaJsonDeserializer = new CourseAreaJsonDeserializer(DomainFactory.INSTANCE);
LeaderboardSearchResultBaseJsonDeserializer deserializer = new LeaderboardSearchResultBaseJsonDeserializer(
new EventBaseJsonDeserializer(
new VenueJsonDeserializer(courseAreaJsonDeserializer),
leaderboardGroupBaseJsonDeserializer, new TrackingConnectorInfoJsonDeserializer()),
leaderboardGroupBaseJsonDeserializer, courseAreaJsonDeserializer);
leaderboardGroupBaseJsonDeserializer);
final LeaderboardSearchResult expected = searchResults.getHits().iterator().next();
LeaderboardSearchResultBase deserialized = deserializer.deserialize(serializer.serialize(expected));
assertEquals("Pfingstbusch (470)", deserialized.getRegattaName());
@@ -373,7 +373,6 @@ public class SearchServiceTest {
assertEquals(expected.getEvents().iterator().next().getStartDate(), deserialized.getEvents().iterator().next().getStartDate());
assertEquals(expected.getEvents().iterator().next().getEndDate(), deserialized.getEvents().iterator().next().getEndDate());
assertEquals(expected.getEvents().iterator().next().getVenue().getName(), deserialized.getEvents().iterator().next().getVenue().getName());
assertEquals(Util.asNewSet(expected.getLeaderboard().getCourseAreas()), Util.asNewSet(deserialized.getLeaderboard().getCourseAreas()));
Iterator<LeaderboardGroup> expectedLGs = expected.getLeaderboardGroups().iterator();
Iterator<? extends LeaderboardGroupBase> deserializedLGs = deserialized.getLeaderboardGroups().iterator();
while (expectedLGs.hasNext()) {