update zdf junit

Author: codingPF

MServer-Config.yaml

@@ -125,7 +125,7 @@ importFilmlistConfigurations :
       format: OLD_JSON_COMPRESSED_XZ
       createDiff: false
       checkImportListUrl: false
-    - active: true
+    - active: false
       path: jdbc
       format: OLD_JSON
       createDiff: false

src/main/java/de/mediathekview/mserver/filmlisten/writer/FilmlistOldFormatWriter.java

@@ -91,7 +91,7 @@ public boolean write(Filmlist filmlist, OutputStream outputStream) throws IOExce
       });
       jsonWriter.endObject();
       jsonWriter.flush();
-      LOG.info("done writting in {} sec reading {} elements resulting in {} elements", ((System.currentTimeMillis()-start)/1000), cnt, filmlist.getFilms().size());
+      LOG.info("done writting in {} sec reading {} elements resulting in {} elements", ((System.currentTimeMillis()-start)/1000), filmlist.getFilms().size(), cnt );
     } catch (IOException e) {
       LOG.error(e);
       return false;

src/test/java/de/mediathekview/mserver/crawler/arte/tasks/ArteVideoInfoTaskTest.java

@@ -34,7 +34,7 @@ public void test() {
   }
 
   private void assertEntry(ArteVideoInfoDto act, Optional<String>[] expected) {
-    assertEquals(act.getId(), expected[0]);
+    assertEquals(act.getId(), expected[0].get());
     assertEquals(act.getKind(), expected[1]);
     assertEquals(act.getTitle(), expected[2]);
     assertEquals(act.getSubtitle(), expected[3]);

src/test/java/de/mediathekview/mserver/crawler/zdf/json/ZdfDayPageDeserializerTest.java

@@ -46,10 +46,6 @@ public static Collection<Object[]> data() {
               new CrawlerUrlDTO(
                   "https://api.zdf.de/content/documents/olympia-im-technikwahn-100.json"),
               new CrawlerUrlDTO("https://api.zdf.de/content/documents/gestrandet-102.json"),
-              new CrawlerUrlDTO(
-                  "https://api.zdf.de/content/documents/im-dialog-vom-23022018-100.json"),
-              new CrawlerUrlDTO(
-                  "https://api.zdf.de/content/documents/augstein--blome-vom-23022018-100.json"),
               new CrawlerUrlDTO(
                   "https://api.zdf.de/content/documents/menschen---das-magazin-vom-24-februar-2018-100.json"),
               new CrawlerUrlDTO("https://api.zdf.de/content/documents/die-orakel-krake-100.json"),
@@ -112,6 +108,7 @@ public void deserializeTest() {
     assertThat(actual, notNullValue());
     assertThat(actual.getNextPageUrl(), equalTo(expectedNextPageUrl));
     assertThat(actual.getEntries().size(), equalTo(expectedEntries.length));
-    assertThat(actual.getEntries(), Matchers.containsInAnyOrder(expectedEntries));
+    actual.getEntries().stream().map(v->new CrawlerUrlDTO(v.getUrl())).toArray(CrawlerUrlDTO[]::new);
+    assertThat(actual.getEntries().stream().map(v->new CrawlerUrlDTO(v.getUrl())).toList(), Matchers.containsInAnyOrder(expectedEntries));
   }
 }

src/test/java/de/mediathekview/mserver/crawler/zdf/tasks/ZdfDayPageTaskTest.java

@@ -22,9 +22,6 @@ public void testWithSinglePage() {
         new CrawlerUrlDTO[] {
           new CrawlerUrlDTO("https://api.zdf.de/content/documents/olympia-im-technikwahn-100.json"),
           new CrawlerUrlDTO("https://api.zdf.de/content/documents/gestrandet-102.json"),
-          new CrawlerUrlDTO("https://api.zdf.de/content/documents/im-dialog-vom-23022018-100.json"),
-          new CrawlerUrlDTO(
-              "https://api.zdf.de/content/documents/augstein--blome-vom-23022018-100.json"),
           new CrawlerUrlDTO(
               "https://api.zdf.de/content/documents/menschen---das-magazin-vom-24-februar-2018-100.json"),
           new CrawlerUrlDTO("https://api.zdf.de/content/documents/die-orakel-krake-100.json"),
@@ -39,7 +36,7 @@ public void testWithSinglePage() {
 
     final Collection<CrawlerUrlDTO> actual = executeTask(requestUrl);
     assertThat(actual, notNullValue());
-    assertThat(actual, Matchers.containsInAnyOrder(expectedEntries));
+    assertThat(actual.stream().map(v -> new CrawlerUrlDTO(v.getUrl())).toList(), Matchers.containsInAnyOrder(expectedEntries));
   }
 
   @Test
@@ -58,7 +55,7 @@ public void testWithMultiplePages() {
     final Collection<CrawlerUrlDTO> actual = executeTask(requestUrl);
 
     assertThat(actual, notNullValue());
-    assertThat(actual.size(), equalTo(35));
+    assertThat(actual.size(), equalTo(33));
   }
 
   @Test