Move car service test cases to original package
Sharing package name between test and its target will require only
package-private API exposure instead of public.
Bug: 36189057
Test: runtest -x packages/services/Car/tests/carservice_test/
Change-Id: I3b0677c22d929f50b39d95dc0dc7b26d374236f1
diff --git a/tests/carservice_test/src/com/android/car/test/AppFocusTest.java b/tests/carservice_test/src/com/android/car/AppFocusTest.java
similarity index 99%
rename from tests/carservice_test/src/com/android/car/test/AppFocusTest.java
rename to tests/carservice_test/src/com/android/car/AppFocusTest.java
index b63383e..d9bce26 100644
--- a/tests/carservice_test/src/com/android/car/test/AppFocusTest.java
+++ b/tests/carservice_test/src/com/android/car/AppFocusTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.car.test;
+package com.android.car;
import android.car.Car;
import android.car.CarAppFocusManager;
diff --git a/tests/carservice_test/src/com/android/car/test/AudioRoutingPolicyTest.java b/tests/carservice_test/src/com/android/car/AudioRoutingPolicyTest.java
similarity index 99%
rename from tests/carservice_test/src/com/android/car/test/AudioRoutingPolicyTest.java
rename to tests/carservice_test/src/com/android/car/AudioRoutingPolicyTest.java
index 7f4aeac..357da1d 100644
--- a/tests/carservice_test/src/com/android/car/test/AudioRoutingPolicyTest.java
+++ b/tests/carservice_test/src/com/android/car/AudioRoutingPolicyTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.car.test;
+package com.android.car;
import android.hardware.automotive.vehicle.V2_0.VehicleAudioContextFlag;
import android.hardware.automotive.vehicle.V2_0.VehicleAudioRoutingPolicyIndex;
diff --git a/tests/carservice_test/src/com/android/car/test/AudioTestUtils.java b/tests/carservice_test/src/com/android/car/AudioTestUtils.java
similarity index 98%
rename from tests/carservice_test/src/com/android/car/test/AudioTestUtils.java
rename to tests/carservice_test/src/com/android/car/AudioTestUtils.java
index 8c3de7c..459daa2 100644
--- a/tests/carservice_test/src/com/android/car/test/AudioTestUtils.java
+++ b/tests/carservice_test/src/com/android/car/AudioTestUtils.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.car.test;
+package com.android.car;
import android.media.AudioAttributes;
import android.media.AudioFocusRequest;
diff --git a/tests/carservice_test/src/com/android/car/test/CarAudioExtFocusTest.java b/tests/carservice_test/src/com/android/car/CarAudioExtFocusTest.java
similarity index 97%
rename from tests/carservice_test/src/com/android/car/test/CarAudioExtFocusTest.java
rename to tests/carservice_test/src/com/android/car/CarAudioExtFocusTest.java
index 71e0d04..46e1df6 100644
--- a/tests/carservice_test/src/com/android/car/test/CarAudioExtFocusTest.java
+++ b/tests/carservice_test/src/com/android/car/CarAudioExtFocusTest.java
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.car.test;
+package com.android.car;
import static android.hardware.automotive.vehicle.V2_0.VehicleProperty.AUDIO_FOCUS;
-import static com.android.car.test.AudioTestUtils.doRequestFocus;
+import static com.android.car.AudioTestUtils.doRequestFocus;
import static java.lang.Integer.toHexString;
import android.car.Car;
@@ -227,7 +227,7 @@
public void testMediaNavFocus() throws Exception {
//music start
AudioFocusListener listenerMusic = new AudioFocusListener();
- int res = doRequestFocus(mAudioManager, listenerMusic,
+ int res = AudioTestUtils.doRequestFocus(mAudioManager, listenerMusic,
AudioManager.STREAM_MUSIC,
AudioManager.AUDIOFOCUS_GAIN);
assertEquals(AudioManager.AUDIOFOCUS_REQUEST_GRANTED, res);
@@ -249,7 +249,7 @@
setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION).
setUsage(AudioAttributes.USAGE_ASSISTANCE_NAVIGATION_GUIDANCE).
build();
- doRequestFocus(mAudioManager, listenerNav, navAttrib,
+ AudioTestUtils.doRequestFocus(mAudioManager, listenerNav, navAttrib,
AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK);
request = mAudioFocusPropertyHandler.waitForAudioFocusRequest(TIMEOUT_MS);
assertEquals(VehicleAudioFocusRequest.REQUEST_GAIN, request[0]);
@@ -293,7 +293,7 @@
public void testMediaExternalMediaNavFocus() throws Exception {
// android music
AudioFocusListener listenerMusic = new AudioFocusListener();
- int res = doRequestFocus(mAudioManager, listenerMusic,
+ int res = AudioTestUtils.doRequestFocus(mAudioManager, listenerMusic,
AudioManager.STREAM_MUSIC,
AudioManager.AUDIOFOCUS_GAIN);
assertEquals(AudioManager.AUDIOFOCUS_REQUEST_GRANTED, res);
@@ -323,7 +323,7 @@
setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION).
setUsage(AudioAttributes.USAGE_ASSISTANCE_NAVIGATION_GUIDANCE).
build();
- doRequestFocus(mAudioManager, listenerNav, navAttrib,
+ AudioTestUtils.doRequestFocus(mAudioManager, listenerNav, navAttrib,
AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK);
request = mAudioFocusPropertyHandler.waitForAudioFocusRequest(TIMEOUT_MS);
assertEquals(VehicleAudioFocusRequest.REQUEST_GAIN_TRANSIENT_MAY_DUCK,
@@ -369,7 +369,7 @@
assertNotNull(carAudioManager);
AudioAttributes radioAttributes = carAudioManager.getAudioAttributesForCarUsage(
CarAudioManager.CAR_AUDIO_USAGE_RADIO);
- int res = doRequestFocus(mAudioManager, listenerRadio,
+ int res = AudioTestUtils.doRequestFocus(mAudioManager, listenerRadio,
radioAttributes, AudioManager.AUDIOFOCUS_GAIN);
assertEquals(AudioManager.AUDIOFOCUS_REQUEST_GRANTED, res);
int[] request = mAudioFocusPropertyHandler.waitForAudioFocusRequest(TIMEOUT_MS);
@@ -389,7 +389,7 @@
AudioFocusListener listenerNav = new AudioFocusListener();
AudioAttributes extNavAttributes = mCarAudioManager.getAudioAttributesForExternalSource(
CarAudioManager.CAR_EXTERNAL_SOURCE_TYPE_EXT_NAV_GUIDANCE);
- res = doRequestFocus(mAudioManager, listenerNav,
+ res = AudioTestUtils.doRequestFocus(mAudioManager, listenerNav,
extNavAttributes, AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK);
assertEquals(AudioManager.AUDIOFOCUS_REQUEST_GRANTED, res);
request = mAudioFocusPropertyHandler.waitForAudioFocusRequest(TIMEOUT_MS);
@@ -438,7 +438,7 @@
public void testMediaExternalNav() throws Exception {
// android music
AudioFocusListener listenerMusic = new AudioFocusListener();
- int res = doRequestFocus(mAudioManager, listenerMusic,
+ int res = AudioTestUtils.doRequestFocus(mAudioManager, listenerMusic,
AudioManager.STREAM_MUSIC,
AudioManager.AUDIOFOCUS_GAIN);
assertEquals(AudioManager.AUDIOFOCUS_REQUEST_GRANTED, res);
@@ -458,7 +458,7 @@
AudioFocusListener listenerNav = new AudioFocusListener();
AudioAttributes extNavAttributes = mCarAudioManager.getAudioAttributesForExternalSource(
CarAudioManager.CAR_EXTERNAL_SOURCE_TYPE_EXT_NAV_GUIDANCE);
- res = doRequestFocus(mAudioManager, listenerNav,
+ res = AudioTestUtils.doRequestFocus(mAudioManager, listenerNav,
extNavAttributes, AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK);
assertEquals(AudioManager.AUDIOFOCUS_REQUEST_GRANTED, res);
request = mAudioFocusPropertyHandler.waitForAudioFocusRequest(TIMEOUT_MS);
@@ -514,7 +514,7 @@
AudioFocusListener listenerIntNav = new AudioFocusListener();
AudioAttributes intNavAttributes = mCarAudioManager.getAudioAttributesForCarUsage(
CarAudioManager.CAR_AUDIO_USAGE_NAVIGATION_GUIDANCE);
- int res = doRequestFocus(mAudioManager, listenerIntNav, intNavAttributes,
+ int res = AudioTestUtils.doRequestFocus(mAudioManager, listenerIntNav, intNavAttributes,
AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK);
assertEquals(AudioManager.AUDIOFOCUS_REQUEST_GRANTED, res);
int[] request = mAudioFocusPropertyHandler.waitForAudioFocusRequest(TIMEOUT_MS);
@@ -534,7 +534,7 @@
AudioFocusListener listenerExtNav = new AudioFocusListener();
AudioAttributes extNavAttributes = mCarAudioManager.getAudioAttributesForExternalSource(
CarAudioManager.CAR_EXTERNAL_SOURCE_TYPE_EXT_NAV_GUIDANCE);
- res = doRequestFocus(mAudioManager, listenerExtNav,
+ res = AudioTestUtils.doRequestFocus(mAudioManager, listenerExtNav,
extNavAttributes, AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK);
assertEquals(AudioManager.AUDIOFOCUS_REQUEST_GRANTED, res);
request = mAudioFocusPropertyHandler.waitForAudioFocusRequest(TIMEOUT_MS);
@@ -582,7 +582,7 @@
public void testMediaExternalRadioNavMediaFocus() throws Exception {
// android music
AudioFocusListener listenerMusic = new AudioFocusListener();
- int res = doRequestFocus(mAudioManager, listenerMusic,
+ int res = AudioTestUtils.doRequestFocus(mAudioManager, listenerMusic,
AudioManager.STREAM_MUSIC,
AudioManager.AUDIOFOCUS_GAIN);
assertEquals(AudioManager.AUDIOFOCUS_REQUEST_GRANTED, res);
@@ -605,7 +605,7 @@
assertNotNull(carAudioManager);
AudioAttributes radioAttributes = carAudioManager.getAudioAttributesForCarUsage(
CarAudioManager.CAR_AUDIO_USAGE_RADIO);
- res = doRequestFocus(mAudioManager, listenerRadio,
+ res = AudioTestUtils.doRequestFocus(mAudioManager, listenerRadio,
radioAttributes, AudioManager.AUDIOFOCUS_GAIN);
assertEquals(AudioManager.AUDIOFOCUS_REQUEST_GRANTED, res);
request = mAudioFocusPropertyHandler.waitForAudioFocusRequest(TIMEOUT_MS);
@@ -627,7 +627,7 @@
setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION).
setUsage(AudioAttributes.USAGE_ASSISTANCE_NAVIGATION_GUIDANCE).
build();
- res = doRequestFocus(mAudioManager, listenerNav, navAttrib,
+ res = AudioTestUtils.doRequestFocus(mAudioManager, listenerNav, navAttrib,
AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK);
request = mAudioFocusPropertyHandler.waitForAudioFocusRequest(TIMEOUT_MS);
assertEquals(VehicleAudioFocusRequest.REQUEST_GAIN,
@@ -763,7 +763,7 @@
assertNotNull(carAudioManager);
AudioAttributes radioAttributes = carAudioManager.getAudioAttributesForCarUsage(mediaUsage);
Log.i(TAG, "request media Focus");
- int res = doRequestFocus(mAudioManager, listenerMedia,
+ int res = AudioTestUtils.doRequestFocus(mAudioManager, listenerMedia,
radioAttributes, AudioManager.AUDIOFOCUS_GAIN);
assertEquals(AudioManager.AUDIOFOCUS_REQUEST_GRANTED, res);
int[] request = mAudioFocusPropertyHandler.waitForAudioFocusRequest(TIMEOUT_MS);
@@ -807,7 +807,7 @@
setUsage(AudioAttributes.USAGE_ASSISTANCE_NAVIGATION_GUIDANCE).
build();
Log.i(TAG, "request nav Focus");
- res = doRequestFocus(mAudioManager, listenerNav, navAttrib,
+ res = AudioTestUtils.doRequestFocus(mAudioManager, listenerNav, navAttrib,
AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK);
request = mAudioFocusPropertyHandler.waitForAudioFocusRequest(TIMEOUT_MS);
assertEquals(VehicleAudioFocusRequest.REQUEST_GAIN_TRANSIENT_MAY_DUCK,
diff --git a/tests/carservice_test/src/com/android/car/test/CarAudioFocusSystemSoundTest.java b/tests/carservice_test/src/com/android/car/CarAudioFocusSystemSoundTest.java
similarity index 97%
rename from tests/carservice_test/src/com/android/car/test/CarAudioFocusSystemSoundTest.java
rename to tests/carservice_test/src/com/android/car/CarAudioFocusSystemSoundTest.java
index afafb28..5e0d2e7 100644
--- a/tests/carservice_test/src/com/android/car/test/CarAudioFocusSystemSoundTest.java
+++ b/tests/carservice_test/src/com/android/car/CarAudioFocusSystemSoundTest.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.car.test;
+package com.android.car;
import static android.hardware.automotive.vehicle.V2_0.VehicleProperty.AUDIO_FOCUS;
import static android.hardware.automotive.vehicle.V2_0.VehicleProperty.AUDIO_STREAM_STATE;
-import static com.android.car.test.AudioTestUtils.doRequestFocus;
+import static com.android.car.AudioTestUtils.doRequestFocus;
import com.google.android.collect.Lists;
@@ -137,7 +137,7 @@
assertNotNull(carAudioManager);
AudioAttributes radioAttributes = carAudioManager.getAudioAttributesForCarUsage(
CarAudioManager.CAR_AUDIO_USAGE_RADIO);
- int res = doRequestFocus(mAudioManager, listenerRadio,
+ int res = AudioTestUtils.doRequestFocus(mAudioManager, listenerRadio,
radioAttributes, AudioManager.AUDIOFOCUS_GAIN);
assertEquals(AudioManager.AUDIOFOCUS_REQUEST_GRANTED, res);
int[] request = mAudioFocusPropertyHandler.waitForAudioFocusRequest(TIMEOUT_MS);
@@ -191,7 +191,7 @@
public void testMusicSystemSound() throws Exception {
// music start
AudioFocusListener listenerMusic = new AudioFocusListener();
- int res = doRequestFocus(mAudioManager, listenerMusic,
+ int res = AudioTestUtils.doRequestFocus(mAudioManager, listenerMusic,
AudioManager.STREAM_MUSIC,
AudioManager.AUDIOFOCUS_GAIN);
assertEquals(AudioManager.AUDIOFOCUS_REQUEST_GRANTED, res);
@@ -247,7 +247,7 @@
setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION).
setUsage(AudioAttributes.USAGE_ASSISTANCE_NAVIGATION_GUIDANCE).
build();
- int res = doRequestFocus(mAudioManager, listenerNav, navAttrib,
+ int res = AudioTestUtils.doRequestFocus(mAudioManager, listenerNav, navAttrib,
AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK);
assertEquals(AudioManager.AUDIOFOCUS_REQUEST_GRANTED, res);
int[] request = mAudioFocusPropertyHandler.waitForAudioFocusRequest(TIMEOUT_MS);
diff --git a/tests/carservice_test/src/com/android/car/test/CarAudioFocusTest.java b/tests/carservice_test/src/com/android/car/CarAudioFocusTest.java
similarity index 96%
rename from tests/carservice_test/src/com/android/car/test/CarAudioFocusTest.java
rename to tests/carservice_test/src/com/android/car/CarAudioFocusTest.java
index 6f5da5f..982924f 100644
--- a/tests/carservice_test/src/com/android/car/test/CarAudioFocusTest.java
+++ b/tests/carservice_test/src/com/android/car/CarAudioFocusTest.java
@@ -13,10 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.car.test;
+package com.android.car;
import static android.hardware.automotive.vehicle.V2_0.VehicleProperty.AUDIO_FOCUS;
-import static com.android.car.test.AudioTestUtils.doRequestFocus;
import android.car.Car;
import android.car.media.CarAudioManager;
@@ -136,7 +135,7 @@
public void testMediaNavFocus() throws Exception {
//music start
AudioFocusListener listenerMusic = new AudioFocusListener();
- int res = doRequestFocus(mAudioManager, listenerMusic,
+ int res = AudioTestUtils.doRequestFocus(mAudioManager, listenerMusic,
AudioManager.STREAM_MUSIC,
AudioManager.AUDIOFOCUS_GAIN);
assertEquals(AudioManager.AUDIOFOCUS_REQUEST_GRANTED, res);
@@ -156,7 +155,7 @@
setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION).
setUsage(AudioAttributes.USAGE_ASSISTANCE_NAVIGATION_GUIDANCE).
build();
- doRequestFocus(mAudioManager, listenerNav, navAttrib,
+ AudioTestUtils.doRequestFocus(mAudioManager, listenerNav, navAttrib,
AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK);
request = mAudioFocusPropertyHandler.waitForAudioFocusRequest(TIMEOUT_MS);
assertEquals(VehicleAudioFocusRequest.REQUEST_GAIN, request[0]);
@@ -194,7 +193,7 @@
public void testMediaExternalMediaNavFocus() throws Exception {
// android music
AudioFocusListener listenerMusic = new AudioFocusListener();
- int res = doRequestFocus(mAudioManager, listenerMusic,
+ int res = AudioTestUtils.doRequestFocus(mAudioManager, listenerMusic,
AudioManager.STREAM_MUSIC,
AudioManager.AUDIOFOCUS_GAIN);
assertEquals(AudioManager.AUDIOFOCUS_REQUEST_GRANTED, res);
@@ -222,7 +221,7 @@
setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION).
setUsage(AudioAttributes.USAGE_ASSISTANCE_NAVIGATION_GUIDANCE).
build();
- doRequestFocus(mAudioManager, listenerNav, navAttrib,
+ AudioTestUtils.doRequestFocus(mAudioManager, listenerNav, navAttrib,
AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK);
request = mAudioFocusPropertyHandler.waitForAudioFocusRequest(TIMEOUT_MS);
assertEquals(VehicleAudioFocusRequest.REQUEST_GAIN_TRANSIENT_MAY_DUCK,
@@ -259,7 +258,7 @@
public void testMediaExternalRadioNavMediaFocus() throws Exception {
// android music
AudioFocusListener listenerMusic = new AudioFocusListener();
- int res = doRequestFocus(mAudioManager, listenerMusic,
+ int res = AudioTestUtils.doRequestFocus(mAudioManager, listenerMusic,
AudioManager.STREAM_MUSIC,
AudioManager.AUDIOFOCUS_GAIN);
assertEquals(AudioManager.AUDIOFOCUS_REQUEST_GRANTED, res);
@@ -280,7 +279,7 @@
assertNotNull(carAudioManager);
AudioAttributes radioAttributes = carAudioManager.getAudioAttributesForCarUsage(
CarAudioManager.CAR_AUDIO_USAGE_RADIO);
- res = doRequestFocus(mAudioManager, listenerRadio,
+ res = AudioTestUtils.doRequestFocus(mAudioManager, listenerRadio,
radioAttributes, AudioManager.AUDIOFOCUS_GAIN);
assertEquals(AudioManager.AUDIOFOCUS_REQUEST_GRANTED, res);
request = mAudioFocusPropertyHandler.waitForAudioFocusRequest(TIMEOUT_MS);
@@ -300,7 +299,7 @@
setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION).
setUsage(AudioAttributes.USAGE_ASSISTANCE_NAVIGATION_GUIDANCE).
build();
- res = doRequestFocus(mAudioManager, listenerNav, navAttrib,
+ res = AudioTestUtils.doRequestFocus(mAudioManager, listenerNav, navAttrib,
AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK);
request = mAudioFocusPropertyHandler.waitForAudioFocusRequest(TIMEOUT_MS);
assertEquals(VehicleAudioFocusRequest.REQUEST_GAIN,
@@ -361,7 +360,7 @@
int context)
throws Exception {
AudioFocusListener lister = new AudioFocusListener();
- int res = doRequestFocus(mAudioManager, lister,
+ int res = AudioTestUtils.doRequestFocus(mAudioManager, lister,
streamType,
androidFocus);
assertEquals(AudioManager.AUDIOFOCUS_REQUEST_GRANTED, res);
@@ -427,7 +426,7 @@
assertNotNull(carAudioManager);
AudioAttributes radioAttributes = carAudioManager.getAudioAttributesForCarUsage(mediaUsage);
Log.i(TAG, "request media Focus");
- int res = doRequestFocus(mAudioManager, listenerMedia,
+ int res = AudioTestUtils.doRequestFocus(mAudioManager, listenerMedia,
radioAttributes, AudioManager.AUDIOFOCUS_GAIN);
assertEquals(AudioManager.AUDIOFOCUS_REQUEST_GRANTED, res);
int[] request = mAudioFocusPropertyHandler.waitForAudioFocusRequest(TIMEOUT_MS);
@@ -462,7 +461,7 @@
setUsage(AudioAttributes.USAGE_ASSISTANCE_NAVIGATION_GUIDANCE).
build();
Log.i(TAG, "request nav Focus");
- res = doRequestFocus(mAudioManager, listenerNav, navAttrib,
+ res = AudioTestUtils.doRequestFocus(mAudioManager, listenerNav, navAttrib,
AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK);
request = mAudioFocusPropertyHandler.waitForAudioFocusRequest(TIMEOUT_MS);
assertEquals(VehicleAudioFocusRequest.REQUEST_GAIN_TRANSIENT_MAY_DUCK,
diff --git a/tests/carservice_test/src/com/android/car/test/CarAudioManagerTest.java b/tests/carservice_test/src/com/android/car/CarAudioManagerTest.java
similarity index 99%
rename from tests/carservice_test/src/com/android/car/test/CarAudioManagerTest.java
rename to tests/carservice_test/src/com/android/car/CarAudioManagerTest.java
index 07646d4..a66cc60 100644
--- a/tests/carservice_test/src/com/android/car/test/CarAudioManagerTest.java
+++ b/tests/carservice_test/src/com/android/car/CarAudioManagerTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.car.test;
+package com.android.car;
import android.car.Car;
import android.car.media.CarAudioManager;
diff --git a/tests/carservice_test/src/com/android/car/test/CarCabinManagerTest.java b/tests/carservice_test/src/com/android/car/CarCabinManagerTest.java
similarity index 99%
rename from tests/carservice_test/src/com/android/car/test/CarCabinManagerTest.java
rename to tests/carservice_test/src/com/android/car/CarCabinManagerTest.java
index cef163e..58b784b 100644
--- a/tests/carservice_test/src/com/android/car/test/CarCabinManagerTest.java
+++ b/tests/carservice_test/src/com/android/car/CarCabinManagerTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.car.test;
+package com.android.car;
import android.car.Car;
import android.car.hardware.CarPropertyValue;
diff --git a/tests/carservice_test/src/com/android/car/test/CarDiagnosticConstantsTest.java b/tests/carservice_test/src/com/android/car/CarDiagnosticConstantsTest.java
similarity index 99%
rename from tests/carservice_test/src/com/android/car/test/CarDiagnosticConstantsTest.java
rename to tests/carservice_test/src/com/android/car/CarDiagnosticConstantsTest.java
index 2ed2658..33be912 100644
--- a/tests/carservice_test/src/com/android/car/test/CarDiagnosticConstantsTest.java
+++ b/tests/carservice_test/src/com/android/car/CarDiagnosticConstantsTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.car.test;
+package com.android.car;
import android.test.suitebuilder.annotation.MediumTest;
import android.util.Log;
diff --git a/tests/carservice_test/src/com/android/car/test/CarDiagnosticManagerTest.java b/tests/carservice_test/src/com/android/car/CarDiagnosticManagerTest.java
similarity index 99%
rename from tests/carservice_test/src/com/android/car/test/CarDiagnosticManagerTest.java
rename to tests/carservice_test/src/com/android/car/CarDiagnosticManagerTest.java
index 56d8a00..eb7ef57 100644
--- a/tests/carservice_test/src/com/android/car/test/CarDiagnosticManagerTest.java
+++ b/tests/carservice_test/src/com/android/car/CarDiagnosticManagerTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.car.test;
+package com.android.car;
import static java.lang.Integer.toHexString;
diff --git a/tests/carservice_test/src/com/android/car/test/CarHvacManagerTest.java b/tests/carservice_test/src/com/android/car/CarHvacManagerTest.java
similarity index 99%
rename from tests/carservice_test/src/com/android/car/test/CarHvacManagerTest.java
rename to tests/carservice_test/src/com/android/car/CarHvacManagerTest.java
index 07f879e..9c89694 100644
--- a/tests/carservice_test/src/com/android/car/test/CarHvacManagerTest.java
+++ b/tests/carservice_test/src/com/android/car/CarHvacManagerTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.car.test;
+package com.android.car;
import android.car.Car;
import android.car.hardware.CarPropertyValue;
diff --git a/tests/carservice_test/src/com/android/car/test/CarInfoManagerTest.java b/tests/carservice_test/src/com/android/car/CarInfoManagerTest.java
similarity index 98%
rename from tests/carservice_test/src/com/android/car/test/CarInfoManagerTest.java
rename to tests/carservice_test/src/com/android/car/CarInfoManagerTest.java
index 2cdbbb0..fe32615 100644
--- a/tests/carservice_test/src/com/android/car/test/CarInfoManagerTest.java
+++ b/tests/carservice_test/src/com/android/car/CarInfoManagerTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.car.test;
+package com.android.car;
import android.car.Car;
import android.car.CarInfoManager;
diff --git a/tests/carservice_test/src/com/android/car/test/CarPackageManagerTest.java b/tests/carservice_test/src/com/android/car/CarPackageManagerTest.java
similarity index 99%
rename from tests/carservice_test/src/com/android/car/test/CarPackageManagerTest.java
rename to tests/carservice_test/src/com/android/car/CarPackageManagerTest.java
index c455bc4..ffbf5a4 100644
--- a/tests/carservice_test/src/com/android/car/test/CarPackageManagerTest.java
+++ b/tests/carservice_test/src/com/android/car/CarPackageManagerTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.car.test;
+package com.android.car;
import android.car.Car;
import android.car.CarNotConnectedException;
diff --git a/tests/carservice_test/src/com/android/car/test/CarPowerManagementTest.java b/tests/carservice_test/src/com/android/car/CarPowerManagementTest.java
similarity index 99%
rename from tests/carservice_test/src/com/android/car/test/CarPowerManagementTest.java
rename to tests/carservice_test/src/com/android/car/CarPowerManagementTest.java
index d5e5bf8..64d9b82 100644
--- a/tests/carservice_test/src/com/android/car/test/CarPowerManagementTest.java
+++ b/tests/carservice_test/src/com/android/car/CarPowerManagementTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.car.test;
+package com.android.car;
import android.hardware.automotive.vehicle.V2_0.VehicleApPowerBootupReason;
import android.hardware.automotive.vehicle.V2_0.VehicleApPowerSetState;
diff --git a/tests/carservice_test/src/com/android/car/test/CarProjectionManagerTest.java b/tests/carservice_test/src/com/android/car/CarProjectionManagerTest.java
similarity index 99%
rename from tests/carservice_test/src/com/android/car/test/CarProjectionManagerTest.java
rename to tests/carservice_test/src/com/android/car/CarProjectionManagerTest.java
index adf288c..773a296 100644
--- a/tests/carservice_test/src/com/android/car/test/CarProjectionManagerTest.java
+++ b/tests/carservice_test/src/com/android/car/CarProjectionManagerTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.car.test;
+package com.android.car;
import android.car.Car;
import android.car.CarProjectionManager;
diff --git a/tests/carservice_test/src/com/android/car/test/CarRadioManagerTest.java b/tests/carservice_test/src/com/android/car/CarRadioManagerTest.java
similarity index 99%
rename from tests/carservice_test/src/com/android/car/test/CarRadioManagerTest.java
rename to tests/carservice_test/src/com/android/car/CarRadioManagerTest.java
index 169a370..7288259 100644
--- a/tests/carservice_test/src/com/android/car/test/CarRadioManagerTest.java
+++ b/tests/carservice_test/src/com/android/car/CarRadioManagerTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.car.test;
+package com.android.car;
import android.car.Car;
import android.car.hardware.radio.CarRadioEvent;
diff --git a/tests/carservice_test/src/com/android/car/test/CarSensorManagerTest.java b/tests/carservice_test/src/com/android/car/CarSensorManagerTest.java
similarity index 99%
rename from tests/carservice_test/src/com/android/car/test/CarSensorManagerTest.java
rename to tests/carservice_test/src/com/android/car/CarSensorManagerTest.java
index daddfdb..00120a3 100644
--- a/tests/carservice_test/src/com/android/car/test/CarSensorManagerTest.java
+++ b/tests/carservice_test/src/com/android/car/CarSensorManagerTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.car.test;
+package com.android.car;
import android.car.Car;
import android.car.CarNotConnectedException;
diff --git a/tests/carservice_test/src/com/android/car/test/CarVendorExtensionManagerTest.java b/tests/carservice_test/src/com/android/car/CarVendorExtensionManagerTest.java
similarity index 99%
rename from tests/carservice_test/src/com/android/car/test/CarVendorExtensionManagerTest.java
rename to tests/carservice_test/src/com/android/car/CarVendorExtensionManagerTest.java
index fa33e56..29b24e3 100644
--- a/tests/carservice_test/src/com/android/car/test/CarVendorExtensionManagerTest.java
+++ b/tests/carservice_test/src/com/android/car/CarVendorExtensionManagerTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.car.test;
+package com.android.car;
import static com.android.car.CarServiceUtils.toByteArray;
diff --git a/tests/carservice_test/src/com/android/car/test/CarVolumeServiceTest.java b/tests/carservice_test/src/com/android/car/CarVolumeServiceTest.java
similarity index 97%
rename from tests/carservice_test/src/com/android/car/test/CarVolumeServiceTest.java
rename to tests/carservice_test/src/com/android/car/CarVolumeServiceTest.java
index 6e4785a..0d9a607 100644
--- a/tests/carservice_test/src/com/android/car/test/CarVolumeServiceTest.java
+++ b/tests/carservice_test/src/com/android/car/CarVolumeServiceTest.java
@@ -13,12 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.car.test;
-
-import static com.android.car.test.AudioTestUtils.doRequestFocus;
-
-import com.android.car.VolumeUtils;
-import com.google.android.collect.Lists;
+package com.android.car;
import android.car.Car;
import android.car.CarNotConnectedException;
@@ -43,19 +38,19 @@
import android.util.SparseIntArray;
import android.view.KeyEvent;
+import com.google.android.collect.Lists;
+
import com.android.car.vehiclehal.VehiclePropValueBuilder;
import com.android.car.vehiclehal.test.MockedVehicleHal.VehicleHalPropertyHandler;
import com.android.internal.annotations.GuardedBy;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.List;
@MediumTest
public class CarVolumeServiceTest extends MockedCarTestBase {
private static final String TAG = CarVolumeServiceTest.class.getSimpleName();
- private static final int MIN_VOL = 1;
private static final int MAX_VOL = 20;
private static final long TIMEOUT_MS = 3000;
private static final long POLL_INTERVAL_MS = 50;
@@ -115,7 +110,7 @@
// give focus to music, now current context becomes VehicleAudioContextFlag.MUSIC_FLAG
CarAudioFocusTest.AudioFocusListener listenerMusic =
new CarAudioFocusTest.AudioFocusListener();
- int res = doRequestFocus(mAudioManager, listenerMusic,
+ int res = AudioTestUtils.doRequestFocus(mAudioManager, listenerMusic,
AudioManager.STREAM_MUSIC,
AudioManager.AUDIOFOCUS_GAIN);
assertEquals(AudioManager.AUDIOFOCUS_REQUEST_GRANTED, res);
@@ -188,7 +183,7 @@
// first give focus to system sound
CarAudioFocusTest.AudioFocusListener listenerMusic =
new CarAudioFocusTest.AudioFocusListener();
- int res = doRequestFocus(mAudioManager, listenerMusic,
+ int res = AudioTestUtils.doRequestFocus(mAudioManager, listenerMusic,
AudioManager.STREAM_SYSTEM,
AudioManager.AUDIOFOCUS_GAIN);
assertEquals(AudioManager.AUDIOFOCUS_REQUEST_GRANTED, res);
@@ -204,7 +199,7 @@
AudioAttributes callAttrib = (new AudioAttributes.Builder()).
setUsage(AudioAttributes.USAGE_ALARM).
build();
- res = doRequestFocus(mAudioManager, listenerAlarm, callAttrib,
+ res = AudioTestUtils.doRequestFocus(mAudioManager, listenerAlarm, callAttrib,
AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK);
assertEquals(AudioManager.AUDIOFOCUS_REQUEST_GRANTED, res);
request = mAudioFocusPropertyHandler.waitForAudioFocusRequest(TIMEOUT_MS);
@@ -237,7 +232,7 @@
CarAudioFocusTest.AudioFocusListener listenerMusic =
new CarAudioFocusTest.AudioFocusListener();
- int res = doRequestFocus(mAudioManager, listenerMusic,
+ int res = AudioTestUtils.doRequestFocus(mAudioManager, listenerMusic,
AudioManager.STREAM_MUSIC,
AudioManager.AUDIOFOCUS_GAIN);
assertEquals(AudioManager.AUDIOFOCUS_REQUEST_GRANTED, res);
@@ -259,7 +254,7 @@
AudioAttributes callAttrib = (new AudioAttributes.Builder()).
setUsage(AudioAttributes.USAGE_VOICE_COMMUNICATION).
build();
- doRequestFocus(mAudioManager, listenerCall, callAttrib,
+ AudioTestUtils.doRequestFocus(mAudioManager, listenerCall, callAttrib,
AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK);
request = mAudioFocusPropertyHandler.waitForAudioFocusRequest(TIMEOUT_MS);
mAudioFocusPropertyHandler.sendAudioFocusState(
diff --git a/tests/carservice_test/src/com/android/car/test/GarageModeTest.java b/tests/carservice_test/src/com/android/car/GarageModeTest.java
similarity index 96%
rename from tests/carservice_test/src/com/android/car/test/GarageModeTest.java
rename to tests/carservice_test/src/com/android/car/GarageModeTest.java
index 19ccb6e..06abdc8 100644
--- a/tests/carservice_test/src/com/android/car/test/GarageModeTest.java
+++ b/tests/carservice_test/src/com/android/car/GarageModeTest.java
@@ -13,17 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.car.test;
+package com.android.car;
import android.car.settings.CarSettings;
import android.content.Context;
import android.test.AndroidTestCase;
import android.test.suitebuilder.annotation.MediumTest;
-import com.android.car.CarPowerManagementService;
-import com.android.car.DeviceIdleControllerWrapper;
-import com.android.car.GarageModeService;
-
@MediumTest
public class GarageModeTest extends AndroidTestCase {
diff --git a/tests/carservice_test/src/com/android/car/test/MockedCarTestBase.java b/tests/carservice_test/src/com/android/car/MockedCarTestBase.java
similarity index 98%
rename from tests/carservice_test/src/com/android/car/test/MockedCarTestBase.java
rename to tests/carservice_test/src/com/android/car/MockedCarTestBase.java
index a060496..d55120a 100644
--- a/tests/carservice_test/src/com/android/car/test/MockedCarTestBase.java
+++ b/tests/carservice_test/src/com/android/car/MockedCarTestBase.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.car.test;
+package com.android.car;
import android.car.test.CarTestManager;
import android.car.test.CarTestManagerBinderWrapper;
@@ -31,9 +31,6 @@
import android.test.AndroidTestCase;
import android.util.Log;
-import com.android.car.CarPowerManagementService;
-import com.android.car.ICarImpl;
-import com.android.car.SystemInterface;
import com.android.car.vehiclehal.test.MockedVehicleHal;
import com.android.car.vehiclehal.test.MockedVehicleHal.DefaultPropertyHandler;
import com.android.car.vehiclehal.test.MockedVehicleHal.StaticPropertyHandler;
diff --git a/tests/carservice_test/src/com/android/car/test/SimpleVmsPublisherClientService.java b/tests/carservice_test/src/com/android/car/SimpleVmsPublisherClientService.java
similarity index 97%
rename from tests/carservice_test/src/com/android/car/test/SimpleVmsPublisherClientService.java
rename to tests/carservice_test/src/com/android/car/SimpleVmsPublisherClientService.java
index 09a10d8..53491b1 100644
--- a/tests/carservice_test/src/com/android/car/test/SimpleVmsPublisherClientService.java
+++ b/tests/carservice_test/src/com/android/car/SimpleVmsPublisherClientService.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.car.test;
+package com.android.car;
import android.car.vms.VmsPublisherClientService;
import android.car.vms.VmsSubscriptionState;
diff --git a/tests/carservice_test/src/com/android/car/test/SystemActivityMonitoringServiceTest.java b/tests/carservice_test/src/com/android/car/SystemActivityMonitoringServiceTest.java
similarity index 98%
rename from tests/carservice_test/src/com/android/car/test/SystemActivityMonitoringServiceTest.java
rename to tests/carservice_test/src/com/android/car/SystemActivityMonitoringServiceTest.java
index 3345605..d95170d 100644
--- a/tests/carservice_test/src/com/android/car/test/SystemActivityMonitoringServiceTest.java
+++ b/tests/carservice_test/src/com/android/car/SystemActivityMonitoringServiceTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.car.test;
+package com.android.car;
import android.app.Activity;
import android.content.ComponentName;
@@ -25,7 +25,6 @@
import android.os.SystemClock;
import android.test.suitebuilder.annotation.MediumTest;
-import com.android.car.SystemActivityMonitoringService;
import com.android.car.SystemActivityMonitoringService.TopTaskInfoContainer;
import com.android.car.vehiclehal.VehiclePropValueBuilder;
import com.android.car.vehiclehal.test.MockedVehicleHal.VehicleHalPropertyHandler;
diff --git a/tests/carservice_test/src/com/android/car/test/TestAppBlockingPolicyService.java b/tests/carservice_test/src/com/android/car/TestAppBlockingPolicyService.java
similarity index 98%
rename from tests/carservice_test/src/com/android/car/test/TestAppBlockingPolicyService.java
rename to tests/carservice_test/src/com/android/car/TestAppBlockingPolicyService.java
index dc1ad8a..ec30d0d 100644
--- a/tests/carservice_test/src/com/android/car/test/TestAppBlockingPolicyService.java
+++ b/tests/carservice_test/src/com/android/car/TestAppBlockingPolicyService.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.car.test;
+package com.android.car;
import android.car.content.pm.AppBlockingPackageInfo;
import android.car.content.pm.CarAppBlockingPolicy;
diff --git a/tests/carservice_test/src/com/android/car/test/VmsHalServiceSubscriptionEventTest.java b/tests/carservice_test/src/com/android/car/VmsHalServiceSubscriptionEventTest.java
similarity index 99%
rename from tests/carservice_test/src/com/android/car/test/VmsHalServiceSubscriptionEventTest.java
rename to tests/carservice_test/src/com/android/car/VmsHalServiceSubscriptionEventTest.java
index 237e3f0..286c004 100644
--- a/tests/carservice_test/src/com/android/car/test/VmsHalServiceSubscriptionEventTest.java
+++ b/tests/carservice_test/src/com/android/car/VmsHalServiceSubscriptionEventTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.car.test;
+package com.android.car;
import static org.junit.Assume.assumeTrue;
diff --git a/tests/carservice_test/src/com/android/car/test/VmsOperationRecorderTest.java b/tests/carservice_test/src/com/android/car/VmsOperationRecorderTest.java
similarity index 99%
rename from tests/carservice_test/src/com/android/car/test/VmsOperationRecorderTest.java
rename to tests/carservice_test/src/com/android/car/VmsOperationRecorderTest.java
index 179a194..f6b3be5 100644
--- a/tests/carservice_test/src/com/android/car/test/VmsOperationRecorderTest.java
+++ b/tests/carservice_test/src/com/android/car/VmsOperationRecorderTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.car.test;
+package com.android.car;
import android.car.vms.VmsLayer;
import android.car.vms.VmsLayerDependency;
diff --git a/tests/carservice_test/src/com/android/car/test/VmsPublisherClientMockService.java b/tests/carservice_test/src/com/android/car/VmsPublisherClientMockService.java
similarity index 97%
rename from tests/carservice_test/src/com/android/car/test/VmsPublisherClientMockService.java
rename to tests/carservice_test/src/com/android/car/VmsPublisherClientMockService.java
index 27b482e..32d224b 100644
--- a/tests/carservice_test/src/com/android/car/test/VmsPublisherClientMockService.java
+++ b/tests/carservice_test/src/com/android/car/VmsPublisherClientMockService.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.car.test;
+package com.android.car;
import android.car.vms.VmsLayer;
import android.car.vms.VmsLayerDependency;
@@ -22,9 +22,8 @@
import android.car.vms.VmsPublisherClientService;
import android.car.vms.VmsSubscriptionState;
import android.util.Log;
-import java.util.ArrayList;
+
import java.util.HashSet;
-import java.util.List;
import java.util.Set;
/**
diff --git a/tests/carservice_test/src/com/android/car/test/VmsPublisherClientServiceTest.java b/tests/carservice_test/src/com/android/car/VmsPublisherClientServiceTest.java
similarity index 99%
rename from tests/carservice_test/src/com/android/car/test/VmsPublisherClientServiceTest.java
rename to tests/carservice_test/src/com/android/car/VmsPublisherClientServiceTest.java
index b355795..2bebc6e 100644
--- a/tests/carservice_test/src/com/android/car/test/VmsPublisherClientServiceTest.java
+++ b/tests/carservice_test/src/com/android/car/VmsPublisherClientServiceTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.car.test;
+package com.android.car;
import android.annotation.ArrayRes;
import android.car.VehicleAreaType;
@@ -33,7 +33,6 @@
import android.test.suitebuilder.annotation.MediumTest;
import android.util.Log;
-import com.android.car.R;
import com.android.car.vehiclehal.VehiclePropValueBuilder;
import com.android.car.vehiclehal.test.MockedVehicleHal;
import com.android.car.vehiclehal.test.MockedVehicleHal.VehicleHalPropertyHandler;
diff --git a/tests/carservice_test/src/com/android/car/test/VmsPublisherPermissionsTest.java b/tests/carservice_test/src/com/android/car/VmsPublisherPermissionsTest.java
similarity index 98%
rename from tests/carservice_test/src/com/android/car/test/VmsPublisherPermissionsTest.java
rename to tests/carservice_test/src/com/android/car/VmsPublisherPermissionsTest.java
index 70940f0..14a2f18 100644
--- a/tests/carservice_test/src/com/android/car/test/VmsPublisherPermissionsTest.java
+++ b/tests/carservice_test/src/com/android/car/VmsPublisherPermissionsTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.car.test;
+package com.android.car;
import android.annotation.ArrayRes;
import android.car.VehicleAreaType;
@@ -30,7 +30,6 @@
import android.hardware.automotive.vehicle.V2_0.VmsMessageType;
import android.test.suitebuilder.annotation.MediumTest;
-import com.android.car.R;
import com.android.car.vehiclehal.VehiclePropValueBuilder;
import com.android.car.vehiclehal.test.MockedVehicleHal;
import com.android.car.vehiclehal.test.MockedVehicleHal.VehicleHalPropertyHandler;
diff --git a/tests/carservice_test/src/com/android/car/test/VmsPublisherSubscriberTest.java b/tests/carservice_test/src/com/android/car/VmsPublisherSubscriberTest.java
similarity index 99%
rename from tests/carservice_test/src/com/android/car/test/VmsPublisherSubscriberTest.java
rename to tests/carservice_test/src/com/android/car/VmsPublisherSubscriberTest.java
index 81dd780..3402011 100644
--- a/tests/carservice_test/src/com/android/car/test/VmsPublisherSubscriberTest.java
+++ b/tests/carservice_test/src/com/android/car/VmsPublisherSubscriberTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.car.test;
+package com.android.car;
import android.annotation.ArrayRes;
import android.car.Car;
diff --git a/tests/carservice_test/src/com/android/car/test/VmsSubscriberManagerTest.java b/tests/carservice_test/src/com/android/car/VmsSubscriberManagerTest.java
similarity index 99%
rename from tests/carservice_test/src/com/android/car/test/VmsSubscriberManagerTest.java
rename to tests/carservice_test/src/com/android/car/VmsSubscriberManagerTest.java
index a1a7594..954afee 100644
--- a/tests/carservice_test/src/com/android/car/test/VmsSubscriberManagerTest.java
+++ b/tests/carservice_test/src/com/android/car/VmsSubscriberManagerTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.car.test;
+package com.android.car;
import static org.junit.Assume.assumeTrue;
diff --git a/tests/carservice_test/src/com/android/car/test/CarStorageMonitoringTest.java b/tests/carservice_test/src/com/android/car/test/CarStorageMonitoringTest.java
deleted file mode 100644
index 5f77339..0000000
--- a/tests/carservice_test/src/com/android/car/test/CarStorageMonitoringTest.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.car.test;
-
-import android.test.suitebuilder.annotation.MediumTest;
-
-import com.android.car.storagemonitoring.EMmcWearInformationProvider;
-import com.android.car.storagemonitoring.UfsWearInformationProvider;
-import com.android.car.storagemonitoring.WearInformation;
-
-import junit.framework.TestCase;
-
-/**
- * Tests the storage monitoring API in CarService.
- */
-@MediumTest
-public class CarStorageMonitoringTest extends TestCase {
- static final String TAG = CarStorageMonitoringTest.class.getSimpleName();
-
- public void testEMmcWearInformationProvider() throws Exception {
- try (TemporaryFile lifetimeFile = new TemporaryFile(TAG)) {
- try (TemporaryFile eolFile = new TemporaryFile(TAG)) {
- lifetimeFile.write("0x05 0x00");
- eolFile.write("01");
-
- EMmcWearInformationProvider wearInfoProvider = new EMmcWearInformationProvider(
- lifetimeFile.getFile(), eolFile.getFile());
-
- WearInformation wearInformation = wearInfoProvider.load();
-
- assertNotNull(wearInformation);
- assertEquals(40, wearInformation.lifetimeEstimateA);
- assertEquals(WearInformation.UNKNOWN_LIFETIME_ESTIMATE,
- wearInformation.lifetimeEstimateB);
-
- assertEquals(WearInformation.PRE_EOL_INFO_NORMAL, wearInformation.preEolInfo);
- }
- }
- }
-
- public void testUfsWearInformationProvider() throws Exception {
- try (TemporaryFile lifetimeFile = new TemporaryFile(TAG)) {
- lifetimeFile.write("ufs version: 1.0\n" +
- "Health Descriptor[Byte offset 0x2]: bPreEOLInfo = 0x2\n" +
- "Health Descriptor[Byte offset 0x1]: bDescriptionIDN = 0x1\n" +
- "Health Descriptor[Byte offset 0x3]: bDeviceLifeTimeEstA = 0x0\n" +
- "Health Descriptor[Byte offset 0x5]: VendorPropInfo = somedatahere\n" +
- "Health Descriptor[Byte offset 0x4]: bDeviceLifeTimeEstB = 0xA\n");
-
- UfsWearInformationProvider wearInfoProvider = new UfsWearInformationProvider(
- lifetimeFile.getFile());
-
- WearInformation wearInformation = wearInfoProvider.load();
-
- assertNotNull(wearInformation);
- assertEquals(90, wearInformation.lifetimeEstimateB);
- assertEquals(WearInformation.PRE_EOL_INFO_WARNING, wearInformation.preEolInfo);
- assertEquals(WearInformation.UNKNOWN_LIFETIME_ESTIMATE,
- wearInformation.lifetimeEstimateA);
- }
- }
-}
diff --git a/tests/carservice_test/src/com/android/car/test/TemporaryFile.java b/tests/carservice_test/src/com/android/car/test/TemporaryFile.java
deleted file mode 100644
index ae4f36b..0000000
--- a/tests/carservice_test/src/com/android/car/test/TemporaryFile.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.car.test;
-
-import android.annotation.Nullable;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.time.Instant;
-
-/**
- * A utility class that represents a file that needs to exist for the duration of a test.
- *
- * Meant to be used with try-with-resources:
- *
- * try (TemporaryFile tf = new TemporaryFile("myTest")) {
- * ...
- * } // file gets deleted here
- */
-final class TemporaryFile implements AutoCloseable {
- private File mFile;
-
- TemporaryFile(@Nullable String prefix) throws IOException {
- if (prefix == null) {
- prefix = TemporaryFile.class.getSimpleName();
- }
- mFile = File.createTempFile(prefix, Long.toString(Instant.now().getEpochSecond()));
- }
-
- @Override
- public void close() throws Exception {
- mFile.delete();
- }
-
- void write(String s) throws IOException {
- BufferedWriter writer = new BufferedWriter(new FileWriter(mFile));
- writer.write(s);
- writer.close();
- }
-
- File getFile() {
- return mFile;
- }
-}
diff --git a/tests/carservice_test/src/com/android/car/test/UptimeTrackerTest.java b/tests/carservice_test/src/com/android/car/test/UptimeTrackerTest.java
deleted file mode 100644
index dc46271..0000000
--- a/tests/carservice_test/src/com/android/car/test/UptimeTrackerTest.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.car.test;
-
-import android.test.suitebuilder.annotation.MediumTest;
-import com.android.car.UptimeTracker;
-import junit.framework.TestCase;
-
-@MediumTest
-public class UptimeTrackerTest extends TestCase {
- static final String TAG = UptimeTrackerTest.class.getSimpleName();
-
- static final class TestTimingProvider implements UptimeTracker.TimingProvider {
- private long mCurrentTime = 0;
- private Runnable mRunnable = null;
-
- TestTimingProvider incrementTime(long by) {
- mCurrentTime += by;
- return this;
- }
-
- TestTimingProvider tick() {
- if (mRunnable != null) {
- mRunnable.run();
- }
- return this;
- }
-
- @Override
- public long getCurrentRealtime() {
- return mCurrentTime;
- }
-
- @Override
- public void schedule(Runnable r, long delay) {
- if (mRunnable != null) {
- throw new IllegalStateException("task already scheduled");
- }
- mRunnable = r;
- }
-
- @Override
- public void cancelAll() {
- mRunnable = null;
- }
- }
-
- private static final long SNAPSHOT_INTERVAL = 0; // actual time doesn't matter for this test
-
- public void testUptimeTrackerFromCleanSlate() throws Exception {
- TestTimingProvider timingProvider = new TestTimingProvider();
- try (TemporaryFile uptimeFile = new TemporaryFile(TAG)) {
- UptimeTracker uptimeTracker = new UptimeTracker(uptimeFile.getFile(),
- SNAPSHOT_INTERVAL, timingProvider);
-
- assertEquals(0, uptimeTracker.getTotalUptime());
-
- timingProvider.incrementTime(5000).tick();
- assertEquals(5000, uptimeTracker.getTotalUptime());
-
- timingProvider.tick();
- assertEquals(5000, uptimeTracker.getTotalUptime());
-
- timingProvider.incrementTime(1000).tick();
- assertEquals(6000, uptimeTracker.getTotalUptime());
-
- timingProvider.incrementTime(400).tick();
- assertEquals(6400, uptimeTracker.getTotalUptime());
- }
- }
-
- public void testUptimeTrackerWithHistoricalState() throws Exception {
- TestTimingProvider timingProvider = new TestTimingProvider();
- try (TemporaryFile uptimeFile = new TemporaryFile(TAG)) {
- uptimeFile.write("{\"uptime\" : 5000}");
- UptimeTracker uptimeTracker = new UptimeTracker(uptimeFile.getFile(),
- SNAPSHOT_INTERVAL, timingProvider);
-
- assertEquals(5000, uptimeTracker.getTotalUptime());
-
- timingProvider.incrementTime(5000).tick();
- assertEquals(10000, uptimeTracker.getTotalUptime());
-
- timingProvider.incrementTime(1000).tick();
- assertEquals(11000, uptimeTracker.getTotalUptime());
- }
- }
-
- public void testUptimeTrackerAcrossHistoricalState() throws Exception {
- TestTimingProvider timingProvider = new TestTimingProvider();
- try (TemporaryFile uptimeFile = new TemporaryFile(TAG)) {
- uptimeFile.write("{\"uptime\" : 5000}");
- UptimeTracker uptimeTracker = new UptimeTracker(uptimeFile.getFile(),
- SNAPSHOT_INTERVAL, timingProvider);
-
- assertEquals(5000, uptimeTracker.getTotalUptime());
-
- timingProvider.incrementTime(5000).tick();
- assertEquals(10000, uptimeTracker.getTotalUptime());
-
- timingProvider.incrementTime(500).tick();
- uptimeTracker.onDestroy();
- timingProvider.cancelAll();
-
- uptimeTracker = new UptimeTracker(uptimeFile.getFile(),
- SNAPSHOT_INTERVAL, timingProvider);
-
- timingProvider.incrementTime(3000).tick();
- assertEquals(13500, uptimeTracker.getTotalUptime());
- }
- }
-
- public void testUptimeTrackerShutdown() throws Exception {
- TestTimingProvider timingProvider = new TestTimingProvider();
- try (TemporaryFile uptimeFile = new TemporaryFile(TAG)) {
- UptimeTracker uptimeTracker = new UptimeTracker(uptimeFile.getFile(),
- SNAPSHOT_INTERVAL, timingProvider);
-
- timingProvider.incrementTime(6000);
- uptimeTracker.onDestroy();
- timingProvider.cancelAll();
-
- uptimeTracker = new UptimeTracker(uptimeFile.getFile(),
- SNAPSHOT_INTERVAL, timingProvider);
- assertEquals(6000, uptimeTracker.getTotalUptime());
- }
- }
-}