Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[netatmo] OH3 test compatiblity - NAPresenceCameraHandlerTest uses internal I18nProviderImpl class #7954

Merged
merged 6 commits into from
Jun 20, 2020
Merged

[netatmo] OH3 test compatiblity - NAPresenceCameraHandlerTest uses internal I18nProviderImpl class #7954

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
78699f9
Merge pull request #1 from openhab/2.5.x
Novanic Jun 10, 2020
ae6b891
Merge pull request #2 from openhab/2.5.x
Novanic Jun 12, 2020
66abc11
Merge pull request #3 from openhab/2.5.x
Novanic Jun 13, 2020
4f2cd51
Merge pull request #4 from openhab/2.5.x
Novanic Jun 16, 2020
bd9cfc1
Merge pull request #5 from openhab/2.5.x
Novanic Jun 18, 2020
e7505c9
[7949] NAPresenceCameraHandlerTest uses internal I18nProviderImpl class
sstrohschein Jun 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
113 changes: 97 additions & 16 deletions .../test/java/org/openhab/binding/netatmo/internal/presence/NAPresenceCameraHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,15 @@

import io.swagger.client.model.NAWelcomeCamera;
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.smarthome.core.internal.i18n.I18nProviderImpl;
import org.eclipse.smarthome.core.i18n.TimeZoneProvider;
import org.eclipse.smarthome.core.library.types.OnOffType;
import org.eclipse.smarthome.core.library.types.StringType;
import org.eclipse.smarthome.core.thing.ChannelUID;
import org.eclipse.smarthome.core.thing.Thing;
import org.eclipse.smarthome.core.thing.ThingTypeUID;
import org.eclipse.smarthome.core.thing.internal.ThingImpl;
import org.eclipse.smarthome.core.types.RefreshType;
import org.eclipse.smarthome.core.types.State;
import org.eclipse.smarthome.core.types.UnDefType;
import org.junit.Before;
import org.junit.Test;
Expand All @@ -46,30 +48,24 @@ public class NAPresenceCameraHandlerTest {

@Mock
private RequestExecutor requestExecutorMock;
@Mock
private TimeZoneProvider timeZoneProviderMock;

private Thing presenceCameraThing;
private NAWelcomeCamera presenceCamera;
private ChannelUID floodlightChannelUID;
private ChannelUID floodlightAutoModeChannelUID;
private NAPresenceCameraHandler handler;
private NAPresenceCameraHandlerAccessible handler;

@Before
public void before() {
presenceCameraThing = new ThingImpl(new ThingTypeUID("netatmo", "NOC"), "1");
presenceCamera = new NAWelcomeCamera();

floodlightChannelUID = new ChannelUID(presenceCameraThing.getUID(), NetatmoBindingConstants.CHANNEL_CAMERA_FLOODLIGHT);
floodlightAutoModeChannelUID = new ChannelUID(presenceCameraThing.getUID(), NetatmoBindingConstants.CHANNEL_CAMERA_FLOODLIGHT_AUTO_MODE);

handler = new NAPresenceCameraHandler(presenceCameraThing, new I18nProviderImpl()) {
{
module = presenceCamera;
}

@Override
@NonNull Optional<@NonNull String> executeGETRequest(@NonNull String url) {
return requestExecutorMock.executeGETRequest(url);
}
};
handler = new NAPresenceCameraHandlerAccessible(presenceCameraThing, presenceCamera);
}

@Test
Expand Down Expand Up @@ -191,7 +187,7 @@ public void testHandleCommand_Request_failed() {
}

@Test
public void testHandleCommand_VPN_URL_not_set() {
public void testHandleCommand_without_VPN() {
handler.handleCommand(floodlightChannelUID, OnOffType.ON);

verify(requestExecutorMock, never()).executeGETRequest(any()); //no executions because the VPN URL is still unknown
Expand Down Expand Up @@ -229,7 +225,7 @@ public void testHandleCommand_Ping_failed_wrong_Response() {

@Test
public void testHandleCommand_Module_NULL() {
NAPresenceCameraHandler handlerWithoutModule = new NAPresenceCameraHandler(presenceCameraThing, new I18nProviderImpl());
NAPresenceCameraHandler handlerWithoutModule = new NAPresenceCameraHandler(presenceCameraThing, timeZoneProviderMock);
handlerWithoutModule.handleCommand(floodlightChannelUID, OnOffType.ON);

verify(requestExecutorMock, never()).executeGETRequest(any()); //no executions because the thing isn't initialized
Expand Down Expand Up @@ -266,7 +262,7 @@ public void testGetNAThingProperty_Floodlight_without_LightModeState() {

@Test
public void testGetNAThingProperty_Floodlight_Module_NULL() {
NAPresenceCameraHandler handlerWithoutModule = new NAPresenceCameraHandler(presenceCameraThing, new I18nProviderImpl());
NAPresenceCameraHandler handlerWithoutModule = new NAPresenceCameraHandler(presenceCameraThing, timeZoneProviderMock);
assertEquals(UnDefType.UNDEF, handlerWithoutModule.getNAThingProperty(floodlightChannelUID.getId()));
}

Expand Down Expand Up @@ -331,10 +327,72 @@ public void testGetNAThingProperty_Floodlight_Scenario_without_AutoMode() {

@Test
public void testGetNAThingProperty_FloodlightAutoMode_Module_NULL() {
NAPresenceCameraHandler handlerWithoutModule = new NAPresenceCameraHandler(presenceCameraThing, new I18nProviderImpl());
NAPresenceCameraHandler handlerWithoutModule = new NAPresenceCameraHandler(presenceCameraThing, timeZoneProviderMock);
assertEquals(UnDefType.UNDEF, handlerWithoutModule.getNAThingProperty(floodlightAutoModeChannelUID.getId()));
}

@Test
public void testGetStreamURL() {
presenceCamera.setVpnUrl(DUMMY_VPN_URL);
String streamURL = handler.getStreamURL("dummyVideoId");
assertNotNull(streamURL);
assertEquals(DUMMY_VPN_URL + "/vod/dummyVideoId/index.m3u8", streamURL);
}

@Test
public void testGetStreamURL_local() {
presenceCamera.setVpnUrl(DUMMY_VPN_URL);
presenceCamera.setIsLocal(true);

String streamURL = handler.getStreamURL("dummyVideoId");
assertNotNull(streamURL);
assertEquals(DUMMY_VPN_URL + "/vod/dummyVideoId/index_local.m3u8", streamURL);
}

@Test
public void testGetStreamURL_not_local() {
presenceCamera.setVpnUrl(DUMMY_VPN_URL);
presenceCamera.setIsLocal(false);

String streamURL = handler.getStreamURL("dummyVideoId");
assertNotNull(streamURL);
assertEquals(DUMMY_VPN_URL + "/vod/dummyVideoId/index.m3u8", streamURL);
}

@Test
public void testGetStreamURL_without_VPN() {
String streamURL = handler.getStreamURL("dummyVideoId");
assertNull(streamURL);
}

@Test
public void testGetLivePictureURLState() {
presenceCamera.setVpnUrl(DUMMY_VPN_URL);

State livePictureURLState = handler.getLivePictureURLState();
assertEquals(new StringType(DUMMY_VPN_URL + "/live/snapshot_720.jpg"), livePictureURLState);
}

@Test
public void testGetLivePictureURLState_without_VPN() {
State livePictureURLState = handler.getLivePictureURLState();
assertEquals(UnDefType.UNDEF, livePictureURLState);
}

@Test
public void testGetLiveStreamState() {
presenceCamera.setVpnUrl(DUMMY_VPN_URL);

State liveStreamState = handler.getLiveStreamState();
assertEquals(new StringType(DUMMY_VPN_URL + "/live/index.m3u8"), liveStreamState);
}

@Test
public void testGetLiveStreamState_without_VPN() {
State liveStreamState = handler.getLiveStreamState();
assertEquals(UnDefType.UNDEF, liveStreamState);
}

private static Optional<String> createPingResponseContent(final String localURL) {
return Optional.of("{\"local_url\":\"" + localURL + "\",\"product_name\":\"Welcome Netatmo\"}");
}
Expand All @@ -343,4 +401,27 @@ private interface RequestExecutor {

Optional<String> executeGETRequest(String url);
}

private class NAPresenceCameraHandlerAccessible extends NAPresenceCameraHandler {

public NAPresenceCameraHandlerAccessible(Thing thing, NAWelcomeCamera presenceCamera) {
super(thing, timeZoneProviderMock);
module = presenceCamera;
}

@Override
protected @NonNull Optional<@NonNull String> executeGETRequest(@NonNull String url) {
return requestExecutorMock.executeGETRequest(url);
}

@Override
protected @NonNull State getLivePictureURLState() {
return super.getLivePictureURLState();
}

@Override
protected @NonNull State getLiveStreamState() {
return super.getLiveStreamState();
}
}
}