Commit Graph

1301 Commits

Author SHA1 Message Date
Etan Cohen
e7ab9fa5ed Merge "[AWARE] CTS tests for publish/subscribe discovery" am: 32e2012c2a am: 0d96fc6fd5
am: c96112a907

Change-Id: I8aee5fabfaca19359850405d670b5852c891b827
2017-03-07 23:52:40 +00:00
Etan Cohen
c96112a907 Merge "[AWARE] CTS tests for publish/subscribe discovery" am: 32e2012c2a
am: 0d96fc6fd5

Change-Id: I6515e5f7707acc31cfffaf63d78c993983adaf1e
2017-03-07 23:47:36 +00:00
Etan Cohen
0d96fc6fd5 Merge "[AWARE] CTS tests for publish/subscribe discovery"
am: 32e2012c2a

Change-Id: Ib7856de088d229ee6346bd94c279000ce041cb74
2017-03-07 23:43:18 +00:00
Etan Cohen
32e2012c2a Merge "[AWARE] CTS tests for publish/subscribe discovery" 2017-03-07 23:35:32 +00:00
Etan Cohen
a9f33d578d [AWARE] CTS tests for publish/subscribe discovery
Validate the SUCCESS case of publish and subscribe
discovery sessions.

Bug: 30556108
Test: CTS tests pass
Change-Id: Ib88606cdf662560258890e2f274c85c3a8818206
2017-03-07 09:32:56 -08:00
Etan Cohen
81a04f5dcf Merge "[CM] CTS tests for requestNetwork APIs" am: b9af841386 am: 766fa1f462
am: 53da30e8fe

Change-Id: I2d3f4ec6e465fe082b2c79d15ea3d4369f03b793
2017-03-07 17:00:52 +00:00
Etan Cohen
53da30e8fe Merge "[CM] CTS tests for requestNetwork APIs" am: b9af841386
am: 766fa1f462

Change-Id: I0369c1d25f32ea2abd040482fcf97bdc43b3eb57
2017-03-07 16:54:51 +00:00
Etan Cohen
766fa1f462 Merge "[CM] CTS tests for requestNetwork APIs"
am: b9af841386

Change-Id: I167c41950ed8a7d267965088a391b7f503decd0d
2017-03-07 16:48:44 +00:00
Etan Cohen
b9af841386 Merge "[CM] CTS tests for requestNetwork APIs" 2017-03-07 16:40:27 +00:00
Etan Cohen
87b18c3df1 [CM] CTS tests for requestNetwork APIs
Add CTS tests for:
- requestNetwork API: test onAvailable
- requestNetwork with timeout API: test onUnavailable (failure)

Bug: 31399536
Test: CTS tests passing
Change-Id: I3565ef375ec90f90b2c76aabee14bf993251eeef
2017-03-06 20:45:13 -08:00
Etan Cohen
db4ab73bec Merge changes I8c2d29be,Ibbc58c3e am: 831196440e am: a8824acb8c
am: 59239876dd

Change-Id: Iaacfd545cd534e9ac46f23c7139ee68dd11daa45
2017-03-07 04:45:04 +00:00
Etan Cohen
59239876dd Merge changes I8c2d29be,Ibbc58c3e am: 831196440e
am: a8824acb8c

Change-Id: I53a6272b9f78912553bd061c503d12db2d1c45c9
2017-03-07 04:42:31 +00:00
Etan Cohen
a8824acb8c Merge changes I8c2d29be,Ibbc58c3e
am: 831196440e

Change-Id: I076e52cdf6e46f1df055de0bfe9583d72f3fd181
2017-03-07 04:40:34 +00:00
Etan Cohen
831196440e Merge changes I8c2d29be,Ibbc58c3e
* changes:
  [AWARE] CTS for attaching to session + MAC address
  [AWARE] Initial CTS: availability API + broadcast
2017-03-07 04:37:19 +00:00
Etan Cohen
08a2758524 [AWARE] CTS for attaching to session + MAC address
Add CTS to verify initial session attach:
- Basic attach
- Attach with identity callback: use to verify MAC
  address change on subsequent attach.

Bug: 30556108
Test: CTS tests pass/fail per expectations
Change-Id: I8c2d29be81bef600a2c9eac99868326473d72b6e
2017-03-06 13:45:49 -08:00
Etan Cohen
5dc4e9b091 [AWARE] Initial CTS: availability API + broadcast
Initial CTS tests for Wi-Fi Aware:
- Add CTS test class for Wi-Fi Aware
- Setup/initialize
- Test the availablity API + broadcast

Bug: 30556108
Test: builds, CTS runs (test fails as expected)
Change-Id: Ibbc58c3ed7a9ad7312864d038fd34c7202222e82
2017-03-06 13:44:50 -08:00
Peter Qiu
714a65f0c0 Merge "wifi: add CTS tests for Passpoint parsing APIs" am: 66d2bf1fe9 am: 8376afc701
am: b8a54f25bf

Change-Id: I1b2f3939414339a9b5a380dc6e22460d5cf5a85e
2017-03-06 00:18:55 +00:00
Peter Qiu
b8a54f25bf Merge "wifi: add CTS tests for Passpoint parsing APIs" am: 66d2bf1fe9
am: 8376afc701

Change-Id: I7865133af1a2eb56a98bf8e1a8f74f225a9ba925
2017-03-06 00:15:19 +00:00
Peter Qiu
8376afc701 Merge "wifi: add CTS tests for Passpoint parsing APIs"
am: 66d2bf1fe9

Change-Id: I5425769dded37bf0f12e3f7622df17a2f69feb18
2017-03-06 00:11:49 +00:00
Peter Qiu
870c7f9007 Merge "WifiManagerTest: add tests for verifying Passpoint configuration management APIs" am: c0d0ca8fe0 am: bf9f0f98b6
am: 4175949b89

Change-Id: Ieb102b7ef5f2e66be15e2b0e22793bef217490e5
2017-03-03 17:31:42 +00:00
Peter Qiu
4175949b89 Merge "WifiManagerTest: add tests for verifying Passpoint configuration management APIs" am: c0d0ca8fe0
am: bf9f0f98b6

Change-Id: Ib1e40d62079e9341ac01f34fe9d5cf7f9759ac99
2017-03-03 17:28:35 +00:00
Peter Qiu
bf9f0f98b6 Merge "WifiManagerTest: add tests for verifying Passpoint configuration management APIs"
am: c0d0ca8fe0

Change-Id: I07dfbfdb705efbf8070a3282bbb31d909698512a
2017-03-03 17:26:06 +00:00
Peter Qiu
24a0a8e643 wifi: add CTS tests for Passpoint parsing APIs
Added a test for PPS MO (PerProviderSubscription Management Object)
tree parsing API and a test for Release 1 installation file
parsing API.

Bug: 35756298
Test: run the newly added PpsMoParserTest and ConfigParserTest

Change-Id: I6da40bef9609830afb80d8562e5bfb051920b541
2017-02-28 13:43:45 -08:00
Peter Qiu
485adf65b6 WifiManagerTest: add tests for verifying Passpoint configuration management APIs
Bug: 35756298
Test: run WifiManagerTest
Change-Id: I3d106ca9dd4ea74de91c6553eb285534a7856363
2017-02-27 13:57:55 -08:00
Sudheer Shanka
863ec4b9cb Relax the check of network availability in CtsHostsideNetworkTests.
Bug: 35523062
Test: cts-tradefed run singleCommand cts-dev --module CtsHostsideNetworkTests -t \
      com.android.cts.net.HostsideRestrictBackgroundNetworkTests

Change-Id: I6c2df38fd7282a0cb9861afbb624018297d400fd
2017-02-21 13:57:43 -08:00
Bjoern Johansson
488f168b55 Merge "Merge "resolve merge conflicts of dfc0ec200f to nougat-mr1-cts-dev" into nougat-mr1-cts-dev am: 4acb742c40 am: 1760c2406a am: b2ecabdbe3 am: 481142bda3" into nyc-mr2-dev-plus-aosp
am: 98b91c958c

Change-Id: Ia1f7cd26e8aceda333ad3971c4105591f21619a6
2017-02-21 19:28:38 +00:00
Bjoern Johansson
a56a0e59e0 Merge "Merge "resolve merge conflicts of dfc0ec200f to nougat-mr1-cts-dev" into nougat-mr1-cts-dev am: 4acb742c40" am: e8fc6640f0 am: 250da2bafd
am: f88b1ce82f

Change-Id: I7e6aad62a0f02828f45e2794e24500a35d71fdad
2017-02-21 19:28:05 +00:00
Android Build Merger (Role)
98b91c958c Merge "Merge "resolve merge conflicts of dfc0ec200f to nougat-mr1-cts-dev" into nougat-mr1-cts-dev am: 4acb742c40 am: 1760c2406a am: b2ecabdbe3 am: 481142bda3" into nyc-mr2-dev-plus-aosp 2017-02-21 19:24:26 +00:00
Bjoern Johansson
c618553064 Merge "resolve merge conflicts of dfc0ec200f to nougat-mr1-cts-dev" into nougat-mr1-cts-dev am: 4acb742c40 am: 1760c2406a am: b2ecabdbe3
am: 481142bda3

Change-Id: Ifd13589f3f5c9906b8091cd52515d8db658bb873
2017-02-21 19:24:02 +00:00
Bjoern Johansson
250da2bafd Merge "Merge "resolve merge conflicts of dfc0ec200f to nougat-mr1-cts-dev" into nougat-mr1-cts-dev am: 4acb742c40"
am: e8fc6640f0

Change-Id: Id93567f78ce4490b1c015d65246b88f4f82f7f9a
2017-02-21 19:19:36 +00:00
Bjoern Johansson
b2ecabdbe3 Merge "resolve merge conflicts of dfc0ec200f to nougat-mr1-cts-dev" into nougat-mr1-cts-dev am: 4acb742c40
am: 1760c2406a

Change-Id: Ic53b6307d2a74440e26be915cef13ab7716611cb
2017-02-21 19:17:53 +00:00
Bjoern Johansson
1760c2406a Merge "resolve merge conflicts of dfc0ec200f to nougat-mr1-cts-dev" into nougat-mr1-cts-dev
am: 4acb742c40

Change-Id: I519a864a1435825f86c9c296c615061e96af2a00
2017-02-21 19:13:11 +00:00
Android Merger
e8fc6640f0 Merge "Merge "resolve merge conflicts of dfc0ec200f to nougat-mr1-cts-dev" into nougat-mr1-cts-dev am: 4acb742c40" 2017-02-21 19:13:04 +00:00
Bjoern Johansson
e711648651 Merge "resolve merge conflicts of dfc0ec200f to nougat-mr1-cts-dev" into nougat-mr1-cts-dev
am: 4acb742c40

Change-Id: I06e42332244bdec51588491d73a0f78950e546a8
2017-02-21 19:12:57 +00:00
Bjoern Johansson
3ae556d481 Merge "Merge "resolve merge conflicts of b0dcfcc14c to nyc-mr1-dev" into nyc-mr1-dev am: a888e825f7 am: 11076c3eba am: 5b0a9ff797" into nyc-mr2-dev-plus-aosp
am: ae713f37ef

Change-Id: Ifd14241a1ef75b6906ccd57457dccf73c1e31748
2017-02-16 23:35:16 +00:00
Bjoern Johansson
9e8f4da975 Merge "resolve merge conflicts of b0dcfcc14c to nyc-mr1-dev" into nyc-mr1-dev am: a888e825f7 am: 11076c3eba am: 5717d105fb
am: 6a0c8bc950

Change-Id: I24c8e3105c28dcae49de0ec98ff003662421cf3e
2017-02-16 23:33:57 +00:00
Bjoern Johansson
067cdc6be2 Merge "resolve merge conflicts of b0dcfcc14c to nyc-mr1-dev" into nyc-mr1-dev am: a888e825f7 am: 11076c3eba
am: 5b0a9ff797

Change-Id: Ie27b0e3835ccd22ad8a96a86ddb71da0134e9372
2017-02-16 23:29:24 +00:00
Bjoern Johansson
6a0c8bc950 Merge "resolve merge conflicts of b0dcfcc14c to nyc-mr1-dev" into nyc-mr1-dev am: a888e825f7 am: 11076c3eba
am: 5717d105fb

Change-Id: Ibb393dbff3b7c1534958312c4bcd31ddb155dbde
2017-02-16 23:28:30 +00:00
Bjoern Johansson
5b0a9ff797 Merge "resolve merge conflicts of b0dcfcc14c to nyc-mr1-dev" into nyc-mr1-dev am: a888e825f7
am: 11076c3eba

Change-Id: I77e30b9ff5bc30869c40a03c6655fd6471caa37c
2017-02-16 23:19:31 +00:00
Bjoern Johansson
11076c3eba Merge "resolve merge conflicts of b0dcfcc14c to nyc-mr1-dev" into nyc-mr1-dev
am: a888e825f7

Change-Id: Ia63071dbcdd927781f9412123d065309edccb733
2017-02-16 23:11:03 +00:00
Bjoern Johansson
65085b1fcd resolve merge conflicts of b0dcfcc14c to nyc-mr1-dev
Change-Id: Ic1e35bab2f426fabf4b15b1e60b186124778c9a8
2017-02-14 18:46:59 -08:00
Bjoern Johansson
959d02c19b resolve merge conflicts of dfc0ec200f to nougat-mr1-cts-dev
Change-Id: Ie0b71a29966154a8590b3e4749f7713acaab0325
2017-02-14 18:24:01 -08:00
Tina Zhou
b0dcfcc14c Merge "Merge "Don't require WiFi in CtsHostsideNetworkTests" into nougat-cts-dev am: dfc0ec200f" into nyc-dev
am: 2be6d78c13

Change-Id: I578972101d3b4c46132fc360be18a5dd947a4113
2017-02-15 00:57:59 +00:00
Tina Zhou
6ec77dd104 Merge "Don't require WiFi in CtsHostsideNetworkTests" into nougat-cts-dev
am: dfc0ec200f

Change-Id: I7ff23d2936d7e9e21eaf8909b2e07c5c816cc32c
2017-02-15 00:54:56 +00:00
Tina Zhou
dfc0ec200f Merge "Don't require WiFi in CtsHostsideNetworkTests" into nougat-cts-dev 2017-02-15 00:48:44 +00:00
Sudheer Shanka
e66cee4861 Update network tests to make sure app has connectivity on start.
In the tests, we check the ouput from "am get-uid-state" command to see
if the app is coming to foreground and check for network access. But the
command gives internal uid state info in AMS and it's possible that the
activity/service is not started yet. Update this behavior so that we check
for network access only after the activity/service is started.

Bug: 27803922
Test: cts-tradefed run singleCommand cts-dev --module CtsHostsideNetworkTests
Change-Id: Ic0d94a585439c1d8629a897a8b56bcbf178a4371
2017-02-13 12:52:13 -08:00
Paul Duffin
51d07a361b Merge "Prepare for removal of legacy-test from default targets" into nyc-mr2-dev-plus-aosp
am: bd014fb0e2  -s ours

Change-Id: Iebf87cf7d5fc62ce8c02e479455a04241c186c87
2017-02-13 13:41:50 +00:00
Paul Duffin
e098c1804d Prepare for removal of legacy-test from default targets
In preparation for removing junit classes from the Android API
the legacy-test target will be removed from the
TARGET_DEFAULT_JAVA_LIBRARIES. This change adds explicit
dependencies on junit and/or legacy-android-test to ensure that
modules will compile properly once it is removed.

Bug: 30188076
Test: make checkbuild
Change-Id: I2bbe603b1344d3eef4b48c498311f91b756b85e3
Merged-In: I0f34fe97154240e8f8eef6816df1c794da60351e
2017-02-10 10:35:05 +00:00
bohu
892ca03290 Merge "Merge "Merge "Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43" into nougat-mr1-cts-dev am: 266d07f3cb" into nyc-mr1-dev am: 62ad215942 am: 12bd64c6fe" into nyc-mr1-dev-plus-aosp am: 8cb528be24" into nyc-mr2-dev-plus-aosp
am: d3f34832ff

Change-Id: Ia3d8e7d45735c1a86f086b062f32ceedd566b2b8
2017-02-03 18:27:49 +00:00
bohu
4374f1b7f7 Merge "Merge "Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43" into nougat-mr1-cts-dev am: 266d07f3cb" into nyc-mr1-dev am: 62ad215942 am: 12bd64c6fe" into nyc-mr1-dev-plus-aosp am: 8cb528be24
am: d12df4a355

Change-Id: I3b04dbc90b1f03b93540a9d5fc85d6f3a938d369
2017-02-03 18:27:45 +00:00