From cdf85adde1be30ce675e8c5442ec4c21a6cd2991 Mon Sep 17 00:00:00 2001
From: Adnan Begovic <adnan@cyngn.com>
Date: Tue, 15 Mar 2016 11:29:41 -0700
Subject: cmsdk: Mandate cm sb feature xml's for service implementation.

  The feature xml plays two roles:

      1) To allow sdk interface (constructor) to throw when system
      service is unavailable. This allows for clearer platform
      development debugging.

      2) To allow for simpler disambiguation of what services to
      instrument in a modular environment.

TICKET: CYNGNOS-2289
Change-Id: Ice0ae7c45aecbb34e0ea667128b040906c46d7e7
---
 .../cyanogenmod/tests/customtiles/unit/CMStatusBarManagerTest.java    | 4 ++++
 .../org/cyanogenmod/tests/customtiles/unit/CustomTileBuilderTest.java | 4 ++++
 tests/src/org/cyanogenmod/tests/customtiles/unit/CustomTileTest.java  | 4 ++++
 .../tests/customtiles/unit/StatusBarPanelCustomTileTest.java          | 4 ++++
 4 files changed, 16 insertions(+)

(limited to 'tests')

diff --git a/tests/src/org/cyanogenmod/tests/customtiles/unit/CMStatusBarManagerTest.java b/tests/src/org/cyanogenmod/tests/customtiles/unit/CMStatusBarManagerTest.java
index 67e311c..69e9742 100644
--- a/tests/src/org/cyanogenmod/tests/customtiles/unit/CMStatusBarManagerTest.java
+++ b/tests/src/org/cyanogenmod/tests/customtiles/unit/CMStatusBarManagerTest.java
@@ -19,6 +19,7 @@ package org.cyanogenmod.tests.customtiles.unit;
 import android.test.AndroidTestCase;
 import android.test.suitebuilder.annotation.SmallTest;
 
+import cyanogenmod.app.CMContextConstants;
 import cyanogenmod.app.CMStatusBarManager;
 import cyanogenmod.app.ICMStatusBarManager;
 
@@ -31,6 +32,9 @@ public class CMStatusBarManagerTest extends AndroidTestCase {
     @Override
     protected void setUp() throws Exception {
         super.setUp();
+        // Only run this if we support cm status bar service
+        org.junit.Assume.assumeTrue(mContext.getPackageManager().hasSystemFeature(
+                CMContextConstants.Features.STATUSBAR));
         mCMStatusBarManager = CMStatusBarManager.getInstance(mContext);
     }
 
diff --git a/tests/src/org/cyanogenmod/tests/customtiles/unit/CustomTileBuilderTest.java b/tests/src/org/cyanogenmod/tests/customtiles/unit/CustomTileBuilderTest.java
index 5d20136..544089d 100644
--- a/tests/src/org/cyanogenmod/tests/customtiles/unit/CustomTileBuilderTest.java
+++ b/tests/src/org/cyanogenmod/tests/customtiles/unit/CustomTileBuilderTest.java
@@ -24,6 +24,7 @@ import android.net.Uri;
 import android.test.AndroidTestCase;
 import android.test.suitebuilder.annotation.MediumTest;
 import android.test.suitebuilder.annotation.SmallTest;
+import cyanogenmod.app.CMContextConstants;
 import cyanogenmod.app.CustomTile;
 import org.cyanogenmod.tests.R;
 import org.cyanogenmod.tests.customtiles.CMStatusBarTest;
@@ -39,6 +40,9 @@ public class CustomTileBuilderTest extends AndroidTestCase {
     @Override
     protected void setUp() throws Exception {
         super.setUp();
+        // Only run this if we support cm status bar service
+        org.junit.Assume.assumeTrue(mContext.getPackageManager().hasSystemFeature(
+                CMContextConstants.Features.STATUSBAR));
     }
 
     @SmallTest
diff --git a/tests/src/org/cyanogenmod/tests/customtiles/unit/CustomTileTest.java b/tests/src/org/cyanogenmod/tests/customtiles/unit/CustomTileTest.java
index ca04f56..3863453 100644
--- a/tests/src/org/cyanogenmod/tests/customtiles/unit/CustomTileTest.java
+++ b/tests/src/org/cyanogenmod/tests/customtiles/unit/CustomTileTest.java
@@ -25,6 +25,7 @@ import android.test.AndroidTestCase;
 import android.test.suitebuilder.annotation.MediumTest;
 import android.test.suitebuilder.annotation.SmallTest;
 import android.widget.RemoteViews;
+import cyanogenmod.app.CMContextConstants;
 import cyanogenmod.app.CustomTile;
 
 import org.cyanogenmod.tests.R;
@@ -39,6 +40,9 @@ public class CustomTileTest extends AndroidTestCase {
     @Override
     protected void setUp() throws Exception {
         super.setUp();
+        // Only run this if we support cm status bar service
+        org.junit.Assume.assumeTrue(mContext.getPackageManager().hasSystemFeature(
+                CMContextConstants.Features.STATUSBAR));
     }
 
     @SmallTest
diff --git a/tests/src/org/cyanogenmod/tests/customtiles/unit/StatusBarPanelCustomTileTest.java b/tests/src/org/cyanogenmod/tests/customtiles/unit/StatusBarPanelCustomTileTest.java
index 537622f..6b22f38 100644
--- a/tests/src/org/cyanogenmod/tests/customtiles/unit/StatusBarPanelCustomTileTest.java
+++ b/tests/src/org/cyanogenmod/tests/customtiles/unit/StatusBarPanelCustomTileTest.java
@@ -25,6 +25,7 @@ import android.os.UserHandle;
 import android.test.AndroidTestCase;
 import android.test.suitebuilder.annotation.MediumTest;
 import android.test.suitebuilder.annotation.SmallTest;
+import cyanogenmod.app.CMContextConstants;
 import cyanogenmod.app.CustomTile;
 import cyanogenmod.app.StatusBarPanelCustomTile;
 import org.cyanogenmod.tests.R;
@@ -39,6 +40,9 @@ public class StatusBarPanelCustomTileTest extends AndroidTestCase {
     @Override
     protected void setUp() throws Exception {
         super.setUp();
+        // Only run this if we support cm status bar service
+        org.junit.Assume.assumeTrue(mContext.getPackageManager().hasSystemFeature(
+                CMContextConstants.Features.STATUSBAR));
     }
 
     @SmallTest
-- 
cgit v1.1