From 0a7c12afda54b272a40a9183492723d71dde9463 Mon Sep 17 00:00:00 2001
From: Seraphym-Tuhai <stuhai@thingsboard.io>
Date: Fri, 26 May 2023 11:39:22 +0300
Subject: [PATCH] refactoring according to comments

---
 .../msa/ui/base/AbstractDriverBaseTest.java   | 19 ++++++-------------
 .../tests/devicessmoke/DeviceFilterTest.java  |  4 +++-
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/base/AbstractDriverBaseTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/base/AbstractDriverBaseTest.java
index dddd30b8db..ea1e669537 100644
--- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/base/AbstractDriverBaseTest.java
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/base/AbstractDriverBaseTest.java
@@ -158,18 +158,11 @@ abstract public class AbstractDriverBaseTest extends AbstractContainerTest {
                 .findFirst().orElse(null);
     }
 
-    public List<Device> getDevicesByName(String... deviceNames) {
-        List<Device> matchingDevicesByName = new ArrayList<>();
+    public List<Device> getDevicesByName(List<String> deviceNames) {
         List<Device> allDevices = testRestClient.getDevices(pageLink).getData();
-        for (Device device : allDevices) {
-            for (String name : deviceNames) {
-                if (device.getName().equals(name)) {
-                    matchingDevicesByName.add(device);
-                    break;
-                }
-            }
-        }
-        return matchingDevicesByName;
+        return allDevices.stream()
+                .filter(device -> deviceNames.contains(device.getName()))
+                .collect(Collectors.toList());
     }
 
     public List<RuleChain> getRuleChainsByName(String name) {
@@ -303,8 +296,8 @@ abstract public class AbstractDriverBaseTest extends AbstractContainerTest {
         }
     }
 
-    public void deleteDevicesByName(String... deviceName) {
-        List<Device> devices = getDevicesByName(deviceName);
+    public void deleteDevicesByName(List<String> deviceNames) {
+        List<Device> devices = getDevicesByName(deviceNames);
         for (Device device : devices) {
             if (device != null) {
                 testRestClient.deleteDevice(device.getId());
diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/devicessmoke/DeviceFilterTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/devicessmoke/DeviceFilterTest.java
index d646db8776..c0fa238dee 100644
--- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/devicessmoke/DeviceFilterTest.java
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/devicessmoke/DeviceFilterTest.java
@@ -27,6 +27,8 @@ import org.thingsboard.server.common.data.security.DeviceCredentials;
 import org.thingsboard.server.msa.ui.utils.DataProviderCredential;
 import org.thingsboard.server.msa.ui.utils.EntityPrototypes;
 
+import java.util.List;
+
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.thingsboard.server.msa.ui.base.AbstractBasePage.random;
 import static org.thingsboard.server.msa.ui.utils.Const.ENTITY_NAME;
@@ -58,7 +60,7 @@ public class DeviceFilterTest extends AbstractDeviceTest {
 
     @AfterClass
     public void deleteTestEntities() {
-        deleteDevicesByName(deviceWithProfileName, activeDeviceName, activeDeviceWithProfileName);
+        deleteDevicesByName(List.of(deviceWithProfileName, activeDeviceName, activeDeviceWithProfileName));
         deleteDeviceProfileByTitle(deviceProfileTitle);
     }