Commit Graph

1020 Commits

Author SHA1 Message Date
Sergio Giro
d223b32572 Merge "AbstractVerifierTest: adapt tests to the new behaviour concerning whitespace" am: c21b54c82b am: 6aa2e158e4
am: fceca8f0e9

* commit 'fceca8f0e94e915e47e60096ef3b6d11f6cfe404':
  AbstractVerifierTest: adapt tests to the new behaviour concerning whitespace
2016-01-18 12:25:12 +00:00
Sergio Giro
fceca8f0e9 Merge "AbstractVerifierTest: adapt tests to the new behaviour concerning whitespace" am: c21b54c82b
am: 6aa2e158e4

* commit '6aa2e158e4494329087e48c26af1dcd128a1c048':
  AbstractVerifierTest: adapt tests to the new behaviour concerning whitespace
2016-01-18 12:23:29 +00:00
Sergio Giro
53f06c0d1d AbstractVerifierTest: adapt tests to the new behaviour concerning whitespace
In a DN like "cn=\na" the "\n" now gets trimmed, which makes sense.
Changing tests to reflect the change.

Bug: 26517725
Change-Id: I641687dd864524d66b925f555000edd44c970962
2016-01-18 12:14:09 +00:00
Dimitry Ivanov
a907d75f06 Merge "Untie MultinetworkApiTest from platform libc++.so" am: 2e14e9afaa am: 4577e05c13
am: 5a78c96856

* commit '5a78c968564520b256ea1e23e36c4b11ca130bc4':
  Untie MultinetworkApiTest from platform libc++.so
2016-01-13 18:54:39 +00:00
Dimitry Ivanov
5a78c96856 Merge "Untie MultinetworkApiTest from platform libc++.so" am: 2e14e9afaa
am: 4577e05c13

* commit '4577e05c13459a4fe27cd5e080eec04975160355':
  Untie MultinetworkApiTest from platform libc++.so
2016-01-12 21:28:10 +00:00
Dimitry Ivanov
04d19df9ca Untie MultinetworkApiTest from platform libc++.so
Bug: http://b/26512135
Change-Id: Ia01fd851fd7d2e50708620adf11d904e42de0b3b
2016-01-12 12:19:12 -08:00
Yi Kong
0ed784d241 Merge "ConcurrencyTest: re-enable WiFi during teardown" am: a49620ff08 am: 8cf5a71ec0
am: 074b8b0de5

* commit '074b8b0de5e92699b5ad11f7a237df892710d518':
  ConcurrencyTest: re-enable WiFi during teardown
2015-12-31 14:45:03 +00:00
Yi Kong
074b8b0de5 Merge "ConcurrencyTest: re-enable WiFi during teardown" am: a49620ff08
am: 8cf5a71ec0

* commit '8cf5a71ec0100fda09c19fc7116c1b50a0e5f096':
  ConcurrencyTest: re-enable WiFi during teardown
2015-12-31 14:43:17 +00:00
Yi Kong
a49620ff08 Merge "ConcurrencyTest: re-enable WiFi during teardown" 2015-12-31 14:39:57 +00:00
Yi Kong
27c101458c ConcurrencyTest: re-enable WiFi during teardown
Bug: 26182816
Change-Id: I3d5704794b17e0ec536a979a544a97a3e1f7b5c7
(cherry picked from commit f79ef7ff21ca9301035b9130d2d864112e8f9ae3)
2015-12-31 14:38:44 +00:00
Yi Kong
bed4c40f42 ConcurrencyTest: re-enable WiFi during teardown
Bug: 26182816
Change-Id: I3d5704794b17e0ec536a979a544a97a3e1f7b5c7
2015-12-23 13:21:37 +00:00
Stuart Scott
131383d5e4 Add support for tests to declare runtime hints.
bug:21762834
Change-Id: I11f3e6ecb026dcbbb8c73c750c7a70d8a15d81fb
2015-12-22 08:53:12 -08:00
Neil Fuller
1ca5875aea Merge "Isolate Local(Server|)SocketTest CTS tests" am: 85ac7d010e am: 6962425a88
am: b64304dd62

* commit 'b64304dd6255cf5efa5a2144d84a69520b251464':
  Isolate Local(Server|)SocketTest CTS tests
2015-12-19 10:11:07 +00:00
Neil Fuller
b64304dd62 Merge "Isolate Local(Server|)SocketTest CTS tests" am: 85ac7d010e
am: 6962425a88

* commit '6962425a885f3e32431a15d8a5c34a78c633c777':
  Isolate Local(Server|)SocketTest CTS tests
2015-12-19 10:09:08 +00:00
Neil Fuller
85ac7d010e Merge "Isolate Local(Server|)SocketTest CTS tests" 2015-12-19 10:05:20 +00:00
Neil Fuller
8ff7b0e3a6 Isolate Local(Server|)SocketTest CTS tests
Tests are failing with "Address in use". It does not repeat when the
test is run locally.

It is unclear why this has started happening: all tests should be
closing their respective sockets. This change will either prevent
conflicts between tests or help debug if they continue to fail.

Bug: 26140463
Change-Id: I72172b70e00936a6cca9d35c7977fe191621b0cc
2015-12-14 13:47:55 +00:00
The Android Automerger
8555d4b892 merge in lmp-mr1-cts-release history after reset to lmp-mr1-dev am: 78df332ef1 am: ee23541449 am: de0ad86920 am: d6ec55ffd7 am: d6ce9c139a am: ffbb798eb2
am: d7229ba33c

* commit 'd7229ba33ca179a3761f0724c55e2d33d344f12b':
2015-12-10 17:34:56 -08:00
The Android Automerger
d7229ba33c merge in lmp-mr1-cts-release history after reset to lmp-mr1-dev am: 78df332ef1 am: ee23541449 am: de0ad86920 am: d6ec55ffd7 am: d6ce9c139a
am: ffbb798eb2

* commit 'ffbb798eb235676052337a10cbdd8591d9f2a6db':
2015-12-10 10:57:32 -08:00
The Android Automerger
de0ad86920 merge in lmp-mr1-cts-release history after reset to lmp-mr1-dev am: 78df332ef1
am: ee23541449

* commit 'ee235414493f963dcbbf7d4f87f725055315d442':
2015-12-10 10:40:16 -08:00
The Android Automerger
ee23541449 merge in lmp-mr1-cts-release history after reset to lmp-mr1-dev
am: 78df332ef1

* commit '78df332ef1a6be3cda40b776a6321425fa829ddb': (32 commits)
  cts: get video size from CamcorderProfile -- DO NOT MERGE
  BUG: 23792027 adding android.hardware.cts.helpers.sensorverification.EventOrderingVerificationTest#testSameTimestamp to knownfailure
  cts: get video size from CamcorderProfile -- DO NOT MERGE
  cts: get video size from CamcorderProfile -- DO NOT MERGE
  BUG: 23954202 fixed minimum memory to be 1099
  DO NOT MERGE ANYWHERE: fix breakage
  DO NOT MERGE: fix breakage
  rename android_security_cts_AudioflingerBinderTest.cpp to android_security_cts_AudioFlingerBinderTest.cpp
  Test if libstagefright dies in onInputBufferFilled on currupted file
  Should return true if the specified file doesn't exist
  DO NOT MERGE - Revert "Revert "Fix AudioTrackTest.testGetTimestamp""
  DO NOT MERGE ANYWHERE:revert and resubmit on lmp-dev
  DO NOT MERGE ANYWHERE:revert and resubmit to lmp-* branches
  Fix build error in ExtractDecodeEditEncodeMuxTest.
  Fixed android.uirendering package in CTS-5.0_R3
  TV: add multiple tracks tests to CtsVerifier
  TV: Add parental control tests to CtsVerifier
  TV: add a test for overlay view from TV input to CtsVerifier
  Add TV app tests to CtsVerifier
  DO NOT MERGE - Add security test for IEffect binder command
  ...
2015-12-10 10:37:14 -08:00
Sergio Giro
ee3370d33a Merge "frameworks/base: add tests for AbstractVerifier" am: f4756068ed am: 05c2b772a3
am: 6449e09912

* commit '6449e09912dd7d26e0c1fc8fa7c64b3442d39ef2':
  frameworks/base: add tests for AbstractVerifier
2015-11-27 14:19:43 +00:00
Sergio Giro
6449e09912 Merge "frameworks/base: add tests for AbstractVerifier" am: f4756068ed
am: 05c2b772a3

* commit '05c2b772a3b80b8bcfe384fac47dd3efb63480fc':
  frameworks/base: add tests for AbstractVerifier
2015-11-27 14:16:39 +00:00
Sergio Giro
05c2b772a3 Merge "frameworks/base: add tests for AbstractVerifier"
am: f4756068ed

* commit 'f4756068ed9d5549cd78f13ff4c3a569cb13271f':
  frameworks/base: add tests for AbstractVerifier
2015-11-27 14:14:26 +00:00
Sergio Giro
615ffeb922 frameworks/base: add tests for AbstractVerifier
DistinguishedNameParser was moved to frameworks/base in
46972b2d825a2368706e7d2210559ca18fc2b332

Testing its behaviour through AbstractVerifier.

DistinguishedNameParserTest adapted from
f7ce6a3b235a9aaf884d3b96e50d6b249dd770e0

Bug: 25882613

Change-Id: Idf901503d96df8b160d84f4f88dbf79359f0e035
2015-11-27 13:55:32 +00:00
Daniel Xie
83ad38b983 Merge "Don\'t run Wifi scan timestamp tests when location is turned off." into marshmallow-cts-dev am: 57031aa47e am: 3f0866e144 am: 9bfb43c08f am: 3b7e1623b3 am: df3a267558
am: 975335db32

* commit '975335db321ccf2f0f6c4a6ff76525816644c96e':
2015-11-18 02:04:33 +00:00
Daniel Xie
eb2b399ce9 Merge "Don\'t run Wifi scan timestamp tests when location is turned off." into marshmallow-cts-dev am: 57031aa47e am: 3f0866e144 am: 9bfb43c08f am: 3b7e1623b3
am: df3a267558

* commit 'df3a2675583188747cc04e7e9daa141f7ca3b53d':
  Don't run Wifi scan timestamp tests when location is turned off.
2015-11-17 04:16:41 +00:00
Daniel Xie
975335db32 Merge "Don\'t run Wifi scan timestamp tests when location is turned off." into marshmallow-cts-dev am: 57031aa47e am: 3f0866e144 am: 9bfb43c08f am: 3b7e1623b3
am: df3a267558

* commit 'df3a2675583188747cc04e7e9daa141f7ca3b53d':
  Don't run Wifi scan timestamp tests when location is turned off.
2015-11-17 01:45:02 +00:00
Daniel Xie
3f0866e144 Merge "Don\'t run Wifi scan timestamp tests when location is turned off." into marshmallow-cts-dev
am: 57031aa47e

* commit '57031aa47e16e4d493c03df886c35c5081fcaeed':
  Don't run Wifi scan timestamp tests when location is turned off.
2015-11-17 01:12:55 +00:00
Wei Wang
abe587984a Don't run Wifi scan timestamp tests when location is turned off.
Bug:24957400
Change-Id: I891040ffc0808d62a8f5f1bb20fd633b9f7f482c
2015-11-10 14:23:55 -08:00
Nash Lincoln
0784f04f1b migrate net host tests to cts_v2
Change-Id: Ida3141522a536a2d33bb366fdb6b00ced907c3a4
2015-11-06 17:05:17 -08:00
Bill Yi
329783175a Merge remote-tracking branch \'goog/mnc-cts-release\' into HEAD am: 79a816d6c0 am: 83590ee982 am: 560faf0787 am: d89ddd6e5e am: db3b729304
am: dba2d69ba1

* commit 'dba2d69ba18be321f9dc45df9435b12b38723280':
  Squashed mnc-dev changes:
2015-10-21 18:21:22 +00:00
Bill Yi
dba2d69ba1 Merge remote-tracking branch \'goog/mnc-cts-release\' into HEAD am: 79a816d6c0 am: 83590ee982 am: 560faf0787 am: d89ddd6e5e
am: db3b729304

* commit 'db3b7293044663f7fe316c708467b3110197e1c4':
  Squashed mnc-dev changes:
2015-10-21 17:31:23 +00:00
Bill Yi
83590ee982 Merge remote-tracking branch \'goog/mnc-cts-release\' into HEAD
am: 79a816d6c0

* commit '79a816d6c08e18870e52c67f6ddbd7b89d3c973a':
  Squashed mnc-dev changes:
2015-10-21 16:46:31 +00:00
Daniel Xie
935fba1ab2 Squashed mnc-dev changes:
This contains all of the changes from b54aa51 to
791e51a on mnc-dev, except the changes
to tests/tests/security.

Bug: 24846656
Change-Id: I01f53a1a238ac49f86928e0e22796dc73e0e34af
2015-10-19 16:01:03 -07:00
Aaron Holden
58bb58ab7b Move WiFi Precondition from device to host side
This enables the option to synchronously connect to a Wifi network if
not already connected.

bug:23939594
Change-Id: I2c808fc95acba324ee72564d08983a2b6e00db95
2015-10-09 12:33:25 -07:00
Stuart Scott
48d6d1ed5f Remove common-config and switch to AndroidJUnitTest.
bug:21762834
Change-Id: I17e1b44e4429a3fbeb9f110a74038e4ec306af38
2015-10-06 10:55:25 -07:00
Aaron Holden
2a651e0f79 Merge "Cleanup of CTS Preconditions work" 2015-10-06 17:22:00 +00:00
Aaron Holden
c75c7e30f6 Cleanup of CTS Preconditions work
- removed unused constant from ScreenLockHelper class
- used getProperty method of ITestDevice, instead of executeShellCommand
- modified BuildCheckTest to reflect use of 'getProperty' method above
- placed target preparer for Wifi check above apk installer, so apk
isn't installed until precondition check has passed
- removed unused imports in net module's PreconditionsTest
- added Wifi precondition check to content, text, webkit & widget modules

bug:23939594
Change-Id: I125b9937b974d142c0d2343f584516bfc713787a
2015-10-06 09:50:57 -07:00
The Android Automerger
c4d6c8144b am 880855fe: am 63268d7b: am cffa6c60: am a5d534f2: am 405ea20f: am 8f97b6c6: am 8a8372c7: am 3dfca9d8: am 78df332e: (-s ours) merge in lmp-mr1-cts-release history after reset to lmp-mr1-dev
* commit '880855fee232808e1bbe6f473ebc2d1de18c8c79':
2015-10-06 01:24:04 +00:00
The Android Automerger
880855fee2 am 63268d7b: am cffa6c60: am a5d534f2: am 405ea20f: am 8f97b6c6: am 8a8372c7: am 3dfca9d8: am 78df332e: (-s ours) merge in lmp-mr1-cts-release history after reset to lmp-mr1-dev
* commit '63268d7bb5705ecdfeff8aa09285259a9037e2f4':
2015-10-06 01:16:05 +00:00
The Android Automerger
405ea20fb8 am 8f97b6c6: am 8a8372c7: am 3dfca9d8: am 78df332e: (-s ours) merge in lmp-mr1-cts-release history after reset to lmp-mr1-dev
* commit '8f97b6c65c11b8757d3d77ab861317e2b077504d':
2015-10-06 00:23:20 +00:00
The Android Automerger
8f97b6c65c am 8a8372c7: am 3dfca9d8: am 78df332e: (-s ours) merge in lmp-mr1-cts-release history after reset to lmp-mr1-dev
* commit '8a8372c7c93b84078db52093043f6962ac7ccd64':
2015-10-06 00:17:55 +00:00
The Android Automerger
8a8372c7c9 am 3dfca9d8: am 78df332e: (-s ours) merge in lmp-mr1-cts-release history after reset to lmp-mr1-dev
* commit '3dfca9d879b75e7be77dc7f19e79200f787dc975':
2015-10-06 00:11:15 +00:00
The Android Automerger
3dfca9d879 am 78df332e: (-s ours) merge in lmp-mr1-cts-release history after reset to lmp-mr1-dev
* commit '78df332ef1a6be3cda40b776a6321425fa829ddb':
2015-10-06 00:01:46 +00:00
Stuart Scott
f9a13a9b49 Migrate Admin to CTSv2.
bug:21762834
Change-Id: Ibec9df07e2f635218bdae70ddf36fda6e60de0e0
2015-10-05 13:36:17 -07:00
Aaron Holden
d62c5997f6 Add WiFi precondition check to 'net' CTS module
bug:23939594
Change-Id: I9e625e635fc6942c9eaa95915888f0fe7284a9ea
2015-09-28 13:17:30 -07:00
Paul Jensen
69ab5795b1 am c9ab5af9: am 8fafeb28: am df4f2629: am a1b4d2de: am 22e42b48: resolved conflicts for 3e4042eb to mnc-dev
* commit 'c9ab5af9f2a811e2b6459b077092c29ca13b6f6d':
  CTS: verify ConnectivityManager.requestNetwork throws for restricted networks
2015-09-25 18:16:04 +00:00
Paul Jensen
c9ab5af9f2 am 8fafeb28: am df4f2629: am a1b4d2de: am 22e42b48: resolved conflicts for 3e4042eb to mnc-dev
* commit '8fafeb28797eb5ff96ebde62b1e7178ab56f29fe':
  CTS: verify ConnectivityManager.requestNetwork throws for restricted networks
2015-09-25 18:09:20 +00:00
Paul Jensen
22e42b48f5 resolved conflicts for 3e4042eb to mnc-dev
Change-Id: I3476d55641288b21a1609a8e72f37012d86bad03
2015-09-25 07:28:26 -04:00
Paul Jensen
3e4042eb78 am 063f9718: am 358b4b14: am 8c04baef: am e287a5c6: Merge "CTS: verify ConnectivityManager.requestNetwork throws for restricted networks" into lmp-dev
* commit '063f971859d0ef5ac96b69de345cd94fd4788b7e':
  CTS: verify ConnectivityManager.requestNetwork throws for restricted networks
2015-09-25 11:09:06 +00:00