diff options
author | Matthew Williams <mjwilliams@google.com> | 2014-06-11 17:02:53 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-11 17:02:53 +0000 |
commit | 43c4f41adb330522c6784177bf8e9a1239c6a15f (patch) | |
tree | 1c685626f8fcc57f926b853f46ce0e6c8def1f17 /services/tests/servicestests | |
parent | dbff68ae1a04ddc4a9b71c1cb0a007468a85fda8 (diff) | |
parent | 46919f358390ad40e19259d12ef04b6898b9e4a4 (diff) | |
download | frameworks_base-43c4f41adb330522c6784177bf8e9a1239c6a15f.zip frameworks_base-43c4f41adb330522c6784177bf8e9a1239c6a15f.tar.gz frameworks_base-43c4f41adb330522c6784177bf8e9a1239c6a15f.tar.bz2 |
am 8e8c1401: Fix build.
* commit '8e8c140114cb3a4f1cf448c4492c13769738ca12':
Fix build.
Diffstat (limited to 'services/tests/servicestests')
-rw-r--r-- | services/tests/servicestests/src/com/android/server/task/TaskStoreTest.java | 1 | ||||
-rw-r--r-- | services/tests/servicestests/src/com/android/server/task/controllers/BatteryControllerTest.java | 68 |
2 files changed, 0 insertions, 69 deletions
diff --git a/services/tests/servicestests/src/com/android/server/task/TaskStoreTest.java b/services/tests/servicestests/src/com/android/server/task/TaskStoreTest.java index 23ea174..7a7fa07 100644 --- a/services/tests/servicestests/src/com/android/server/task/TaskStoreTest.java +++ b/services/tests/servicestests/src/com/android/server/task/TaskStoreTest.java @@ -16,7 +16,6 @@ import com.android.server.job.controllers.JobStatus; import java.util.List; -import static com.android.server.job.JobStore.initAndGet; /** * Test reading and writing correctly from file. */ diff --git a/services/tests/servicestests/src/com/android/server/task/controllers/BatteryControllerTest.java b/services/tests/servicestests/src/com/android/server/task/controllers/BatteryControllerTest.java deleted file mode 100644 index 9754e8c..0000000 --- a/services/tests/servicestests/src/com/android/server/task/controllers/BatteryControllerTest.java +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Copyright (C) 2014 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.server.task.controllers; - - -import android.content.ComponentName; -import android.content.Intent; -import android.test.AndroidTestCase; - -import com.android.server.job.StateChangedListener; -import com.android.server.job.controllers.BatteryController; -import com.android.server.job.controllers.JobStatus; - -import static com.android.server.job.controllers.BatteryController.getForTesting; - -import static org.mockito.Mockito.*; - -/** - * - */ -public class BatteryControllerTest extends AndroidTestCase { - BatteryController mBatteryControllerUnderTest; - - StateChangedListener mStateChangedListenerStub = new StateChangedListener() { - @Override - public void onControllerStateChanged() { - - } - - @Override - public void onRunJobNow(JobStatus taskStatus) { - - } - }; - BatteryController.ChargingTracker mTrackerUnderTest; - - public void setUp() throws Exception { - mBatteryControllerUnderTest = getForTesting(mStateChangedListenerStub, getTestContext()); - mTrackerUnderTest = mBatteryControllerUnderTest.getTracker(); - } - - public void testSendBatteryChargingIntent() throws Exception { - Intent batteryConnectedIntent = new Intent(Intent.ACTION_POWER_CONNECTED) - .setComponent(new ComponentName(getContext(), mTrackerUnderTest.getClass())); - Intent batteryHealthyIntent = new Intent(Intent.ACTION_BATTERY_OKAY) - .setComponent(new ComponentName(getContext(), mTrackerUnderTest.getClass())); - - mTrackerUnderTest.onReceiveInternal(batteryConnectedIntent); - mTrackerUnderTest.onReceiveInternal(batteryHealthyIntent); - - assertTrue(mTrackerUnderTest.isOnStablePower()); - } - -}
\ No newline at end of file |