tsai
/
thingsboard
mirror of https://github.com/thingsboard/thingsboard.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

small refactoring

pull/7746/head
Sergey Matvienko 4 years ago
parent
606f883473
commit
d42f0661a0
2 changed files with 4 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/base/AbstractDriverBaseTest.java
  2. 7
      msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/listeners/TestListener.java

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

@ -16,7 +16,6 @@
package org.thingsboard.server.msa.ui.base; package org.thingsboard.server.msa.ui.base;
import com.google.common.io.Files; import com.google.common.io.Files;
import io.github.bonigarcia.wdm.WebDriverManager;
import io.qameta.allure.Attachment; import io.qameta.allure.Attachment;
import lombok.SneakyThrows; import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@ -97,7 +96,7 @@ abstract public class AbstractDriverBaseTest extends AbstractContainerTest {
return driver; return driver;
} }
public boolean getHeadless() { public boolean isHeadless() {
return HEADLESS; return HEADLESS;
} }

7
msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/listeners/TestListener.java
View File

@ -16,7 +16,6 @@
package org.thingsboard.server.msa.ui.listeners; package org.thingsboard.server.msa.ui.listeners;
import io.qameta.allure.Allure;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebDriver;
import org.testng.ITestContext; import org.testng.ITestContext;
@ -32,7 +31,7 @@ public class TestListener implements ITestListener {
public void onTestSuccess(ITestResult tr) { public void onTestSuccess(ITestResult tr) {
String str = "Test " + tr.getMethod().getMethodName() + " success"; String str = "Test " + tr.getMethod().getMethodName() + " success";
log.info("*----------------------* " + str + " *----------------------*"); log.info("*----------------------* " + str + " *----------------------*");
if (!((AbstractDriverBaseTest) tr.getInstance()).getHeadless()) { if (!((AbstractDriverBaseTest) tr.getInstance()).isHeadless()) {
WebDriver driver = ((AbstractDriverBaseTest) tr.getInstance()).getDriver(); WebDriver driver = ((AbstractDriverBaseTest) tr.getInstance()).getDriver();
captureScreen(driver, "success"); captureScreen(driver, "success");
} }
@ -43,7 +42,7 @@ public class TestListener implements ITestListener {
String str1 = "Failed because of - " + tr.getThrowable(); String str1 = "Failed because of - " + tr.getThrowable();
log.info("*----------------------* " + str + " *----------------------*"); log.info("*----------------------* " + str + " *----------------------*");
log.info("*----------------------* " + str1 + " *----------------------*"); log.info("*----------------------* " + str1 + " *----------------------*");
if (!((AbstractDriverBaseTest) tr.getInstance()).getHeadless()) { if (!((AbstractDriverBaseTest) tr.getInstance()).isHeadless()) {
WebDriver driver = ((AbstractDriverBaseTest) tr.getInstance()).getDriver(); WebDriver driver = ((AbstractDriverBaseTest) tr.getInstance()).getDriver();
captureScreen(driver, "failure"); captureScreen(driver, "failure");
} }
@ -54,7 +53,7 @@ public class TestListener implements ITestListener {
String str1 = "Skipped because of - " + tr.getThrowable(); String str1 = "Skipped because of - " + tr.getThrowable();
log.info("*----------------------* " + str + " *----------------------*"); log.info("*----------------------* " + str + " *----------------------*");
log.info("*----------------------* " + str1 + " *----------------------*"); log.info("*----------------------* " + str1 + " *----------------------*");
if (!((AbstractDriverBaseTest) tr.getInstance()).getHeadless()) { if (!((AbstractDriverBaseTest) tr.getInstance()).isHeadless()) {
WebDriver driver = ((AbstractDriverBaseTest) tr.getInstance()).getDriver(); WebDriver driver = ((AbstractDriverBaseTest) tr.getInstance()).getDriver();
captureScreen(driver, "skipped"); captureScreen(driver, "skipped");
} }

Write Preview
Loading…
Cancel
Save