aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-06-09Merge "Fix JUnitParamsRunner so it works with CTS sharding am: b03560c325 ↵android-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r34android-wear-9.0.0_r33android-wear-9.0.0_r32android-wear-9.0.0_r31android-wear-9.0.0_r30android-wear-9.0.0_r3android-wear-9.0.0_r29android-wear-9.0.0_r28android-wear-9.0.0_r27android-wear-9.0.0_r26android-wear-9.0.0_r25android-wear-9.0.0_r24android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-wear-9.0.0_r1android-wear-8.0.0_r1android-vts-9.0_r9android-vts-9.0_r8android-vts-9.0_r7android-vts-9.0_r6android-vts-9.0_r5android-vts-9.0_r4android-vts-9.0_r19android-vts-9.0_r18android-vts-9.0_r17android-vts-9.0_r16android-vts-9.0_r15android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-security-9.0.0_r76android-security-9.0.0_r75android-security-9.0.0_r74android-security-9.0.0_r73android-security-9.0.0_r72android-security-9.0.0_r71android-security-9.0.0_r70android-security-9.0.0_r69android-security-9.0.0_r68android-security-9.0.0_r67android-security-9.0.0_r66android-security-9.0.0_r65android-security-9.0.0_r64android-security-9.0.0_r63android-security-9.0.0_r62android-p-preview-1android-o-mr1-iot-preview-7android-cts-9.0_r9android-cts-9.0_r8android-cts-9.0_r7android-cts-9.0_r6android-cts-9.0_r5android-cts-9.0_r4android-cts-9.0_r3android-cts-9.0_r20android-cts-9.0_r2android-cts-9.0_r19android-cts-9.0_r18android-cts-9.0_r17android-cts-9.0_r16android-cts-9.0_r15android-cts-9.0_r14android-cts-9.0_r13android-cts-9.0_r12android-cts-9.0_r11android-cts-9.0_r10android-cts-9.0_r1android-9.0.0_r9android-9.0.0_r8android-9.0.0_r7android-9.0.0_r61android-9.0.0_r60android-9.0.0_r6android-9.0.0_r59android-9.0.0_r58android-9.0.0_r57android-9.0.0_r56android-9.0.0_r55android-9.0.0_r54android-9.0.0_r53android-9.0.0_r52android-9.0.0_r51android-9.0.0_r50android-9.0.0_r5android-9.0.0_r49android-9.0.0_r48android-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r3android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r2android-9.0.0_r19android-9.0.0_r18android-9.0.0_r17android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11android-9.0.0_r10android-9.0.0_r1security-pi-releasepie-vts-releasepie-security-releasepie-s2-releasepie-release-2pie-releasepie-r2-s2-releasepie-r2-s1-releasepie-r2-releasepie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-platform-releasepie-gsipie-dr1-releasepie-dr1-devpie-devpie-cuttlefish-testingpie-cts-releasepie-b4s4-releasepie-b4s4-devoreo-mr1-devo-mr1-iot-preview-7Paul Duffin
am: 2f41cd20c0 am: f58521195e am: 55edd63fa3 am: c27747cb91 am: 3422818d91" into oc-dr1-dev-plus-aosp am: 1eda771728 Change-Id: I44551434bc0c9197b106770c761ff4026fedbf26
2017-06-09Fix JUnitParamsRunner so it works with CTS sharding am: b03560c325 am: ↵Paul Duffin
2f41cd20c0 am: f58521195e am: 55edd63fa3 am: c27747cb91 am: ad285d8a17 am: 72bb3341d9 Change-Id: I7ed286fa9a95f0b757f57b96dc552c13ee6bc56f
2017-06-09Merge "Fix JUnitParamsRunner so it works with CTS sharding am: b03560c325 ↵android-o-mr1-iot-preview-6o-mr1-iot-preview-6Android Build Merger (Role)
am: 2f41cd20c0 am: f58521195e am: 55edd63fa3 am: c27747cb91 am: 3422818d91" into oc-dr1-dev-plus-aosp
2017-06-09Fix JUnitParamsRunner so it works with CTS sharding am: b03560c325 am: ↵Paul Duffin
2f41cd20c0 am: f58521195e am: 55edd63fa3 am: c27747cb91 am: 3422818d91 Change-Id: I7e0837f5b98260b4fde44ee4dfca9a971e40964c
2017-06-09Fix JUnitParamsRunner so it works with CTS sharding am: b03560c325 am: ↵Paul Duffin
2f41cd20c0 am: f58521195e am: 55edd63fa3 am: c27747cb91 am: ad285d8a17 Change-Id: I8796c14dd51c0e0774638a3199f2f352107e60fd
2017-06-09Fix JUnitParamsRunner so it works with CTS sharding am: b03560c325 am: ↵oreo-dr1-devPaul Duffin
2f41cd20c0 am: f58521195e am: 55edd63fa3 am: c27747cb91 Change-Id: Idb87e45cee9a8a984457da776a97ab4e17e6fa34
2017-06-09Fix JUnitParamsRunner so it works with CTS sharding am: b03560c325 am: ↵android-o-mr1-preview-2android-o-mr1-preview-1Paul Duffin
2f41cd20c0 am: f58521195e am: 55edd63fa3 am: c27747cb91 Change-Id: I342667526228eff6b871ee33baa94b71d8cc420d
2017-06-09Merge "Ignore tests that no longer work am: 2a75dcb2fd am: f3cfecad10 am: ↵Paul Duffin
5a47920cc4 am: a4bb7ac645 am: a0c00d58b7 -s ours am: 03f179b987" into oc-dr1-dev-plus-aosp am: 2594f7b833 Change-Id: I04079a7aa28e655ced5074ca452a1feca724b385
2017-06-09Ignore tests that no longer work am: 2a75dcb2fd am: f3cfecad10 am: ↵Paul Duffin
5a47920cc4 am: a4bb7ac645 am: a0c00d58b7 -s ours am: e0269077c5 am: b83c1c74b5 Change-Id: Ia414efebd04570f3cac7f8a056129d4f8a75dab4
2017-06-09Merge "Ignore tests that no longer work am: 2a75dcb2fd am: f3cfecad10 am: ↵Android Build Merger (Role)
5a47920cc4 am: a4bb7ac645 am: a0c00d58b7 -s ours am: 03f179b987" into oc-dr1-dev-plus-aosp
2017-06-09Ignore tests that no longer work am: 2a75dcb2fd am: f3cfecad10 am: ↵Paul Duffin
5a47920cc4 am: a4bb7ac645 am: a0c00d58b7 -s ours am: e0269077c5 Change-Id: Ie22f4286f4bac234f176b1546852fbd1a5ee77bc
2017-06-09Ignore tests that no longer work am: 2a75dcb2fd am: f3cfecad10 am: ↵Paul Duffin
5a47920cc4 am: a4bb7ac645 am: a0c00d58b7 -s ours am: 03f179b987 Change-Id: I4870acbadbae554b9e6fdc8e3e6e719c975e281a
2017-06-09Ignore tests that no longer work am: 2a75dcb2fd am: f3cfecad10 am: ↵Paul Duffin
5a47920cc4 am: a4bb7ac645 am: a0c00d58b7 -s ours Change-Id: I5b0212871aa8febc4551e0808509b3ce3654a2f3
2017-06-09Ignore tests that no longer work am: 2a75dcb2fd am: f3cfecad10 am: ↵Paul Duffin
5a47920cc4 am: a4bb7ac645 am: a0c00d58b7 -s ours Change-Id: I6a12f8ac2dded936997d51e0e57fcba8832cda6f
2017-06-09Fix JUnitParamsRunner so it works with CTS sharding am: b03560c325 am: ↵android-vts-8.0_r2android-vts-8.0_r1oreo-devPaul Duffin
2f41cd20c0 am: f58521195e am: 55edd63fa3 Bug:38419944 Change-Id: Idb0cf19a4fb6d7e9b6161a708c8c582f4393fdc4 (cherry picked from commit bf41e5d5462598381b2fe3ce7e0d5303450a4ca6)
2017-06-08Ignore tests that no longer work am: 2a75dcb2fd am: f3cfecad10 am: 5a47920cc4Paul Duffin
am: a4bb7ac645 Bug:38419944 Change-Id: If74ffd92284a9254fb8f0df776bf88b36b386558 (cherry picked from commit 20b7a9576f4fdddc13b32e159fb31852d2f50f97)
2017-05-26Fix JUnitParamsRunner so it works with CTS sharding am: b03560c325 am: ↵Paul Duffin
2f41cd20c0 am: f58521195e am: 55edd63fa3 Change-Id: Idb0cf19a4fb6d7e9b6161a708c8c582f4393fdc4
2017-05-26Fix JUnitParamsRunner so it works with CTS sharding am: b03560c325 am: ↵Paul Duffin
2f41cd20c0 am: f58521195e Change-Id: I63c6e87ba97733c1b233e4283c86b4d1180686c9
2017-05-26Fix JUnitParamsRunner so it works with CTS sharding am: b03560c325Paul Duffin
am: 2f41cd20c0 Change-Id: Idcf24600dea537fa1cfe3eb925d3ff82a586453f
2017-05-26Fix JUnitParamsRunner so it works with CTS shardingPaul Duffin
am: b03560c325 Change-Id: I755190fc7c11a89ff1a26b639e43d718ba4d6373
2017-05-26Fix JUnitParamsRunner so it works with CTS shardingandroid-o-preview-4android-o-preview-3android-o-iot-preview-5o-iot-preview-5Paul Duffin
CTS uses the Android Test Support Library's TestRequestBuilder.ShardingFilter to spread changes across a number of devices in order to parallelize testing. CTS runs the tests in two modes, in the first it collects the set of tests that will be run - the list of tests returned by Runner.getDescription() (after filtering) and in the second it actually runs the tests as returned by ParentRunner.getFilteredChildren(). JUnitParams does not work in that situation because it applies the filter in a different way for parameterized methods depending on whether it is collecting or running which leads to inconsistent methods in each phase which causes CTS problems. When collecting it creates a flat list of FrameworkMethod instances, one for each method, whether parameterized or not and applies the filter to that. Once it has filtered it iterates over to create the Description and during that process it creates N Description objects for each parameterized method and 1 Description object for each non-parameterized method. That means that for each parameterized method either every instance is collected or none of them are. When running it creates a flat list of FrameworkMethod instances, one for each non-parameterized method and N for each parameterized method (where N is the number of parameter sets supplied for the method). They are then filtered individually. That means that for each parameterized method some of its instances are run but not necessarily all. This fixes it by making the running and describing parts completely consistent in how they apply the filters. This change will be pushed upstream if possible. Tested by running the two commands given in the bug and ensuring that they produce the correct set of tests. Added target to build the test on host and ran selected tests from there. Ran all tests on the device as per instructions in Android.mk file. Bug: 38419944 Test: See above Change-Id: I25b4d4130ffdc71c77992abf592662ba1e1432db
2017-05-26Ignore tests that no longer work am: 2a75dcb2fd am: f3cfecad10 am: 5a47920cc4Paul Duffin
am: a4bb7ac645 Change-Id: If74ffd92284a9254fb8f0df776bf88b36b386558
2017-05-26Ignore tests that no longer work am: 2a75dcb2fd am: f3cfecad10Paul Duffin
am: 5a47920cc4 Change-Id: I46f89b6c7c199b48a1c8f9eadd5221fe783f4075
2017-05-26Ignore tests that no longer work am: 2a75dcb2fdPaul Duffin
am: f3cfecad10 Change-Id: Ie9a463a530cb6282ff928698a5c420e9ea31d937
2017-05-26Ignore tests that no longer workPaul Duffin
am: 2a75dcb2fd Change-Id: Ie1b660f401e9ea9c301b11ad8976dbd25b737c8c
2017-05-25Ignore tests that no longer workPaul Duffin
Previous changes caused tests that use @TestCaseName to start to fail but did not update the tests to ensure that they still run. Bug: 38419944 Test: run tests as described in Android.mk Change-Id: I2d5ed10bcf49fa114f73292bbe06fd70c158ae99
2017-03-24Hard code text case name template for AndroidJUnitRunner and CTS am: ↵Paul Duffin
ab5f9f1d78 am: 67e1cb1101 am: 2ce40971d6 Change-Id: Ib8a42ab6f8d107b9b337219174e84e9cb9db12a9
2017-03-24Hard code text case name template for AndroidJUnitRunner and CTS am: ab5f9f1d78Paul Duffin
am: 67e1cb1101 Change-Id: Id51ba0ddae726eb1395353b64738f914aa56f71f
2017-03-24Hard code text case name template for AndroidJUnitRunner and CTSandroid-wear-o-preview-4android-wear-o-preview-3android-o-preview-2Paul Duffin
am: ab5f9f1d78 Change-Id: I9ffd6f4c59eee40bd1da192efc803179cd13c8bc
2017-03-24Hard code text case name template for AndroidJUnitRunner and CTSPaul Duffin
AndroidJUnitRunner and CTS require test names to be a specific format. The default JUnitParams format is not suitable. This change forces it to one that is suitable and prevents it from being overridden using the @TestCaseName annotation. These are a sample of parameterized and unparameterized test names. The latter two are from a JUnitParamsRunner based test. libcore.java.net.FtpURLConnectionTest#testOutputUrl pass libcore.java.net.IDNTest#test_toUnicode_failures pass libcore.java.net.InetAddressTest#test_getByName_invalid[0] pass libcore.java.net.InetAddressTest#test_getByName_invalid[1] pass Bug: 36074730 Bug: 36541809 Test: run cts -m CtsLibcoreTestCases and check test names of parameterized tests, e.g. those from libcore.java.net.InetAddressTest Change-Id: Id9a8f8ce9affeb85fb2f410d11e764e99d7287b3
2017-03-22Make sure that filters affect the Description am: 99fe7c3891 am: 6c3f4570e0Paul Duffin
am: 63dd96c6f8 Change-Id: Ia2a7e2ab316c022e19b52ab4fc54ca00490cbf79
2017-03-22Make sure that filters affect the Description am: 99fe7c3891Paul Duffin
am: 6c3f4570e0 Change-Id: I518a1c3cebf52ba7b46044b61a6aca43235a6ac2
2017-03-22Make sure that filters affect the DescriptionPaul Duffin
am: 99fe7c3891 Change-Id: Ic1ec1cba072389efda4a4488f1a0bf9ce7d98fb0
2017-03-22Make sure that filters affect the DescriptionPaul Duffin
JUnitParamsRunner caches the Description on first request but if that happens before applying a filter then the Description never gets updated. This fixes the problem by discarding the cached Description forcing it to be regenerated next time it is requested. Bug: 36074730 Test: run cts -a arm64-v8a -m CtsLibcoreTestCases -t libcore.java.net.InetAddressTest#test_isReachable_by_ICMP Change-Id: Ibc35c013c388f81fd5b69c553b167e3d11af6841
2016-12-20Partially revert "Patch to make it compile against JUnit 4.10 and run on ↵Paul Duffin
Android" am: ea07fbcef7 am: cad05b7095 am: 4f3ba93439 am: 327d6aab06 Change-Id: I73a337bdf0f7788693de2d2d05540566cd06a1e8
2016-12-20Partially revert "Patch to make it compile against JUnit 4.10 and run on ↵Paul Duffin
Android" am: ea07fbcef7 am: cad05b7095 am: 4f3ba93439 Change-Id: I700e33a147deee5aae6b933ec84dd5bcd4deeffa
2016-12-20Partially revert "Patch to make it compile against JUnit 4.10 and run on ↵Paul Duffin
Android" am: ea07fbcef7 am: cad05b7095 Change-Id: If4c1901447ed615342da4e325334aa94668db7f1
2016-12-20Partially revert "Patch to make it compile against JUnit 4.10 and run on ↵Paul Duffin
Android" am: ea07fbcef7 Change-Id: Ib4b5b7a2071f1f79836d68031aff13af660b754c
2016-12-16Partially revert "Patch to make it compile against JUnit 4.10 and run on ↵android-o-preview-1o-previewPaul Duffin
Android" This partially reverts commit 6774bdc0447b72a618eab51772685010afd5647a. Bug: 33613916 Test: make checkbuild Change-Id: Iac008952ff1a0e6f89d8862e817a8b2480dcbb28
2016-12-07Replace junit-targetdex with junit am: 2eb7ea4dd4 am: b35ab41812 am: f330f31974Paul Duffin
am: ad800d890f Change-Id: Id6c2a2d5283a76f86abae303f13643213fb5f8f2
2016-12-07Replace junit-targetdex with junit am: 2eb7ea4dd4 am: b35ab41812Paul Duffin
am: f330f31974 Change-Id: Iebda00eb11345447aab8bdec38a6df69d0564bdd
2016-12-07Replace junit-targetdex with junit am: 2eb7ea4dd4Paul Duffin
am: b35ab41812 Change-Id: I97a6b5a19442abcd1b5b45c866bf8f58fb94c095
2016-12-07Replace junit-targetdex with junitPaul Duffin
am: 2eb7ea4dd4 Change-Id: Ie8c8721248fa803e6baaae77823e233c16a642ed
2016-12-07Replace junit-targetdex with junitPaul Duffin
Bug: 30188076 Test: make checkbuild Change-Id: Iaafeb7aab6d28b4ce2e93a35ea412f234fa21834
2016-11-29Use junit-host instead of junit am: 92b5e663ad am: e9e6cb4a30 am: 00303d4fa5Paul Duffin
am: b03c543b23 Change-Id: Ia2186fb535c3c341ffda59d371e51a7d14539bea
2016-11-29Use junit-host instead of junit am: 92b5e663ad am: e9e6cb4a30Paul Duffin
am: 00303d4fa5 Change-Id: I38c8714666d4bed5fc70321296dac64e3b847039
2016-11-29Use junit-host instead of junit am: 92b5e663adPaul Duffin
am: e9e6cb4a30 Change-Id: I60308c4903607b007ba2de8d7f1d2f5abd905284
2016-11-29Use junit-host instead of junitPaul Duffin
am: 92b5e663ad Change-Id: I9e428e1df9c66a40b6d4f141ee407cbc867528b1
2016-11-29Use junit-host instead of junitPaul Duffin
Bug: 30188076 Test: make checkbuild Change-Id: I7cb06fd4ebe00601d176fee3b1080c8a46930bbb
2016-11-28Use junit-hostdex instead of core-junit-hostdex/junit4-target-hostdex am: ↵Paul Duffin
fe726a1ab7 am: d532dd184b am: 3c0b47b663 am: 0207cc0753 Change-Id: I771ce4f5e68be43aa37cb70191244ab83638a38b
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-16 16:12:48 +0000