Browse Source

add screenshot if headless false

pull/7746/head
Serafym Tuhai 4 years ago
parent
commit
9bcbfb3bd5
  1. 7
      msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/base/AbstractDriverBaseTest.java
  2. 29
      msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/listeners/TestListener.java
  3. 1
      msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/SortByNameTest.java

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

@ -54,18 +54,17 @@ abstract public class AbstractDriverBaseTest extends AbstractContainerTest {
@BeforeMethod @BeforeMethod
public void openBrowser() { public void openBrowser() {
log.info("*----------------------* Setup driver *----------------------*"); log.info("*----------------------* Setup driver *----------------------*");
WebDriverManager.chromedriver().driverVersion("100.0.04896.20").setup();
if (HEADLESS == true) { if (HEADLESS == true) {
ChromeOptions options = new ChromeOptions(); ChromeOptions options = new ChromeOptions();
options.addArguments("--ignore-certificate-errors"); options.addArguments("--ignore-certificate-errors");
options.addArguments("--no-sandbox"); options.addArguments("--no-sandbox");
options.addArguments("--disable-dev-shm-usage"); options.addArguments("--disable-dev-shm-usage");
options.addArguments("--headless"); options.addArguments("--headless");
WebDriverManager.chromedriver().setup();
driver = new ChromeDriver(options); driver = new ChromeDriver(options);
} else { } else {
ChromeOptions options = new ChromeOptions(); ChromeOptions options = new ChromeOptions();
options.addArguments("--ignore-certificate-errors"); options.addArguments("--ignore-certificate-errors");
WebDriverManager.chromedriver().setup();
driver = new ChromeDriver(options); driver = new ChromeDriver(options);
} }
driver.manage().window().setSize(dimension); driver.manage().window().setSize(dimension);
@ -89,6 +88,10 @@ abstract public class AbstractDriverBaseTest extends AbstractContainerTest {
return driver; return driver;
} }
public boolean getHeadless() {
return HEADLESS;
}
protected boolean urlContains(String urlPath) { protected boolean urlContains(String urlPath) {
WebDriverWait wait = new WebDriverWait(driver, Duration.ofMillis(5000)); WebDriverWait wait = new WebDriverWait(driver, Duration.ofMillis(5000));
try { try {

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

@ -34,11 +34,10 @@ 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 + " *----------------------*");
Allure.getLifecycle().updateTestCase((t) -> { if (!((AbstractDriverBaseTest) tr.getInstance()).getHeadless()) {
t.setStatusDetails(t.getStatusDetails().setMessage(str)); driver = ((AbstractDriverBaseTest) tr.getInstance()).getDriver();
}); captureScreen(driver, "success");
driver = ((AbstractDriverBaseTest) tr.getInstance()).getDriver(); }
captureScreen(driver, "success");
} }
public void onTestFailure(ITestResult tr) { public void onTestFailure(ITestResult tr) {
@ -46,12 +45,10 @@ 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 + " *----------------------*");
Allure.getLifecycle().updateTestCase((t) -> { if (!((AbstractDriverBaseTest) tr.getInstance()).getHeadless()) {
t.setStatusDetails(t.getStatusDetails().setMessage(str)); driver = ((AbstractDriverBaseTest) tr.getInstance()).getDriver();
t.setStatusDetails(t.getStatusDetails().setMessage(str1)); captureScreen(driver, "failure");
}); }
driver = ((AbstractDriverBaseTest) tr.getInstance()).getDriver();
captureScreen(driver, "failure");
} }
public void onTestSkipped(ITestResult tr) { public void onTestSkipped(ITestResult tr) {
@ -59,12 +56,10 @@ 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 + " *----------------------*");
Allure.getLifecycle().updateTestCase((t) -> { if (!((AbstractDriverBaseTest) tr.getInstance()).getHeadless()) {
t.setStatusDetails(t.getStatusDetails().setMessage(str)); driver = ((AbstractDriverBaseTest) tr.getInstance()).getDriver();
t.setStatusDetails(t.getStatusDetails().setMessage(str1)); captureScreen(driver, "skipped");
}); }
driver = ((AbstractDriverBaseTest) tr.getInstance()).getDriver();
captureScreen(driver, "skipped");
} }
public void onStart(ITestContext testContext) { public void onStart(ITestContext testContext) {

1
msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/SortByNameTest.java

@ -58,7 +58,6 @@ public class SortByNameTest extends AbstractDriverBaseTest {
@Description @Description
public void specialCharacterUp(String ruleChainName) { public void specialCharacterUp(String ruleChainName) {
testRestClient.postRuleChain(defaultRuleChainPrototype(ruleChainName)); testRestClient.postRuleChain(defaultRuleChainPrototype(ruleChainName));
;
sideBarMenuView.ruleChainsBtn().click(); sideBarMenuView.ruleChainsBtn().click();
ruleChainsPage.sortByNameBtn().click(); ruleChainsPage.sortByNameBtn().click();

Loading…
Cancel
Save