Browse Source

refactoring

pull/7906/head
Seraphym-Tuhai 4 years ago
parent
commit
2dc5727139
  1. 8
      msa/black-box-tests/README.md
  2. 7
      msa/black-box-tests/src/test/java/org/thingsboard/server/msa/TestProperties.java
  3. 0
      msa/black-box-tests/src/test/resources/config.properties

8
msa/black-box-tests/README.md

@ -55,8 +55,6 @@ As result, in REPOSITORY column, next images should be present:
mvn clean install -DblackBoxTests.skip=false -Dsuite=all
### To run a separate test manually on a built UI:
1. Add the black-box-tests module in the [pom.xml](../pom.xml) or add as a Maven project as in the picture
![addAsMavenProject.png](../black-box-tests/src/test/resources/addAsMavenProject.png)
2. Add Vm Option "-DrunLocal=true -Dtb.baseUiUrl=http://localhost:4200/" in Run -> Edit Configuration -> Edit Configuration Templates -> TestNG
3. Go to the test class you need in the [UI tests directory](../black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests) and run the test in it
or go to the [resources](../black-box-tests/src/test/resources) and run test suite you need
1. Add the black-box-tests module in the [pom.xml](../pom.xml) or add as a Maven project
2. Add Vm Option "*-DrunLocal=true -Dtb.baseUiUrl=http://localhost:4200/*" in "Run" -> "Edit Configuration" -> "Edit Configuration Templates" -> "TestNG"
3. To run a specific test, go to the test class in the [UI tests package](../black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests) and run the test. Alternatively, go to the [resources](../black-box-tests/src/test/resources) in the black-box-tests module and run the test suite that you need.

7
msa/black-box-tests/src/test/java/org/thingsboard/server/msa/TestProperties.java

@ -16,11 +16,6 @@
package org.thingsboard.server.msa;
import lombok.extern.slf4j.Slf4j;
import org.testcontainers.DockerClientFactory;
import java.io.IOException;
import java.io.InputStream;
import java.util.Properties;
@Slf4j
public class TestProperties {
@ -31,8 +26,6 @@ public class TestProperties {
private static final ContainerTestSuite instance = ContainerTestSuite.getInstance();
private static Properties properties;
public static String getBaseUrl() {
if (instance.isActive()) {
return HTTPS_URL;

0
msa/black-box-tests/src/test/resources/config.properties

Loading…
Cancel
Save