Commit Graph

4062 Commits

Author SHA1 Message Date
Etan Cohen
7a4bbedc55 resolve merge conflicts of bc5182bb20 to qt-dev am: 0bf6d01729 am: 336f36f987 am: 0c6cf0993e
Change-Id: I297fba1f809535fa157ec2de1c1cc1e0007a0834
2020-02-14 20:13:59 +00:00
Etan Cohen
0c6cf0993e resolve merge conflicts of bc5182bb20 to qt-dev am: 0bf6d01729 am: 336f36f987
Change-Id: I184c9d2ef9ce86025c181e829bf0eb10cd6e7843
2020-02-14 07:27:50 +00:00
Etan Cohen
336f36f987 resolve merge conflicts of bc5182bb20 to qt-dev am: 0bf6d01729
Change-Id: Ifa46d5f5c55a2b25cafcbcf8568d9c69e0b4d1ea
2020-02-14 07:11:10 +00:00
Etan Cohen
0bf6d01729 resolve merge conflicts of bc5182bb20 to qt-dev
Bug: None
Test: Trivial merge resolution
Change-Id: I7c906295e30e0eb0b1f119fee9937d08aa2ae154
2020-02-13 19:47:43 -08:00
Jimmy Chen
aac1041896 cts: fix p2p cts test cases
p2p does not use NetworkInfo.isAvailable() anymore.
Remove this obsolete check.

Bug: 148164038
Test: atest android.net.wifi.cts.ConcurrencyTest
Change-Id: I544a2363d85ea47e404e481d4d285b9fd6b38eb5
2020-02-11 19:01:57 +08:00
Sudheer Shanka
9a1e3be614 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
2020-02-05 18:09:08 -08:00
Automerger Merge Worker
bc5182bb20 Merge "CtsNetTestCases: Fix issues in android.net.wifi.cts.WifiEnterpriseConfigTest" into pie-cts-dev am: 5f31310dac
Change-Id: Ida9479f99d3dde24217575ed039690420cc9089e
2020-02-06 00:58:53 +00:00
David Su
3db4363cfd Rename WifiManager.ACTION_WIFI_SCAN_AVAILABLE
Renamed to WIFI_SCAN_AVAILABILITY_CHANGED to
conform to API guidelines.

Bug: 148781526
Test: compiles
Change-Id: Ic84cbededfe9e5d02900fbe7a6a99c059af89641
2020-02-03 14:29:00 -08:00
David Su
c8551662d3 Merge "Rename PERSISTENT_NET_ID/TEMPORARY_NET_ID" 2020-01-31 21:02:55 +00:00
Automerger Merge Worker
852a496c36 Merge "Change the location of WiFi Initialize() API within the same function" am: 26d8f5808b am: 6e599930dd am: 883afff147
Change-Id: I105289e5db38cf9475dbaf377733f069940825b2
2020-01-31 16:46:58 +00:00
Automerger Merge Worker
6e599930dd Merge "Change the location of WiFi Initialize() API within the same function" am: 26d8f5808b
Change-Id: I077641561f2c970e980d37a69fc248cd2d67f8ad
2020-01-31 16:31:36 +00:00
Automerger Merge Worker
9df7fcb86a Merge "CtsNetTestCases: Fix issues in android.net.wifi.cts.WifiEnterpriseConfigTest" am: bec47acfaa am: 26461e5ea8 am: 978a9bc103
Change-Id: Ib14926206e8c6e5d446e5a70002ae46ee1677370
2020-01-31 16:19:19 +00:00
Automerger Merge Worker
26461e5ea8 Merge "CtsNetTestCases: Fix issues in android.net.wifi.cts.WifiEnterpriseConfigTest" am: bec47acfaa
Change-Id: Ia3ce4c1e115f74c9771e9b49af633a2d278edaf5
2020-01-31 16:06:13 +00:00
Etan Cohen
26d8f5808b Merge "Change the location of WiFi Initialize() API within the same function" 2020-01-30 21:59:31 +00:00
David Su
bdc82a44eb Rename PERSISTENT_NET_ID/TEMPORARY_NET_ID
Renamed to NETWORK_ID_PERSISTENT/
NETWORK_ID_TEMPORARY to conform to API guidelines.

Bug: 147668001
Test: compiles
Change-Id: Ia4d1e317fe659d5e8e871b1c6808272ff3414c76
2020-01-30 12:41:52 -08:00
jgkim
b38f0df3f9 CtsNetTestCases: Fix issues in android.net.wifi.cts.WifiEnterpriseConfigTest
1.android.net.wifi.cts.WifiEnterpriseConfigTest#testAddEapNetwork
2.android.net.wifi.cts.WifiEnterpriseConfigTest#testEnterpriseConfigDoesNotPrintPassword
3.android.net.wifi.cts.WifiEnterpriseConfigTest#testSettersAndGetters

Bug:143000258
Test: run cts-on-gsi -m CtsNetTestCases-t android.net.wifi.cts.WifiEnterpriseConfigTest#testAddEapNetwork
Test: run cts-on-gsi -m CtsNetTestCases-t android.net.wifi.cts.WifiEnterpriseConfigTest#testEnterpriseConfigDoesNotPrintPassword
Test: run cts-on-gsi -m CtsNetTestCases-t android.net.wifi.cts.WifiEnterpriseConfigTest#testSettersAndGetters
Change-Id: Iaed949693c8ac8ce67dbde6acb622f90f0e638da
Merged-In: Iaed949693c8ac8ce67dbde6acb622f90f0e638da
2020-01-30 01:24:41 +00:00
Etan Cohen
bec47acfaa Merge "CtsNetTestCases: Fix issues in android.net.wifi.cts.WifiEnterpriseConfigTest" 2020-01-29 21:11:31 +00:00
Jae Choon Jeon
d8fd0f8395 Change the location of WiFi Initialize() API within the same function
The testcase is failing for the model as there are no clients which have already invoked the initialize API.
So we changed the location of initialize() API little forward to be invoked before CTS test.

Bug: 148126151
Test: run cts --m CtsNetTestCases --t android.net.wifi.cts.ConcurrencyTest#testConcurrency

Change-Id: I1081d343795e07440ebf380c25f47c320c064556
Signed-off-by: Jae Choon Jeon <jc.d.jeon@samsung.com>
(cherry picked from commit 1a46560a2b55df0b3159884a7eed4b2598c2e827)
2020-01-28 17:25:48 +00:00
Les Lee
92be98755d Merge "softap: Update LOHS API usage" 2020-01-19 05:53:55 +00:00
lesl
f70b854aaf softap: Update LOHS API usage
Use SoftApConfiguration to replace WifiConfiguration

Bug: 138801922
Bug: 142752869
Test: atest
android.net.wifi.cts.WifiManagerTest#testStartLocalOnlyHotspotSingleRequestByApps
android.net.wifi.cts.WifiManagerTest#testStartLocalOnlyHotspotSuccess
android.net.wifi.cts.WifiManagerTest#testStartLocalOnlyHotspotWithConfig

Change-Id: I918da2b77f6284fba24edae53f6a4ca6c4072cda
2020-01-17 15:58:03 +08:00
Automerger Merge Worker
33529a67d8 Merge "CtsTetheringTest secondary_user" am: 737b6a2f8a am: 0dd6e6cc37 am: 7020d85339
Change-Id: I84ad0214bba86d4fde8d2040e31bd7e1d62000b0
2020-01-16 20:24:28 +00:00
jovanak
0dd6e6cc37 Merge "CtsTetheringTest secondary_user"
am: 737b6a2f8a

Change-Id: Id3d0b80cb84971628c16ff010ae80aa263d674ac
2020-01-16 12:01:58 -08:00
jovanak
72a8efb9c0 CtsTetheringTest secondary_user
Marks this CTS test module as supporting secondary_user, meaning that
the tests are eligible to be run from a regular Android user other
than the system user (i.e. other than user 0).

Note that 'user' here refers to the concept of users in Android
Multiuser; it is NOT the same as a uid.

Bug: 141773058
Test: module passed with secondary_user params
 (--enable-optional-parameterization --module-parameter secondary_user)

Change-Id: I92d97cae99418dac3cd6e1cbb625b12f0c2cc60a
2020-01-14 16:18:41 -08:00
TreeHugger Robot
0e666aaa1c Merge "Fix CTS usages of @hide WifiSsid" 2020-01-13 20:10:52 +00:00
David Su
b5cd542daa Fix CTS usages of @hide WifiSsid
Migrate to WifiInfo.getSSID() and ScanResult.SSID.

Bug: 144036594
Test: atest android.net.wifi.cts.ScanResultTest
Change-Id: I402978d9455b0ce9e7dbcdb90836f7b0efa0fdc5
2020-01-13 11:05:00 -08:00
David Su
1afbb489c1 Merge changes from topic "cts-wifimanagertest-hide-apis"
* changes:
  Remove WifiManager CTS test using TxPacketCountListener
  CtsNetTestCases: fix Wifi @hide usages
2020-01-13 19:02:20 +00:00
David Su
47a4a384c4 Remove WifiManager CTS test using TxPacketCountListener
TxPacketCountListener is @hide and only used for
CTS. Remove the test using this altogether.

Bug: 144036594
Test: atest android.net.wifi.cts.WifiManagerTest
Change-Id: Iac42c7dca4ca5cbbae6c464530319975e8d1571e
2020-01-10 17:13:22 -08:00
David Su
656e4768c3 CtsNetTestCases: fix Wifi @hide usages
Remove CTS @hide Wifi API usages.

Bug: 144036594
Test: atest CtsNetTestCases
Change-Id: I88de956a56f81212133d1da48d5217b282bc10c1
2020-01-10 13:43:37 -08:00
lesl
142df96ebf cts: Use set/getPassphrase to replace set/getWpa2Passphrase
Bug: 142752869
Test: atest
android.net.wifi.cts.WifiManagerTest#testStartLocalOnlyHotspotSingleRequestByApps
android.net.wifi.cts.WifiManagerTest#testStartLocalOnlyHotspotSuccess
android.net.wifi.cts.WifiManagerTest#testStartLocalOnlyHotspotWithConfig

Change-Id: Iea9f797373b9b8ebae90428edb2da8b1f3d48efb
2020-01-09 19:58:49 +08:00
jgkim
ca18cb02b6 CtsNetTestCases: Fix issues in android.net.wifi.cts.WifiEnterpriseConfigTest
1.android.net.wifi.cts.WifiEnterpriseConfigTest#testAddEapNetwork
2.android.net.wifi.cts.WifiEnterpriseConfigTest#testEnterpriseConfigDoesNotPrintPassword
3.android.net.wifi.cts.WifiEnterpriseConfigTest#testSettersAndGetters

Bug:143000258
Test: run cts-on-gsi -m CtsNetTestCases-t android.net.wifi.cts.WifiEnterpriseConfigTest#testAddEapNetwork
Test: run cts-on-gsi -m CtsNetTestCases-t android.net.wifi.cts.WifiEnterpriseConfigTest#testEnterpriseConfigDoesNotPrintPassword
Test: run cts-on-gsi -m CtsNetTestCases-t android.net.wifi.cts.WifiEnterpriseConfigTest#testSettersAndGetters
Change-Id: Iaed949693c8ac8ce67dbde6acb622f90f0e638da
2020-01-03 16:23:15 +09:00
Colin Cross
f7d2ff895e 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
cts/tests/location/location_fine/src/android/location/cts/fine/CriteriaTest.java:199: error: [JUnit4TestNotRun] This looks like a test method but is not run; please add @Test and @Ignore, or, if this is a helper method, reduce its visibility.
cts/tests/location/location_fine/src/android/location/cts/fine/LocationManagerFineTest.java:948: error: [TryFailThrowable] Catching Throwable/Error masks failures from fail() or assert*() in the try block
cts/tests/location/location_fine/src/android/location/cts/fine/LocationTest.java:402: error: [JUnit4TestNotRun] This looks like a test method but is not run; please add @Test and @Ignore, or, if this is a helper method, reduce its visibility.
cts/tests/tests/assist/src/android/assist/cts/AssistTestBase.java:613: error: [CheckReturnValue] Ignored return value of method that is annotated with @CheckReturnValue
cts/tests/tests/assist/src/android/assist/cts/AssistTestBase.java:616: error: [CheckReturnValue] Ignored return value of method that is annotated with @CheckReturnValue
cts/tests/tests/media/src/android/media/cts/AudioRecordTest.java:1661: error: [JUnit4TestNotRun] This looks like a test method but is not run; please add @Test and @Ignore, or, if this is a helper method, reduce its visibility.
cts/tests/tests/media/src/android/media/cts/AudioRecordTest.java:1681: error: [JUnit4TestNotRun] This looks like a test method but is not run; please add @Test and @Ignore, or, if this is a helper method, reduce its visibility.

Bug: 146455923
Test: m RUN_ERROR_PRONE=true javac-check
Change-Id: I48b1ccb61c807d0b41a165298ef5981258d6656e
2019-12-31 09:40:49 -08:00
Automerger Merge Worker
2644c4f485 Merge "fix the problem that testNetworkSettingsPermission case can not detect all apps whose holding the NETWORK_SETTINGS permission" am: 9228a471cc am: 8634565225 am: 1737d5d1ac
Change-Id: I44338c18e76930f54230b31ee4a0834d9b047f25
2019-12-24 02:06:31 +00:00
Automerger Merge Worker
1737d5d1ac Merge "fix the problem that testNetworkSettingsPermission case can not detect all apps whose holding the NETWORK_SETTINGS permission" am: 9228a471cc am: 8634565225
Change-Id: I0f3f4139fc7dc534699a6642672f7515002fc2f3
2019-12-24 01:52:52 +00:00
qianyou
8634565225 Merge "fix the problem that testNetworkSettingsPermission case can not detect all apps whose holding the NETWORK_SETTINGS permission"
am: 9228a471cc

Change-Id: I32edc7a87d1c0b49a44806c89407a2f644b94110
2019-12-23 17:41:05 -08:00
Treehugger Robot
9228a471cc Merge "fix the problem that testNetworkSettingsPermission case can not detect all apps whose holding the NETWORK_SETTINGS permission" 2019-12-24 01:36:56 +00:00
Automerger Merge Worker
b7f1851cd6 Merge "Fix Error Prone errors" am: 72acd372b2 am: bbf2f80c02 am: 311b4e40df
Change-Id: I37c3d645d88c7c8a0b68b657b8699864d1801e20
2019-12-20 21:23:06 +00:00
Automerger Merge Worker
311b4e40df Merge "Fix Error Prone errors" am: 72acd372b2 am: bbf2f80c02
Change-Id: If25e24771a7ec33681e2cc3c0ca210351e66deab
2019-12-20 21:19:35 +00:00
Colin Cross
bbf2f80c02 Merge "Fix Error Prone errors"
am: 72acd372b2

Change-Id: I3c095bc457071fd46ffb1b5566c5d26fdca01a95
2019-12-20 13:08:01 -08:00
Colin Cross
72acd372b2 Merge "Fix Error Prone errors" 2019-12-20 21:02:06 +00:00
qianyou
b4d1e75085 fix the problem that testNetworkSettingsPermission case can not detect all apps whose holding the NETWORK_SETTINGS permission
This test case stop when detect a app failure once a time, which cannot find out all app failure. Use StringBuilder to collect failure info of all apps first, if the StringBuilder is not empty then print all the failure info.

Bug:145475188
Test: run cts -m CtsNetTestCases -t android.net.wifi.cts.WifiManagerTest#testNetworkSettingsPermission

Change-Id: I0e49b65bbe7deca82edd1908dfb6f221551ff725
Signed-off-by: qianyou <qianyou@xiaomi.com>
(cherry picked from commit dcb3a18cbf81f2970d6c3b23a478da5b4ba91805)
2019-12-20 01:25:01 +00:00
Etan Cohen
2c9f4bf117 Merge "[AWARE] Add API to expose supported cipher suites" 2019-12-20 01:07:49 +00:00
Automerger Merge Worker
0a97edb99f Merge "Add cts for MacAddress public API" am: 0f364ba113 am: d35360b193 am: cfd433d999
Change-Id: Ib99db4fb43bbcc4bff9d233c05bccde6f62604af
2019-12-19 08:38:59 +00:00
Automerger Merge Worker
cfd433d999 Merge "Add cts for MacAddress public API" am: 0f364ba113 am: d35360b193
Change-Id: I4f3f11fa123099ff464a77d06a0b768c47c8302f
2019-12-19 08:22:29 +00:00
Aaron Huang
d35360b193 Merge "Add cts for MacAddress public API"
am: 0f364ba113

Change-Id: I7e1f870ecc47fda0e3691782389cb2920e76fd13
2019-12-19 00:10:09 -08:00
Aaron Huang
0f364ba113 Merge "Add cts for MacAddress public API" 2019-12-19 08:02:20 +00:00
Colin Cross
284371356c 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/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/LockTaskHostDrivenTest.java:50: error: [JUnitAmbiguousTestClass] Test class inherits from JUnit 3's TestCase but has JUnit 4 @Test annotations.
cts/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/LockTaskTest.java:51: error: [JUnitAmbiguousTestClass] Test class inherits from JUnit 3's TestCase but has JUnit 4 @Test annotations.
cts/tests/tests/telephony/current/src/android/telephony/cts/CarrierServiceTest.java:34: error: [JUnitAmbiguousTestClass] Test class inherits from JUnit 3's TestCase but has JUnit 4 @Test annotations.
cts/tests/tests/tethering/src/android/tethering/cts/TetheringManagerTest.java:166: error: [ArrayToString] Calling toString on an array does not provide useful information
cts/tests/tests/tethering/src/android/tethering/cts/TetheringManagerTest.java:172: error: [ArrayToString] Calling toString on an array does not provide useful information

Bug: 146455923
Test: m RUN_ERROR_PRONE=true javac-check
Change-Id: I949e409fd7ba80ab8937db1c08eaaaf9608b17ed
2019-12-18 14:08:48 -08:00
David Su
0862b9f616 Merge "Use public getters for WifiP2pConfig fields" 2019-12-18 18:15:24 +00:00
Automerger Merge Worker
3d17e4ba40 Merge "Add mts tag to the build file for MTS testing" am: fd1f875e39 am: c0eaab2bd8 am: f0d974fcb8
Change-Id: I70e13e1861c48cbf26b38dfcd09e1a3ce1e6fee6
2019-12-18 10:28:08 +00:00
Automerger Merge Worker
f0d974fcb8 Merge "Add mts tag to the build file for MTS testing" am: fd1f875e39 am: c0eaab2bd8
Change-Id: I79bbfb7858d7928b40702691a5fb5f2673f986ba
2019-12-18 10:16:17 +00:00
markchien
c0eaab2bd8 Merge "Add mts tag to the build file for MTS testing"
am: fd1f875e39

Change-Id: Ida08be7794032867536fbeb12e59f572aee70673
2019-12-18 02:03:27 -08:00