From 052c8378435dae893714923c71a9075f74f0b529 Mon Sep 17 00:00:00 2001 From: "miriam.baglioni" Date: Thu, 20 May 2021 15:54:44 +0200 Subject: [PATCH] - --- .../dhp/actionmanager/project/utils/EXCELParser.java | 2 +- .../dhp/actionmanager/project/EXCELParserTest.java | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/actionmanager/project/utils/EXCELParser.java b/dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/actionmanager/project/utils/EXCELParser.java index cc18c6f54c..1a6ebb9e86 100644 --- a/dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/actionmanager/project/utils/EXCELParser.java +++ b/dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/actionmanager/project/utils/EXCELParser.java @@ -32,7 +32,7 @@ public class EXCELParser { XSSFSheet sheet = wb.getSheet(sheetName); - if(sheetName == null){ + if (sheetName == null) { throw new RuntimeException("Sheet name " + sheetName + " not present in current file"); } diff --git a/dhp-workflows/dhp-aggregation/src/test/java/eu/dnetlib/dhp/actionmanager/project/EXCELParserTest.java b/dhp-workflows/dhp-aggregation/src/test/java/eu/dnetlib/dhp/actionmanager/project/EXCELParserTest.java index 59b536cd54..e48dcd0613 100644 --- a/dhp-workflows/dhp-aggregation/src/test/java/eu/dnetlib/dhp/actionmanager/project/EXCELParserTest.java +++ b/dhp-workflows/dhp-aggregation/src/test/java/eu/dnetlib/dhp/actionmanager/project/EXCELParserTest.java @@ -21,7 +21,7 @@ public class EXCELParserTest { private static Path workingDir; private HttpConnector httpConnector = new HttpConnector(); - private static final String URL = "http://cordis.europa.eu/data/reference/cordisref-H2020topics.xlsx"; + private static final String URL = "https://cordis.europa.eu/data/reference/cordisref-h2020topics.xlsx"; @BeforeAll public static void beforeAll() throws IOException { @@ -36,9 +36,11 @@ public class EXCELParserTest { EXCELParser excelParser = new EXCELParser(); List pl = excelParser - .parse(httpConnector.getInputSourceAsStream(URL), "eu.dnetlib.dhp.actionmanager.project.utils.ExcelTopic"); + .parse( + httpConnector.getInputSourceAsStream(URL), "eu.dnetlib.dhp.actionmanager.project.utils.EXCELTopic", + "Topics"); - Assertions.assertEquals(3837, pl.size()); + Assertions.assertEquals(3878, pl.size()); } }