Revert "Add a host test for Mockito." am: c8600e6ec8 am: c0f589004e am: 05b6b6b3ea
am: 54f58cfc4b
Change-Id: I7fec9fb6399e6fdcca366f42d50c46e97641b50c
diff --git a/Android.bp b/Android.bp
index 8836590..d03df66 100644
--- a/Android.bp
+++ b/Android.bp
@@ -78,58 +78,6 @@
java_resource_dirs: ["subprojects/inline/src/main/resources"],
}
-// Mockito host test target for Mockito usage
-java_test_host {
- name: "mockito-host-test",
- srcs: [
- "src/test/java/**/*.java",
- ],
- exclude_srcs: [
- // MockMethodDispatcher.class is renamed to MockMethodDispatcher.raw
- // in upstream, and used by InlineByteBuddyMockmaker. It's not set up
- // here so we need to exclude tests that use InlineByteBuddyMockmaker.
- "src/test/java/org/mockito/internal/creation/bytebuddy/Inline*.java",
- "src/test/java/org/mockito/internal/configuration/plugins/DefaultMockitoPluginsTest.java",
- "src/test/java/org/mockitousage/plugins/MockitoPluginsTest.java",
-
- // Exclude class loader tests because it assumes mockito tests and mockito library are in
- // different jars, but current host test settings don't support arbitrary shared java
- // libraries.
- "src/test/java/org/mockitoutil/ClassLoadersTest.java",
-
- // TODO(b/140568508): Add these tests back after it's fixed.
- // For some reason tradefed expect the following test suite with @Ignore annotation on
- // their classes to generate 1 test result for each of them. Need to exclude them from the
- // test manually.
- "src/test/java/org/mockitousage/bugs/MultithreadedStubbingHalfManualTest.java",
- "src/test/java/org/mockitousage/junitrunner/ModellingVerboseMockitoTest.java",
- "src/test/java/org/mockitousage/stacktrace/ModellingDescriptiveMessagesTest.java",
-
- // Exclude known bad tests
- // See https://github.com/mockito/mockito/commit/6109160e74d5081cbb170cfbb2324bb3991518ff
- "src/test/java/org/mockitousage/matchers/VarargsTest.java",
- // See https://github.com/mockito/mockito/issues/1174. The following test fails because
- // OpenJDK 9 adds type assertions on generic types sometimes.
- "src/test/java/org/mockitousage/bugs/GenericsMockitoAnnotationsTest.java",
- "src/test/java/org/mockito/internal/stubbing/defaultanswers/ReturnsMocksTest.java",
- ],
- static_libs: [
- "junit",
- "mockito",
- "mockito-asm",
- "mockito-assertj-core",
- "objenesis",
- ],
- test_suites: ["general-tests"],
- errorprone: {
- javacflags: [
- // In long term we may want to fix these code in upstream, but for the time being
- // let's suppress it.
- "-XepDisableAllChecks",
- ],
- },
-}
-
// Common dependencies for both target and host.
// ===========================================================
java_import {
@@ -150,12 +98,3 @@
jars: ["lib/byte-buddy-agent-1.9.10.jar"],
}
-java_import_host {
- name: "mockito-assertj-core",
- jars: ["lib/assertj-core-2.9.0.jar"],
-}
-
-java_import_host {
- name: "mockito-asm",
- jars: ["lib/asm-7.0.jar"],
-}
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 4538fd3..a971772 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -31,9 +31,6 @@
"exclude-annotation": "androidx.test.filters.LargeTest"
}
]
- },
- {
- "name": "mockito-host-test"
}
]
}
diff --git a/lib/asm-7.0-sources.jar b/lib/asm-7.0-sources.jar
deleted file mode 100644
index cad7502..0000000
--- a/lib/asm-7.0-sources.jar
+++ /dev/null
Binary files differ
diff --git a/lib/asm-7.0.jar b/lib/asm-7.0.jar
deleted file mode 100644
index 2cf38f4..0000000
--- a/lib/asm-7.0.jar
+++ /dev/null
Binary files differ
diff --git a/lib/asm-7.0.jar.txt b/lib/asm-7.0.jar.txt
deleted file mode 100644
index 4d19185..0000000
--- a/lib/asm-7.0.jar.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-
- ASM: a very small and fast Java bytecode manipulation framework
- Copyright (c) 2000-2011 INRIA, France Telecom
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- 3. Neither the name of the copyright holders nor the names of its
- contributors may be used to endorse or promote products derived from
- this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/lib/assertj-core-2.9.0-sources.jar b/lib/assertj-core-2.9.0-sources.jar
deleted file mode 100644
index 07fbd43..0000000
--- a/lib/assertj-core-2.9.0-sources.jar
+++ /dev/null
Binary files differ
diff --git a/lib/assertj-core-2.9.0.jar b/lib/assertj-core-2.9.0.jar
deleted file mode 100644
index 77017da..0000000
--- a/lib/assertj-core-2.9.0.jar
+++ /dev/null
Binary files differ
diff --git a/lib/assertj-core-2.9.0.jar.txt b/lib/assertj-core-2.9.0.jar.txt
deleted file mode 100644
index 261eeb9..0000000
--- a/lib/assertj-core-2.9.0.jar.txt
+++ /dev/null
@@ -1,201 +0,0 @@
- 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.
