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

fix bug: lwm2m tests dif Port

Browse Source
This commit is contained in:
nick 2024-04-10 16:51:51 +03:00
parent 4044649c9c
commit d2d68faee7
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
application/src/test/java/org/thingsboard/server/transport/lwm2m/security/diffPort/AbstractLwM2MIntegrationDiffPortTest.java
View File

@ -59,14 +59,12 @@ public abstract class AbstractLwM2MIntegrationDiffPortTest extends AbstractSecur
.until(() -> lwM2MTestClient.getClientStates().contains(ON_REGISTRATION_SUCCESS) || lwM2MTestClient.getClientStates().contains(ON_REGISTRATION_STARTED)); .until(() -> lwM2MTestClient.getClientStates().contains(ON_REGISTRATION_SUCCESS) || lwM2MTestClient.getClientStates().contains(ON_REGISTRATION_STARTED));
Assert.assertTrue(lwM2MTestClient.getClientStates().containsAll(expectedStatusesRegistrationLwm2mSuccess)); Assert.assertTrue(lwM2MTestClient.getClientStates().containsAll(expectedStatusesRegistrationLwm2mSuccess));
await(awaitAlias)
.atMost(40, TimeUnit.SECONDS)
.until(() -> {
doAnswer(new Answer<Object>() { doAnswer(new Answer<Object>() {
@Override @Override
public Object answer(InvocationOnMock invocation) throws Throwable { public Object answer(InvocationOnMock invocation) throws Throwable {
Object[] arguments = invocation.getArguments(); Object[] arguments = invocation.getArguments();
if (arguments.length > 0 && arguments[0] instanceof RegistrationUpdate) { if (arguments.length > 0 && arguments[0] instanceof RegistrationUpdate) {
log.error("RegistrationUpdate arguments [{}]", arguments);
int portOld = ((RegistrationUpdate) arguments[0]).getPort(); int portOld = ((RegistrationUpdate) arguments[0]).getPort();
int portValueChange = 5; int portValueChange = 5;
arguments[0] = registrationUpdateNewPort((RegistrationUpdate) arguments[0], portValueChange); arguments[0] = registrationUpdateNewPort((RegistrationUpdate) arguments[0], portValueChange);
@ -76,6 +74,10 @@ public abstract class AbstractLwM2MIntegrationDiffPortTest extends AbstractSecur
return invocation.callRealMethod(); return invocation.callRealMethod();
} }
}).when(registrationStoreTest).updateRegistration(any(RegistrationUpdate.class)); }).when(registrationStoreTest).updateRegistration(any(RegistrationUpdate.class));
await(awaitAlias)
.atMost(40, TimeUnit.SECONDS)
.until(() -> {
return lwM2MTestClient.getClientStates().contains(ON_UPDATE_SUCCESS); return lwM2MTestClient.getClientStates().contains(ON_UPDATE_SUCCESS);
}); });
Assert.assertTrue(lwM2MTestClient.getClientStates().containsAll(expectedStatusesRegistrationLwm2mSuccessUpdate)); Assert.assertTrue(lwM2MTestClient.getClientStates().containsAll(expectedStatusesRegistrationLwm2mSuccessUpdate));