Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
285,023 Commits 3 Branches 0 Tags
b6d2eff8b1ad4ceed1f8a97f19e43aff5452898f
Commit Graph

6 Commits

Author SHA1 Message Date
Paul Duffin
43267b4b9e Merge "Prepare for removal of legacy-test from default targets" am: c74ccf1588 am: ab62fd67d8 
am: 56a2ae1056

Change-Id: I0ede6895eb25f72a74af3ac4431a21960500bec5
 2017-01-19 11:49:28 +00:00
Paul Duffin
ab62fd67d8 Merge "Prepare for removal of legacy-test from default targets" 
am: c74ccf1588

Change-Id: Id4876a2597171ac78062acf8194fce1af6d50b77
 2017-01-19 11:40:22 +00:00
Paul Duffin
ccb0445027 Prepare for removal of legacy-test from default targets 
In preparation for removing junit classes from the Android API
the legacy-test target will be removed from the
TARGET_DEFAULT_JAVA_LIBRARIES. This change adds explicit
dependencies on junit and/or legacy-android-test to ensure that
modules will compile properly once it is removed.

(cherry picked from 6387604f9e672ece85e07c4bcbd7be396867f06f)

Bug: 30188076
Test: make checkbuild
Merged-In: I13e88297731253420e4e5f5291d503f13a39a156
Change-Id: I58446eb8c45d8ac2bcdbc9fa40d1321e811bdd4b
 2017-01-19 09:43:05 +00:00
Lorenzo Colitti
9997f1489a DO NOT MERGE: Move FakeSettingsProvider to a common location. 
(cherry picked from commit 7df1a82802)

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

(cherry picked from commit b8df76e413)

Change-Id: Ib82b162f354b8cbb521bc0783556f3225b4d12ac
 2017-01-18 19:08:00 +09:00
Lorenzo Colitti
b8df76e413 DO NOT MERGE: Move FakeSettingsProvider to a common location. 
(cherry picked from commit 7df1a82802)

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: I8d4d4de2937012dd33924f53e68f96241a9b2b4f
 2016-12-08 17:13:34 +09:00
Christopher Wiley
1c811fa468 Create frameworks-base-testutils lib 
( cherry-pick 07630f6bd3 )

This permits sharing of test components used in connectivity tests.
Rename the MockLooper to TestLooper, reflecting that it is not a
true mock, but a manually controlled Looper for use in tests.

Bug: 28848133
Test: Tests consuming this library pass.

Change-Id: I57e11f9544c7bffdb02739ab2a921512b1b11874
 2016-06-07 10:00:08 -07:00