Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am fbcbad13: Merge "Add sizes to SysUI tests" into mnc-dev

Browse Source 
* commit 'fbcbad138d1b4c55e86ff671821b4feb7fc48f50':
  Add sizes to SysUI tests
This commit is contained in:
Jason Monk
2015-07-29 00:40:58 +00:00
committed by Android Git Automerger
parent 822456ebe3 fbcbad138d
commit ea0ad97949
5 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/CallbackHandlerTest.java
View File

@@ -18,6 +18,7 @@ package com.android.systemui.statusbar.policy;
import android.os.HandlerThread; import android.os.HandlerThread;
import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionInfo;
import android.test.AndroidTestCase; import android.test.AndroidTestCase;
import android.test.suitebuilder.annotation.SmallTest;
import com.android.systemui.R; import com.android.systemui.R;
import com.android.systemui.statusbar.policy.NetworkController.IconState; import com.android.systemui.statusbar.policy.NetworkController.IconState;
@@ -32,6 +33,7 @@ import org.mockito.MockitoAnnotations;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@SmallTest
public class CallbackHandlerTest extends AndroidTestCase { public class CallbackHandlerTest extends AndroidTestCase {
private CallbackHandler mHandler; private CallbackHandler mHandler;

2
packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerDataTest.java
View File

@@ -2,9 +2,11 @@ package com.android.systemui.statusbar.policy;
import android.os.Looper; import android.os.Looper;
import android.telephony.TelephonyManager; import android.telephony.TelephonyManager;
import android.test.suitebuilder.annotation.SmallTest;
import org.mockito.Mockito; import org.mockito.Mockito;
@SmallTest
public class NetworkControllerDataTest extends NetworkControllerBaseTest { public class NetworkControllerDataTest extends NetworkControllerBaseTest {
public void test3gDataIcon() { public void test3gDataIcon() {

2
packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerEthernetTest.java
View File

@@ -1,12 +1,14 @@
package com.android.systemui.statusbar.policy; package com.android.systemui.statusbar.policy;
import android.net.NetworkCapabilities; import android.net.NetworkCapabilities;
import android.test.suitebuilder.annotation.SmallTest;
import com.android.systemui.statusbar.policy.NetworkController.IconState; import com.android.systemui.statusbar.policy.NetworkController.IconState;
import org.mockito.ArgumentCaptor; import org.mockito.ArgumentCaptor;
import org.mockito.Mockito; import org.mockito.Mockito;
@SmallTest
public class NetworkControllerEthernetTest extends NetworkControllerBaseTest { public class NetworkControllerEthernetTest extends NetworkControllerBaseTest {
public void testEthernetIcons() { public void testEthernetIcons() {

2
packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerSignalTest.java
View File

@@ -25,6 +25,7 @@ import android.telephony.ServiceState;
import android.telephony.SignalStrength; import android.telephony.SignalStrength;
import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionInfo;
import android.telephony.TelephonyManager; import android.telephony.TelephonyManager;
import android.test.suitebuilder.annotation.SmallTest;
import com.android.internal.telephony.PhoneConstants; import com.android.internal.telephony.PhoneConstants;
import com.android.internal.telephony.TelephonyIntents; import com.android.internal.telephony.TelephonyIntents;
@@ -36,6 +37,7 @@ import org.mockito.Mockito;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@SmallTest
public class NetworkControllerSignalTest extends NetworkControllerBaseTest { public class NetworkControllerSignalTest extends NetworkControllerBaseTest {
public void testNoIconWithoutMobile() { public void testNoIconWithoutMobile() {

2
packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerWifiTest.java
View File

@@ -5,12 +5,14 @@ import android.net.NetworkCapabilities;
import android.net.NetworkInfo; import android.net.NetworkInfo;
import android.net.wifi.WifiInfo; import android.net.wifi.WifiInfo;
import android.net.wifi.WifiManager; import android.net.wifi.WifiManager;
import android.test.suitebuilder.annotation.SmallTest;
import com.android.systemui.statusbar.policy.NetworkController.IconState; import com.android.systemui.statusbar.policy.NetworkController.IconState;
import org.mockito.ArgumentCaptor; import org.mockito.ArgumentCaptor;
import org.mockito.Mockito; import org.mockito.Mockito;
@SmallTest
public class NetworkControllerWifiTest extends NetworkControllerBaseTest { public class NetworkControllerWifiTest extends NetworkControllerBaseTest {
// These match the constants in WifiManager and need to be kept up to date. // These match the constants in WifiManager and need to be kept up to date.
private static final int MIN_RSSI = -100; private static final int MIN_RSSI = -100;