diff options
author | Paul Duffin <paulduffin@google.com> | 2016-07-20 11:53:06 +0100 |
---|---|---|
committer | Paul Duffin <paulduffin@google.com> | 2016-07-21 11:30:44 +0100 |
commit | 6774bdc0447b72a618eab51772685010afd5647a (patch) | |
tree | ace1650656a30833b9c26d1f2a0a7c27581aecac | |
parent | 67bea903e940b78438a4d95bf54d4787e3aac0b0 (diff) | |
download | platform_external_junit-params-6774bdc0447b72a618eab51772685010afd5647a.tar.gz platform_external_junit-params-6774bdc0447b72a618eab51772685010afd5647a.tar.bz2 platform_external_junit-params-6774bdc0447b72a618eab51772685010afd5647a.zip |
Patch to make it compile against JUnit 4.10 and run on Android
The main issues are:
* JUnit 4.10 does not support giving Description instances a
unique id, separate to its display name.
* JUnit 4.10's BlockJUnit4ClassRunner.validateFields(List)
method is private so cannot be overridden.
* JUnit 4.10 requires test classes to be static.
* JUnit 4.10 has no assertNotEquals() methods.
* Some of the tests need to be run from the project's root
directory in order to access file system resources. As a
result those tests do not work when run on the device and so
they are marked with @Ignore.
Bug: 30244565
Test: Ran the junit-params-test using vogar
Change-Id: I8f1bd602d07bedec1340373ad5747e3565ce617d
-rw-r--r-- | Android.mk | 78 | ||||
-rw-r--r-- | lib/assertj-core-1.7.1-sources.jar | bin | 0 -> 447732 bytes | |||
-rw-r--r-- | lib/assertj-core-1.7.1.jar | bin | 0 -> 618901 bytes | |||
-rw-r--r-- | lib/assertj-core-1.7.1.jar.txt | 202 | ||||
-rw-r--r-- | src/main/java/junitparams/JUnitParamsRunner.java | 5 | ||||
-rw-r--r-- | src/main/java/junitparams/internal/InvokeParameterisedMethod.java | 8 | ||||
-rw-r--r-- | src/main/java/junitparams/internal/TestMethod.java | 9 | ||||
-rw-r--r-- | src/test/java/junitparams/FileParamsTest.java | 4 | ||||
-rw-r--r-- | src/test/java/junitparams/RulesTest.java | 3 | ||||
-rw-r--r-- | src/test/java/junitparams/SamplesOfUsageVerificationTest.java | 3 | ||||
-rw-r--r-- | src/test/java/junitparams/internal/TestMethodTest.java | 4 | ||||
-rw-r--r-- | src/test/java/junitparams/usage/SamplesOfUsageTest.java | 3 |
12 files changed, 311 insertions, 8 deletions
diff --git a/Android.mk b/Android.mk new file mode 100644 index 0000000..2870d1f --- /dev/null +++ b/Android.mk @@ -0,0 +1,78 @@ +# Copyright (C) 2016 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# + +LOCAL_PATH := $(call my-dir) + +# build for the host JVM +#----------------------- +include $(CLEAR_VARS) +LOCAL_SRC_FILES := $(call all-java-files-under, src/main/java) +LOCAL_MODULE := junit-params-host +LOCAL_MODULE_TAGS := optional +LOCAL_STATIC_JAVA_LIBRARIES := \ + junit +include $(BUILD_HOST_JAVA_LIBRARY) + +# build for the host dalvik +# ------------------------- +include $(CLEAR_VARS) +LOCAL_SRC_FILES := $(call all-java-files-under, src/main/java) +LOCAL_MODULE := junit-params-hostdex +LOCAL_MODULE_TAGS := optional +LOCAL_STATIC_JAVA_LIBRARIES := \ + junit4-target-hostdex +include $(BUILD_HOST_DALVIK_STATIC_JAVA_LIBRARY) + +#------------------------------- +# build a target jar + +include $(CLEAR_VARS) + +LOCAL_SRC_FILES := $(call all-java-files-under, src/main/java) +LOCAL_MODULE := junit-params +LOCAL_MODULE_TAGS := optional +LOCAL_STATIC_JAVA_LIBRARIES := \ + junit4-target +include $(BUILD_STATIC_JAVA_LIBRARY) + +#------------------------------- +# build a target test jar +# +# Run the test jar as follows: +# vogar --classpath \ + ${ANDROID_PRODUCT_OUT}/obj/JAVA_LIBRARIES/junit-params-test_intermediates/classes.jack \ + junitparams + +include $(CLEAR_VARS) + +LOCAL_SRC_FILES := $(call all-java-files-under, src/test/java) +LOCAL_JAVA_RESOURCE_DIRS := src/test/resources +LOCAL_MODULE := junit-params-test +LOCAL_MODULE_TAGS := optional +LOCAL_STATIC_JAVA_LIBRARIES := \ + junit-params \ + junit-params-assertj-core +include $(BUILD_STATIC_JAVA_LIBRARY) + +#------------------------------- +# prebuilt dependencies + +include $(CLEAR_VARS) + +LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := \ + junit-params-assertj-core:lib/assertj-core-1.7.1.jar + +include $(BUILD_MULTI_PREBUILT) diff --git a/lib/assertj-core-1.7.1-sources.jar b/lib/assertj-core-1.7.1-sources.jar Binary files differnew file mode 100644 index 0000000..dfbbe54 --- /dev/null +++ b/lib/assertj-core-1.7.1-sources.jar diff --git a/lib/assertj-core-1.7.1.jar b/lib/assertj-core-1.7.1.jar Binary files differnew file mode 100644 index 0000000..ee9268d --- /dev/null +++ b/lib/assertj-core-1.7.1.jar diff --git a/lib/assertj-core-1.7.1.jar.txt b/lib/assertj-core-1.7.1.jar.txt new file mode 100644 index 0000000..d645695 --- /dev/null +++ b/lib/assertj-core-1.7.1.jar.txt @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/src/main/java/junitparams/JUnitParamsRunner.java b/src/main/java/junitparams/JUnitParamsRunner.java index fa37257..b77539c 100644 --- a/src/main/java/junitparams/JUnitParamsRunner.java +++ b/src/main/java/junitparams/JUnitParamsRunner.java @@ -16,6 +16,8 @@ import junitparams.internal.ParameterisedTestClassRunner; import junitparams.internal.ParametrizedTestMethodsFilter; import junitparams.internal.TestMethod; +import static org.junit.internal.runners.rules.RuleFieldValidator.RULE_VALIDATOR; + /** * <h1>JUnitParams</h1><br> * <p> @@ -402,7 +404,8 @@ public class JUnitParamsRunner extends BlockJUnit4ClassRunner { @Override protected void collectInitializationErrors(List<Throwable> errors) { - super.validateFields(errors); + // TODO(JUnit4.10) - super.validateFields() is private in JUnit 4.10 - so inline method + RULE_VALIDATOR.validate(getTestClass(), errors); for (Throwable throwable : errors) throwable.printStackTrace(); } diff --git a/src/main/java/junitparams/internal/InvokeParameterisedMethod.java b/src/main/java/junitparams/internal/InvokeParameterisedMethod.java index 7d313c2..ea4c98d 100644 --- a/src/main/java/junitparams/internal/InvokeParameterisedMethod.java +++ b/src/main/java/junitparams/internal/InvokeParameterisedMethod.java @@ -219,7 +219,13 @@ public class InvokeParameterisedMethod extends Statement { } boolean matchesDescription(Description description) { - return description.hashCode() == uniqueMethodId.hashCode(); + // TODO(JUnit4.10) - because JUnit 4.10 has no separation of display name and unique method + // id, we need to do some mangling of the name to get a match + String displayName = description.getDisplayName(); + + int endIndex = displayName.lastIndexOf("(", displayName.length() - 1); + String uniqueName = (endIndex == - 1) ? displayName : displayName.substring(0, endIndex); + return uniqueName.equals(uniqueMethodId); } @Override diff --git a/src/main/java/junitparams/internal/TestMethod.java b/src/main/java/junitparams/internal/TestMethod.java index 6125803..7eac3ae 100644 --- a/src/main/java/junitparams/internal/TestMethod.java +++ b/src/main/java/junitparams/internal/TestMethod.java @@ -103,10 +103,13 @@ public class TestMethod { for (int i = 0; i < params.length; i++) { Object paramSet = params[i]; String name = namingStrategy.getTestCaseName(i, paramSet); - String uniqueMethodId = Utils.uniqueMethodId(i, paramSet, name()); - + // TODO(JUnit4.10) - Description.createTestDescription(Class, String, Serializable) + // is not available in JUnit 4.10. That means that it is not possible to + // differentiate between tests using a unique method id. Just use the name for now. + // There is a corresponding change in + // InvokeParameterisedMethod.matchesDescription(Description description). parametrised.addChild( - Description.createTestDescription(testClass().getName(), name, uniqueMethodId) + Description.createTestDescription(testClass(), name) ); } return parametrised; diff --git a/src/test/java/junitparams/FileParamsTest.java b/src/test/java/junitparams/FileParamsTest.java index b581400..3917af7 100644 --- a/src/test/java/junitparams/FileParamsTest.java +++ b/src/test/java/junitparams/FileParamsTest.java @@ -1,5 +1,6 @@ package junitparams; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; @@ -12,12 +13,14 @@ import static org.assertj.core.api.Assertions.*; @RunWith(JUnitParamsRunner.class) public class FileParamsTest { + @Ignore("Does not work when run on device as it does not have access to the file") @Test @FileParameters("src/test/resources/test.csv") public void loadParamsFromFileWithIdentityMapper(int age, String name) { assertThat(age).isGreaterThan(0); } + @Ignore("Does not work when run on device as it does not have access to the file") @Test @FileParameters(value = "src/test/resources/test.csv", mapper = PersonMapper.class) public void loadParamsFromFileWithCustomMapper(Person person) { @@ -30,6 +33,7 @@ public class FileParamsTest { assertThat(age).isGreaterThan(0); } + @Ignore("Does not work when run on device as it does not have access to the file") @Test @FileParameters("file:src/test/resources/test.csv") public void loadParamsFromFileAtFilesystem(int age, String name) { diff --git a/src/test/java/junitparams/RulesTest.java b/src/test/java/junitparams/RulesTest.java index 3dde4cf..d49d35e 100644 --- a/src/test/java/junitparams/RulesTest.java +++ b/src/test/java/junitparams/RulesTest.java @@ -47,7 +47,8 @@ public class RulesTest { .hasMessage("The @Rule 'testRule' must be public."); } - public class ProtectedRuleTest { + // TODO(JUnit4.10) - must be static in JUnit 4.10 + public static class ProtectedRuleTest { @Rule TestRule testRule; diff --git a/src/test/java/junitparams/SamplesOfUsageVerificationTest.java b/src/test/java/junitparams/SamplesOfUsageVerificationTest.java index 13a0719..a485d4e 100644 --- a/src/test/java/junitparams/SamplesOfUsageVerificationTest.java +++ b/src/test/java/junitparams/SamplesOfUsageVerificationTest.java @@ -15,7 +15,8 @@ public class SamplesOfUsageVerificationTest { Result result = JUnitCore.runClasses(SamplesOfUsageTest.class); assertEquals(0, result.getFailureCount()); - assertEquals(0, result.getIgnoreCount()); + // TODO(JUnit4.10) - 2 tests are ignored because they do not work when run on the device. + assertEquals(2, result.getIgnoreCount()); } } diff --git a/src/test/java/junitparams/internal/TestMethodTest.java b/src/test/java/junitparams/internal/TestMethodTest.java index 2964781..cceccbc 100644 --- a/src/test/java/junitparams/internal/TestMethodTest.java +++ b/src/test/java/junitparams/internal/TestMethodTest.java @@ -93,7 +93,9 @@ public class TestMethodTest { public void testVarargsCustomClass(Pair... pairs){ assertEquals(pairs[0].x, pairs[0].y); assertEquals(pairs[1].x, pairs[1].y); - assertNotEquals(pairs[2].x, pairs[2].y); + // TODO(JUnit4.10) - assertNotEquals not in JUnit 4.10 + // assertNotEquals(pairs[2].x, pairs[2].y); + assertTrue(pairs[2].x != pairs[2].y); } protected Object[] parametersForTestVarargsCustomClass(){ diff --git a/src/test/java/junitparams/usage/SamplesOfUsageTest.java b/src/test/java/junitparams/usage/SamplesOfUsageTest.java index 5ce425d..3c5f410 100644 --- a/src/test/java/junitparams/usage/SamplesOfUsageTest.java +++ b/src/test/java/junitparams/usage/SamplesOfUsageTest.java @@ -5,6 +5,7 @@ import java.util.Date; import java.util.Iterator; import java.util.List; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; @@ -101,10 +102,12 @@ 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") @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") @Test @FileParameters(value = "src/test/resources/test.csv", mapper = PersonMapper.class) public void loadParamsFromAnyFile(PersonTest.Person person) { } |