From 48b135190e352e7993cc43b26bd874683d8eadd2 Mon Sep 17 00:00:00 2001 From: Alessia Bardi Date: Fri, 15 Apr 2022 14:42:59 +0200 Subject: [PATCH] Added some printlns while testing --- .../ariadneplus/thanados/ThanadosIterator.java | 2 +- .../thanados/ThanadosIteratorTest.java | 15 ++++++++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dnet-ariadneplus/src/main/java/eu/dnetlib/data/collector/plugins/ariadneplus/thanados/ThanadosIterator.java b/dnet-ariadneplus/src/main/java/eu/dnetlib/data/collector/plugins/ariadneplus/thanados/ThanadosIterator.java index 72ffa9a..75783d6 100644 --- a/dnet-ariadneplus/src/main/java/eu/dnetlib/data/collector/plugins/ariadneplus/thanados/ThanadosIterator.java +++ b/dnet-ariadneplus/src/main/java/eu/dnetlib/data/collector/plugins/ariadneplus/thanados/ThanadosIterator.java @@ -24,7 +24,6 @@ public class ThanadosIterator extends ThreadSafeIterator { private final CloseableHttpClient client = HttpClients.createDefault(); private String baseUrl; - private String currentLine; private List identifiers; private int counter = 0; private String urlFormat = "%s/%s?format=xml"; @@ -50,6 +49,7 @@ public class ThanadosIterator extends ThreadSafeIterator { if (counter <= this.identifiers.size()) { String toDownload = String.format(urlFormat, baseUrl, identifiers.get(counter)); log.debug("Downloading "+toDownload); + System.out.println("Downloading "+toDownload); return download(toDownload); } else { throw new CollectorServiceRuntimeException("Iterator has reached the end"); diff --git a/dnet-ariadneplus/src/test/java/eu/dnetlib/data/collector/plugins/ariadneplus/thanados/ThanadosIteratorTest.java b/dnet-ariadneplus/src/test/java/eu/dnetlib/data/collector/plugins/ariadneplus/thanados/ThanadosIteratorTest.java index 06acc26..440b643 100644 --- a/dnet-ariadneplus/src/test/java/eu/dnetlib/data/collector/plugins/ariadneplus/thanados/ThanadosIteratorTest.java +++ b/dnet-ariadneplus/src/test/java/eu/dnetlib/data/collector/plugins/ariadneplus/thanados/ThanadosIteratorTest.java @@ -1,8 +1,14 @@ package eu.dnetlib.data.collector.plugins.ariadneplus.thanados; +import org.apache.commons.io.FileUtils; +import org.apache.commons.io.IOUtils; import org.junit.Ignore; import org.junit.Test; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; + @Ignore public class ThanadosIteratorTest { @@ -12,20 +18,19 @@ public class ThanadosIteratorTest { @Test public void testDownloadList(){ it = new ThanadosIterator("", sitelist); - int count = 0; it.getIdentifiers().stream().forEach(id -> System.out.println(id)); - System.out.println(it.getIdentifiers().size()); } @Test - public void testDownload(){ + public void testDownload() throws IOException { int count = 0; - it = new ThanadosIterator("https://thanados.openatlas.eu/api/0.3/subunits/", sitelist); + it = new ThanadosIterator("https://thanados.openatlas.eu/api/0.3/subunits", sitelist); while(it.hasNext()){ it.next(); count++; + System.out.println(count); } - System.out.println(count); + System.out.println("DONE"); } }