summaryrefslogtreecommitdiff
path: root/tests/common/java/android/net
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Revert "Disable NetworkStatsHistory builder test in tm-dev"" into tm-devJunyu Lai2022-06-151-3/+0
|\
| * Revert "Disable NetworkStatsHistory builder test in tm-dev"Junyu Lai2022-06-151-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This CL reverts ag/18615112 and ag/18660036 by pointing the merged-in tag to an unrelated CL that only exists on aosp and its downstreams, to make this CL doesn't get merged in aosp downstreams. Ignore-AOSP-First: tm-dev only change. Bug: 234099453 Test: atest android.net.netstats.NetworkStatsHistoryTest Change-Id: Iefe38f7a671900f45475d1daf2f7d1f781aed540 Merged-In: I47fb59334d00ae7fee91c5694548b3cf89b09b2d Reason: Prebuilt is merged.
* | Fix LinkProperties exclude routes tests on user builds.Lorenzo Colitti2022-06-131-10/+15
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The tests fail on user builds because they target T and attempt to override the compat change, which is not allowed on user builds because the change defaults to on for apps targeting T+. Fix this by marking the tests max target SDK 31. Also improve the tests a bit: - Use a RuleChain to make it explicit that CtsNetTestCasesMaxTargetSdk31 should be evaluated before EnableCompatChanges (otherwise the compat change rule would crash on user builds even if the max target SDK rule was going to skip the test anyway). - Fix the IgnoreUpTo for all exclude route tests to say S+. Currently: - One says R+, which is incorrect because the updated LinkProperties code is in the connectivity module, which only goes back to S, not R. - The others say T+, which is incorrect because the update code is present on S. Fix: 233553525 Test: LinkProperties test in CtsNetTestCasesLatestSdk passes on T user build Test: LinkProperties test in CtsNetTestCasesMaxTargetSdk31 passes on T user build Change-Id: Ie0e2f6761b90a65813ed3610c7b5e930a9fdc982 (cherry picked from commit 1bb94a34909912a449e0b719b6ddd5b8aa4a9f7d) Merged-In: Ie0e2f6761b90a65813ed3610c7b5e930a9fdc982
* Run testExcludedRoutesDisabled only in APKs with target SDK < T.Lorenzo Colitti2022-06-011-0/+2
| | | | | | | | | | | | | | | This test crashes if run from an APK that has target SDK 33 or above because it tries to disable a compat change that on those SDK versions is enabled by default. Run it only in CtsNetTestCasesMaxTargetSdk31 and skip it in our regular CTS modules. Bug: 233553525 Test: test-only change Change-Id: Iaf9c46591c13505c9d2a2a09994b9ee22a22390c (cherry picked from commit 1c7a20c6c697ed4ad6ff08c9cc45131e90ede514) Merged-In: Iaf9c46591c13505c9d2a2a09994b9ee22a22390c
* Disable NetworkStatsHistory builder test in tm-devJunyu Lai2022-05-261-0/+3
| | | | | | | | | | | | | | The test cannot be run in tm-dev because tm-dev use prebuilt mainline module, which does not include the solution in previous patch yet. Hence, disable the test temporarily. Ignore-AOSP-First: Base change not in AOSP, will cherry-pick immediately after Test: atest android.net.netstats.NetworkStatsHistoryTest Bug: 233825704 Change-Id: I770a10bfd1b3b2068b2e116207bd6cdbecf9face Merged-In: Ib2fbd3c7703e9ed606650643db6e1977f550d90d
* Return sorted NetworkStatsHistoryJunyu Lai2022-05-261-11/+25
| | | | | | | | | | | | | | | | | | NetworkStatsHistory internally assumes that bucketStart is sorted at all times. However, in the fields, we've found there are some buckets of NetworkStatsHistory do not preserve the order of timestamp, which is caught by the IAE when addEntry is called. In order to provide backward compatibility, return sorted items instead of throwing IAE when adding entry into NetworkStatsHistory instance. Ignore-AOSP-First: Base change not in AOSP, will cherry-pick immediately after Test: atest android.net.netstats.NetworkStatsHistoryTest#testBuilder Bug: 233825704 Change-Id: If3187384bd1e90770ca5873b8ec73e852fff543d
* Merge changes from topic "stats-migration" into tm-devJunyu Lai2022-05-191-2/+13
|\ | | | | | | | | | | | | | | | | * changes: Skip PersistentIntTest on S- device Don't clobber existing history entries. Ensure NetworkStats migrated snapshot is identical [MS82.1] Support network stats data migration process Add a PersistentInt class.
| * Don't clobber existing history entries.Lorenzo Colitti2022-05-181-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, adding a history to a NetworkStatsCollection.Builder will overwrite any history that was previously passed in with the same key. This breaks the importer (which is the primary/only caller of this code), because the importer re-uses the same NetworkStatsCollection object to import multiple files. Instead, simply add any passed-in entries after the ones that were already there. Require the caller to pass in entries in order, because NetworkStatsHistory internally assumes that entris are always sorted. Ignore-AOSP-First: in a topic with internal-only changes Bug: 230289468 Test: manually verified this unbreaks the importer Change-Id: Ic8647ff28fca78d579d5f759f96a864877f8158b
* | Remove NetworkIdentitySet usage in CTSRemi NGUYEN VAN2022-05-161-3/+3
|/ | | | | | | | | | | | | NetworkIdentitySet is hidden API and may change on subsequent module updates. Use the module_lib NetworkStatsCollection.Key constructor that uses a set of NetworkIdentity instead. Bug: 217129444 Test: atest NetworkStatsCollectionTest Change-Id: Icd1160ae920059306c3319f7298707f1e14cbb48 (cherry picked from commit 7b0c61d0bd906d88677a7f3c4d8b3f7e8a0cd4bc) Merged-In: Icd1160ae920059306c3319f7298707f1e14cbb48
* Follow-up changes to Update VPN isolation code for excluded routespreranap2022-05-131-3/+4
| | | | | | | | | | Making changes in the hasExcludeRoute() with more realistic values as suggested in CL 18173562(https://googleplex-android-review.git.corp.google.com/c/platform/packages/modules/Connectivity/+/18173562) by Lorenzo Bug: 230058738 Test: atest LinkPropertiesTest Change-Id: Ic0ea1e83fbe5bfec98b0060ba1a9635d5ba710e1 Merged-In: Ic0ea1e83fbe5bfec98b0060ba1a9635d5ba710e1
* Update VPN isolation code for excluded routesPrerana2022-05-061-0/+11
| | | | | | | | | | | Bug: 230058738 Test: atest LinkPropertiesTest Result: https://paste.googleplex.com/4706859672928256 Change-Id: I970fca6b0e2cd358e9bd77152563d13367867c74 (cherry picked from commit 2b97bbebf4b85e0024fc75298e760fc03516be40) Merged-In: I970fca6b0e2cd358e9bd77152563d13367867c74
* Merge "Fix CtsNetTestCases on Q" am: d651629b14 am: 5b658859b8Remi NGUYEN VAN2022-04-181-18/+21
|\ | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2063742 Change-Id: Id112fcddada866c596a2847c0f5b51700421d20d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| * Merge "Fix CtsNetTestCases on Q"Remi NGUYEN VAN2022-04-181-18/+21
| |\
| | * Fix CtsNetTestCases on QRemi NGUYEN VAN2022-04-151-18/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Skip NetworkCapabilitiesTest on Q. The test covers code that is very localized in NetworkCapabilities.java, and is only updatable on S+, so does not need to be in MTS before that. - Fix ConnectivityManagerTest to remove external references to CaptivePortalData instances in the lambdas, as this is compiled into a method taking CaptivePortalData as argument, and because the class does not exist on Q, the test runner would crash enumerating method arguments. - Remove call to getSystemService(ETHERNET_SERVICE) on Q from the test thread, as it will crash when called from a thread that does not have a Looper. Test: atest CtsNetTestCases Bug: 227253613 Change-Id: I97c64b24c767e874dfba00aa1f46be2c4972f917
* | | Merge "Filter out excluded routes in LinkProperties" am: ac8935bee7 am: ↵Taras Antoshchuk2022-04-131-0/+41
|\| | | | | | | | | | | | | | | | | | | | | | | | | | bb8601a015 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1619104 Change-Id: I27c51a479eeb3f70c6c986f3235f4be27441ba7b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| * | Filter out excluded routes in LinkPropertiesTaras Antoshchuk2022-04-131-0/+41
| |/ | | | | | | | | | | | | | | Gate presence of excluded routes in LinkProperties on target sdk T. Bug: 186082280 Test: atest LinkPropertiesTest Change-Id: If8fdb468a0a4968c5f2a878b7aacfeb4f7d9a9e5
| * Rename setAccessUids to setAllowedUidsChalard Jean2022-03-161-20/+20
| | | | | | | | | | | | | | Bug: 217725769 Test: ConnectivityServiceTest CtsNetTestCases Change-Id: Ic8a3f91553d1462b7f54259c467fb90a950bdd59 Merged-In: I8860fbb353eedf5d01e9dc248e4d765046bd562c
* | Rename setAccessUids to setAllowedUidsChalard Jean2022-03-161-20/+20
| | | | | | | | | | | | | | | | | | Bug: 217725769 Ignore-AOSP-First: Due to dependency on Telephony code which is not in AOSP Test: ConnectivityServiceTest CtsNetTestCases Change-Id: I8860fbb353eedf5d01e9dc248e4d765046bd562c
* | Merge "Rename getVpnRequiresValidation to isVpnValidationRequired" am: ↵Chiachang Wang2022-03-031-1/+1
|\| | | | | | | | | | | | | | | 978370cb9c am: 5b8e9f7650 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1991612 Change-Id: I575e7e94d9d8e0cb10eae91b2d34c85d9a01394f
| * Merge "Rename getVpnRequiresValidation to isVpnValidationRequired"Chiachang Wang2022-03-031-1/+1
| |\
| | * Rename getVpnRequiresValidation to isVpnValidationRequiredChiachang Wang2022-03-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Update API name from getVpnRequiresValidation to isVpnValidationRequired according to API review feedback. Test: atest FrameworksNetTests Bug: 220129160 Change-Id: I1025f4c35b320c14e872eaffd7ed82658a5f3d0c
* | | Fix testing with/without connectivity module am: 3b81323e4a am: 4007947307Remi NGUYEN VAN2022-02-161-0/+2
|\| | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1987446 Change-Id: I4ad88eaa1492bc3bd2076de9a762cbe6cb8f481b
| * | Fix testing with/without connectivity moduleRemi NGUYEN VAN2022-02-161-0/+2
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add missing @ConnectivityModuleTest annotations to tests that cover functionalities that were introduced in a newer connectivity module update. Also add CtsNetTestCasesLatestSdk to postsubmit with only APK modules installed, and with only the connectivity/tethering module installed. This can then be moved to presubmit to catch such issues before they are merged. While doing this cleanup the TEST_MAPPING file in tests/ and merge its contents into the root TEST_MAPPING file. This does not change anything for "postsubmit" tests as they are run independently of changes. It only causes FrameworksNetIntegrationTests to run in presubmit on any change in modules/Connectivity/ instead of only on modules/Connectivity/tests/ changes, which is how it should be. Bug: 218611855 Test: TH needs to test TEST_MAPPING Change-Id: I26629a35d8c2df3db33180ecc22d49d538ad3b8b
* | Merge "Allow test+other networks to have specifiers" am: 106569b856 am: ↵Remi NGUYEN VAN2022-02-141-16/+30
|\| | | | | | | | | | | | | | | b4c8b3dc68 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1944724 Change-Id: I6a51f3bf259ae2cd6455f8963bc4753b41cd8eb3
| * Merge "Allow test+other networks to have specifiers"Remi NGUYEN VAN2022-02-141-16/+30
| |\
| | * Allow test+other networks to have specifiersRemi NGUYEN VAN2022-01-121-16/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow adding a network specifier to networks that have two transports, if one of them is TRANSPORT_TEST. This allows creating test ethernet networks that have a network specifier. Bug: 175199512 Test: atest NetworkCapabilitiesTest Change-Id: I2ced91926dff21fbe143258f33f3d42004a954c7
* | | Merge "Change naming of excludeLocalRoutes" am: 84ad04f768 am: c1ae7a1047Chiachang Wang2022-02-101-3/+3
|\| | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1976348 Change-Id: If7d654a347b562859389a171c1d36b82580f2038
| * | Merge "Change naming of excludeLocalRoutes"Chiachang Wang2022-02-101-3/+3
| |\ \
| | * | Change naming of excludeLocalRoutesChiachang Wang2022-02-091-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Address API review feedback to change naming of setExcludedLocalRoutesVpn and getter. Bug: 217742354 Test: atest FrameworksNetTests Change-Id: I57bbf55c7aba1c86ec8687d2431a50b37e63c6d0
* | | | Merge changes from topic "bandwidth-limiting" am: 6b5b7b40d8 am: 4eeea56e39Patrick Rohr2022-02-091-0/+17
|\| | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1955585 Change-Id: I059668f6f5d5c1fa2faa3e2bca2f062f78cb4314
| * | | Merge changes from topic "bandwidth-limiting"Patrick Rohr2022-02-091-0/+17
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | * changes: Add bandwidth limiting to CS Add setting that controls network rate limit
| | * | Add setting that controls network rate limitPatrick Rohr2022-02-091-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The INGRESS_RATE_LIMIT_BYTES_PER_SECOND setting controls the rate limit for internet networks. If set to -1, no rate limit applies. There is one global rate limit that will be applied to all networks with NET_CAPABILITY_INTERNET. Test: atest ConnectivitySettingsManagerTest Bug: 157552970 Change-Id: Ia82aa867686d484ce46734f76d4a48bf864eff84
* | | | Merge changes Ie000244a,I3a55bc74Aaron Huang2022-02-091-0/+205
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Add test for NetworkTemplate.Builder#setRoaming(int) Add NetworkTemplateTest to common test for cts coverage
| * | | | Add test for NetworkTemplate.Builder#setRoaming(int)Aaron Huang2022-02-091-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ignore-AOSP-First: Required API is not in downstream yet Bug: 215435701 Test: CtsNetTestCases Change-Id: Ie000244a954585241304adef95b4156e64d33f41
| * | | | Add NetworkTemplateTest to common test for cts coverageAaron Huang2022-02-091-0/+191
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test for NetworkTemplate.Builder Ignore-AOSP-First: Required API is not in downstream yet Bug: 215435701 Test: CtsNetTestCases Change-Id: I3a55bc74388fa34a142abec308b67b185641c460
* | | | | Merge "[MS83] Add Cts for NetworkStatsCollection/History builders"Junyu Lai2022-02-092-0/+134
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | [MS83] Add Cts for NetworkStatsCollection/History buildersjunyulai2022-02-092-0/+134
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: 1. atest CtsNetTestCases:android.net.netstats.NetworkStatsHistoryTest 2. atest CtsNetTestCases:android.net.netstats.NetworkStatsCollectionTest 3. atest FrameworksNetTests Ignore-AOSP-First: Required API is not in downstream yet Bug: 218441356 Change-Id: If3d45325623cad987aab35f89c55f84042271adf
* | | | Merge "Add and implement API for VpnManagers to request validation"Jean Chalard2022-02-091-0/+13
|\ \ \ \ | |/ / / |/| | |
| * | | Add and implement API for VpnManagers to request validationChiachang Wang2022-02-081-0/+13
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a new API that lets VPN apps using VpnManager request that the platform run its basic validation check on the resulting network. Bug: 184750836 Test: atest FrameworksNetTests Change-Id: I00092eee857d3e33529b19461cfd5dd060a0fe20
* / / Expose public APIs for IP & static IP configurationEtan Cohen2022-02-071-269/+0
|/ / | | | | | | | | | | | | | | | | | | Create public API for IP and static IP configuration. Bug: 209840828 Test: atest android.net.cts.IpConfigurationTest Test: atest android.net.cts.StaticIpConfigurationTest Test: atest android.net.dhcp.DhcpResultsParcelableUtilTest Change-Id: I720f168d1023806970919ca5dd44239a276826b6
* | Add accessUids to NetworkCapabilities.Chalard Jean2022-01-311-0/+46
| | | | | | | | | | | | | | | | For now, all entry points reject this. Followup changes will allow the supported use cases. Test: new unit tests and CTS for this in this patch Change-Id: I7262811a2e46336d3bb63c80886fc0578a36da94
* | Add low latency and high bandwidth network capabilitiesSooraj Sasindran2022-01-251-0/+27
| | | | | | | | | | | | Bug: 194332512 Test: build Change-Id: I415ca1ba90ea54c4106f806fe855bcb84d3e38ba
* | Add support for Multiple enterprise sliceSooraj Sasindran2022-01-221-46/+47
| | | | | | | | | | | | | | Bug: 194332512 Test: unit test CTS-Coverage-Bug: 211133973 Change-Id: Ie8be08a7cfa9155168d1da146d02fd1643248bdc
* | Merge "Update the SDK for the tests with intended target in T+"Chiachang Wang2022-01-211-1/+2
|\ \
| * | Update the SDK for the tests with intended target in T+Chiachang Wang2022-01-201-1/+2
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | Correct the SDK for those tests are expected running in T+ device. Check @IgnoreUpTo(S) may be incorrect after receiving patches before T release. Refer to temporary constant definition in DevSdkIgnoreRule until the SDK constant being pushed into AOSP and synced with branch used for mainline. BUg: 215294242 Test: atest CtsNetTestCases CtsNetTestCasesLatestSdk Change-Id: Ide6a241f7944dd1e75bc33b21aa29471a5df94c6
* | Mark connectivity module tests as suchRemi NGUYEN VAN2022-01-1813-7/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add @ConnectivityModuleTest to tests for classes that are mainly used to back the connectivity (tethering) module, in particular data classes. This causes the test not to be run in NetworkStack/CaptivePortalLogin MTS tests when the connectivity (tethering) module is not installed. Skipping such tests is necessary in that configuration as they may test behavior that is new in the latest update, and data classes backing the connectivity module would not be affected by NetworkStack/CaptivePortalLogin updates anyway. Bug: 211075897 Test: atest CtsNetTestCasesLatestSdk Change-Id: I6163cd998fc78765b903fdb7acd21e652bc711c9
* | Do not verify field count in tests used in CTSRemi NGUYEN VAN2022-01-1825-119/+42
|/ | | | | | | | | | | | | | | | | Tests in tests/common and tests/cts are run as part of CtsNetTestCases. Many used assertFieldCountEquals in parceling/unparceling tests to ensure that unexpected fields were not added, or that they were not missed when testing parceling/unparceling. However with many of the classes updatable through module updates, the field count may change in the future, breaking CTS tests. Stop checking for the field count, as it would break on module releases, and its value is lower than the maintenance cost. Bug: 205901761 Test: atest CtsNetTestCases Change-Id: I79854741f7e834574d4825bb737ef507785310fe
* Merge "Add NetworkProviderTest#testRegisterNetworkOffer back into test"Chiachang Wang2021-12-281-2/+0
|\
| * Add NetworkProviderTest#testRegisterNetworkOffer back into testChiachang Wang2021-12-271-2/+0
| | | | | | | | | | | | | | | | | | | | This test was temporarily disabled because prebuilt module is not updated in the branch. Now the prebuilt was S already, so add the test back to test to ensure the coverage. Test: atest FrameworksNetTests CtsNetTestCases Bug: 189074532 Change-Id: I510f457d2869c2904404fe7ef55828e84636e4c5
* | Merge "Allow VPN network agent to exclude local traffic"Chiachang Wang2021-12-281-2/+9
|\ \