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

fix bug: lwm2m tests dif Port Comments 1

Browse Source
This commit is contained in:
nick 2024-04-11 12:25:44 +03:00
parent 6c3c9f99b9
commit 934287a380
3 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,14 +50,12 @@ public abstract class AbstractLwM2MIntegrationDiffPortTest extends AbstractSecur
doAnswer((invocation) -> { doAnswer((invocation) -> {
Object[] arguments = invocation.getArguments(); Object[] arguments = invocation.getArguments();
log.warn("doAnswer for registrationStoreTest.updateRegistration with args {}", arguments); log.trace("doAnswer for registrationStoreTest.updateRegistration with args {}", arguments);
// if (arguments.length > 0 && arguments[0] instanceof RegistrationUpdate) { 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); int portNew = ((RegistrationUpdate) arguments[0]).getPort();
int portNew = ((RegistrationUpdate) arguments[0]).getPort(); Assert.assertEquals((portNew - portOld), portValueChange);
Assert.assertEquals((portNew - portOld), portValueChange);
// }
return invocation.callRealMethod(); return invocation.callRealMethod();
}).when(registrationStoreTest).updateRegistration(any(RegistrationUpdate.class)); }).when(registrationStoreTest).updateRegistration(any(RegistrationUpdate.class));

3
common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbInMemoryRegistrationStore.java
View File

@ -147,8 +147,7 @@ public class TbInMemoryRegistrationStore implements RegistrationStore, Startable
@Override @Override
public UpdatedRegistration updateRegistration(RegistrationUpdate update) { public UpdatedRegistration updateRegistration(RegistrationUpdate update) {
// test fix bug Diff port log.trace("updateRegistration [{}]", update);
log.trace("updateRegistration inMemory {}", update);
try { try {
lock.writeLock().lock(); lock.writeLock().lock();

3
common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbLwM2mRedisRegistrationStore.java
View File

@ -222,8 +222,7 @@ public class TbLwM2mRedisRegistrationStore implements RegistrationStore, Startab
@Override @Override
public UpdatedRegistration updateRegistration(RegistrationUpdate update) { public UpdatedRegistration updateRegistration(RegistrationUpdate update) {
// test fix bug Diff port log.trace("updateRegistration [{}]", update);
log.trace("updateRegistration Redis {}", update);
Lock lock = null; Lock lock = null;
try (var connection = connectionFactory.getConnection()) { try (var connection = connectionFactory.getConnection()) {