Commit Graph

2940 Commits

Author SHA1 Message Date
Lucas Lin
da9c2fb600 Merge "Use assertEquals instead of assertTrue to compare the vpn type" am: 56055496f3 am: 9ca145bcfa
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1739093

Change-Id: Idb987331163fde7019febdcbf3e28bf205894d37
2021-06-22 00:02:15 +00:00
Lucas Lin
f602b03178 Merge "Add CTS for systemReady() & getIpSecNetIdRange()" am: 7e2a491835 am: 72d2223bf7
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1676425

Change-Id: I6cc3cc6f52ffb783bb21e3914b4eacd19756d755
2021-06-21 23:37:47 +00:00
Lucas Lin
56055496f3 Merge "Use assertEquals instead of assertTrue to compare the vpn type" 2021-06-21 23:35:16 +00:00
Lucas Lin
7e2a491835 Merge "Add CTS for systemReady() & getIpSecNetIdRange()" 2021-06-21 20:52:46 +00:00
Lucas Lin
833cb00abf Merge "Call ConnectivitySettingsUtils to set/get private DNS related settings" am: c12550b9f4 am: 8f8e1512d6
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1719017

Change-Id: Ifbe743b2f1eccfb1e553e6521cc0a461a8a475d8
2021-06-21 20:51:42 +00:00
James Mattis
ed5d25d599 Merge "Updating timeout for Per-App CTS" am: 420072651d am: eaa493d033
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1736927

Change-Id: Ia7035d953fe0f073467b608b58aa06f65a313224
2021-06-21 20:50:56 +00:00
Lucas Lin
c12550b9f4 Merge "Call ConnectivitySettingsUtils to set/get private DNS related settings" 2021-06-21 19:12:33 +00:00
James Mattis
420072651d Merge "Updating timeout for Per-App CTS" 2021-06-21 17:17:13 +00:00
Treehugger Robot
09733fd351 Merge "Add a test for ConnectivityFrameworkInitializer" am: aa397809e2 am: 62df9b8d06
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1675598

Change-Id: I703593eab8e45bfaa861b93f8b274c2e86e19a24
2021-06-21 13:58:04 +00:00
Treehugger Robot
353e4349d6 Merge "Add test for setHttpProxyConfiguration" am: bccd97f0b3 am: 9627dd29b5
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1564956

Change-Id: I6ca0bdecaf5c72847b5569fd4f6ff10abfc0cba4
2021-06-21 13:57:54 +00:00
Junyu Lai
11ccd1531f Merge "Add CTS for registerNetworkOffer" am: f92979bd5b am: 26bb0a84a6
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1731451

Change-Id: I07371bcb29bd2646d9b72396a92e5c397e4a1f16
2021-06-21 13:57:37 +00:00
Remi NGUYEN VAN
3d25f6e8a7 Merge "Add connectivity coverage tests" am: cc79d7c0f8 am: 68114fe408
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1731232

Change-Id: I6cc7f3a3abe97fccc59e14e77e99a0843f3363bb
2021-06-21 13:56:37 +00:00
lucaslin
b781a94ccf Add CTS for systemReady() & getIpSecNetIdRange()
Bug: 182963354
Test: 1. atest CtsNetTestCases:ConnectivityManagerTest
      2. atest CtsNetTestCasesLatestSdk:ConnectivityManagerTest
Change-Id: I0b286f32389501402e552010546c62f3e56833d6
2021-06-21 19:37:43 +08:00
Treehugger Robot
aa397809e2 Merge "Add a test for ConnectivityFrameworkInitializer" 2021-06-21 11:23:11 +00:00
Treehugger Robot
bccd97f0b3 Merge "Add test for setHttpProxyConfiguration" 2021-06-21 10:59:12 +00:00
Junyu Lai
f92979bd5b Merge "Add CTS for registerNetworkOffer" 2021-06-21 10:58:04 +00:00
Remi NGUYEN VAN
cc79d7c0f8 Merge "Add connectivity coverage tests" 2021-06-21 10:55:33 +00:00
Treehugger Robot
b8a0916175 Merge "Add CTS for setProfileNetworkPreference" am: 5d4f701244 am: 106a4752f7
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1733784

Change-Id: I7bd055c546c550c72b367b22adb3a2b2698c0cd9
2021-06-21 10:35:56 +00:00
Treehugger Robot
5d4f701244 Merge "Add CTS for setProfileNetworkPreference" 2021-06-21 10:25:05 +00:00
Aaron Huang
b31181a37c Merge "CTS test for PacProxyManager" am: b93396edfb am: 7320aefbdd
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1705131

Change-Id: Ibd6bef57f66c6c793271f0315c4336b187ffc048
2021-06-21 10:14:21 +00:00
Aaron Huang
b93396edfb Merge "CTS test for PacProxyManager" 2021-06-21 09:42:33 +00:00
lucaslin
8962128a0b Call ConnectivitySettingsUtils to set/get private DNS related settings
ConnectivitySettingsManager and CtsNetUtils are doing the same
thing to set/get private DNS related settings.
To prevent making the duplication code in two places, move the
body to frameworks/libs/net and call it.

Bug: 185311744
Test: atest CtsNetTestCases CtsNetTestCasesLatestSdk
Change-Id: I3272c825b86ec30c3d0bf4097088c653e668461b
2021-06-21 16:39:08 +08:00
lucaslin
56bc7d4dde Use assertEquals instead of assertTrue to compare the vpn type
Bug: 184261389
Test: atest CtsHostsideNetworkTests:HostsideVpnTests#testDefault
Change-Id: I55371fabe0d2fa32a71520af11f18f1eeea31460
2021-06-17 19:43:08 +08:00
James Mattis
4dad9710e1 Updating timeout for Per-App CTS
Increasing the timeout values for waiting for callbacks for the per-app
CTS tests to match the timeout value used in the waitForAvailable()
helper method.

Bug: 191230288
Test: atest CtsNetTestCases:android.net.cts.ConnectivityManagerTest
Change-Id: I49e5a99f18a5651370e6914f30be659134b537ff
2021-06-16 19:11:45 -07:00
Chiachang Wang
4da66b9d58 Merge "Add test for CM#setAcceptUnvalidated" am: 27586f8210 am: d6d3bf0b89
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1731234

Change-Id: If39fb3d39aee18dab8476fdac934724685c46817
2021-06-16 15:39:15 +00:00
Chiachang Wang
ef5a495829 Merge "Add test for CM#setAcceptPartialConnectivity" am: 2693dc2696 am: 98e8422124
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1730545

Change-Id: Ie49fb789e8731ddac1465fed46f5f139d8ce10f6
2021-06-16 15:39:08 +00:00
Chiachang Wang
d6d3bf0b89 Merge "Add test for CM#setAcceptUnvalidated" am: 27586f8210
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1731234

Change-Id: I524644366a398b34de8f659d0d0d275f3f513c0c
2021-06-16 15:29:47 +00:00
Chiachang Wang
98e8422124 Merge "Add test for CM#setAcceptPartialConnectivity" am: 2693dc2696
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1730545

Change-Id: I702a17935b7e0a29d5c45e5ae6bd7ccf3c76eccd
2021-06-16 15:29:37 +00:00
Chiachang Wang
27586f8210 Merge "Add test for CM#setAcceptUnvalidated" 2021-06-16 15:17:51 +00:00
Chiachang Wang
2693dc2696 Merge "Add test for CM#setAcceptPartialConnectivity" 2021-06-16 15:17:37 +00:00
Remi NGUYEN VAN
aec3a5e548 Merge "Make tests compatible with mockito-extended" am: ad7108ce34 am: c3d789bff1
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1737400

Change-Id: Ie5b04c5ea05d330dcc97d098720b08d4797927de
2021-06-16 13:56:01 +00:00
Remi NGUYEN VAN
c3d789bff1 Merge "Make tests compatible with mockito-extended" am: ad7108ce34
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1737400

Change-Id: I3c6de9b5da64e3bb26b1dc75e9184cf373d313fe
2021-06-16 13:34:34 +00:00
Remi NGUYEN VAN
ad7108ce34 Merge "Make tests compatible with mockito-extended" 2021-06-16 13:22:37 +00:00
Junyu Lai
8aa17e2a6a Merge changes I627dcd0f,I81abc174,Id7948d21 am: 75090fb64e am: 93b8b38683
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1731450

Change-Id: I5588db4e540440e08f62c90d7369fb308a02b2f6
2021-06-16 12:14:22 +00:00
Chiachang Wang
901eeb201d Add test for CM#setAcceptUnvalidated
The always bit is verified in NetworkAgentTest. There is no easy
configuration to set an explicitly selected network to accept an
unvalidated network. Verify the accepted case also in
NetworkAgentTest.

Bug: 186061922
Test: atest CtsNetTestCases:android.net.cts.ConnectivityManagerTest
Test: atest CtsNetTestCasesLatestSdk
Change-Id: I803eb975fb0b6c52d55b2310293bcad407d21f42
2021-06-16 20:09:08 +08:00
Chiachang Wang
589105d385 Add test for CM#setAcceptPartialConnectivity
Bug: 186061922
Test: atest CtsNetTestCases:android.net.cts.ConnectivityManagerTest
Test: atest CtsNetTestCasesLatestSdk
Change-Id: Iba312defb6f02896eac518d71d36f1ef3df3d00b
2021-06-16 20:06:15 +08:00
Junyu Lai
93b8b38683 Merge changes I627dcd0f,I81abc174,Id7948d21 am: 75090fb64e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1731450

Change-Id: I3662e70034b16721e4ad1711654cb9f7eda45d35
2021-06-16 11:59:37 +00:00
Junyu Lai
75090fb64e Merge changes I627dcd0f,I81abc174,Id7948d21
* changes:
  Fix expectCallback does not fail when no callback received
  Add CTS for registerBestMatchingNetworkCallback
  No-op refactoring of NetworkAgentTest
2021-06-16 11:46:34 +00:00
Remi NGUYEN VAN
595dda3604 Merge "Remove ConnectivityServiceTest signature perms use" am: 54c7434f0d am: 96ad425c5e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1736615

Change-Id: Ifd8c397644f5fc680b34905882ec287bb43c1e1b
2021-06-16 11:37:53 +00:00
Remi NGUYEN VAN
96ad425c5e Merge "Remove ConnectivityServiceTest signature perms use" am: 54c7434f0d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1736615

Change-Id: I0f9c3677f135dd48fc73da08661497190f8d3c20
2021-06-16 11:24:51 +00:00
Remi NGUYEN VAN
54c7434f0d Merge "Remove ConnectivityServiceTest signature perms use" 2021-06-16 11:09:05 +00:00
Remi NGUYEN VAN
fe20e1317d Add connectivity coverage tests
The coverage tests will allow measuring code coverage for all
Connectivity+Tethering code.

This is a combination of the current TetheringCoverageTests, and
FrameworksNetTests.

Adding min_sdk_version to the test prevents it from using deprecated
IoUtils utilities. Replace it with the non-deprecated alternative.

Test: atest ConnectivityCoverageTests
Change-Id: I5366e1cc9cd6ddb41f24718246381cc2b1cc1383
2021-06-16 19:45:20 +09:00
Remi NGUYEN VAN
c9c745f2f2 Make tests compatible with mockito-extended
This does not change the mockito library to use mockito-extended in
FrameworksNetTests, but changes the tests so that they would pass if
built against that library.

This is useful to run FrameworksNetTests in a common test suite with
other tests that use mockito-extended, for example a common connectivity
coverage test target.

The change includes increasing the test timeout in
ConnectivityServiceTest, as mockito-extended can have performance impact
(~3 times on hwasan builds). This change does not make tests run slower
in the current FrameworksNetTests suite though.

Bug: 187935317
Test: atest FrameworksNetTests
Change-Id: I61fa371e8957037075a2617a014647ff062207c6
2021-06-16 17:53:08 +09:00
Remi NGUYEN VAN
18a979fa41 Remove ConnectivityServiceTest signature perms use
To allow unit tests to run without platform certificates, remove
signature permission usage in ConnectivityServiceTest.

This mocks permission checks done in ConnectivityService for which the
test assumed that the permission was held, and mocks calls to
BatteryStatsManager. Calls to ActivityManagerService (through
PendingIntent) are done with shell permissions as the test uses real
PendingIntent mechanics.

Bug: 187935317
Test: atest FrameworksNetTests
Change-Id: If309d653ac2e9bbcf1b94bcee6336367289df359
2021-06-16 16:32:03 +09:00
Lucas Lin
d71d5fd659 Merge "Add a test to check if the VPN type is set or not" am: 3b7c0749d5 am: 1ed1f3fcf8
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1733785

Change-Id: Iba0daf89608e68b5e17326b9943f438d3f9ae2c6
2021-06-16 04:22:38 +00:00
Lucas Lin
1ed1f3fcf8 Merge "Add a test to check if the VPN type is set or not" am: 3b7c0749d5
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1733785

Change-Id: I33a31c80f5cf30f329fc168f0b7cc291add0d7e9
2021-06-16 04:00:13 +00:00
Chiachang Wang
c17bbec538 Merge "Ignore testFactoryReset in instant app mode" am: f3283e6b93 am: c60aab0243
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1735673

Change-Id: Ibf0f8cf56360ffaa9c94f089018bbfe885373706
2021-06-16 02:35:26 +00:00
Lucas Lin
3b7c0749d5 Merge "Add a test to check if the VPN type is set or not" 2021-06-16 02:22:45 +00:00
Chiachang Wang
c60aab0243 Merge "Ignore testFactoryReset in instant app mode" am: f3283e6b93
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1735673

Change-Id: I497b71bf3a54c177f1b6e2cd63b3588b3c85f2cb
2021-06-16 02:06:37 +00:00
Chiachang Wang
f3283e6b93 Merge "Ignore testFactoryReset in instant app mode" 2021-06-16 01:49:51 +00:00