public/openhab-addons
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[mqtt-homeassistant] MQTT Homeassistant test concurrency bug fixed (#11161)

Browse Source 
Signed-off-by: Anton Kharuzhy <antroids@gmail.com>

Co-authored-by: Anton Kharuzhy <antroids@gmail.com>
This commit is contained in:
antroids 2021-08-26 15:46:53 +03:00 committed by GitHub
parent 81989112d1
commit 36377a790e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bundles/org.openhab.binding.mqtt.homeassistant/src/test/java/org/openhab/binding/mqtt/homeassistant/internal/AbstractHomeAssistantTests.java
View File

@ -25,12 +25,11 @@ import java.net.URISyntaxException;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.nio.file.Paths; import java.nio.file.Paths;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.UUID; import java.util.UUID;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.NonNullByDefault;
import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Assertions;
@ -94,7 +93,7 @@ public abstract class AbstractHomeAssistantTests extends JavaTest {
protected final Bridge bridgeThing = BridgeBuilder.create(BRIDGE_TYPE_UID, BRIDGE_UID).build(); protected final Bridge bridgeThing = BridgeBuilder.create(BRIDGE_TYPE_UID, BRIDGE_UID).build();
protected final BrokerHandler bridgeHandler = spy(new BrokerHandler(bridgeThing)); protected final BrokerHandler bridgeHandler = spy(new BrokerHandler(bridgeThing));
protected final Thing haThing = ThingBuilder.create(HA_TYPE_UID, HA_UID).withBridge(BRIDGE_UID).build(); protected final Thing haThing = ThingBuilder.create(HA_TYPE_UID, HA_UID).withBridge(BRIDGE_UID).build();
protected final Map<String, Set<MqttMessageSubscriber>> subscriptions = new HashMap<>(); protected final ConcurrentMap<String, Set<MqttMessageSubscriber>> subscriptions = new ConcurrentHashMap<>();
private final JinjaTransformationService jinjaTransformationService = new JinjaTransformationService(); private final JinjaTransformationService jinjaTransformationService = new JinjaTransformationService();
@ -125,10 +124,9 @@ public abstract class AbstractHomeAssistantTests extends JavaTest {
doAnswer(invocation -> { doAnswer(invocation -> {
final var topic = (String) invocation.getArgument(0); final var topic = (String) invocation.getArgument(0);
final var subscriber = (MqttMessageSubscriber) invocation.getArgument(1); final var subscriber = (MqttMessageSubscriber) invocation.getArgument(1);
final var topicSubscriptions = subscriptions.getOrDefault(topic, new HashSet<>());
topicSubscriptions.add(subscriber); subscriptions.putIfAbsent(topic, ConcurrentHashMap.newKeySet());
subscriptions.put(topic, topicSubscriptions); subscriptions.get(topic).add(subscriber);
return CompletableFuture.completedFuture(true); return CompletableFuture.completedFuture(true);
}).when(bridgeConnection).subscribe(any(), any()); }).when(bridgeConnection).subscribe(any(), any());