refactoring

This commit is contained in:
Miriam Baglioni 2023-01-25 11:52:51 +01:00
parent 4dcd03b78e
commit f738db860a
2 changed files with 2 additions and 4 deletions

View File

@ -88,10 +88,9 @@ public class SparkDumpFunderResults implements Serializable {
} else {
String fName = p.getId().substring(3, p.getId().indexOf("_")).toUpperCase();
if (fName.equalsIgnoreCase("ec")) {
if(p.getId().contains("he")){
if (p.getId().contains("he")) {
fName += "_HE";
}
else if (p.getId().contains("h2020")) {
} else if (p.getId().contains("h2020")) {
fName += "_H2020";
} else {
fName += "_FP7";

View File

@ -514,7 +514,6 @@ public class DumpSubsetTest {
Assertions.assertEquals(102, tmp.count());
Assertions.assertEquals(51, tmp.filter(r -> r.getSource().getId().startsWith("50|")).count());
Assertions.assertEquals(39, tmp.filter(r -> r.getSource().getId().startsWith("10|")).count());
Assertions.assertEquals(12, tmp.filter(r -> r.getSource().getId().startsWith("00|")).count());