Browse Source

Fix EDQS msa test

pull/13362/head
ViacheslavKlimov 1 year ago
parent
commit
40ed140952
  1. 7
      msa/black-box-tests/src/test/java/org/thingsboard/server/msa/TestRestClient.java
  2. 2
      msa/black-box-tests/src/test/java/org/thingsboard/server/msa/edqs/EdqsEntityDataQueryTest.java

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

@ -42,6 +42,7 @@ import org.thingsboard.server.common.data.alarm.Alarm;
import org.thingsboard.server.common.data.asset.Asset;
import org.thingsboard.server.common.data.asset.AssetProfile;
import org.thingsboard.server.common.data.cf.CalculatedField;
import org.thingsboard.server.common.data.edqs.EdqsState;
import org.thingsboard.server.common.data.event.EventType;
import org.thingsboard.server.common.data.id.AlarmId;
import org.thingsboard.server.common.data.id.AssetId;
@ -738,13 +739,13 @@ public class TestRestClient {
.as(Long.class);
}
public Boolean isEdqsApiEnabled() {
public EdqsState getEdqsState() {
return given().spec(requestSpec)
.get("/api/edqs/enabled")
.get("/api/edqs/state")
.then()
.statusCode(HTTP_OK)
.extract()
.as(Boolean.class);
.as(EdqsState.class);
}
public void assignDeviceToCustomer(CustomerId customerId, DeviceId id) {

2
msa/black-box-tests/src/test/java/org/thingsboard/server/msa/edqs/EdqsEntityDataQueryTest.java

@ -73,7 +73,7 @@ public class EdqsEntityDataQueryTest extends AbstractContainerTest {
@BeforeClass
public void beforeClass() throws Exception {
testRestClient.login("sysadmin@thingsboard.org", "sysadmin");
await().atMost(60, TimeUnit.SECONDS).until(() -> testRestClient.isEdqsApiEnabled());
await().atMost(60, TimeUnit.SECONDS).until(() -> testRestClient.getEdqsState().isApiEnabled());
tenantId = testRestClient.postTenant(EntityPrototypes.defaultTenantPrototype("Tenant")).getId();
tenantAdminId = testRestClient.createUserAndLogin(defaultTenantAdmin(tenantId, "tenantAdmin@thingsboard.org"), "tenant");

Loading…
Cancel
Save