Browse Source

refactoring according to comments

pull/8619/head
Seraphym-Tuhai 3 years ago
parent
commit
0a7c12afda
  1. 19
      msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/base/AbstractDriverBaseTest.java
  2. 4
      msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/devicessmoke/DeviceFilterTest.java

19
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); .findFirst().orElse(null);
} }
public List<Device> getDevicesByName(String... deviceNames) { public List<Device> getDevicesByName(List<String> deviceNames) {
List<Device> matchingDevicesByName = new ArrayList<>();
List<Device> allDevices = testRestClient.getDevices(pageLink).getData(); List<Device> allDevices = testRestClient.getDevices(pageLink).getData();
for (Device device : allDevices) { return allDevices.stream()
for (String name : deviceNames) { .filter(device -> deviceNames.contains(device.getName()))
if (device.getName().equals(name)) { .collect(Collectors.toList());
matchingDevicesByName.add(device);
break;
}
}
}
return matchingDevicesByName;
} }
public List<RuleChain> getRuleChainsByName(String name) { public List<RuleChain> getRuleChainsByName(String name) {
@ -303,8 +296,8 @@ abstract public class AbstractDriverBaseTest extends AbstractContainerTest {
} }
} }
public void deleteDevicesByName(String... deviceName) { public void deleteDevicesByName(List<String> deviceNames) {
List<Device> devices = getDevicesByName(deviceName); List<Device> devices = getDevicesByName(deviceNames);
for (Device device : devices) { for (Device device : devices) {
if (device != null) { if (device != null) {
testRestClient.deleteDevice(device.getId()); testRestClient.deleteDevice(device.getId());

4
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.DataProviderCredential;
import org.thingsboard.server.msa.ui.utils.EntityPrototypes; import org.thingsboard.server.msa.ui.utils.EntityPrototypes;
import java.util.List;
import static org.assertj.core.api.Assertions.assertThat; 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.base.AbstractBasePage.random;
import static org.thingsboard.server.msa.ui.utils.Const.ENTITY_NAME; import static org.thingsboard.server.msa.ui.utils.Const.ENTITY_NAME;
@ -58,7 +60,7 @@ public class DeviceFilterTest extends AbstractDeviceTest {
@AfterClass @AfterClass
public void deleteTestEntities() { public void deleteTestEntities() {
deleteDevicesByName(deviceWithProfileName, activeDeviceName, activeDeviceWithProfileName); deleteDevicesByName(List.of(deviceWithProfileName, activeDeviceName, activeDeviceWithProfileName));
deleteDeviceProfileByTitle(deviceProfileTitle); deleteDeviceProfileByTitle(deviceProfileTitle);
} }

Loading…
Cancel
Save