From 03cf1797516c054317da228d6eec027edc50f25c Mon Sep 17 00:00:00 2001
From: felmer <franz-josef.elmer@id.ethz.ch>
Date: Wed, 23 Sep 2020 10:50:19 +0200
Subject: [PATCH] SSDM-10191: fixing testForMaterialsByModificationDate
---
.../api/v1/GeneralInformationServiceTest.java | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/api/v1/GeneralInformationServiceTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/api/v1/GeneralInformationServiceTest.java
index 652dcb6ad3c..a61ad40a56b 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/api/v1/GeneralInformationServiceTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/api/v1/GeneralInformationServiceTest.java
@@ -2805,10 +2805,7 @@ public class GeneralInformationServiceTest extends SystemTestCase
MatchClauseTimeAttribute.MODIFICATION_DATE, CompareMode.LESS_THAN_OR_EQUAL,
"2009-03-19", "+1"));
- List<Material> materials =
- generalInformationService.searchForMaterials(sessionToken, searchCriteria)
- .stream().filter(m -> m.getMaterialTypeIdentifier().getMaterialTypeCode().equals("SIRNA"))
- .collect(Collectors.toList());
+ List<Material> materials = filter(generalInformationService.searchForMaterials(sessionToken, searchCriteria));
assertEquals(2774, materials.size());
searchCriteria = new SearchCriteria();
@@ -2816,8 +2813,15 @@ public class GeneralInformationServiceTest extends SystemTestCase
MatchClauseTimeAttribute.MODIFICATION_DATE, CompareMode.GREATER_THAN_OR_EQUAL,
"2009-03-19", "+1"));
- materials = generalInformationService.searchForMaterials(sessionToken, searchCriteria);
- assertEquals(2, materials.size());
+ materials = filter(generalInformationService.searchForMaterials(sessionToken, searchCriteria));
+ assertEquals(0, materials.size());
+ }
+
+ private List<Material> filter(List<Material> materials)
+ {
+ return materials
+ .stream().filter(m -> m.getMaterialTypeIdentifier().getMaterialTypeCode().equals("SIRNA"))
+ .collect(Collectors.toList());
}
@Test
--
GitLab