Commit graph android_packages_modules_Co.../tests/common/java
Message SHA1
Run testExcludedRoutesDisabled only in APKs with target SDK < T.
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 1c7a20c6c6)
Merged-In: Iaf9c46591c13505c9d2a2a09994b9ee22a22390c

Lorenzo Colitti   authored and   Cherrypicker Worker   commited 2022-06-01 06:05:05 +00:00
4685a553c2
Disable NetworkStatsHistory builder test in tm-dev
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

Junyu Lai   commited 2022-05-26 22:19:35 +08:00
04075c2af2
Return sorted NetworkStatsHistory
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

Junyu Lai   commited 2022-05-26 22:04:43 +08:00
25c6d60f8a
Merge changes from topic "stats-migration" into tm-dev
* 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.

Junyu Lai   authored and   Android (Google) Code Review   commited 2022-05-19 14:54:01 +00:00
ac6213123a
Don't clobber existing history entries.
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

Lorenzo Colitti   authored and   Junyu Lai   commited 2022-05-18 23:51:03 +08:00
b36e57a004
Remove NetworkIdentitySet usage in CTS
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 7b0c61d0bd)
Merged-In: Icd1160ae920059306c3319f7298707f1e14cbb48

Remi NGUYEN VAN   authored and   Cherrypicker Worker   commited 2022-05-16 12:58:27 +00:00
5711f9e6ae
Follow-up changes to Update VPN isolation code for excluded routes
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

preranap   authored and   Prerana Patil   commited 2022-05-13 18:25:10 +00:00
1905154b1a
Update VPN isolation code for excluded routes
Bug: 230058738
Test: atest LinkPropertiesTest

Result: https://paste.googleplex.com/4706859672928256

Change-Id: I970fca6b0e2cd358e9bd77152563d13367867c74
(cherry picked from commit 2b97bbebf4)
Merged-In: I970fca6b0e2cd358e9bd77152563d13367867c74

Prerana   authored and   Prerana Patil   commited 2022-05-06 18:19:58 +00:00
a53ed851da
Merge "Fix CtsNetTestCases on Q" am: d651629b14 am: 5b658859b8
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>

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2022-04-18 03:56:42 +00:00
9cfcbdf56f
Merge "Fix CtsNetTestCases on Q"
Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2022-04-18 03:12:42 +00:00
d651629b14
Fix CtsNetTestCases on Q
- 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

Remi NGUYEN VAN   commited 2022-04-15 16:40:08 +09:00
c559512cd2
Merge "Filter out excluded routes in LinkProperties" am: ac8935bee7 am: 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>

Taras Antoshchuk   authored and   Automerger Merge Worker   commited 2022-04-13 13:47:24 +00:00
819056e0b8
Filter out excluded routes in LinkProperties
Gate presence of excluded routes in LinkProperties on target sdk T.

Bug: 186082280
Test: atest LinkPropertiesTest
Change-Id: If8fdb468a0a4968c5f2a878b7aacfeb4f7d9a9e5

Taras Antoshchuk   commited 2022-04-13 01:17:56 +02:00
30d41e59bc
Rename setAccessUids to setAllowedUids
Bug: 217725769
Test: ConnectivityServiceTest CtsNetTestCases
Change-Id: Ic8a3f91553d1462b7f54259c467fb90a950bdd59
Merged-In: I8860fbb353eedf5d01e9dc248e4d765046bd562c

Chalard Jean   authored and   Sooraj Sasindran   commited 2022-03-16 17:58:20 +00:00
de665266cd
Rename setAccessUids to setAllowedUids
Bug: 217725769
Ignore-AOSP-First: Due to dependency on Telephony code which is not in
AOSP
Test: ConnectivityServiceTest CtsNetTestCases

Change-Id: I8860fbb353eedf5d01e9dc248e4d765046bd562c

Chalard Jean   authored and   Sooraj Sasindran   commited 2022-03-16 06:29:27 +00:00
7d72b41c95
Merge "Rename getVpnRequiresValidation to isVpnValidationRequired" am: 978370cb9c am: 5b8e9f7650
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1991612

Change-Id: I575e7e94d9d8e0cb10eae91b2d34c85d9a01394f

Chiachang Wang   authored and   Automerger Merge Worker   commited 2022-03-03 01:02:54 +00:00
9cfc5de9dd
Merge "Rename getVpnRequiresValidation to isVpnValidationRequired"
Chiachang Wang   authored and   Gerrit Code Review   commited 2022-03-03 00:10:54 +00:00
978370cb9c
Rename getVpnRequiresValidation to isVpnValidationRequired
Update API name from getVpnRequiresValidation to
isVpnValidationRequired according to API review feedback.

Test: atest FrameworksNetTests
Bug: 220129160
Change-Id: I1025f4c35b320c14e872eaffd7ed82658a5f3d0c

Chiachang Wang   commited 2022-03-02 01:02:45 +00:00
7ec6ae74c8
Fix testing with/without connectivity module am: 3b81323e4a am: 4007947307
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1987446

Change-Id: I4ad88eaa1492bc3bd2076de9a762cbe6cb8f481b

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2022-02-16 13:19:00 +00:00
c3f60015c5
Fix testing with/without connectivity module
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

Remi NGUYEN VAN   commited 2022-02-16 15:22:30 +09:00
3b81323e4a
Merge "Allow test+other networks to have specifiers" am: 106569b856 am: b4c8b3dc68
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1944724

Change-Id: I6a51f3bf259ae2cd6455f8963bc4753b41cd8eb3

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2022-02-14 06:33:40 +00:00
631300885a
Merge "Allow test+other networks to have specifiers"
Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2022-02-14 05:31:20 +00:00
106569b856
Merge "Change naming of excludeLocalRoutes" am: 84ad04f768 am: c1ae7a1047
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1976348

Change-Id: If7d654a347b562859389a171c1d36b82580f2038

Chiachang Wang   authored and   Automerger Merge Worker   commited 2022-02-10 01:39:12 +00:00
5ea7f1eb32
Merge "Change naming of excludeLocalRoutes"
Chiachang Wang   authored and   Gerrit Code Review   commited 2022-02-10 00:50:30 +00:00
84ad04f768
Merge changes from topic "bandwidth-limiting" am: 6b5b7b40d8 am: 4eeea56e39
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1955585

Change-Id: I059668f6f5d5c1fa2faa3e2bca2f062f78cb4314

Patrick Rohr   authored and   Automerger Merge Worker   commited 2022-02-09 18:33:22 +00:00
e5e904ee28
Merge changes from topic "bandwidth-limiting"
* changes:
  Add bandwidth limiting to CS
  Add setting that controls network rate limit

Patrick Rohr   authored and   Gerrit Code Review   commited 2022-02-09 18:00:04 +00:00
6b5b7b40d8
Add setting that controls network rate limit
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

Patrick Rohr   commited 2022-02-09 14:46:26 +01:00
a20843638f
Merge changes Ie000244a,I3a55bc74
* changes:
  Add test for NetworkTemplate.Builder#setRoaming(int)
  Add NetworkTemplateTest to common test for cts coverage

Aaron Huang   authored and   Android (Google) Code Review   commited 2022-02-09 12:15:59 +00:00
addfdf5d7e
Merge "[MS83] Add Cts for NetworkStatsCollection/History builders"
Junyu Lai   authored and   Android (Google) Code Review   commited 2022-02-09 11:50:16 +00:00
b125c6f974
[MS83] Add Cts for NetworkStatsCollection/History builders
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

junyulai   commited 2022-02-09 17:18:19 +08:00
86fd7ea636
Change naming of excludeLocalRoutes
Address API review feedback to change naming of
setExcludedLocalRoutesVpn and getter.

Bug: 217742354
Test: atest FrameworksNetTests
Change-Id: I57bbf55c7aba1c86ec8687d2431a50b37e63c6d0

Chiachang Wang   commited 2022-02-09 15:50:06 +08:00
f890874970
Add test for NetworkTemplate.Builder#setRoaming(int)
Ignore-AOSP-First: Required API is not in downstream yet
Bug: 215435701
Test: CtsNetTestCases
Change-Id: Ie000244a954585241304adef95b4156e64d33f41

Aaron Huang   commited 2022-02-09 14:58:20 +08:00
7f0d18537d
Add NetworkTemplateTest to common test for cts coverage
Test for NetworkTemplate.Builder

Ignore-AOSP-First: Required API is not in downstream yet
Bug: 215435701
Test: CtsNetTestCases
Change-Id: I3a55bc74388fa34a142abec308b67b185641c460

Aaron Huang   commited 2022-02-09 14:58:15 +08:00
d97e5a42d4
Merge "Add and implement API for VpnManagers to request validation"
Jean Chalard   authored and   Gerrit Code Review   commited 2022-02-09 06:03:45 +00:00
4b66d4e244
Add and implement API for VpnManagers to request validation
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

Chiachang Wang   authored and   Chalard Jean   commited 2022-02-08 22:47:26 +09:00
865511a8c4
Expose public APIs for IP & static IP configuration
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

Etan Cohen   commited 2022-02-07 19:57:07 +00:00
1e86b3af26
Add accessUids to NetworkCapabilities.
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

Chalard Jean   commited 2022-01-31 17:04:58 +09:00
9a30acf744
Add low latency and high bandwidth network capabilities
Bug: 194332512
Test: build
Change-Id: I415ca1ba90ea54c4106f806fe855bcb84d3e38ba

Sooraj Sasindran   commited 2022-01-25 09:35:30 -08:00
f8eb713874
Add support for Multiple enterprise slice
Bug: 194332512
Test: unit test
CTS-Coverage-Bug: 211133973
Change-Id: Ie8be08a7cfa9155168d1da146d02fd1643248bdc

Sooraj Sasindran   commited 2022-01-22 14:39:40 -08:00
f4a58dcd45
Merge "Update the SDK for the tests with intended target in T+"
Chiachang Wang   authored and   Gerrit Code Review   commited 2022-01-21 06:34:29 +00:00
b04664d7a6
Update the SDK for the tests with intended target in T+
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

Chiachang Wang   commited 2022-01-20 10:30:19 +08:00
7212fbee14
Mark connectivity module tests as such
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

Remi NGUYEN VAN   commited 2022-01-18 16:55:44 +09:00
e347301890
Do not verify field count in tests used in CTS
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

Remi NGUYEN VAN   commited 2022-01-18 16:55:32 +09:00
8bc36966d4
Allow test+other networks to have specifiers
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

Remi NGUYEN VAN   commited 2022-01-12 12:00:41 +09:00
1bce54f287
Merge "Add NetworkProviderTest#testRegisterNetworkOffer back into test"
Chiachang Wang   authored and   Gerrit Code Review   commited 2021-12-28 09:24:16 +00:00
e4ee88f108
Merge "Allow VPN network agent to exclude local traffic"
Chiachang Wang   authored and   Gerrit Code Review   commited 2021-12-28 07:45:20 +00:00
a7b3d00968
Allow VPN network agent to exclude local traffic
Add API to allow network agent to set whether the local traffic
is excluded from the network. This commit is nonfunctional
currently but only storing the boolean inside the NAI.

Bug: 184750836
Test: atest FrameworksNetTests
Change-Id: I3799216ac8fdf22eb4bcabc6c6136d8edbf69360

Chiachang Wang   commited 2021-12-28 11:13:21 +08:00
bb754d6cc5
Add NetworkProviderTest#testRegisterNetworkOffer back into test
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

Chiachang Wang   commited 2021-12-27 03:30:47 +00:00
69761b4c1c
Merge "Add enterpriseSpecifier"
Treehugger Robot   authored and   Gerrit Code Review   commited 2021-12-23 22:25:20 +00:00
fbe500351e
Add enterpriseSpecifier
Add enterpriseSpecifier to network capability

Bug: 194332512
CTS-Coverage-Bug: 211133973
Test: CTS and unit test.
Change-Id: If16c8e17cee71cc6788c43a8818bcca68a00bf99

Sooraj Sasindran   commited 2021-12-23 09:32:20 -08:00
4196937bdd