Commit Graph

4636 Commits

Author SHA1 Message Date
Yan Yan
28df18148b Merge "Test building IkeSessionParams with EAP" am: 4f532038f1 am: 8163d0ec62
Change-Id: I838cff728ca95081189bd715fe8b2ff8870948ad
2020-04-26 22:00:08 +00:00
Yan Yan
8163d0ec62 Merge "Test building IkeSessionParams with EAP" am: 4f532038f1
Change-Id: Idebb767e4f975f975ce2299f4310fe25fc78a94a
2020-04-26 21:50:45 +00:00
Yan Yan
4f532038f1 Merge "Test building IkeSessionParams with EAP" 2020-04-26 21:29:31 +00:00
Yan Yan
30717132c4 Merge "Add test for IkeIdentification" am: 609d48cc11 am: 250cd90ab6
Change-Id: Idede5b46a1ed814bbc7c537e8db66f801a955720
2020-04-25 02:20:03 +00:00
Yan Yan
de5df252f6 Merge "Add initial CTS test for IkeSessionParams" am: f839aaad8c am: 8a6bf04733
Change-Id: Ie36e8c51611b8886e3b3262ff4a368d7444daf5f
2020-04-25 02:19:53 +00:00
Yan Yan
250cd90ab6 Merge "Add test for IkeIdentification" am: 609d48cc11
Change-Id: I0e3921aee9e5f66375d15e89523647e52f4caf90
2020-04-25 02:08:41 +00:00
Yan Yan
8a6bf04733 Merge "Add initial CTS test for IkeSessionParams" am: f839aaad8c
Change-Id: Iaaa69b04d380b2ae3705e33472f7fb97b1a5cb24
2020-04-25 02:08:26 +00:00
evitayan
e800e95037 Test building IkeSessionParams with EAP
Bug: 148689509
Test: atest CtsIkeTestCases
Change-Id: Iea7f4d14502f4b204c7a0d7357e1aaec99954e1f
2020-04-24 19:01:11 -07:00
Yan Yan
609d48cc11 Merge "Add test for IkeIdentification" 2020-04-25 01:56:17 +00:00
Yan Yan
f839aaad8c Merge "Add initial CTS test for IkeSessionParams" 2020-04-25 01:53:15 +00:00
Mark Chien
1f03fbdeed [automerger skipped] Merge changes Ief9c7453,Ifb3a0618 into rvc-dev am: 7c10f3f277 -s ours
am skip reason: Change-Id Ief9c745322e8705c0e50185e749a81c5a9d20743 with SHA-1 0420e692a7 is in history

Change-Id: I7ba9696e197b4c53b7031f3d7d380b44c66cfbac
2020-04-25 01:10:39 +00:00
evitayan
9dcef40023 Add test for IkeIdentification
Bug: 148689509
Test: atest CtsIkeTestCases
Change-Id: Ieda584446c37d121fc16a212e2c6c60b934b0f53
2020-04-24 18:16:18 +00:00
evitayan
b9438336c7 Add initial CTS test for IkeSessionParams
This commit adds tests for building IkeSessionParams with PSK. It
also tests configuring SA lifetimes, retransmissions and PCSCF
server requests

Bug: 148689509
Test: atest CtsIkeTestCases
Change-Id: I16fdc1ff9a22acb82b376211e0f187c4ead4cae5
2020-04-24 10:30:30 -07:00
Treehugger Robot
482dda22da Merge "Add testTetheringUpstream cts test" am: 6aa8f074d0 am: 91d915e116
Change-Id: I3aa5fadfb7b417730d53c8976f425e3c229e9918
2020-04-24 16:01:23 +00:00
Treehugger Robot
22da660983 Merge "Test legacy tether/untether API and onError callback" am: c31694df4c am: b8e44e87b3
Change-Id: I8a6b617bd1e43e8689b92c00349bf72e155fd94d
2020-04-24 16:00:43 +00:00
Treehugger Robot
91d915e116 Merge "Add testTetheringUpstream cts test" am: 6aa8f074d0
Change-Id: Ib8ca2e9a3dca0494af62e193f261bf4a943d3028
2020-04-24 15:44:51 +00:00
Treehugger Robot
b8e44e87b3 Merge "Test legacy tether/untether API and onError callback" am: c31694df4c
Change-Id: If9a821510f0e1117faf3d12808753fd3e2535adf
2020-04-24 15:44:37 +00:00
Treehugger Robot
6aa8f074d0 Merge "Add testTetheringUpstream cts test" 2020-04-24 15:36:21 +00:00
Treehugger Robot
c31694df4c Merge "Test legacy tether/untether API and onError callback" 2020-04-24 15:29:44 +00:00
markchien
668dfa5998 Add testTetheringUpstream cts test
If cellular is the mobile network, tethering should select it as
upstream. If DUN is required, tethering should use DUN as its upstream.

Bug: 153614366
Bug: 150644305
Test: atest CtsTetheringTest

Change-Id: Ief9c745322e8705c0e50185e749a81c5a9d20743
Merged-In: Ief9c745322e8705c0e50185e749a81c5a9d20743
2020-04-24 22:31:01 +08:00
markchien
0420e692a7 Add testTetheringUpstream cts test
If cellular is the mobile network, tethering should select it as
upstream. If DUN is required, tethering should use DUN as its upstream.

Bug: 153614366
Bug: 150644305
Test: atest CtsTetheringTest

Change-Id: Ief9c745322e8705c0e50185e749a81c5a9d20743
2020-04-24 22:29:43 +08:00
markchien
a6b3b70278 Test legacy tether/untether API and onError callback
Test legacy tether/untether API behavior. tether() rely on downstream
setup ready for tethering. Currently the only user is bluetooth
tethering. For other tetherings, there is no guaranteed that calling
tether() can always switch given interface to tethered. Tethering
may callback with onError depend on the interface status. Caller
should use startTethering/stopTethering API instead of these
legacy APIs.

This change also change the precondition verification of startTethering.
If tethering interface got error last time, such interface would not
be reported as tetherable.

Bug: 150632712
Test: atest CtsTetheringTest
Change-Id: Ifb3a0618208ffd0ff224c60f377036bc22ba0565
Merged-In: Ifb3a0618208ffd0ff224c60f377036bc22ba0565
2020-04-24 22:23:23 +08:00
markchien
1a54afc5b1 Test legacy tether/untether API and onError callback
Test legacy tether/untether API behavior. tether() rely on downstream
setup ready for tethering. Currently the only user is bluetooth
tethering. For other tetherings, there is no guaranteed that calling
tether() can always switch given interface to tethered. Tethering
may callback with onError depend on the interface status. Caller
should use startTethering/stopTethering API instead of these
legacy APIs.

This change also change the precondition verification of startTethering.
If tethering interface got error last time, such interface would not
be reported as tetherable.

Bug: 150632712
Test: atest CtsTetheringTest
Change-Id: Ifb3a0618208ffd0ff224c60f377036bc22ba0565
2020-04-24 21:16:06 +08:00
TreeHugger Robot
38bd84d94e [automerger skipped] Merge "Move DhcpInfoTest to FrameworksNetCommonTests" into rvc-dev am: 25cd61eb7e -s ours
am skip reason: Change-Id I8d70565fe3388fd8351002f2ed87c43343879e57 with SHA-1 48e0812796 is in history

Change-Id: Ie70f26552e41ba517d80067fad37cabf1980f5cb
2020-04-24 06:27:15 +00:00
TreeHugger Robot
25cd61eb7e Merge "Move DhcpInfoTest to FrameworksNetCommonTests" into rvc-dev 2020-04-24 06:15:12 +00:00
Sudheer Shanka
f5af3d7527 [automerger skipped] Merge changes I05285811,I782f8a06,I7c5bf823,I7bb2a7e4 into stage-aosp-master am: 4cd0f56bea -s ours
am skip reason: Change-Id I05285811d7131e116d5e1d072137ed2cf9576d05 with SHA-1 643abc73d9 is in history

Change-Id: I7964684d586048225998b2956500b96d8f57988c
2020-04-24 03:15:54 +00:00
Sudheer Shanka
4cd0f56bea Merge changes I05285811,I782f8a06,I7c5bf823,I7bb2a7e4 into stage-aosp-master
* changes:
  Ensure location is enabled before getting SSID.
  Fix a regression in how required properties are collected.
  Fix Error Prone errors
  Reland "Pull service dumps to help debug test failures."
2020-04-24 03:14:17 +00:00
Yan Yan
f2d50ece98 Merge "Add CTS for EapSessionConfig" am: c7afaba688 am: b15c228d88
Change-Id: I3d2ee1aeba0c8473c71a41f3202da663707724f1
2020-04-24 00:39:39 +00:00
Yan Yan
b15c228d88 Merge "Add CTS for EapSessionConfig" am: c7afaba688
Change-Id: I51e89a5604d78c325a8a985b3144ae49734f9eb3
2020-04-24 00:25:31 +00:00
Yan Yan
c7afaba688 Merge "Add CTS for EapSessionConfig" 2020-04-24 00:00:43 +00:00
Yan Yan
8d5985e738 Merge "Create base class that sets up test network" am: c921e5075f am: a1c71f705b
Change-Id: I750675c3eafb2a28d554df163826b8ec86f03ca0
2020-04-23 22:52:51 +00:00
Yan Yan
1020e90c9a Merge "Make a copy of TunUtils and PacketUtils" am: dbe2adf308 am: 755a4b59b7
Change-Id: I42e2ccd1d5a884d0992f3f75468904799d4f3ec6
2020-04-23 22:52:40 +00:00
Yan Yan
a1c71f705b Merge "Create base class that sets up test network" am: c921e5075f
Change-Id: Ib5f5fd2bc54ad5c4866622f74f1c1d555fee5592
2020-04-23 22:37:28 +00:00
Yan Yan
755a4b59b7 Merge "Make a copy of TunUtils and PacketUtils" am: dbe2adf308
Change-Id: I8a268a878c089a98a1d9b73190ab0db6204b0746
2020-04-23 22:37:03 +00:00
Yan Yan
c921e5075f Merge "Create base class that sets up test network" 2020-04-23 22:19:21 +00:00
Yan Yan
dbe2adf308 Merge "Make a copy of TunUtils and PacketUtils" 2020-04-23 22:18:45 +00:00
Sudheer Shanka
d43f034725 Ensure location is enabled before getting SSID.
When location is disabled, Wi-Fi scan results and SSID are not available
to apps.

Fixes: 153850762
Fixes: 153396893
Test: atest hostsidetests/net/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java
Change-Id: I05285811d7131e116d5e1d072137ed2cf9576d05
Merged-In: I05285811d7131e116d5e1d072137ed2cf9576d05
2020-04-23 14:18:32 -07:00
Sudheer Shanka
004c442de9 Fix a regression in how required properties are collected.
+ Enable app standby mode before running the tests.

Fixes: 147459100
Fixes: 117169751
Test: atest hostsidetests/net/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java
Test: cts-tradefed run singleCommand cts-on-gsi --skip-device-info \
      --skip-preconditions -m CtsHostsideNetworkTests \
      -t com.android.cts.net.HostsideRestrictBackgroundNetworkTests

Change-Id: I782f8a06922622d28f9a9d5c9f2afa2b12f8aa80
Merged-In: I782f8a06922622d28f9a9d5c9f2afa2b12f8aa80
2020-04-23 14:18:32 -07:00
Sudheer Shanka
a0e71e89ea Fix Error Prone errors
Soong wasn't including android_app or android_test sources in the
javac-check target used for the Error Prone build, which allowed
some Error Prone errors to get in.  Fix them so Error Prone can be
re-enabled for these targets.

Fixes:
cts/hostsidetests/net/app/src/com/android/cts/net/hostside/RequiredPropertiesRule.java:61: error: [CollectionIncompatibleType] Argument '~requiredProperty.getValue()' should not be passed to this method; its type int is not compatible with its collection's type argument Property

Bug: 146455923
Test: m RUN_ERROR_PRONE=true javac-check
Change-Id: I7c5bf823bf371902285ce3ee3929796fa40c653b
Merged-In: I48b1ccb61c807d0b41a165298ef5981258d6656e
2020-04-23 14:18:32 -07:00
Sudheer Shanka
3cd28c2a39 Reland "Pull service dumps to help debug test failures."
+ Convert tests to use Junit4
+ Add annotations to specify required conditions for the test to run.

This reverts commit 89099548f8.

Bug: 137859686
Change-Id: I7bb2a7e4b2dca3696761e7c030f3380b9226b676
Merged-In: I93317c201a0ea06732e29154ab7e140735381f59
2020-04-23 14:18:32 -07:00
Sudheer Shanka
e3b1da9363 [automerger skipped] Merge changes I05285811,I782f8a06,I7c5bf823,I7bb2a7e4 am: 8d7f5f0f9a -s ours am: 03b91d2e5e -s ours
am skip reason: Change-Id I05285811d7131e116d5e1d072137ed2cf9576d05 with SHA-1 643abc73d9 is in history

Change-Id: I6752e843170f0c0447ffe42bb297180a4d0a8c75
2020-04-23 19:45:46 +00:00
Sudheer Shanka
03b91d2e5e [automerger skipped] Merge changes I05285811,I782f8a06,I7c5bf823,I7bb2a7e4 am: 8d7f5f0f9a -s ours
am skip reason: skipped by user sudheersai

Change-Id: I13d4668cb83890490a46ef63444ef6390d1e0e91
2020-04-23 19:33:11 +00:00
Sudheer Shanka
8d7f5f0f9a Merge changes I05285811,I782f8a06,I7c5bf823,I7bb2a7e4
* changes:
  Ensure location is enabled before getting SSID.
  Fix a regression in how required properties are collected.
  Fix Error Prone errors
  Reland "Pull service dumps to help debug test failures."
2020-04-23 17:57:10 +00:00
evitayan
8cfc634bbc Create base class that sets up test network
This class will be extended by both IkeSessionParamsTest and
IkeSessionTestBase

Bug: 148689509
Test: atest CtsIkeTestCases
Change-Id: I98979758a7a684219e35c02ded93224ea172d44f
2020-04-23 10:40:49 -07:00
Mark Chien
3928481da4 [automerger skipped] Merge "Test enable tethering permission and stopAllTethering" into rvc-dev am: 2cf72fecd3 -s ours
am skip reason: Change-Id I38702886ea355e1aec8eb8ac404fdd46a44582e3 with SHA-1 257cad8052 is in history

Change-Id: Ibb1747b13ce5dfcf1d2ee15d9656f58956aaa6a5
2020-04-23 17:01:01 +00:00
Mark Chien
f46d6a1e8d Test enable tethering permission and stopAllTethering
1. Test whether start tethering is gated by suitable permission.
2. Test stopAllTethering

Bug: 153613718
Test: atest CtsTetheringTest

Merged-In: I38702886ea355e1aec8eb8ac404fdd46a44582e3
Change-Id: I38702886ea355e1aec8eb8ac404fdd46a44582e3
2020-04-23 14:48:03 +00:00
Mark Chien
f7963a7f35 Merge "Test enable tethering permission and stopAllTethering" am: 34ec9b0db7 am: 39a164dfd0
Change-Id: Ie5bef87706d63f4ea2c09c2a6161290e7c5a88a3
2020-04-23 13:28:22 +00:00
Mark Chien
39a164dfd0 Merge "Test enable tethering permission and stopAllTethering" am: 34ec9b0db7
Change-Id: Ib650908fbb6e1fcb39689168e3d85e78c821e278
2020-04-23 13:14:52 +00:00
Mark Chien
34ec9b0db7 Merge "Test enable tethering permission and stopAllTethering" 2020-04-23 13:02:04 +00:00
Paul Hu
b37f3618f9 [automerger skipped] Add TetheringCommonTests to CtsTetheringTest am: 11fec376f5 -s ours
am skip reason: Change-Id I26c06d522ef2935deb2b1abbd3c5b6be97a48a27 with SHA-1 6f203abeab is in history

Change-Id: I3cfedc63e2bb1e3582f095c6959317f6f91d3d92
2020-04-23 08:16:45 +00:00