diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2017-06-11 07:14:48 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-06-11 07:14:48 +0000 |
commit | 1c35198d6c9338d2735509d2540ac3bc0f2b5804 (patch) | |
tree | b4227f625f29e2426693f940545b2883b51fbe5d /src/test/java/junitparams/usage/SamplesOfUsageTest.java | |
parent | af2411168919bcf33aded774058a84d921e85c7e (diff) | |
parent | c27747cb9107b2e81c50baccf20a96719f96baf1 (diff) | |
download | platform_external_junit-params-android-cts-8.0_r2.tar.gz platform_external_junit-params-android-cts-8.0_r2.tar.bz2 platform_external_junit-params-android-cts-8.0_r2.zip |
release-request-276f9f52-87fd-4915-bd79-9a2f0ee77433-for-git_oc-release-4090213 snap-temp-L31600000073091223android-cts-8.0_r9android-cts-8.0_r8android-cts-8.0_r7android-cts-8.0_r6android-cts-8.0_r5android-cts-8.0_r4android-cts-8.0_r3android-cts-8.0_r24android-cts-8.0_r23android-cts-8.0_r22android-cts-8.0_r21android-cts-8.0_r20android-cts-8.0_r2android-cts-8.0_r19android-cts-8.0_r18android-cts-8.0_r17android-cts-8.0_r16android-cts-8.0_r15android-cts-8.0_r14android-cts-8.0_r13android-cts-8.0_r12android-cts-8.0_r11android-cts-8.0_r10android-cts-8.0_r1android-cts-7.1_r18android-8.0.0_r9android-8.0.0_r7android-8.0.0_r50android-8.0.0_r49android-8.0.0_r48android-8.0.0_r47android-8.0.0_r46android-8.0.0_r45android-8.0.0_r44android-8.0.0_r43android-8.0.0_r42android-8.0.0_r41android-8.0.0_r40android-8.0.0_r4android-8.0.0_r39android-8.0.0_r38android-8.0.0_r37android-8.0.0_r36android-8.0.0_r35android-8.0.0_r32android-8.0.0_r31android-8.0.0_r30android-8.0.0_r3android-8.0.0_r29android-8.0.0_r28android-8.0.0_r2android-8.0.0_r17android-8.0.0_r16android-8.0.0_r15android-8.0.0_r13android-8.0.0_r12android-8.0.0_r11android-8.0.0_r10android-8.0.0_r1security-oc-releaseoreo-security-releaseoreo-releaseoreo-r6-releaseoreo-r5-releaseoreo-r4-releaseoreo-r3-releaseoreo-r2-releaseoreo-cts-release
Change-Id: I000970b5f49fa4d8b7d33342ede87ea55042a579
Diffstat (limited to 'src/test/java/junitparams/usage/SamplesOfUsageTest.java')
-rw-r--r-- | src/test/java/junitparams/usage/SamplesOfUsageTest.java | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/src/test/java/junitparams/usage/SamplesOfUsageTest.java b/src/test/java/junitparams/usage/SamplesOfUsageTest.java index 3c5f410..9a96961 100644 --- a/src/test/java/junitparams/usage/SamplesOfUsageTest.java +++ b/src/test/java/junitparams/usage/SamplesOfUsageTest.java @@ -102,12 +102,14 @@ public class SamplesOfUsageTest { return new Object[]{new Object[]{"first", 1}, new Object[]{"second", 2}}; } - @Ignore("does not work when run on device as it does not have access to the file") + // Android-changed: does not work when run on device as it does not have access to the file + @Ignore @Test @FileParameters("src/test/resources/test.csv") public void loadParamsFromCsv(int age, String name) { } - @Ignore("does not work when run on device as it does not have access to the file") + // Android-changed: does not work when run on device as it does not have access to the file + @Ignore @Test @FileParameters(value = "src/test/resources/test.csv", mapper = PersonMapper.class) public void loadParamsFromAnyFile(PersonTest.Person person) { } @@ -128,11 +130,17 @@ public class SamplesOfUsageTest { @Parameters("please\\, escape commas if you use it here and don't want your parameters to be splitted") public void commasInParametersUsage(String phrase) { } + // Android-changed: CTS and AndroidJUnitRunner rely on specific format to test names, changing + // them will prevent CTS and AndroidJUnitRunner from working properly; see b/36541809 + @Ignore @Test @Parameters({ "1,1", "2,2", "3,6" }) @TestCaseName("factorial({0}) = {1}") public void customNamesForTestCase(int argument, int result) { } + // Android-changed: CTS and AndroidJUnitRunner rely on specific format to test names, changing + // them will prevent CTS and AndroidJUnitRunner from working properly; see b/36541809 + @Ignore @Test @Parameters({ "value1, value2", "value3, value4" }) @TestCaseName("[{index}] {method}: {params}") @@ -148,6 +156,9 @@ public class SamplesOfUsageTest { ); } + // Android-changed: CTS and AndroidJUnitRunner rely on specific format to test names, changing + // them will prevent CTS and AndroidJUnitRunner from working properly; see b/36541809 + @Ignore @Test @Parameters(method = "mixedParameters") @TestCaseName("{0}, {1}, {2}, {3}") |