From 0d38a72c022fa93dba0bf052f893e51fb73d3552 Mon Sep 17 00:00:00 2001 From: "andre.schmid" Date: Thu, 8 Sep 2022 18:55:08 +0100 Subject: Support TOSCA functions in Node Capability Filters MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adds support to use TOSCA functions as value in the node capability filters. Removes the current capability filter component to reuse, with a few changes, the node property filters component. Fixes problems with the edition and deletion of node capability filters. Change-Id: Ic91242d6cbc24e2ce0f60b84c63e104575bef8a9 Issue-ID: SDC-4173 Signed-off-by: André Schmid --- .../sdc/frontend/ci/tests/pages/ServiceDependenciesEditor.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'integration-tests/src') diff --git a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/pages/ServiceDependenciesEditor.java b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/pages/ServiceDependenciesEditor.java index f5f58582ec..b0f0814b8c 100644 --- a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/pages/ServiceDependenciesEditor.java +++ b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/pages/ServiceDependenciesEditor.java @@ -25,6 +25,7 @@ import com.fasterxml.jackson.databind.json.JsonMapper; import java.util.List; import java.util.Map; import java.util.Map.Entry; +import java.util.Objects; import java.util.stream.Collectors; import lombok.AllArgsConstructor; import lombok.Getter; @@ -53,8 +54,11 @@ public class ServiceDependenciesEditor extends AbstractPageObject { */ public List getPropertySelectOptions() { return new Select(webDriver.findElement(By.xpath(XpathSelector.SERVICE_PROPERTY_NAME.xPath))) - .getOptions().stream() - .map(option -> option.getAttribute("innerText")).collect(Collectors.toList()); + .getOptions().stream() + .map(option -> option.getAttribute("innerText")) + .filter(Objects::nonNull) + .filter(option -> !option.startsWith("Select")) + .collect(Collectors.toList()); } public void addProperty(final ServiceDependencyProperty property) { -- cgit 1.2.3-korg