Skip to content

Commit 9c30677

Browse files
committed
Fix tests
Signed-off-by: Chris Jackson <[email protected]>
1 parent fc5ea82 commit 9c30677

File tree

2 files changed

+17
-2
lines changed

2 files changed

+17
-2
lines changed

com.zsmartsystems.zigbee.dongle.ember/src/main/java/com/zsmartsystems/zigbee/dongle/ember/ZigBeeDongleEzsp.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,10 @@ public ZigBeeStatus initialize() {
475475
if (networkParametersResponse == null) {
476476
return ZigBeeStatus.COMMUNICATION_ERROR;
477477
}
478-
networkParameters = networkParametersResponse.getParameters();
478+
EmberNetworkParameters localNetworkParameters = networkParametersResponse.getParameters();
479+
if (localNetworkParameters != null) {
480+
networkParameters = localNetworkParameters;
481+
}
479482
logger.debug("Ember initial network parameters are {}", networkParameters);
480483

481484
ieeeAddress = ncp.getIeeeAddress();

com.zsmartsystems.zigbee.dongle.ember/src/test/java/com/zsmartsystems/zigbee/dongle/ember/ZigBeeTransportTransmitTest.java

+13-1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import com.zsmartsystems.zigbee.TestUtilities;
1616
import com.zsmartsystems.zigbee.dongle.ember.ezsp.command.EzspGetNetworkParametersResponse;
1717
import com.zsmartsystems.zigbee.dongle.ember.ezsp.command.EzspGetParentChildParametersResponse;
18+
import com.zsmartsystems.zigbee.dongle.ember.ezsp.command.EzspVersionResponse;
1819
import com.zsmartsystems.zigbee.dongle.ember.ezsp.structure.EmberCurrentSecurityState;
1920
import com.zsmartsystems.zigbee.dongle.ember.ezsp.structure.EmberNetworkParameters;
2021
import com.zsmartsystems.zigbee.dongle.ember.ezsp.structure.EmberNetworkStatus;
@@ -24,6 +25,7 @@
2425
import com.zsmartsystems.zigbee.dongle.ember.ezsp.structure.EzspStatus;
2526
import com.zsmartsystems.zigbee.dongle.ember.internal.EzspProtocolHandler;
2627
import com.zsmartsystems.zigbee.transport.ZigBeePort;
28+
import com.zsmartsystems.zigbee.transport.ZigBeeTransportReceive;
2729
import com.zsmartsystems.zigbee.transport.ZigBeeTransportTransmitAbstractTest;
2830

2931
/**
@@ -52,6 +54,11 @@ public void initialiseTransport() throws Exception {
5254
Mockito.when(ncp.setRadioPower(ArgumentMatchers.anyInt())).thenReturn(EmberStatus.EMBER_SUCCESS);
5355
Mockito.when(ncp.getNwkAddress()).thenReturn(Integer.valueOf(0));
5456
Mockito.when(ncp.getIeeeAddress()).thenReturn(new IeeeAddress("1234567890ABCDEF"));
57+
final EzspVersionResponse version = Mockito.mock(EzspVersionResponse.class);
58+
Mockito.when(version.getProtocolVersion()).thenReturn(4);
59+
60+
Mockito.when(ncp.getVersion()).thenReturn(version);
61+
Mockito.when(ncp.getNetworkParameters()).thenReturn(Mockito.mock(EzspGetNetworkParametersResponse.class));
5562

5663
ZigBeePort port = Mockito.mock(ZigBeePort.class);
5764
Mockito.when(port.open()).thenReturn(Boolean.TRUE);
@@ -62,8 +69,13 @@ public EmberNcp getEmberNcp() {
6269
return ncp;
6370
}
6471
};
72+
EzspProtocolHandler frameHandler = Mockito.mock(EzspProtocolHandler.class);
73+
Mockito.when(frameHandler.isAlive()).thenReturn(Boolean.TRUE);
74+
TestUtilities.setField(ZigBeeDongleEzsp.class, dongle, "frameHandler", frameHandler);
75+
76+
final ZigBeeTransportReceive receiver = Mockito.mock(ZigBeeTransportReceive.class);
6577

66-
TestUtilities.setField(ZigBeeDongleEzsp.class, dongle, "frameHandler", Mockito.mock(EzspProtocolHandler.class));
78+
dongle.setZigBeeTransportReceive(receiver);
6779

6880
transport = dongle;
6981
}

0 commit comments

Comments
 (0)