From d42f0661a09fa1fd48431e524b7af1c3a2866838 Mon Sep 17 00:00:00 2001 From: Sergey Matvienko Date: Wed, 7 Dec 2022 18:38:54 +0100 Subject: [PATCH] small refactoring --- .../server/msa/ui/base/AbstractDriverBaseTest.java | 3 +-- .../thingsboard/server/msa/ui/listeners/TestListener.java | 7 +++---- 2 files changed, 4 insertions(+), 6 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 0405daa33c..42c83235c1 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 @@ -16,7 +16,6 @@ package org.thingsboard.server.msa.ui.base; import com.google.common.io.Files; -import io.github.bonigarcia.wdm.WebDriverManager; import io.qameta.allure.Attachment; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; @@ -97,7 +96,7 @@ abstract public class AbstractDriverBaseTest extends AbstractContainerTest { return driver; } - public boolean getHeadless() { + public boolean isHeadless() { return HEADLESS; } diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/listeners/TestListener.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/listeners/TestListener.java index 60da6d32e6..c5be186eb4 100644 --- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/listeners/TestListener.java +++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/listeners/TestListener.java @@ -16,7 +16,6 @@ package org.thingsboard.server.msa.ui.listeners; -import io.qameta.allure.Allure; import lombok.extern.slf4j.Slf4j; import org.openqa.selenium.WebDriver; import org.testng.ITestContext; @@ -32,7 +31,7 @@ public class TestListener implements ITestListener { public void onTestSuccess(ITestResult tr) { String str = "Test " + tr.getMethod().getMethodName() + " success"; log.info("*----------------------* " + str + " *----------------------*"); - if (!((AbstractDriverBaseTest) tr.getInstance()).getHeadless()) { + if (!((AbstractDriverBaseTest) tr.getInstance()).isHeadless()) { WebDriver driver = ((AbstractDriverBaseTest) tr.getInstance()).getDriver(); captureScreen(driver, "success"); } @@ -43,7 +42,7 @@ public class TestListener implements ITestListener { String str1 = "Failed because of - " + tr.getThrowable(); log.info("*----------------------* " + str + " *----------------------*"); log.info("*----------------------* " + str1 + " *----------------------*"); - if (!((AbstractDriverBaseTest) tr.getInstance()).getHeadless()) { + if (!((AbstractDriverBaseTest) tr.getInstance()).isHeadless()) { WebDriver driver = ((AbstractDriverBaseTest) tr.getInstance()).getDriver(); captureScreen(driver, "failure"); } @@ -54,7 +53,7 @@ public class TestListener implements ITestListener { String str1 = "Skipped because of - " + tr.getThrowable(); log.info("*----------------------* " + str + " *----------------------*"); log.info("*----------------------* " + str1 + " *----------------------*"); - if (!((AbstractDriverBaseTest) tr.getInstance()).getHeadless()) { + if (!((AbstractDriverBaseTest) tr.getInstance()).isHeadless()) { WebDriver driver = ((AbstractDriverBaseTest) tr.getInstance()).getDriver(); captureScreen(driver, "skipped"); }