dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix EDQS msa test

Browse Source
This commit is contained in:
ViacheslavKlimov 2025-05-12 15:18:38 +03:00
parent 14f24d2497
commit 40ed140952
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -73,7 +73,7 @@ public class EdqsEntityDataQueryTest extends AbstractContainerTest {
@BeforeClass @BeforeClass
public void beforeClass() throws Exception { public void beforeClass() throws Exception {
testRestClient.login("sysadmin@thingsboard.org", "sysadmin"); 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(); tenantId = testRestClient.postTenant(EntityPrototypes.defaultTenantPrototype("Tenant")).getId();
tenantAdminId = testRestClient.createUserAndLogin(defaultTenantAdmin(tenantId, "tenantAdmin@thingsboard.org"), "tenant"); tenantAdminId = testRestClient.createUserAndLogin(defaultTenantAdmin(tenantId, "tenantAdmin@thingsboard.org"), "tenant");