diff --git a/dump/src/test/java/eu/dnetlib/dhp/oa/graph/dump/DumpJobTest.java b/dump/src/test/java/eu/dnetlib/dhp/oa/graph/dump/DumpJobTest.java index a35f109..98c6a52 100644 --- a/dump/src/test/java/eu/dnetlib/dhp/oa/graph/dump/DumpJobTest.java +++ b/dump/src/test/java/eu/dnetlib/dhp/oa/graph/dump/DumpJobTest.java @@ -946,7 +946,6 @@ public class DumpJobTest { } - @Test public void testEOSCDumpZenodoReview() throws Exception { @@ -954,66 +953,70 @@ public class DumpJobTest { DumpProducts dump = new DumpProducts(); dump - .run( - false, getClass() - .getResource("/eu/dnetlib/dhp/oa/graph/dump/eosc/input/review202211/zenodo7353841") - .getPath(), workingDir.toString() + "/orp", getClass() - .getResource("/eu/dnetlib/dhp/oa/graph/dump/communityMapPath/communitymap.json") - .getPath(), OtherResearchProduct.class, - EoscResult.class, Constants.DUMPTYPE.EOSC.getType()); + .run( + false, getClass() + .getResource("/eu/dnetlib/dhp/oa/graph/dump/eosc/input/review202211/zenodo7353841") + .getPath(), + workingDir.toString() + "/orp", getClass() + .getResource("/eu/dnetlib/dhp/oa/graph/dump/communityMapPath/communitymap.json") + .getPath(), + OtherResearchProduct.class, + EoscResult.class, Constants.DUMPTYPE.EOSC.getType()); JavaRDD tmp = sc - .textFile(workingDir.toString() + "/orp") - .map(item -> OBJECT_MAPPER.readValue(item, EoscResult.class)); + .textFile(workingDir.toString() + "/orp") + .map(item -> OBJECT_MAPPER.readValue(item, EoscResult.class)); System.out.println(OBJECT_MAPPER.writeValueAsString(tmp.first())); dump - .run( - false, getClass() - .getResource("/eu/dnetlib/dhp/oa/graph/dump/eosc/input/review202211/zenodo7351393") - .getPath(), workingDir.toString() + "/soft", getClass() - .getResource("/eu/dnetlib/dhp/oa/graph/dump/communityMapPath/communitymap.json") - .getPath(), Software.class, - EoscResult.class, Constants.DUMPTYPE.EOSC.getType()); - + .run( + false, getClass() + .getResource("/eu/dnetlib/dhp/oa/graph/dump/eosc/input/review202211/zenodo7351393") + .getPath(), + workingDir.toString() + "/soft", getClass() + .getResource("/eu/dnetlib/dhp/oa/graph/dump/communityMapPath/communitymap.json") + .getPath(), + Software.class, + EoscResult.class, Constants.DUMPTYPE.EOSC.getType()); JavaRDD tmp2 = sc - .textFile(workingDir.toString() + "/soft") - .map(item -> OBJECT_MAPPER.readValue(item, EoscResult.class)); + .textFile(workingDir.toString() + "/soft") + .map(item -> OBJECT_MAPPER.readValue(item, EoscResult.class)); System.out.println(OBJECT_MAPPER.writeValueAsString(tmp2.first())); dump - .run( - false, getClass() - .getResource("/eu/dnetlib/dhp/oa/graph/dump/eosc/input/review202211/zenodo7351221") - .getPath(), workingDir.toString() + "/soft2", getClass() - .getResource("/eu/dnetlib/dhp/oa/graph/dump/communityMapPath/communitymap.json") - .getPath(), Software.class, - EoscResult.class, Constants.DUMPTYPE.EOSC.getType()); - + .run( + false, getClass() + .getResource("/eu/dnetlib/dhp/oa/graph/dump/eosc/input/review202211/zenodo7351221") + .getPath(), + workingDir.toString() + "/soft2", getClass() + .getResource("/eu/dnetlib/dhp/oa/graph/dump/communityMapPath/communitymap.json") + .getPath(), + Software.class, + EoscResult.class, Constants.DUMPTYPE.EOSC.getType()); JavaRDD tmp3 = sc - .textFile(workingDir.toString() + "/soft2") - .map(item -> OBJECT_MAPPER.readValue(item, EoscResult.class)); + .textFile(workingDir.toString() + "/soft2") + .map(item -> OBJECT_MAPPER.readValue(item, EoscResult.class)); System.out.println(OBJECT_MAPPER.writeValueAsString(tmp3.first())); - dump - .run( - false, getClass() - .getResource("/eu/dnetlib/dhp/oa/graph/dump/eosc/input/review202211/rohub") - .getPath(), workingDir.toString() + "/orp2", getClass() - .getResource("/eu/dnetlib/dhp/oa/graph/dump/communityMapPath/communitymap.json") - .getPath(), OtherResearchProduct.class, - EoscResult.class, Constants.DUMPTYPE.EOSC.getType()); - + .run( + false, getClass() + .getResource("/eu/dnetlib/dhp/oa/graph/dump/eosc/input/review202211/rohub") + .getPath(), + workingDir.toString() + "/orp2", getClass() + .getResource("/eu/dnetlib/dhp/oa/graph/dump/communityMapPath/communitymap.json") + .getPath(), + OtherResearchProduct.class, + EoscResult.class, Constants.DUMPTYPE.EOSC.getType()); JavaRDD tmp4 = sc - .textFile(workingDir.toString() + "/orp2") - .map(item -> OBJECT_MAPPER.readValue(item, EoscResult.class)); + .textFile(workingDir.toString() + "/orp2") + .map(item -> OBJECT_MAPPER.readValue(item, EoscResult.class)); System.out.println(OBJECT_MAPPER.writeValueAsString(tmp4.first()));