From 426e051de9eec4f23557ca0b9c98ee054fa0f5a0 Mon Sep 17 00:00:00 2001 From: David Mayboroda Date: Mon, 16 Nov 2015 19:38:30 +0200 Subject: [PATCH] robolectric tests fixed --- src/com/connectsdk/service/DIALService.java | 15 ++++- .../com/connectsdk/core/MediaInfoTest.java | 6 +- .../com/connectsdk/core/SubtitleInfoTest.java | 6 +- .../device/ConnectableDeviceTest.java | 9 +-- .../discovery/DiscoveryManagerTest.java | 15 ++--- .../provider/SSDPDiscoveryProviderTest.java | 10 ++-- .../ZeroConfDiscoveryPrividerTest.java | 56 ++++++++++--------- .../provider/ssdp/SSDPClientTest.java | 9 +-- .../provider/ssdp/SSDPPacketTest.java | 6 +- .../service/AirPlayServiceTest.java | 5 +- .../service/DIALServiceSendCommandTest.java | 13 +++-- .../connectsdk/service/DIALServiceTest.java | 5 +- .../service/DLNAServiceSendCommandTest.java | 12 ++-- .../connectsdk/service/DLNAServiceTest.java | 11 ++-- .../service/NetCastTVServiceTest.java | 10 ++-- .../connectsdk/service/RokuServiceTest.java | 5 +- .../service/WebOSTVServiceTest.java | 9 +-- .../service/airplay/PListParserTest.java | 6 +- .../sessions/WebOSWebAppSessionTest.java | 17 +++--- .../service/upnp/DLNAHttpServerTest.java | 5 +- .../webos/WebOSTVServiceSocketClientTest.java | 7 +-- 21 files changed, 134 insertions(+), 103 deletions(-) diff --git a/src/com/connectsdk/service/DIALService.java b/src/com/connectsdk/service/DIALService.java index 475bcb93..3b550bea 100644 --- a/src/com/connectsdk/service/DIALService.java +++ b/src/com/connectsdk/service/DIALService.java @@ -54,6 +54,7 @@ public class DIALService extends DeviceService implements Launcher { public static final String ID = "DIAL"; private static final String APP_NETFLIX = "Netflix"; + private static final String APP_YOUTUBE = "YouTube"; private static List registeredApps = new ArrayList(); @@ -206,9 +207,9 @@ public void launchYouTube(String contentId, AppLaunchListener listener) { @Override public void launchYouTube(String contentId, float startTime, AppLaunchListener listener) { String params = null; - AppInfo appInfo = new AppInfo("YouTube"); + AppInfo appInfo = new AppInfo(APP_YOUTUBE); appInfo.setName(appInfo.getId()); - + JSONObject jsonParams = null; if (contentId != null && contentId.length() > 0) { if (startTime < 0.0) { if (listener != null) { @@ -219,6 +220,16 @@ public void launchYouTube(String contentId, float startTime, AppLaunchListener l } String pairingCode = java.util.UUID.randomUUID().toString(); + /* + jsonParams = new JSONObject(); + try { + //jsonParams.put("pairingCode", pairingCode); + jsonParams.put("v", contentId); + jsonParams.put("t", startTime); + } catch (JSONException e) { + Log.e(Util.T, "Launch YouTube error", e); + } + */ params = String.format(Locale.US, "pairingCode=%s&v=%s&t=%.1f", pairingCode, contentId, startTime); } diff --git a/test/src/com/connectsdk/core/MediaInfoTest.java b/test/src/com/connectsdk/core/MediaInfoTest.java index 46b91262..b2636651 100644 --- a/test/src/com/connectsdk/core/MediaInfoTest.java +++ b/test/src/com/connectsdk/core/MediaInfoTest.java @@ -19,16 +19,18 @@ */ package com.connectsdk.core; +import com.connectsdk.BuildConfig; + import junit.framework.Assert; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.RobolectricTestRunner; +import org.robolectric.RobolectricGradleTestRunner; import org.robolectric.annotation.Config; @RunWith(RobolectricGradleTestRunner.class) -@Config(constants = BuildConfig.class) +@Config(constants = BuildConfig.class, sdk = 21) public class MediaInfoTest { @Test diff --git a/test/src/com/connectsdk/core/SubtitleInfoTest.java b/test/src/com/connectsdk/core/SubtitleInfoTest.java index 835e293d..5649d811 100644 --- a/test/src/com/connectsdk/core/SubtitleInfoTest.java +++ b/test/src/com/connectsdk/core/SubtitleInfoTest.java @@ -19,16 +19,18 @@ */ package com.connectsdk.core; +import com.connectsdk.BuildConfig; + import junit.framework.Assert; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.RobolectricTestRunner; +import org.robolectric.RobolectricGradleTestRunner; import org.robolectric.annotation.Config; @RunWith(RobolectricGradleTestRunner.class) -@Config(constants = BuildConfig.class) +@Config(constants = BuildConfig.class, sdk = 21) public class SubtitleInfoTest { @Test diff --git a/test/src/com/connectsdk/device/ConnectableDeviceTest.java b/test/src/com/connectsdk/device/ConnectableDeviceTest.java index e816317c..d809dee5 100644 --- a/test/src/com/connectsdk/device/ConnectableDeviceTest.java +++ b/test/src/com/connectsdk/device/ConnectableDeviceTest.java @@ -1,5 +1,6 @@ package com.connectsdk.device; +import com.connectsdk.BuildConfig; import com.connectsdk.discovery.DiscoveryManager; import com.connectsdk.service.AirPlayService; import com.connectsdk.service.DIALService; @@ -19,8 +20,8 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mockito; -import org.robolectric.Robolectric; -import org.robolectric.RobolectricTestRunner; +import org.robolectric.RobolectricGradleTestRunner; +import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import java.io.IOException; @@ -28,14 +29,14 @@ import java.util.List; @RunWith(RobolectricGradleTestRunner.class) -@Config(constants = BuildConfig.class) +@Config(constants = BuildConfig.class, sdk = 21) public class ConnectableDeviceTest { private ConnectableDevice device; @Before public void setUp() { - DiscoveryManager.init(Robolectric.application); + DiscoveryManager.init(RuntimeEnvironment.application); device = new ConnectableDevice(); } diff --git a/test/src/com/connectsdk/discovery/DiscoveryManagerTest.java b/test/src/com/connectsdk/discovery/DiscoveryManagerTest.java index 67e90304..01a4ef02 100644 --- a/test/src/com/connectsdk/discovery/DiscoveryManagerTest.java +++ b/test/src/com/connectsdk/discovery/DiscoveryManagerTest.java @@ -1,5 +1,6 @@ package com.connectsdk.discovery; +import com.connectsdk.BuildConfig; import com.connectsdk.discovery.provider.SSDPDiscoveryProvider; import com.connectsdk.discovery.provider.ZeroconfDiscoveryProvider; import com.connectsdk.service.DIALService; @@ -10,8 +11,8 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.Robolectric; -import org.robolectric.RobolectricTestRunner; +import org.robolectric.RobolectricGradleTestRunner; +import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import java.util.Objects; @@ -21,14 +22,14 @@ */ @RunWith(RobolectricGradleTestRunner.class) -@Config(constants = BuildConfig.class) +@Config(constants = BuildConfig.class, sdk = 21) public class DiscoveryManagerTest { DiscoveryManager discovery; @Before public void setUp() { - discovery = new DiscoveryManager(Robolectric.application); + discovery = new DiscoveryManager(RuntimeEnvironment.application); } @Test @@ -48,7 +49,7 @@ public void testUnregisterDeviceServiceWithWrongArguments() { @Test public void testUnregisterDeviceServiceWithWrongProvider() { - discovery.discoveryProviders.add(new SSDPDiscoveryProvider(Robolectric.application)); + discovery.discoveryProviders.add(new SSDPDiscoveryProvider(RuntimeEnvironment.application)); discovery.deviceClasses.put(DIALService.ID, DIALService.class); Assert.assertEquals(1, discovery.discoveryProviders.size()); Assert.assertEquals(1, discovery.deviceClasses.size()); @@ -60,7 +61,7 @@ public void testUnregisterDeviceServiceWithWrongProvider() { @Test public void testUnregisterDeviceServiceWithWrongServiceID() { - discovery.discoveryProviders.add(new SSDPDiscoveryProvider(Robolectric.application)); + discovery.discoveryProviders.add(new SSDPDiscoveryProvider(RuntimeEnvironment.application)); discovery.deviceClasses.put(DLNAService.ID, DIALService.class); Assert.assertEquals(1, discovery.discoveryProviders.size()); Assert.assertEquals(1, discovery.deviceClasses.size()); @@ -72,7 +73,7 @@ public void testUnregisterDeviceServiceWithWrongServiceID() { @Test public void testUnregisterDeviceService() { - discovery.discoveryProviders.add(new SSDPDiscoveryProvider(Robolectric.application)); + discovery.discoveryProviders.add(new SSDPDiscoveryProvider(RuntimeEnvironment.application)); discovery.deviceClasses.put(DIALService.ID, DIALService.class); Assert.assertEquals(1, discovery.discoveryProviders.size()); Assert.assertEquals(1, discovery.deviceClasses.size()); diff --git a/test/src/com/connectsdk/discovery/provider/SSDPDiscoveryProviderTest.java b/test/src/com/connectsdk/discovery/provider/SSDPDiscoveryProviderTest.java index 8f9c6857..238b365e 100755 --- a/test/src/com/connectsdk/discovery/provider/SSDPDiscoveryProviderTest.java +++ b/test/src/com/connectsdk/discovery/provider/SSDPDiscoveryProviderTest.java @@ -2,6 +2,7 @@ import android.content.Context; +import com.connectsdk.BuildConfig; import com.connectsdk.core.TestUtil; import com.connectsdk.discovery.DiscoveryFilter; import com.connectsdk.discovery.provider.ssdp.SSDPClient; @@ -14,10 +15,9 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.ArgumentCaptor; import org.mockito.Mockito; -import org.robolectric.Robolectric; -import org.robolectric.RobolectricTestRunner; +import org.robolectric.RobolectricGradleTestRunner; +import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import java.io.IOException; @@ -31,7 +31,7 @@ import static org.mockito.Mockito.when; @RunWith(RobolectricGradleTestRunner.class) -@Config(constants = BuildConfig.class, shadows={WifiInfoShadow.class}) +@Config(constants = BuildConfig.class, shadows={WifiInfoShadow.class}, sdk = 21) public class SSDPDiscoveryProviderTest{ @@ -57,7 +57,7 @@ public void setUp() throws Exception { byte[] data = new byte[1]; when(ssdpClient.responseReceive()).thenReturn(new DatagramPacket(data, 1)); when(ssdpClient.multicastReceive()).thenReturn(new DatagramPacket(data, 1)); - dp = new StubSSDPDiscoveryProvider(Robolectric.application); + dp = new StubSSDPDiscoveryProvider(RuntimeEnvironment.application); assertNotNull(dp); } @After diff --git a/test/src/com/connectsdk/discovery/provider/ZeroConfDiscoveryPrividerTest.java b/test/src/com/connectsdk/discovery/provider/ZeroConfDiscoveryPrividerTest.java index 96ef3536..97061cdb 100644 --- a/test/src/com/connectsdk/discovery/provider/ZeroConfDiscoveryPrividerTest.java +++ b/test/src/com/connectsdk/discovery/provider/ZeroConfDiscoveryPrividerTest.java @@ -1,41 +1,43 @@ package com.connectsdk.discovery.provider; -import static org.mockito.Matchers.any; -import static org.mockito.Mockito.atLeastOnce; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.never; -import static org.mockito.Mockito.timeout; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - -import java.io.IOException; -import java.net.InetAddress; +import android.content.Context; -import javax.jmdns.JmDNS; -import javax.jmdns.ServiceEvent; -import javax.jmdns.ServiceInfo; -import javax.jmdns.ServiceListener; -import javax.jmdns.impl.JmDNSImpl; +import com.connectsdk.BuildConfig; +import com.connectsdk.discovery.DiscoveryFilter; +import com.connectsdk.discovery.DiscoveryManager; +import com.connectsdk.discovery.DiscoveryProvider; +import com.connectsdk.discovery.DiscoveryProviderListener; +import com.connectsdk.service.config.ServiceDescription; +import com.connectsdk.shadow.WifiInfoShadow; import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mockito; -import org.robolectric.Robolectric; -import org.robolectric.RobolectricTestRunner; +import org.robolectric.RobolectricGradleTestRunner; +import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; +import org.robolectric.shadows.ShadowLooper; -import android.content.Context; +import java.io.IOException; +import java.net.InetAddress; -import com.connectsdk.discovery.DiscoveryFilter; -import com.connectsdk.discovery.DiscoveryManager; -import com.connectsdk.discovery.DiscoveryProvider; -import com.connectsdk.discovery.DiscoveryProviderListener; -import com.connectsdk.service.config.ServiceDescription; -import com.connectsdk.shadow.WifiInfoShadow; +import javax.jmdns.JmDNS; +import javax.jmdns.ServiceEvent; +import javax.jmdns.ServiceInfo; +import javax.jmdns.ServiceListener; +import javax.jmdns.impl.JmDNSImpl; + +import static org.mockito.Matchers.any; +import static org.mockito.Mockito.atLeastOnce; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.timeout; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; @RunWith(RobolectricGradleTestRunner.class) -@Config(constants = BuildConfig.class, shadows = {WifiInfoShadow.class }) +@Config(constants = BuildConfig.class, shadows = {WifiInfoShadow.class }, sdk = 21) public class ZeroConfDiscoveryPrividerTest { private ZeroconfDiscoveryProvider dp; @@ -77,7 +79,7 @@ protected JmDNS createJmDNS() { @Before public void setUp() { - dp = new StubZeroConfDiscoveryProvider(Robolectric.application); + dp = new StubZeroConfDiscoveryProvider(RuntimeEnvironment.application); mDNS = mock(StubJmDNS.class); eventMock = mock(StubServiceEvent.class); @@ -296,7 +298,7 @@ public void testServiceRemoveEvent() throws Exception { // when dp.jmdnsListener.serviceRemoved(event); - Robolectric.runUiThreadTasksIncludingDelayedTasks(); + ShadowLooper.runUiThreadTasksIncludingDelayedTasks(); // then verify(listener).onServiceRemoved(any(DiscoveryProvider.class), any(ServiceDescription.class)); diff --git a/test/src/com/connectsdk/discovery/provider/ssdp/SSDPClientTest.java b/test/src/com/connectsdk/discovery/provider/ssdp/SSDPClientTest.java index 3fc3c70c..8b4ab54c 100644 --- a/test/src/com/connectsdk/discovery/provider/ssdp/SSDPClientTest.java +++ b/test/src/com/connectsdk/discovery/provider/ssdp/SSDPClientTest.java @@ -1,5 +1,6 @@ package com.connectsdk.discovery.provider.ssdp; +import com.connectsdk.BuildConfig; import com.connectsdk.core.Util; import com.connectsdk.shadow.WifiInfoShadow; @@ -9,8 +10,8 @@ import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Mockito; -import org.robolectric.Robolectric; -import org.robolectric.RobolectricTestRunner; +import org.robolectric.RobolectricGradleTestRunner; +import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import java.io.IOException; @@ -23,7 +24,7 @@ import java.net.SocketAddress; @RunWith(RobolectricGradleTestRunner.class) -@Config(constants = BuildConfig.class, shadows = { WifiInfoShadow.class }) +@Config(constants = BuildConfig.class, shadows = { WifiInfoShadow.class }, sdk = 21) public class SSDPClientTest { InetAddress localAddress; @@ -38,7 +39,7 @@ public SSDPClientTest() { @Before public void setUp() throws IOException { - localAddress = Util.getIpAddress(Robolectric.application); + localAddress = Util.getIpAddress(RuntimeEnvironment.application); ssdpClient = new SSDPClient(localAddress, mLocalSocket, wildSocket); } diff --git a/test/src/com/connectsdk/discovery/provider/ssdp/SSDPPacketTest.java b/test/src/com/connectsdk/discovery/provider/ssdp/SSDPPacketTest.java index c9388f97..3d63dd4e 100644 --- a/test/src/com/connectsdk/discovery/provider/ssdp/SSDPPacketTest.java +++ b/test/src/com/connectsdk/discovery/provider/ssdp/SSDPPacketTest.java @@ -1,16 +1,18 @@ package com.connectsdk.discovery.provider.ssdp; +import com.connectsdk.BuildConfig; + import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.RobolectricTestRunner; +import org.robolectric.RobolectricGradleTestRunner; import org.robolectric.annotation.Config; import java.net.DatagramPacket; @RunWith(RobolectricGradleTestRunner.class) -@Config(constants = BuildConfig.class) +@Config(constants = BuildConfig.class, sdk = 21) public class SSDPPacketTest { DatagramPacket mDatagramPacket; diff --git a/test/src/com/connectsdk/service/AirPlayServiceTest.java b/test/src/com/connectsdk/service/AirPlayServiceTest.java index fc583608..bde24111 100644 --- a/test/src/com/connectsdk/service/AirPlayServiceTest.java +++ b/test/src/com/connectsdk/service/AirPlayServiceTest.java @@ -1,5 +1,6 @@ package com.connectsdk.service; +import com.connectsdk.BuildConfig; import com.connectsdk.service.capability.MediaControl; import com.connectsdk.service.command.ServiceCommand; import com.connectsdk.service.command.ServiceCommandError; @@ -12,7 +13,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mockito; -import org.robolectric.RobolectricTestRunner; +import org.robolectric.RobolectricGradleTestRunner; import org.robolectric.annotation.Config; import java.io.IOException; @@ -21,7 +22,7 @@ * Created by Oleksii Frolov on 3/19/2015. */ @RunWith(RobolectricGradleTestRunner.class) -@Config(constants = BuildConfig.class) +@Config(constants = BuildConfig.class, sdk = 21) public class AirPlayServiceTest { private StubAirPlayService service; diff --git a/test/src/com/connectsdk/service/DIALServiceSendCommandTest.java b/test/src/com/connectsdk/service/DIALServiceSendCommandTest.java index ab1b34de..2cfb9042 100644 --- a/test/src/com/connectsdk/service/DIALServiceSendCommandTest.java +++ b/test/src/com/connectsdk/service/DIALServiceSendCommandTest.java @@ -20,6 +20,7 @@ package com.connectsdk.service; +import com.connectsdk.BuildConfig; import com.connectsdk.core.TestUtil; import com.connectsdk.etc.helper.HttpConnection; import com.connectsdk.etc.helper.HttpMessage; @@ -35,14 +36,14 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mockito; -import org.robolectric.Robolectric; -import org.robolectric.RobolectricTestRunner; +import org.robolectric.RobolectricGradleTestRunner; import org.robolectric.annotation.Config; +import org.robolectric.shadows.ShadowLooper; import java.io.IOException; @RunWith(RobolectricGradleTestRunner.class) -@Config(constants = BuildConfig.class) +@Config(constants = BuildConfig.class, sdk = 21) public class DIALServiceSendCommandTest { public static final String COMMAND_URL = "http://host:8080/path"; @@ -150,7 +151,7 @@ public void testSendCommand200ShouldInvokeSuccess() throws Exception { service.sendCommand(command); TestUtil.runUtilBackgroundTasks(); - Robolectric.runUiThreadTasksIncludingDelayedTasks(); + ShadowLooper.runUiThreadTasksIncludingDelayedTasks(); Mockito.verify(listener).onSuccess(Mockito.eq(response)); } @@ -166,7 +167,7 @@ public void testSendCommand201ShouldInvokeSuccess() throws Exception { service.sendCommand(command); TestUtil.runUtilBackgroundTasks(); - Robolectric.runUiThreadTasksIncludingDelayedTasks(); + ShadowLooper.runUiThreadTasksIncludingDelayedTasks(); Mockito.verify(listener).onSuccess(Mockito.eq(response)); } @@ -196,7 +197,7 @@ private void verifyFailedConnection(int code) throws IOException { service.sendCommand(command); TestUtil.runUtilBackgroundTasks(); - Robolectric.runUiThreadTasksIncludingDelayedTasks(); + ShadowLooper.runUiThreadTasksIncludingDelayedTasks(); Mockito.verify(listener).onError(Mockito.any(ServiceCommandError.class)); } diff --git a/test/src/com/connectsdk/service/DIALServiceTest.java b/test/src/com/connectsdk/service/DIALServiceTest.java index bcb3cc29..2e073f3f 100644 --- a/test/src/com/connectsdk/service/DIALServiceTest.java +++ b/test/src/com/connectsdk/service/DIALServiceTest.java @@ -20,6 +20,7 @@ package com.connectsdk.service; +import com.connectsdk.BuildConfig; import com.connectsdk.service.capability.Launcher; import com.connectsdk.service.command.ServiceCommand; import com.connectsdk.service.config.ServiceConfig; @@ -32,11 +33,11 @@ import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Mockito; -import org.robolectric.RobolectricTestRunner; +import org.robolectric.RobolectricGradleTestRunner; import org.robolectric.annotation.Config; @RunWith(RobolectricGradleTestRunner.class) -@Config(constants = BuildConfig.class) +@Config(constants = BuildConfig.class, sdk = 21) public class DIALServiceTest { private static final String APPLICATION_URL = "http://applicationurl"; diff --git a/test/src/com/connectsdk/service/DLNAServiceSendCommandTest.java b/test/src/com/connectsdk/service/DLNAServiceSendCommandTest.java index 132f6760..dfefb7d4 100644 --- a/test/src/com/connectsdk/service/DLNAServiceSendCommandTest.java +++ b/test/src/com/connectsdk/service/DLNAServiceSendCommandTest.java @@ -20,9 +20,9 @@ package com.connectsdk.service; +import com.connectsdk.BuildConfig; import com.connectsdk.core.TestUtil; import com.connectsdk.etc.helper.HttpConnection; -import com.connectsdk.etc.helper.HttpMessage; import com.connectsdk.service.capability.listeners.ResponseListener; import com.connectsdk.service.command.ServiceCommand; import com.connectsdk.service.command.ServiceCommandError; @@ -35,15 +35,15 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mockito; -import org.robolectric.Robolectric; -import org.robolectric.RobolectricTestRunner; +import org.robolectric.RobolectricGradleTestRunner; import org.robolectric.annotation.Config; +import org.robolectric.shadows.ShadowLooper; import java.io.IOException; @RunWith(RobolectricGradleTestRunner.class) -@Config(constants = BuildConfig.class) +@Config(constants = BuildConfig.class, sdk = 21) public class DLNAServiceSendCommandTest { public static final String COMMAND_URL = "http://host:8080/path"; @@ -104,7 +104,7 @@ public void testSendPostCommandWithNullPayload() throws Exception { service.sendCommand(command); TestUtil.runUtilBackgroundTasks(); - Robolectric.runUiThreadTasksIncludingDelayedTasks(); + ShadowLooper.runUiThreadTasksIncludingDelayedTasks(); Mockito.verify(httpConnection, Mockito.times(0)).execute(); Mockito.verify(listener).onError(Mockito.any(ServiceCommandError.class)); @@ -121,7 +121,7 @@ public void testSendPostCommandWithWrongPayload() throws Exception { service.sendCommand(command); TestUtil.runUtilBackgroundTasks(); - Robolectric.runUiThreadTasksIncludingDelayedTasks(); + ShadowLooper.runUiThreadTasksIncludingDelayedTasks(); Mockito.verify(httpConnection, Mockito.times(0)).execute(); Mockito.verify(listener).onError(Mockito.any(ServiceCommandError.class)); diff --git a/test/src/com/connectsdk/service/DLNAServiceTest.java b/test/src/com/connectsdk/service/DLNAServiceTest.java index df7fcaf5..1f39324d 100644 --- a/test/src/com/connectsdk/service/DLNAServiceTest.java +++ b/test/src/com/connectsdk/service/DLNAServiceTest.java @@ -1,5 +1,6 @@ package com.connectsdk.service; +import com.connectsdk.BuildConfig; import com.connectsdk.core.SubtitleInfo; import com.connectsdk.core.TestUtil; import com.connectsdk.discovery.provider.ssdp.Service; @@ -15,8 +16,8 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mockito; -import org.robolectric.Robolectric; -import org.robolectric.RobolectricTestRunner; +import org.robolectric.RobolectricGradleTestRunner; +import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.xml.sax.SAXException; @@ -31,7 +32,7 @@ * Created by oleksii.frolov on 1/13/2015. */ @RunWith(RobolectricGradleTestRunner.class) -@Config(constants = BuildConfig.class) +@Config(constants = BuildConfig.class, sdk = 21) public class DLNAServiceTest { private DLNAService service; @@ -42,7 +43,7 @@ public class DLNAServiceTest { public void setUp() { dlnaServer = Mockito.mock(DLNAHttpServer.class); service = new DLNAService(Mockito.mock(ServiceDescription.class), - Mockito.mock(ServiceConfig.class), Robolectric.application, dlnaServer); + Mockito.mock(ServiceConfig.class), RuntimeEnvironment.application, dlnaServer); } @Test @@ -446,7 +447,7 @@ private DLNAService makeServiceWithControlURL(String base, String controlURL) { ServiceDescription description = Mockito.mock(ServiceDescription.class); Mockito.when(description.getServiceList()).thenReturn(services); - return new DLNAService(description, Mockito.mock(ServiceConfig.class), Robolectric.application, null); + return new DLNAService(description, Mockito.mock(ServiceConfig.class), RuntimeEnvironment.application, null); } private void assertXMLEquals(String expectedXML, String actualXML) throws SAXException, IOException { diff --git a/test/src/com/connectsdk/service/NetCastTVServiceTest.java b/test/src/com/connectsdk/service/NetCastTVServiceTest.java index 243f470d..b876a6ea 100644 --- a/test/src/com/connectsdk/service/NetCastTVServiceTest.java +++ b/test/src/com/connectsdk/service/NetCastTVServiceTest.java @@ -1,12 +1,12 @@ package com.connectsdk.service; +import com.connectsdk.BuildConfig; import com.connectsdk.discovery.DiscoveryManager; import com.connectsdk.service.capability.CapabilityMethods; import com.connectsdk.service.capability.MediaControl; import com.connectsdk.service.capability.MediaPlayer; import com.connectsdk.service.capability.listeners.ResponseListener; import com.connectsdk.service.command.NotSupportedServiceCommandError; -import com.connectsdk.service.command.ServiceCommand; import com.connectsdk.service.command.ServiceCommandError; import com.connectsdk.service.config.ServiceConfig; import com.connectsdk.service.config.ServiceDescription; @@ -18,12 +18,12 @@ import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Mockito; -import org.robolectric.Robolectric; -import org.robolectric.RobolectricTestRunner; +import org.robolectric.RobolectricGradleTestRunner; +import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; @RunWith(RobolectricGradleTestRunner.class) -@Config(constants = BuildConfig.class) +@Config(constants = BuildConfig.class, sdk = 21) public class NetCastTVServiceTest { private NetcastTVService service; @@ -135,7 +135,7 @@ private void verifyNotImplemented(ResponseListener listener) { } private void setPairingLevel(DiscoveryManager.PairingLevel level) { - DiscoveryManager.init(Robolectric.application); + DiscoveryManager.init(RuntimeEnvironment.application); DiscoveryManager.getInstance().setPairingLevel(level); } diff --git a/test/src/com/connectsdk/service/RokuServiceTest.java b/test/src/com/connectsdk/service/RokuServiceTest.java index 60edf7aa..8097241f 100644 --- a/test/src/com/connectsdk/service/RokuServiceTest.java +++ b/test/src/com/connectsdk/service/RokuServiceTest.java @@ -19,6 +19,7 @@ */ package com.connectsdk.service; +import com.connectsdk.BuildConfig; import com.connectsdk.core.MediaInfo; import com.connectsdk.core.TestUtil; import com.connectsdk.service.capability.MediaPlayer; @@ -32,11 +33,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mockito; -import org.robolectric.RobolectricTestRunner; +import org.robolectric.RobolectricGradleTestRunner; import org.robolectric.annotation.Config; @RunWith(RobolectricGradleTestRunner.class) -@Config(constants = BuildConfig.class) +@Config(constants = BuildConfig.class, sdk = 21) public class RokuServiceTest { private StubRokuService service; diff --git a/test/src/com/connectsdk/service/WebOSTVServiceTest.java b/test/src/com/connectsdk/service/WebOSTVServiceTest.java index bcc8b519..f25262a1 100644 --- a/test/src/com/connectsdk/service/WebOSTVServiceTest.java +++ b/test/src/com/connectsdk/service/WebOSTVServiceTest.java @@ -19,6 +19,7 @@ */ package com.connectsdk.service; +import com.connectsdk.BuildConfig; import com.connectsdk.core.ChannelInfo; import com.connectsdk.core.MediaInfo; import com.connectsdk.core.SubtitleInfo; @@ -47,9 +48,9 @@ import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Mockito; -import org.robolectric.Robolectric; -import org.robolectric.RobolectricTestRunner; +import org.robolectric.RobolectricGradleTestRunner; import org.robolectric.annotation.Config; +import org.robolectric.shadows.ShadowLooper; import java.util.Arrays; import java.util.HashMap; @@ -57,7 +58,7 @@ import java.util.Map; @RunWith(RobolectricGradleTestRunner.class) -@Config(constants = BuildConfig.class) +@Config(constants = BuildConfig.class, sdk = 21) public class WebOSTVServiceTest { private WebOSTVService service; @@ -452,7 +453,7 @@ private void verifyPlayMediaOnTheLatestWebOS(MediaInfo mediaInfo, boolean should // run join success ResponseListener webAppListener = argListener.getValue(); webAppListener.onSuccess(null); - Robolectric.runUiThreadTasksIncludingDelayedTasks(); + ShadowLooper.runUiThreadTasksIncludingDelayedTasks(); // should delegate playing media to the WebAppSession ArgumentCaptor argMediaInfo = ArgumentCaptor.forClass(MediaInfo.class); diff --git a/test/src/com/connectsdk/service/airplay/PListParserTest.java b/test/src/com/connectsdk/service/airplay/PListParserTest.java index fe918a5c..32da84af 100644 --- a/test/src/com/connectsdk/service/airplay/PListParserTest.java +++ b/test/src/com/connectsdk/service/airplay/PListParserTest.java @@ -19,13 +19,15 @@ */ package com.connectsdk.service.airplay; +import com.connectsdk.BuildConfig; + import junit.framework.Assert; import org.json.JSONException; import org.json.JSONObject; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.RobolectricTestRunner; +import org.robolectric.RobolectricGradleTestRunner; import org.robolectric.annotation.Config; import org.xmlpull.v1.XmlPullParserException; @@ -33,7 +35,7 @@ @RunWith(RobolectricGradleTestRunner.class) -@Config(constants = BuildConfig.class) +@Config(constants = BuildConfig.class, sdk = 21) public class PListParserTest { @Test diff --git a/test/src/com/connectsdk/service/sessions/WebOSWebAppSessionTest.java b/test/src/com/connectsdk/service/sessions/WebOSWebAppSessionTest.java index 9d3491e6..8e5be5c3 100644 --- a/test/src/com/connectsdk/service/sessions/WebOSWebAppSessionTest.java +++ b/test/src/com/connectsdk/service/sessions/WebOSWebAppSessionTest.java @@ -19,6 +19,9 @@ */ package com.connectsdk.service.sessions; +import android.support.annotation.NonNull; + +import com.connectsdk.BuildConfig; import com.connectsdk.core.MediaInfo; import com.connectsdk.core.SubtitleInfo; import com.connectsdk.service.DeviceService; @@ -41,14 +44,12 @@ import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Mockito; -import org.robolectric.Robolectric; -import org.robolectric.RobolectricTestRunner; +import org.robolectric.RobolectricGradleTestRunner; import org.robolectric.annotation.Config; - -import android.support.annotation.NonNull; +import org.robolectric.shadows.ShadowLooper; @RunWith(RobolectricGradleTestRunner.class) -@Config(constants = BuildConfig.class) +@Config(constants = BuildConfig.class, sdk = 21) public class WebOSWebAppSessionTest { private WebOSWebAppSession session; @@ -73,7 +74,7 @@ public void testPrevious() throws JSONException { ResponseListener listener = Mockito.mock(ResponseListener.class); session.previous(listener); - Robolectric.runUiThreadTasksIncludingDelayedTasks(); + ShadowLooper.runUiThreadTasksIncludingDelayedTasks(); ArgumentCaptor argPacket = ArgumentCaptor.forClass(JSONObject.class); ArgumentCaptor argPayload = ArgumentCaptor.forClass(JSONObject.class); Mockito.verify(socket).sendMessage(argPacket.capture(), argPayload.capture()); @@ -94,7 +95,7 @@ public void testNext() throws JSONException { ResponseListener listener = Mockito.mock(ResponseListener.class); session.next(listener); - Robolectric.runUiThreadTasksIncludingDelayedTasks(); + ShadowLooper.runUiThreadTasksIncludingDelayedTasks(); ArgumentCaptor argPacket = ArgumentCaptor.forClass(JSONObject.class); ArgumentCaptor argPayload = ArgumentCaptor.forClass(JSONObject.class); Mockito.verify(socket).sendMessage(argPacket.capture(), argPayload.capture()); @@ -115,7 +116,7 @@ public void testJumpToTrack() throws JSONException { ResponseListener listener = Mockito.mock(ResponseListener.class); session.jumpToTrack(7, listener); - Robolectric.runUiThreadTasksIncludingDelayedTasks(); + ShadowLooper.runUiThreadTasksIncludingDelayedTasks(); ArgumentCaptor argPacket = ArgumentCaptor.forClass(JSONObject.class); ArgumentCaptor argPayload = ArgumentCaptor.forClass(JSONObject.class); Mockito.verify(socket).sendMessage(argPacket.capture(), argPayload.capture()); diff --git a/test/src/com/connectsdk/service/upnp/DLNAHttpServerTest.java b/test/src/com/connectsdk/service/upnp/DLNAHttpServerTest.java index cf580ea1..a024665d 100644 --- a/test/src/com/connectsdk/service/upnp/DLNAHttpServerTest.java +++ b/test/src/com/connectsdk/service/upnp/DLNAHttpServerTest.java @@ -1,19 +1,20 @@ package com.connectsdk.service.upnp; +import com.connectsdk.BuildConfig; import com.connectsdk.service.command.URLServiceSubscription; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mockito; -import org.robolectric.RobolectricTestRunner; +import org.robolectric.RobolectricGradleTestRunner; import org.robolectric.annotation.Config; /** * Created by oleksii on 4/27/15. */ @RunWith(RobolectricGradleTestRunner.class) -@Config(constants = BuildConfig.class) +@Config(constants = BuildConfig.class, sdk = 21) public class DLNAHttpServerTest { DLNAHttpServer server; diff --git a/test/src/com/connectsdk/service/webos/WebOSTVServiceSocketClientTest.java b/test/src/com/connectsdk/service/webos/WebOSTVServiceSocketClientTest.java index 538f47ef..dce97ff5 100644 --- a/test/src/com/connectsdk/service/webos/WebOSTVServiceSocketClientTest.java +++ b/test/src/com/connectsdk/service/webos/WebOSTVServiceSocketClientTest.java @@ -1,10 +1,9 @@ package com.connectsdk.service.webos; +import com.connectsdk.BuildConfig; import com.connectsdk.service.WebOSTVService; -import com.connectsdk.service.capability.listeners.ResponseListener; import com.connectsdk.service.command.ServiceCommand; -import com.connectsdk.service.command.ServiceCommandError; import junit.framework.Assert; @@ -12,13 +11,13 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mockito; -import org.robolectric.RobolectricTestRunner; +import org.robolectric.RobolectricGradleTestRunner; import org.robolectric.annotation.Config; import java.net.URI; @RunWith(RobolectricGradleTestRunner.class) -@Config(constants = BuildConfig.class) +@Config(constants = BuildConfig.class, sdk = 21) public class WebOSTVServiceSocketClientTest { private WebOSTVServiceSocketClient socketClient;