robolectric tests fixed

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<String> registeredApps = new ArrayList<String>();
 
@@ -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);
         }
 

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

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

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,23 +20,23 @@
 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;
 import java.util.ArrayList;
 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();
     }
 

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());

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

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));

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);
     }
 

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;

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;