fixed for Java 8

This commit is contained in:
anhefti 2020-03-03 15:59:04 +01:00
parent 697eff4055
commit 3e3887a90c

View file

@ -1437,19 +1437,11 @@ public class UseCasesIntegrationTest extends GuiIntegrationTest {
.stream() .stream()
.filter(attr -> "URLFilterEnable".equals(attr.name)) .filter(attr -> "URLFilterEnable".equals(attr.name))
.findFirst() .findFirst()
.or(() -> {
fail("Expected one attribute");
return null;
})
.ifPresent( .ifPresent(
attr -> { attr -> {
values.stream() values.stream()
.filter(cv -> cv.attributeId.equals(attr.id)) .filter(cv -> cv.attributeId.equals(attr.id))
.findFirst() .findFirst()
.or(() -> {
fail("Expected one attribute");
return null;
})
.ifPresent( .ifPresent(
val -> assertEquals(Constants.TRUE_STRING, val.value)); val -> assertEquals(Constants.TRUE_STRING, val.value));
}); });
@ -1458,30 +1450,18 @@ public class UseCasesIntegrationTest extends GuiIntegrationTest {
.stream() .stream()
.filter(attr -> "URLFilterRules".equals(attr.name)) .filter(attr -> "URLFilterRules".equals(attr.name))
.findFirst() .findFirst()
.or(() -> {
fail("Expected one attribute");
return null;
})
.ifPresent( .ifPresent(
parent -> { parent -> {
attributes.stream() attributes.stream()
.filter(attr -> parent.id.equals(attr.parentId) .filter(attr -> parent.id.equals(attr.parentId)
&& "URLFilterRules.expression".equals(attr.name)) && "URLFilterRules.expression".equals(attr.name))
.findFirst() .findFirst()
.or(() -> {
fail("Expected one attribute");
return null;
})
.ifPresent( .ifPresent(
tAttr -> { tAttr -> {
values.stream() values.stream()
.filter(tVal -> tVal.attributeId.equals(tAttr.id) .filter(tVal -> tVal.attributeId.equals(tAttr.id)
&& tVal.listIndex == 0) && tVal.listIndex == 0)
.findFirst() .findFirst()
.or(() -> {
fail("Expected one value");
return null;
})
.ifPresent( .ifPresent(
firstTVal -> assertEquals("jrtjrtzj", firstTVal.value)); firstTVal -> assertEquals("jrtjrtzj", firstTVal.value));
}); });