Fix android car lib tests.
Change-Id: I1d70396b5cc5fee7c0c211e36aa2d5e6f374fef3
diff --git a/tests/android_car_api_test/AndroidManifest.xml b/tests/android_car_api_test/AndroidManifest.xml
index bdfb3d9..41c23c1 100644
--- a/tests/android_car_api_test/AndroidManifest.xml
+++ b/tests/android_car_api_test/AndroidManifest.xml
@@ -16,11 +16,11 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
- package="com.android.support.car.apitest"
+ package="com.android.car.apitest"
android:sharedUserId="android.uid.system" >
<instrumentation android:name="android.test.InstrumentationTestRunner"
- android:targetPackage="com.android.support.car.apitest"
+ android:targetPackage="com.android.car.apitest"
android:label="Tests for Car APIs"/>
<application android:label="CarApiTest">
diff --git a/tests/android_car_api_test/src/com/android/car/apitest/AppBlockingPackageInfoTest.java b/tests/android_car_api_test/src/com/android/car/apitest/AppBlockingPackageInfoTest.java
index 482374e..999b41a 100644
--- a/tests/android_car_api_test/src/com/android/car/apitest/AppBlockingPackageInfoTest.java
+++ b/tests/android_car_api_test/src/com/android/car/apitest/AppBlockingPackageInfoTest.java
@@ -56,7 +56,7 @@
}
public static final AppBlockingPackageInfo createInfoSelf(Context context) {
- final String packageName = "com.android.support.car.apitest";
+ final String packageName = "com.android.car.apitest";
PackageManager pm = context.getPackageManager();
Signature[] signatures;
try {
diff --git a/tests/android_car_api_test/src/com/android/car/apitest/CarNavigationManagerTest.java b/tests/android_car_api_test/src/com/android/car/apitest/CarNavigationManagerTest.java
index a92b380..367e63b 100644
--- a/tests/android_car_api_test/src/com/android/car/apitest/CarNavigationManagerTest.java
+++ b/tests/android_car_api_test/src/com/android/car/apitest/CarNavigationManagerTest.java
@@ -39,15 +39,15 @@
super.setUp();
mCarNavigationManager =
(CarNavigationManager) getCar().getCarManager(Car.CAR_NAVIGATION_SERVICE);
- assertNotNull(mCarNavigationManager);
mCarAppFocusManager =
(CarAppFocusManager) getCar().getCarManager(Car.APP_FOCUS_SERVICE);
assertNotNull(mCarAppFocusManager);
}
public void testStart() throws Exception {
- if (!mCarNavigationManager.isInstrumentClusterSupported()) {
- Log.w(TAG, "Unable to run the test: instrument cluster is not supported");
+ if (mCarNavigationManager == null) {
+ Log.w(TAG, "Unable to run the test: "
+ + "car navigation manager was not created succesfully.");
return;
}