Commit Graph

1339 Commits

Author SHA1 Message Date
Chiachang Wang
8167ede0fd Merge "Check target transport type for meterness change" am: ac551dff33 am: 63592fd781
Change-Id: I59bcca1b2bcbbf7991139a25350359eacba945e3
2020-04-22 06:22:55 +00:00
Chiachang Wang
6aac2067f6 Check target transport type for meterness change
When test case updates the wifi network from unmetered to
metered, test case will wait for wifi network reconnect.
However, if other metered networks are also connected at
the same time, test case may mis-take the network as the
target network. Thus, add transport type check to ensure
the transport type of the network is the expected one.

Bug: 153400606
Test: atest CtsNetTestCasesLatestSdk:\
      android.net.cts.ConnectivityManagerTest#\
      testGetMultipathPreference
Change-Id: I75dab1a00bbe1a1c75b548a6ce4ae3eacd325d92
2020-04-22 05:51:39 +00:00
Remi NGUYEN VAN
26e64df41a Merge "Fix test initialization errors on Q" am: 8b5e3031fa am: 2fcbc1b8ad
Change-Id: I2df5d37f74529e0fafae7f580c0795f30ab8959f
2020-04-21 12:42:37 +00:00
Remi NGUYEN VAN
8b5e3031fa Merge "Fix test initialization errors on Q" 2020-04-21 12:07:03 +00:00
Remi NGUYEN VAN
a7f8f2d01c Fix test initialization errors on Q
ConnectivityDiagnosticsManagerTest, MultinetworkApiTest,
NetworkAgentTest crashed before the runner could start them:
 - Ignore ConnectivityDiagnosticsManagerTest on Q: it tests an API that
   was introduced in R.
 - Build JNI libraries used by MultinetworkApiTest against the NDK to
   avoid errors loading the libraries on older platforms, when
   transitive dependencies have been added.
 - Do not attempt to override Handler#getLooper() (which is final) in
   NetworkAgentTest; it appears to have been overridden by accident by
   specifying "val looper" in the TestableNetworkAgent definition, which
   generates a getter.

Test: atest CtsNetTestCasesLatestSdk:ConnectivityDiagnosticsManagerTest
      atest CtsNetTestCasesLatestSdk:MultinetworkApiTest
      atest CtsNetTestCasesLatestSdk:NetworkAgentTest
Bug: 150918852
Change-Id: I262b54c6897ed755adaeb2b118c638320634f7a1
2020-04-21 15:16:44 +09:00
Junyu Lai
fd43b2d3e8 Merge "Remove upper bound check of getTotal* APIs in TrafficStatsTest" am: 9eba1b2c1b am: e331edcd23
Change-Id: I22edc46039bf35e544d9ce8a9f3a00b713478e05
2020-04-21 03:46:08 +00:00
Junyu Lai
9eba1b2c1b Merge "Remove upper bound check of getTotal* APIs in TrafficStatsTest" 2020-04-21 03:07:58 +00:00
Remi NGUYEN VAN
a8b5e991f0 Merge "Skip new UrlQuerySanitizer tests on Q" into rvc-dev am: f9a56e671b
Change-Id: Id256409f395859b010ca09bcf8e91737f22eeac9
2020-04-21 01:42:18 +00:00
Chiachang Wang
b14bd1af58 Merge "Update network object when wifi meterness is changed" am: db0b1c13e5 am: 7c111f53bf
Change-Id: I7ec9f0b04fa8b5a77cc7856359171134b9ec7e35
2020-04-20 14:13:04 +00:00
Chiachang Wang
db0b1c13e5 Merge "Update network object when wifi meterness is changed" 2020-04-20 13:35:54 +00:00
Remi NGUYEN VAN
958e8d1ceb Skip new UrlQuerySanitizer tests on Q
The tests verify behavior that was only fixed on R, but
UrlQuerySanitizerTest is part of MTS which needs to pass on Q.

Test: atest CtsNetTestCasesLatestSdk:UrlQuerySanitizerTest
Bug: 150904735
Change-Id: I214b2fd8a45732a41e8604db70c83a8e3f4a45e4
2020-04-20 18:51:17 +09:00
junyulai
5cfd8d6bb1 Remove upper bound check of getTotal* APIs in TrafficStatsTest
Currently, this cause flakiness since some background traffic
was counted when performing tests, or the traffic generated by
adb over network. While there is no good way to filter out all
reasonable cases, disable the upper bound checks.

Test: atest TrafficStatsTest
Bug: 142978584
Change-Id: I8140310c9caeff6069d1f55590bf40f83bf211e4
2020-04-20 15:44:32 +08:00
Chiachang Wang
21ec1de1ff Update network object when wifi meterness is changed
The new wifi disconnect behavior is introduced. When wifi
network is changed from unmetered to metered, the wifi
network will disconnect and reconnect. Update the test to
verify the same SSID wifi is connected and also update the
target network to verfiy the metered preference.

Bug: 153400606
Test: atest CtsNetTestCases:android.net.cts.ConnectivityManagerTest\
      #testGetMultipathPreference
Change-Id: Ic298d3d85d8c6b77c8df7614a945f2c22dcdff38
2020-04-20 09:50:17 +08:00
Aaron Huang
02c5d57e96 Merge "Move DhcpInfoTest to FrameworksNetCommonTests" am: 12b24407cf am: 4685ca6b06
Change-Id: Ic293c1af3f90f1e1224fc12289c984786814db80
2020-04-17 15:18:30 +00:00
Aaron Huang
12b24407cf Merge "Move DhcpInfoTest to FrameworksNetCommonTests" 2020-04-17 14:35:41 +00:00
Aaron Huang
d1e528ae9c Add test for NetworkRequest#getRequestorUid()
Add test for new API.

Bug: 151110379
Test: atest CtsNetTestCasesLatestSdk:android.net.cts.NetworkRequestTest
Change-Id: I9602cac142b3e45d12e66a6f3f35ab594e6590c1
Merged-In: I9602cac142b3e45d12e66a6f3f35ab594e6590c1
2020-04-17 14:32:26 +00:00
Aaron Huang
dacbdaa378 Add tests for NetworkRequest API
This change inculdes coverage of NetworkRequest#Builder().clearCapabilities()
and NetworkRequest#getRequestorPackageName()

Bug: 153614623
Test: atest CtsNetTestCasesLatestSdk:android.net.cts.NetworkRequestTest
Change-Id: Id4e31013cfae78c25abd27b557da4e3e9487870c
Merged-In: Id4e31013cfae78c25abd27b557da4e3e9487870c
2020-04-17 14:31:31 +00:00
Aaron Huang
48e0812796 Move DhcpInfoTest to FrameworksNetCommonTests
Move to frameworks/base/tests/net/common so that it can
be run in cts test and presubmit test.

Bug: 154299158
Test: atest CtsNetTestCasesLatestSdk:android.net.DhcpInfoTest
Change-Id: I8d70565fe3388fd8351002f2ed87c43343879e57
2020-04-17 17:48:53 +08:00
Aaron Huang
201eb700e3 Merge changes I9602cac1,Id4e31013 am: c8739d5f10 am: 887ef05bfe
Change-Id: I09607465a4ad73f62365ccfbb80cf5a39a7f876a
2020-04-17 06:00:02 +00:00
Yan Yan
6742ce7ab1 Merge changes Ib3e80315,If19fb12c,Ic50d70f3 into rvc-dev
* changes:
  Test setting config requests for TunnelModeChildSessionParams
  Test setting proposal, TS and lifetime for ChildSessionParams
  Add CTS for building IKE and Child SaProposal
2020-04-16 17:24:17 +00:00
Aaron Huang
bbc5554392 Add test for NetworkRequest#getRequestorUid()
Add test for new API.

Bug: 151110379
Test: atest CtsNetTestCasesLatestSdk:android.net.cts.NetworkRequestTest
Change-Id: I9602cac142b3e45d12e66a6f3f35ab594e6590c1
2020-04-16 21:43:15 +08:00
Aaron Huang
5585672f92 Add tests for NetworkRequest API
This change inculdes coverage of NetworkRequest#Builder().clearCapabilities()
and NetworkRequest#getRequestorPackageName()

Bug: 153614623
Test: atest CtsNetTestCasesLatestSdk:android.net.cts.NetworkRequestTest
Change-Id: Id4e31013cfae78c25abd27b557da4e3e9487870c
2020-04-16 18:51:44 +08:00
Chiachang Wang
13301d025a Add test for NetworkRequest#canBeSatisfiedBy
Test: atest CtsNetTestCasesLatestSdk:android.net.cts.NetworkRequestTest
      on both Q and R device
Bug: 153972141
Change-Id: I614963cdd5f26bf3d47246fdc9eb11e74d05a460
Merged-In: I614963cdd5f26bf3d47246fdc9eb11e74d05a460
(cherry picked from commit 8f9325fcf28c4248eb3eb4bf21ec6a103eec614a)
2020-04-16 01:42:37 +00:00
Yan Yan
5e89d115fb Test setting config requests for TunnelModeChildSessionParams
Bug: 148689509
Test: atest CtsIkeTestCases
Change-Id: Ib3e803159cdf42a8655c0e4d0f22faeabe161c4c
Merged-In: Ib3e803159cdf42a8655c0e4d0f22faeabe161c4c
(cherry picked from commit 7ec4cf34cc443984889c5728a2b538ea91ec5036)
2020-04-15 20:51:48 +00:00
Yan Yan
2b98dce4e9 Test setting proposal, TS and lifetime for ChildSessionParams
Bug: 148689509
Test: atest CtsIkeTestCases
Change-Id: If19fb12c92f65d487478fda172acb21f6cfb1717
Merged-In: If19fb12c92f65d487478fda172acb21f6cfb1717
(cherry picked from commit ee06cc4c06e54c7cf9cb46acd38066106bdc1cba)
2020-04-15 20:49:52 +00:00
Jeff Sharkey
aa97661da8 Merge "Fix logic inversion bug from Android 1.0." into rvc-dev am: 4d2e516a6b
Change-Id: Iba0e3675d8f7383c0dcf03d24314b99125871c05
2020-04-15 17:40:17 +00:00
Yan Yan
dfa5258c66 Merge "Create TestNetworkUtils for IKE and IPsec CTS" am: eea1497731 am: dce837cc5b
Change-Id: Ibbe5f255122a65d4a5bd1f9b6fe04a83653e2d53
2020-04-15 17:32:59 +00:00
Chiachang Wang
7e01bd5eb2 Merge "Add test for NetworkRequest#canBeSatisfiedBy" am: a0e3d97f24 am: 07ce15016b
Change-Id: I1bc9101ee4d6ee0ef03209e41537a9b091617cf5
2020-04-15 17:32:39 +00:00
Yan Yan
ff7fe1e5fe Add CTS for building IKE and Child SaProposal
Bug: 148689509
Test: atest CtsIkeTestCases
Change-Id: Ic50d70f35216a065ff398c38262f2de0b370c5ef
Merged-In: Ic50d70f35216a065ff398c38262f2de0b370c5ef
(cherry picked from commit 7f95e39c2534b370a28e4d6cf08ebb8b74950fcb)
2020-04-15 17:03:39 +00:00
Yan Yan
eea1497731 Merge "Create TestNetworkUtils for IKE and IPsec CTS" 2020-04-15 17:02:14 +00:00
Chiachang Wang
a0e3d97f24 Merge "Add test for NetworkRequest#canBeSatisfiedBy" 2020-04-15 15:00:51 +00:00
Jeff Sharkey
4d2e516a6b Merge "Fix logic inversion bug from Android 1.0." into rvc-dev 2020-04-15 13:54:37 +00:00
Chiachang Wang
da03c6a3f5 Add test for NetworkRequest#canBeSatisfiedBy
Test: atest CtsNetTestCasesLatestSdk:android.net.cts.NetworkRequestTest
      on both Q and R device
Bug: 153972141
Change-Id: I614963cdd5f26bf3d47246fdc9eb11e74d05a460
2020-04-15 21:35:19 +08:00
Chalard Jean
5217786c6c Address comments from aosp/1284557
Test: this
Bug: 139268426
Change-Id: I5d90fe2716032b7ebd2b425225fe8e96900fe63b
Merged-In: I5edbff1d7eed2f939ba26f1ebd7ead49ac67b978
(cherry picked from commit 55d7923c1d75e3d91b79461e2bd3846abdd9eed2, aosp/1284569)
2020-04-15 05:18:26 +00:00
Chalard Jean
6a96996525 Test Signal thresholds
Test: this
Bug: 139268426
Change-Id: I48ea9afa2a31c3edd4b00a566ed47796912c453a
Merged-In: I136f246d0e3ad6744989e7d6f4f8034cc6674def
(cherry picked from commit 159bce95cb8ca0aba6cf74a0b57a24dae3aadc05, aosp/1284559)
2020-04-15 05:17:45 +00:00
Chalard Jean
2e3c3b8d89 Test sendNetworkScore
Test: this
Bug: 139268426
Change-Id: Ie46ff2676944e6d6603bbff271fc6dca9935e548
Merged-In: I66cea443f0c6aa9235da577817787d764fbd030b
(cherry picked from commit c7091c91558d56632da237cf0a01567fcde3cba2, aosp/1284561)
2020-04-15 05:17:22 +00:00
Chalard Jean
e582c5d4be Test sendCaps and sendProps
Test: this
Bug: 139268426
Change-Id: I6d30ac0193225826a97ff3853a98b939e571d074
Merged-In: Idefce1174b82668d23c53dd1bf95bc660cb21c28
(cherry picked from commit 7922d354307e4a41a336c29291285550a94da434, aosp/1284560)
2020-04-15 05:16:41 +00:00
Chalard Jean
4f9483a9b8 Test validation status
Test: this
Bug: 139268426
Change-Id: I04be5cda321af109cb6fd7510362d817ab23b505
Merged-In: I8499d9da8643cf60c912570e7a2ac2207d662e16
(cherry picked from commit 03af30598907add0f64d815f5487ea97e8d61f04, aosp/1284558)
2020-04-15 05:15:30 +00:00
Chalard Jean
d527355734 Test accept unvalidated
Test: this
Bug: 139268426
Change-Id: I9343f72e1b1f4752e9781ff9b44e2a561d166cfb
Merged-In: I3326a2119d66e67566fce0268ea4861729b1c64c
(cherry-picked from aosp/1284557)
2020-04-15 05:14:05 +00:00
Chalard Jean
dce3e15cd3 Test onStartSocketKeepalive
Test: this
Bug: 139268426
Change-Id: I26f68fdf9b687a2d87c971525b1cd2c48d4579bb
Merged-In: I4e251fa0203a1888badef9ed90495fe8b3340a1c
(cherry-picked aosp/1258137)
2020-04-15 05:13:07 +00:00
Chalard Jean
6fe3606924 Increase test independence
If a test fails without unregistering an agent, other tests will
see their requests match the old agent. That means any test failing
will fail all subsequent tests, which is not very helpful.

Solve this by making sure the agents are unregistered before the
test ends. Also ensure the requests are unregistered.

Test: NetworkAgentTest
Bug: 139268426
Change-Id: If183d78298aa2a0bcae9e2487199dee14014cdfb
Merged-In: I2c167803d478d31fd85dc6e6e621f35d36c68fb4
(cherry-picked from aosp/1284556)
2020-04-15 05:12:05 +00:00
evitayan
825a7f32ac Create TestNetworkUtils for IKE and IPsec CTS
Create TestNetworkUtils that provides interfaces to set up test
network. It will be used by both IKE and IPsec CTS

Bug: 148689509
Test: atest CtsIkeTestCases
Change-Id: I1c49711d3c6ce03ceafdbf3004e25d9d59a6201c
2020-04-14 18:18:30 -07:00
Yan Yan
0719d14b44 Merge "Test setting config requests for TunnelModeChildSessionParams" am: bc1a79226c am: 46177b2909
Change-Id: I717e7c0fa9e786414a3074e59c772ec93c51794e
2020-04-15 01:12:18 +00:00
Yan Yan
bc1a79226c Merge "Test setting config requests for TunnelModeChildSessionParams" 2020-04-15 00:59:32 +00:00
Yan Yan
1b2465f5a7 Merge "Test setting proposal, TS and lifetime for ChildSessionParams" am: 7b1e443180 am: b49ff5bf7e
Change-Id: Ie0ea72c4e834788501d73fde5f73c36cd9d076ff
2020-04-14 23:56:55 +00:00
Yan Yan
4bbe81fb6f Merge "Add CTS for building IKE and Child SaProposal" am: 7099db605e am: 4e61345a51
Change-Id: I7319aaef9f2b00bd24f5da053ca39707f428441c
2020-04-14 23:56:27 +00:00
Yan Yan
7b1e443180 Merge "Test setting proposal, TS and lifetime for ChildSessionParams" 2020-04-14 23:27:57 +00:00
Yan Yan
7099db605e Merge "Add CTS for building IKE and Child SaProposal" 2020-04-14 23:19:55 +00:00
evitayan
cb778b1200 Test setting config requests for TunnelModeChildSessionParams
Bug: 148689509
Test: atest CtsIkeTestCases
Change-Id: Ib3e803159cdf42a8655c0e4d0f22faeabe161c4c
2020-04-14 13:56:52 -07:00
Chalard Jean
524f93613f Test onBandwidthUpdateRequested
Test: this
Bug: 139268426
Change-Id: I5f4b42dc68fdd13f26e59b4e2217d39dcee8f2a1
Merged-In: I427ae6ac2c8910683e47f503ba71a05e35507571
(cherry picked from commit bbe53cd710440468520d5d5713eaa503b6c9d8b9, aosp/1258136)
2020-04-14 04:55:16 +00:00