mirror of
https://github.com/danieldemus/openhab-addons
synced 2026-07-31 13:34:22 +02:00
[satel] Event log details for event description with id 10 (#18491)
Signed-off-by: Krzysztof Goworek <krzysztof.goworek@gmail.com>
This commit is contained in:
+10
@@ -157,6 +157,16 @@ public class DeviceNameResolver {
|
||||
return deviceNumber == 0 ? "telephone: unknown" : resolve(DeviceType.TELEPHONE, deviceNumber);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns name of telephone relay with given number.
|
||||
*
|
||||
* @param deviceNumber device number
|
||||
* @return name of telephone relay
|
||||
*/
|
||||
public String resolveTelephoneRelay(int deviceNumber) {
|
||||
return "telephone relay: " + deviceNumber;
|
||||
}
|
||||
|
||||
private String readDeviceName(DeviceType deviceType, int deviceNumber) {
|
||||
String cacheKey = String.format("%s_%d", deviceType, deviceNumber);
|
||||
String result = nameCache.computeIfAbsent(cacheKey, k -> {
|
||||
|
||||
+1
@@ -220,6 +220,7 @@ public class EventLogReader {
|
||||
case 7 -> deviceNameResolver.resolveUser(eventDesc.getSource());
|
||||
case 8 -> deviceNameResolver.resolve(DeviceType.EXPANDER, eventDesc.getSource());
|
||||
case 9 -> deviceNameResolver.resolveTelephone(eventDesc.getSource());
|
||||
case 10 -> deviceNameResolver.resolveTelephoneRelay(eventDesc.getSource());
|
||||
case 11 -> deviceNameResolver.resolve(DeviceType.PARTITION, eventDesc.getPartition()) + DETAILS_SEPARATOR
|
||||
+ deviceNameResolver.resolveDataBus(eventDesc.getSource());
|
||||
case 12 -> (eventDesc.getSource() <= bridgeHandler.getIntegraType().getOnMainboard())
|
||||
|
||||
+5
@@ -241,6 +241,11 @@ class DeviceNameResolverTest {
|
||||
assertEquals("telephone: unknown", result);
|
||||
}
|
||||
|
||||
@Test
|
||||
void resolveTelephoneRelayShouldReturnTelephoneRelayName() {
|
||||
assertEquals("telephone relay: 1", testSubject.resolveTelephoneRelay(1));
|
||||
}
|
||||
|
||||
void setUpResponse(String deviceName) {
|
||||
when(bridgeHandler.sendCommand(isA(ReadDeviceInfoCommand.class), eq(false))).thenAnswer(invocationOnMock -> {
|
||||
ReadDeviceInfoCommand cmd = invocationOnMock.getArgument(0);
|
||||
|
||||
+4
-2
@@ -210,10 +210,12 @@ class EventLogReaderTest {
|
||||
}
|
||||
|
||||
@Test
|
||||
void buildDetailsShouldReturnDefaultDetailsForKind10() {
|
||||
void buildDetailsShouldReturnDetailsForKind10() {
|
||||
when(deviceNameResolver.resolveTelephoneRelay(70)).thenReturn("telephone relay");
|
||||
|
||||
String result = testSubject.buildDetails(createEventDescription(10));
|
||||
|
||||
assertEquals("kind=10, partition=40, source=70, object=1, ucn=30", result);
|
||||
assertEquals("telephone relay", result);
|
||||
}
|
||||
|
||||
@Test
|
||||
|
||||
Reference in New Issue
Block a user