Browse Source

refactoring

pull/8394/head
Seraphym-Tuhai 4 years ago
parent
commit
301b792599
  1. 15
      msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/base/AbstractDriverBaseTest.java

15
msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/base/AbstractDriverBaseTest.java

@ -48,7 +48,6 @@ import java.net.MalformedURLException;
import java.net.URL;
import java.time.Duration;
import java.util.List;
import java.util.Optional;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
@ -138,23 +137,15 @@ abstract public class AbstractDriverBaseTest extends AbstractContainerTest {
}
public static RuleChain getRuleChainByName(String name) {
Optional<RuleChain> ruleChain = testRestClient.getRuleChains(pageLink).getData().stream()
return testRestClient.getRuleChains(pageLink).getData().stream()
.filter(s -> s.getName().equals(name))
.findFirst();
return ruleChain.orElseGet(() -> {
log.error("No rule chains found with name: " + name);
return null;
});
.findFirst().orElse(null);
}
public List<RuleChain> getRuleChainsByName(String name) {
List<RuleChain> ruleChains = testRestClient.getRuleChains(pageLink).getData().stream()
return testRestClient.getRuleChains(pageLink).getData().stream()
.filter(s -> s.getName().equals(name))
.collect(Collectors.toList());
if (ruleChains.isEmpty()) {
log.error("No rule chains found with name: " + name);
}
return ruleChains;
}
public static Customer getCustomerByName(String name) {

Loading…
Cancel
Save