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

Move FakeSettingsProvider to a common location.

Browse Source 
Test: runtest frameworks-util -c com.android.internal.util.test.FakeSettingsProviderTest
Test: runtest frameworks-services -c com.android.server.ConnectivityServiceTest
Test: runtest frameworks-services -c com.android.server.retaildemo.PreloadAppsInstallerTest
Test: runtest frameworks-services -c com.android.server.retaildemo.RetailDemoModeServiceTest
Bug: 31479480
Change-Id: I82a1a1a7219cf1385092b84d85eddf9dda90c685
This commit is contained in:
Lorenzo Colitti
2016-10-28 12:37:38 +09:00
parent d28137e0b7
commit 7df1a82802
7 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/tests/utiltests/Android.mk
View File

@@ -14,6 +14,7 @@ LOCAL_SRC_FILES += src/android/util/IRemoteMemoryIntArray.aidl
LOCAL_STATIC_JAVA_LIBRARIES := \
android-support-test \
frameworks-base-testutils \
mockito-target-minus-junit4
LOCAL_JAVA_LIBRARIES := android.test.runner

2
services/tests/servicestests/src/com/android/internal/util/FakeSettingsProviderTest.java → core/tests/utiltests/src/com/android/internal/util/test/FakeSettingsProviderTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.internal.util;
package com.android.internal.util.test;
import android.content.ContentResolver;
import android.database.ContentObserver;

2
services/tests/servicestests/src/com/android/server/ConnectivityServiceTest.java
View File

@@ -75,8 +75,8 @@ import android.test.suitebuilder.annotation.SmallTest;
import android.util.Log;
import android.util.LogPrinter;
import com.android.internal.util.FakeSettingsProvider;
import com.android.internal.util.WakeupMessage;
import com.android.internal.util.test.FakeSettingsProvider;
import com.android.server.connectivity.NetworkAgentInfo;
import com.android.server.connectivity.NetworkMonitor;
import com.android.server.connectivity.NetworkMonitor.CaptivePortalProbeResult;

4
services/tests/servicestests/src/com/android/server/retaildemo/PreloadAppsInstallerTest.java
View File

@@ -34,7 +34,7 @@ import android.support.test.InstrumentationRegistry;
import android.support.test.filters.SmallTest;
import android.test.mock.MockContentResolver;
import com.android.internal.util.FakeSettingsProvider;
import com.android.internal.util.test.FakeSettingsProvider;
import org.junit.After;
import org.junit.Before;
@@ -146,4 +146,4 @@ public class PreloadAppsInstallerTest {
Settings.Secure.getStringForUser(mContentResolver,
Settings.Secure.DEMO_USER_SETUP_COMPLETE, TEST_DEMO_USER));
}
}
}

2
services/tests/servicestests/src/com/android/server/retaildemo/RetailDemoModeServiceTest.java
View File

@@ -61,7 +61,7 @@ import android.test.mock.MockContentProvider;
import android.test.mock.MockContentResolver;
import android.util.ArrayMap;
import com.android.internal.util.FakeSettingsProvider;
import com.android.internal.util.test.FakeSettingsProvider;
import com.android.internal.widget.LockPatternUtils;
import com.android.server.SystemService;
import com.android.server.retaildemo.RetailDemoModeService.Injector;

2
tests/utils/testutils/Android.mk
View File

@@ -27,4 +27,6 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
android-support-test \
mockito-target-minus-junit4
LOCAL_JAVA_LIBRARIES := android.test.runner
include $(BUILD_STATIC_JAVA_LIBRARY)

2
services/tests/servicestests/src/com/android/internal/util/FakeSettingsProvider.java → tests/utils/testutils/java/com/android/internal/util/test/FakeSettingsProvider.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.internal.util;
package com.android.internal.util.test;
import android.net.Uri;
import android.os.Bundle;