upgrade the version to 2.23.9
This commit is contained in:
wang_yue111
parent
a192f994f5
commit
cc27f49d44
@ -1,29 +0,0 @@
|
|||||||
--- a/conf/mockito-core.bnd.orig 2014-12-31 16:43:56.000000000 +0000
|
|
||||||
+++ b/conf/mockito-core.bnd 2015-09-01 19:36:18.534549995 +0100
|
|
||||||
@@ -1,21 +1,19 @@
|
|
||||||
--versionpolicy=[${version;==;${@}},${version;+;${@}})
|
|
||||||
-
|
|
||||||
-Bundle-Name= Mockito Mock Library for Java. Core bundle requires Hamcrest-core and Objenesis.
|
|
||||||
+Bundle-Name= Mockito Mock Library for Java.
|
|
||||||
Bundle-SymbolicName= org.mockito.mockito-core
|
|
||||||
Bundle-Version= ${version}
|
|
||||||
|
|
||||||
Export-Package= !org.mockito.asm.*, \
|
|
||||||
!org.mockito.cglib.*, \
|
|
||||||
!org.mockito.internal.*, \
|
|
||||||
- org.mockito.*;version=${version}
|
|
||||||
+ org.mockito.*
|
|
||||||
|
|
||||||
Import-Package= junit.*;resolution:=optional, \
|
|
||||||
org.junit.*;resolution:=optional, \
|
|
||||||
org.apache.tools.ant.*;resolution:=optional, \
|
|
||||||
- org.hamcrest;version="[1.0,3.0)", \
|
|
||||||
- org.objenesis;version="[2.1,3.0)", \
|
|
||||||
+ org.objenesis;version="[1.0,3.0)", \
|
|
||||||
org.mockito.asm.signature;resolution:=optional, \
|
|
||||||
- org.mockito.*
|
|
||||||
+ org.mockito.*, \
|
|
||||||
+ net.sf.cglib.core,net.sf.cglib.proxy,net.sf.cglib.reflect
|
|
||||||
|
|
||||||
Private-Package: org.mockito.*
|
|
||||||
|
|
||||||
@ -1,87 +0,0 @@
|
|||||||
--- a/build.xml.orig 2014-12-31 16:43:56.000000000 +0000
|
|
||||||
+++ b/build.xml 2015-06-22 09:20:12.859059775 +0100
|
|
||||||
@@ -81,6 +81,7 @@
|
|
||||||
<target name="compile" depends="clean, prepare">
|
|
||||||
<javac srcdir="src" destdir="${src.classes.dir}" source="1.5" target="1.5" debug="true" deprecation="true" nowarn="true">
|
|
||||||
<classpath refid="compile.classpath" />
|
|
||||||
+ <compilerarg value="-Xlint:none" />
|
|
||||||
</javac>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
@@ -207,18 +208,14 @@
|
|
||||||
<delete file="${target.dir}/${jar.core.osgified}" />
|
|
||||||
</target>
|
|
||||||
|
|
||||||
- <target name="jar" depends="jar.all">
|
|
||||||
- <jarjar jarfile="${target.dir}/${jar.core}">
|
|
||||||
+ <target name="jar" depends="compile">
|
|
||||||
+ <jar jarfile="${target.dir}/${jar.core}">
|
|
||||||
<manifest>
|
|
||||||
<attribute name="Built-By" value="${user.name}"/>
|
|
||||||
<attribute name="Implementation-Version" value="${version}"/>
|
|
||||||
</manifest>
|
|
||||||
- <fileset dir="${lib.dir.repackaged}" includes="*.txt" />
|
|
||||||
- <fileset dir="." file="LICENSE" />
|
|
||||||
- <fileset dir="." file="NOTICE" />
|
|
||||||
<fileset dir="${src.classes.dir}" />
|
|
||||||
- <zipfileset src="${lib.dir.repackaged}/cglib-and-asm-1.0.jar"/>
|
|
||||||
- </jarjar>
|
|
||||||
+ </jar>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="sources" >
|
|
||||||
@@ -319,53 +316,10 @@
|
|
||||||
<h1><a href="org/mockito/Mockito.html">Click to see examples</a>. Mockito ${version} API.</h1>
|
|
||||||
]]>
|
|
||||||
</doctitle>
|
|
||||||
- <header>
|
|
||||||
- <![CDATA[
|
|
||||||
- <!-- Note there is a weird javadoc task bug if using the double quote char \" that causes an 'illegal package name' error -->
|
|
||||||
-
|
|
||||||
- <!-- using the beautify plugin for jQuery from https://bitbucket.org/larscorneliussen/beautyofcode/ -->
|
|
||||||
- <script type="text/javascript">
|
|
||||||
- var shBaseURL = '{@docRoot}/js/sh-2.1.382/';
|
|
||||||
- </script>
|
|
||||||
- <script type="text/javascript" src="{@docRoot}/js/jquery-1.7.min.js"></script>
|
|
||||||
- <script type="text/javascript" src="{@docRoot}/js/jquery.beautyOfCode-min.js"></script>
|
|
||||||
-
|
|
||||||
- <script type="text/javascript">
|
|
||||||
- /* Apply beautification of code */
|
|
||||||
- var usingOldIE = false;
|
|
||||||
- if($.browser.msie && parseInt($.browser.version) < 9) usingOldIE = true;
|
|
||||||
-
|
|
||||||
- if(!usingOldIE) {
|
|
||||||
- $.beautyOfCode.init({
|
|
||||||
- theme : 'Eclipse',
|
|
||||||
- brushes: ['Java']
|
|
||||||
- });
|
|
||||||
-
|
|
||||||
- var version = ${version};
|
|
||||||
-
|
|
||||||
- /* Add name & version to header */
|
|
||||||
- $(function() {
|
|
||||||
- $('td.NavBarCell1[colspan=2]').each(function(index, element) {
|
|
||||||
- var jqueryTD = $(element);
|
|
||||||
- jqueryTD.after(
|
|
||||||
- $('<td><em><strong>Mockito ${version} API</strong></em></td>').attr('class','NavBarCell1').attr('id','mockito-version-header')
|
|
||||||
- );
|
|
||||||
- jqueryTD.removeAttr('colspan');
|
|
||||||
- })
|
|
||||||
- })
|
|
||||||
- }
|
|
||||||
- </script>
|
|
||||||
- ]]>
|
|
||||||
- </header>
|
|
||||||
<group title="Main package" packages="org.mockito"/>
|
|
||||||
<classpath refid="compile.classpath" />
|
|
||||||
</javadoc>
|
|
||||||
- <copy todir="${javadoc.dir}/org/mockito" file="javadoc/img/logo.jpg" />
|
|
||||||
- <copy todir="${javadoc.dir}/js" file="javadoc/js/jquery-1.7.min.js" />
|
|
||||||
- <copy todir="${javadoc.dir}/js" file="javadoc/js/jquery.beautyOfCode-min.js" />
|
|
||||||
- <copy todir="${javadoc.dir}/js/sh-2.1.382">
|
|
||||||
- <fileset dir="javadoc/js/sh-2.1.382"/>
|
|
||||||
- </copy>
|
|
||||||
+ <copy todir="${javadoc.dir}/org/mockito" file="javadoc/org/mockito/logo.jpg" />
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="repackage-tests" depends="compile.test">
|
|
||||||
19
make-mockito-sourcetarball.sh
Normal file
19
make-mockito-sourcetarball.sh
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
#!/bin/bash -ex
|
||||||
|
|
||||||
|
VERSION=2.23.9
|
||||||
|
SRCDIR=mockito-${VERSION}
|
||||||
|
|
||||||
|
git clone https://github.com/mockito/mockito.git ${SRCDIR}
|
||||||
|
pushd $SRCDIR
|
||||||
|
git archive --format=tar --prefix=${SRCDIR}/ v${VERSION} > ../${SRCDIR}.tar
|
||||||
|
popd
|
||||||
|
|
||||||
|
rm -rf ${SRCDIR}
|
||||||
|
|
||||||
|
tar -xf ${SRCDIR}.tar
|
||||||
|
rm ${SRCDIR}.tar
|
||||||
|
pushd ${SRCDIR}
|
||||||
|
rm -rf `find -name *.jar` gradlew gradlew.bat src/javadoc
|
||||||
|
popd
|
||||||
|
|
||||||
|
tar -cvJf mockito-${VERSION}.tar.xz ${SRCDIR}
|
||||||
BIN
mockito-2.23.9.tar.xz
Normal file
BIN
mockito-2.23.9.tar.xz
Normal file
Binary file not shown.
683
mockito-core.pom
Normal file
683
mockito-core.pom
Normal file
@ -0,0 +1,683 @@
|
|||||||
|
<?xml version='1.0' encoding='UTF-8'?>
|
||||||
|
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
<groupId>org.mockito</groupId>
|
||||||
|
<artifactId>mockito-core</artifactId>
|
||||||
|
<version>@VERSION@</version>
|
||||||
|
<name>mockito-core</name>
|
||||||
|
<packaging>jar</packaging>
|
||||||
|
<url>https://github.com/mockito/mockito</url>
|
||||||
|
<description>Mockito mock objects library core API and implementation</description>
|
||||||
|
<!-- NOTE! This file is loosely based on the mockito-core pom from maven central
|
||||||
|
but with many additions to allow building and running tests -->
|
||||||
|
<dependencies>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.ow2.asm</groupId>
|
||||||
|
<artifactId>asm</artifactId>
|
||||||
|
<version>7.0</version>
|
||||||
|
<scope>compile</scope>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>net.bytebuddy</groupId>
|
||||||
|
<artifactId>byte-buddy</artifactId>
|
||||||
|
<version>1.9.3</version>
|
||||||
|
<scope>compile</scope>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>net.bytebuddy</groupId>
|
||||||
|
<artifactId>byte-buddy-agent</artifactId>
|
||||||
|
<version>1.9.3</version>
|
||||||
|
<scope>compile</scope>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.objenesis</groupId>
|
||||||
|
<artifactId>objenesis</artifactId>
|
||||||
|
<version>2.6</version>
|
||||||
|
<scope>compile</scope>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.hamcrest</groupId>
|
||||||
|
<artifactId>hamcrest-core</artifactId>
|
||||||
|
<version>1.3</version>
|
||||||
|
<scope>provided</scope>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>junit</groupId>
|
||||||
|
<artifactId>junit</artifactId>
|
||||||
|
<version>4.12</version>
|
||||||
|
<scope>provided</scope>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.assertj</groupId>
|
||||||
|
<artifactId>assertj-core</artifactId>
|
||||||
|
<version>2.9.0</version>
|
||||||
|
<scope>test</scope>
|
||||||
|
</dependency>
|
||||||
|
</dependencies>
|
||||||
|
<build>
|
||||||
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.felix</groupId>
|
||||||
|
<artifactId>maven-bundle-plugin</artifactId>
|
||||||
|
<version>3.5.0</version>
|
||||||
|
<configuration>
|
||||||
|
<manifestLocation>${project.build.directory}/osgi</manifestLocation>
|
||||||
|
<instructions>
|
||||||
|
<_include>-osgi.bnd</_include>
|
||||||
|
</instructions>
|
||||||
|
</configuration>
|
||||||
|
<executions>
|
||||||
|
<execution>
|
||||||
|
<phase>process-classes</phase>
|
||||||
|
<goals>
|
||||||
|
<goal>manifest</goal>
|
||||||
|
</goals>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
</plugin>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.codehaus.mojo</groupId>
|
||||||
|
<artifactId>exec-maven-plugin</artifactId>
|
||||||
|
<version>1.6.0</version>
|
||||||
|
<executions>
|
||||||
|
<execution>
|
||||||
|
<phase>process-classes</phase>
|
||||||
|
<goals>
|
||||||
|
<goal>exec</goal>
|
||||||
|
</goals>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
<configuration>
|
||||||
|
<executable>cp</executable>
|
||||||
|
<arguments>
|
||||||
|
<argument>${project.build.outputDirectory}/org/mockito/internal/creation/bytebuddy/MockMethodDispatcher.class</argument>
|
||||||
|
<argument>${project.build.outputDirectory}/org/mockito/internal/creation/bytebuddy/MockMethodDispatcher.raw</argument>
|
||||||
|
</arguments>
|
||||||
|
</configuration>
|
||||||
|
</plugin>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-jar-plugin</artifactId>
|
||||||
|
<version>3.1.0</version>
|
||||||
|
<configuration>
|
||||||
|
<archive>
|
||||||
|
<manifestFile>${project.build.directory}/osgi/MANIFEST.MF</manifestFile>
|
||||||
|
</archive>
|
||||||
|
<excludes>
|
||||||
|
<exclude>**/MockMethodDispatcher.class</exclude>
|
||||||
|
</excludes>
|
||||||
|
</configuration>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
|
</build>
|
||||||
|
<licenses>
|
||||||
|
<license>
|
||||||
|
<name>The MIT License</name>
|
||||||
|
<url>https://github.com/mockito/mockito/blob/master/LICENSE</url>
|
||||||
|
<distribution>repo</distribution>
|
||||||
|
</license>
|
||||||
|
</licenses>
|
||||||
|
<scm>
|
||||||
|
<url>https://github.com/mockito/mockito.git</url>
|
||||||
|
</scm>
|
||||||
|
<issueManagement>
|
||||||
|
<url>https://github.com/mockito/mockito/issues</url>
|
||||||
|
<system>GitHub issues</system>
|
||||||
|
</issueManagement>
|
||||||
|
<ciManagement>
|
||||||
|
<url>https://travis-ci.org/mockito/mockito</url>
|
||||||
|
<system>TravisCI</system>
|
||||||
|
</ciManagement>
|
||||||
|
<developers>
|
||||||
|
<developer>
|
||||||
|
<id>mockitoguy</id>
|
||||||
|
<name>Szczepan Faber</name>
|
||||||
|
<roles>
|
||||||
|
<role>Core developer</role>
|
||||||
|
</roles>
|
||||||
|
<url>https://github.com/mockitoguy</url>
|
||||||
|
</developer>
|
||||||
|
<developer>
|
||||||
|
<id>bric3</id>
|
||||||
|
<name>Brice Dutheil</name>
|
||||||
|
<roles>
|
||||||
|
<role>Core developer</role>
|
||||||
|
</roles>
|
||||||
|
<url>https://github.com/bric3</url>
|
||||||
|
</developer>
|
||||||
|
<developer>
|
||||||
|
<id>raphw</id>
|
||||||
|
<name>Rafael Winterhalter</name>
|
||||||
|
<roles>
|
||||||
|
<role>Core developer</role>
|
||||||
|
</roles>
|
||||||
|
<url>https://github.com/raphw</url>
|
||||||
|
</developer>
|
||||||
|
<developer>
|
||||||
|
<id>TimvdLippe</id>
|
||||||
|
<name>Tim van der Lippe</name>
|
||||||
|
<roles>
|
||||||
|
<role>Core developer</role>
|
||||||
|
</roles>
|
||||||
|
<url>https://github.com/TimvdLippe</url>
|
||||||
|
</developer>
|
||||||
|
</developers>
|
||||||
|
<contributors>
|
||||||
|
<contributor>
|
||||||
|
<name>continuous-delivery-drone</name>
|
||||||
|
<url>https://github.com/continuous-delivery-drone</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>shipkit.org automated bot</name>
|
||||||
|
<url>https://github.com/shipkit-org</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Marcin Zajączkowski</name>
|
||||||
|
<url>https://github.com/szpak</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Pascal Schumacher</name>
|
||||||
|
<url>https://github.com/PascalSchumacher</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Igor Czechowski</name>
|
||||||
|
<url>https://github.com/iczechowski</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Bartosz Bańkowski</name>
|
||||||
|
<url>https://github.com/bbankowski</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Erhard Pointl</name>
|
||||||
|
<url>https://github.com/epeee</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Allon Murienik</name>
|
||||||
|
<url>https://github.com/mureinik</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Christian Schwarz</name>
|
||||||
|
<url>https://github.com/ChristianSchwarz</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Lukasz Szewc</name>
|
||||||
|
<url>https://github.com/lukasz-szewc</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Marcin Grzejszczak</name>
|
||||||
|
<url>https://github.com/marcingrzejszczak</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Marc Philipp</name>
|
||||||
|
<url>https://github.com/marcphilipp</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Sangwoo Lee</name>
|
||||||
|
<url>https://github.com/marchpig</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Philip P. Moltmann</name>
|
||||||
|
<url>https://github.com/moltmann</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Tim Perry</name>
|
||||||
|
<url>https://github.com/pimterry</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>David J. M. Karlsen</name>
|
||||||
|
<url>https://github.com/davidkarlsen</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Dawud-xx</name>
|
||||||
|
<url>https://github.com/Dawud-xx</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Lovro Pandžić</name>
|
||||||
|
<url>https://github.com/lpandzic</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Werner Beroux</name>
|
||||||
|
<url>https://github.com/wernight</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Tsuyoshi Murakami</name>
|
||||||
|
<url>https://github.com/tmurakami</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Serge Bishyr</name>
|
||||||
|
<url>https://github.com/SeriyBg</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Dmitry Timofeev</name>
|
||||||
|
<url>https://github.com/dmitry-timofeev</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>jerzykrlk</name>
|
||||||
|
<url>https://github.com/jerzykrlk</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>alberskib</name>
|
||||||
|
<url>https://github.com/alberskib</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Joseph Walton</name>
|
||||||
|
<url>https://github.com/josephw</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Stephan Schroevers</name>
|
||||||
|
<url>https://github.com/Stephan202</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Michal Kordas</name>
|
||||||
|
<url>https://github.com/mkordas</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Kamil Szymański</name>
|
||||||
|
<url>https://github.com/kamilszymanski</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Hynek Mlnařík</name>
|
||||||
|
<url>https://github.com/hmlnarik</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Hugh Hamill</name>
|
||||||
|
<url>https://github.com/hughwphamill</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Hans Joachim Desserud</name>
|
||||||
|
<url>https://github.com/hansjoachim</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Gunnar Wagenknecht</name>
|
||||||
|
<url>https://github.com/guw</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Dmytro Chyzhykov</name>
|
||||||
|
<url>https://github.com/ffbit</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>r-smirnov</name>
|
||||||
|
<url>https://github.com/r-smirnov</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>ianparkinson</name>
|
||||||
|
<url>https://github.com/ianparkinson</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>dmac100</name>
|
||||||
|
<url>https://github.com/dmac100</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Vineet Kumar</name>
|
||||||
|
<url>https://github.com/vin</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Urs Metz</name>
|
||||||
|
<url>https://github.com/UrsMetz</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Tarnowski Jan</name>
|
||||||
|
<url>https://github.com/tarnowskijan</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Roman Elizarov</name>
|
||||||
|
<url>https://github.com/elizarov</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Roland Hauser</name>
|
||||||
|
<url>https://github.com/SourcePond</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Michał Borek</name>
|
||||||
|
<url>https://github.com/michalborek</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Michael Pinnegar</name>
|
||||||
|
<url>https://github.com/Jazzepi</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Marius Volkhart</name>
|
||||||
|
<url>https://github.com/MariusVolkhart</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Lucas Cavalcanti</name>
|
||||||
|
<url>https://github.com/lucascs</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Leonardo Carrasco</name>
|
||||||
|
<url>https://github.com/thesnowgoose</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Krzysztof Wolny</name>
|
||||||
|
<url>https://github.com/vanta</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Jeffrey Falgout</name>
|
||||||
|
<url>https://github.com/JeffreyFalgout</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Ismael Juma</name>
|
||||||
|
<url>https://github.com/ijuma</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Emory Merryman</name>
|
||||||
|
<url>https://github.com/AFnRFCb7</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Clark Brewer</name>
|
||||||
|
<url>https://github.com/brewerc</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Carlos Aguayo</name>
|
||||||
|
<url>https://github.com/carlosaguayo</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Arend v. Reinersdorff</name>
|
||||||
|
<url>https://github.com/arend-von-reinersdorff</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Alberto Scotto</name>
|
||||||
|
<url>https://github.com/alb-i986</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>yyvess</name>
|
||||||
|
<url>https://github.com/yyvess</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>訾明华</name>
|
||||||
|
<url>https://github.com/ziminghua</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>wuwen</name>
|
||||||
|
<url>https://github.com/wuwen5</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>test111</name>
|
||||||
|
<url>https://github.com/tradingreason</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Xin Liu</name>
|
||||||
|
<url>https://github.com/L-KID</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Wojtek Wilk</name>
|
||||||
|
<url>https://github.com/wwilk</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Walter Scott Johnson</name>
|
||||||
|
<url>https://github.com/li-wjohnson</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Walter Johnson</name>
|
||||||
|
<url>https://github.com/li-wjohnson</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Vladislav</name>
|
||||||
|
<url>https://github.com/VChirp</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Vivian Pennel</name>
|
||||||
|
<url>https://github.com/Vp3n</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Venkata Jaswanth</name>
|
||||||
|
<url>https://github.com/aj-jaswanth</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Tom Ball</name>
|
||||||
|
<url>https://github.com/tomball</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Tokuhiro Matsuno</name>
|
||||||
|
<url>https://github.com/tokuhirom</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Tim Cooke</name>
|
||||||
|
<url>https://github.com/trcooke</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Stuart Blair</name>
|
||||||
|
<url>https://github.com/stuartblair</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Simen Bekkhus</name>
|
||||||
|
<url>https://github.com/SimenB</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Scott Markwell</name>
|
||||||
|
<url>https://github.com/smarkwell</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Sanne Grinovero</name>
|
||||||
|
<url>https://github.com/Sanne</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Roi Atalla</name>
|
||||||
|
<url>https://github.com/ra4king</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Robert Stupp</name>
|
||||||
|
<url>https://github.com/snazy</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Radim Kubacki</name>
|
||||||
|
<url>https://github.com/radimk</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Philipp Jardas</name>
|
||||||
|
<url>https://github.com/phjardas</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Oliver Drotbohm</name>
|
||||||
|
<url>https://github.com/odrotbohm</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Niklas Baudy</name>
|
||||||
|
<url>https://github.com/vanniktech</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Myrle Krantz</name>
|
||||||
|
<url>https://github.com/myrle-krantz</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Matt Dean</name>
|
||||||
|
<url>https://github.com/mattbdean</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Markus Wüstenberg</name>
|
||||||
|
<url>https://github.com/markuswustenberg</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Maciej Kuster</name>
|
||||||
|
<url>https://github.com/NagRock</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>MEDDAH Julien</name>
|
||||||
|
<url>https://github.com/MeddahJ</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Ludovic Meurillon</name>
|
||||||
|
<url>https://github.com/LudoMeurillon</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Ludovic Chane</name>
|
||||||
|
<url>https://github.com/ludochane</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Krisztian Milesz</name>
|
||||||
|
<url>https://github.com/mileszk</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Kengo TODA</name>
|
||||||
|
<url>https://github.com/KengoTODA</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Kayvan Najafzadeh</name>
|
||||||
|
<url>https://github.com/kayvannj</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>José Paumard</name>
|
||||||
|
<url>https://github.com/JosePaumard</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Jonathan Lloyd</name>
|
||||||
|
<url>https://github.com/lloydjm77</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Johnny Lim</name>
|
||||||
|
<url>https://github.com/izeye</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Jesse Englert</name>
|
||||||
|
<url>https://github.com/jpenglert</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Jeremy Rickard</name>
|
||||||
|
<url>https://github.com/jrrickard</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Ivan Vershinin</name>
|
||||||
|
<url>https://github.com/vershinin</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Igor Kostenko</name>
|
||||||
|
<url>https://github.com/isanych</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Igor Conrado Alves de Lima</name>
|
||||||
|
<url>https://github.com/igorcadelima</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Gaëtan Muller</name>
|
||||||
|
<url>https://github.com/MGaetan89</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Felix W. Dekker</name>
|
||||||
|
<url>https://github.com/FWDekker</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Evgeny Astafyev</name>
|
||||||
|
<url>https://github.com/astafev</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Eugene Ivakhno</name>
|
||||||
|
<url>https://github.com/eugene-ivakhno</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Erik Bakker</name>
|
||||||
|
<url>https://github.com/eamelink</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Dmitriy Zaitsev</name>
|
||||||
|
<url>https://github.com/DmitriyZaitsev</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Divyansh Gupta</name>
|
||||||
|
<url>https://github.com/divyansh-gupta</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Dennis Cheung</name>
|
||||||
|
<url>https://github.com/hkdennis2k</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Denis Zharkov</name>
|
||||||
|
<url>https://github.com/dzharkov</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>David Xia</name>
|
||||||
|
<url>https://github.com/davidxia</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>David Gageot</name>
|
||||||
|
<url>https://github.com/dgageot</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Christian Persson</name>
|
||||||
|
<url>https://github.com/Saser</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Bruno Krebs</name>
|
||||||
|
<url>https://github.com/brunokrebs</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Ben Yu</name>
|
||||||
|
<url>https://github.com/fluentfuture</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Bastien Jansen</name>
|
||||||
|
<url>https://github.com/bjansen</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Bartosz Miller</name>
|
||||||
|
<url>https://github.com/BartoszMiller</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Ariel Isaac</name>
|
||||||
|
<url>https://github.com/Ariel-Isaacm</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Anuraag Agrawal</name>
|
||||||
|
<url>https://github.com/anuraaga</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>André Gonçalves</name>
|
||||||
|
<url>https://github.com/andrerigon</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Andrey</name>
|
||||||
|
<url>https://github.com/andreyrmg</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Andrei Solntsev</name>
|
||||||
|
<url>https://github.com/asolntsev</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Allan Wang</name>
|
||||||
|
<url>https://github.com/AllanWang</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Alex Simkin</name>
|
||||||
|
<url>https://github.com/SimY4</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>rberghegger</name>
|
||||||
|
<url>https://github.com/rberghegger</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>philipa</name>
|
||||||
|
<url>https://github.com/philipa</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>paulduffin</name>
|
||||||
|
<url>https://github.com/paulduffin</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>mgrafl</name>
|
||||||
|
<url>https://github.com/mgrafl</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>jmetertea</name>
|
||||||
|
<url>https://github.com/jmetertea</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>geoffschoeman</name>
|
||||||
|
<url>https://github.com/geoffschoeman</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>bruceeddy</name>
|
||||||
|
<url>https://github.com/bruceeddy</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>ashleyfrieze</name>
|
||||||
|
<url>https://github.com/ashleyfrieze</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>Nirvanall</name>
|
||||||
|
<url>https://github.com/Nirvanall</url>
|
||||||
|
</contributor>
|
||||||
|
<contributor>
|
||||||
|
<name>LiamClark</name>
|
||||||
|
<url>https://github.com/LiamClark</url>
|
||||||
|
</contributor>
|
||||||
|
</contributors>
|
||||||
|
</project>
|
||||||
@ -1,39 +0,0 @@
|
|||||||
From 02df4868e1614b9fd224e40c1556b78eeb01cd3d Mon Sep 17 00:00:00 2001
|
|
||||||
From: Michael Simacek <msimacek@redhat.com>
|
|
||||||
Date: Wed, 4 Dec 2013 16:52:24 +0100
|
|
||||||
Subject: [PATCH] mockito matcher
|
|
||||||
|
|
||||||
Signed-off-by: Michael Simacek <msimacek@redhat.com>
|
|
||||||
---
|
|
||||||
src/org/mockito/internal/matchers/LocalizedMatcher.java | 8 +++++++-
|
|
||||||
1 file changed, 7 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/src/org/mockito/internal/matchers/LocalizedMatcher.java b/src/org/mockito/internal/matchers/LocalizedMatcher.java
|
|
||||||
index d6dda04..9dffe06 100644
|
|
||||||
--- a/src/org/mockito/internal/matchers/LocalizedMatcher.java
|
|
||||||
+++ b/src/org/mockito/internal/matchers/LocalizedMatcher.java
|
|
||||||
@@ -22,6 +22,12 @@ public class LocalizedMatcher implements Matcher, ContainsExtraTypeInformation,
|
|
||||||
this.location = new LocationImpl();
|
|
||||||
}
|
|
||||||
|
|
||||||
+ /* This is a hack for Fedora. Bug has been filed here:
|
|
||||||
+ * https://code.google.com/p/mockito/issues/detail?id=428 */
|
|
||||||
+ public void describeMismatch(Object item, Description mismatchDescription) {
|
|
||||||
+ mismatchDescription.appendText("was ").appendValue(item);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
public void _dont_implement_Matcher___instead_extend_BaseMatcher_() {
|
|
||||||
// yeah right
|
|
||||||
}
|
|
||||||
@@ -37,7 +43,7 @@ public class LocalizedMatcher implements Matcher, ContainsExtraTypeInformation,
|
|
||||||
public Location getLocation() {
|
|
||||||
return location;
|
|
||||||
}
|
|
||||||
-
|
|
||||||
+
|
|
||||||
@Override
|
|
||||||
public String toString() {
|
|
||||||
return "Localized: " + this.actualMatcher;
|
|
||||||
--
|
|
||||||
1.8.3.1
|
|
||||||
|
|
||||||
85
mockito.spec
85
mockito.spec
@ -1,72 +1,61 @@
|
|||||||
Name: mockito
|
Name: mockito
|
||||||
Version: 1.10.19
|
Version: 2.23.9
|
||||||
Release: 18
|
Release: 1
|
||||||
Summary: A Java mocking framework
|
Summary: Tasty mocking framework for unit tests in Java
|
||||||
License: MIT
|
License: MIT
|
||||||
URL: http://mockito.org
|
URL: https://site.mockito.org/
|
||||||
Source0: https://github.com/mockito/mockito/archive/v1.10.19.tar.gz
|
|
||||||
# fix bnd config to resolve build error
|
|
||||||
Patch0001: fix-bnd-config.patch
|
|
||||||
# fix ant script to resolve build error
|
|
||||||
Patch0002: fixup-ant-script.patch
|
|
||||||
# fix build error
|
|
||||||
Patch0003: mockito-matcher.patch
|
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
BuildRequires: javapackages-local java-devel ant objenesis cglib
|
Source0: %{name}-%{version}.tar.xz
|
||||||
BuildRequires: junit hamcrest aqute-bnd dos2unix
|
Source1: make-%{name}-sourcetarball.sh
|
||||||
Requires: objenesis cglib junit hamcrest
|
Source2: mockito-core.pom
|
||||||
|
Patch0: use-unbundled-asm.patch
|
||||||
|
BuildRequires: maven-local mvn(junit:junit) mvn(net.bytebuddy:byte-buddy)
|
||||||
|
BuildRequires: mvn(net.bytebuddy:byte-buddy-agent) mvn(org.apache.felix:maven-bundle-plugin)
|
||||||
|
BuildRequires: mvn(org.assertj:assertj-core) mvn(org.codehaus.mojo:exec-maven-plugin)
|
||||||
|
BuildRequires: mvn(org.hamcrest:hamcrest-core) mvn(org.objenesis:objenesis)
|
||||||
|
BuildRequires: mvn(org.ow2.asm:asm)
|
||||||
%description
|
%description
|
||||||
Mockito is a mocking framework that tastes really good. It lets you write
|
Mockito is a mocking framework that tastes really good. It lets you write
|
||||||
beautiful tests with clean & simple API. Mockito doesn't give you hangover
|
beautiful tests with clean & simple API. Mockito doesn't give you hangover
|
||||||
because the tests are very readable and they produce clean verification
|
because the tests are very readable and they produce clean verification
|
||||||
errors.
|
errors.
|
||||||
|
|
||||||
%package help
|
%package javadoc
|
||||||
Summary: This package contains help documents
|
Summary: Javadocs for %{name}
|
||||||
Provides: mockito-javadoc = %{version}-%{release}
|
%description javadoc
|
||||||
Obsoletes: mockito-javadoc < %{version}-%{release}
|
This package contains the API documentation for %{name}.
|
||||||
|
|
||||||
%description help
|
|
||||||
Files for help with mockito
|
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
rm -rf `find -name *.jar` build.gradle cglib-and-asm doc gradle gradlew gradlew.bat javadoc
|
%patch0
|
||||||
dos2unix `find -name *.java`
|
sed -e 's/@VERSION@/%{version}/' %{SOURCE2} > pom.xml
|
||||||
%patch0001 -p1
|
cat > osgi.bnd <<EOF
|
||||||
%patch0002 -p1
|
Automatic-Module-Name: org.mockito
|
||||||
%patch0003 -p1
|
Bundle-SymbolicName: org.mockito
|
||||||
%pom_add_dep net.sf.cglib:cglib:3.1 maven/mockito-core.pom
|
Bundle-Name: Mockito Mock Library for Java.
|
||||||
find . -name "*.java" -exec sed -i "s|org\.mockito\.cglib|net\.sf\.cglib|g" {} +
|
Import-Package: junit.*;resolution:=optional,org.junit.*;resolution:=optional,org.hamcrest;resolution:=optional,org.mockito*;version="%{version}",*
|
||||||
install -d lib/compile
|
Private-Package: org.mockito.*
|
||||||
%pom_xpath_remove 'target[@name="javadoc"]/copy' build.xml
|
-removeheaders: Bnd-LastModified,Include-Resource,Private-Package
|
||||||
|
EOF
|
||||||
|
%mvn_alias org.%{name}:%{name}-core org.%{name}:%{name}-all
|
||||||
|
|
||||||
%build
|
%build
|
||||||
build-jar-repository lib/compile objenesis cglib junit hamcrest/core
|
%mvn_build -- -Dproject.build.sourceEncoding=UTF-8
|
||||||
ant jar javadoc
|
|
||||||
cd target
|
|
||||||
bnd wrap --version 1.10.19 --output mockito-core-1.10.19.bar \
|
|
||||||
--properties ../conf/mockito-core.bnd mockito-core-1.10.19.jar
|
|
||||||
mv mockito-core-1.10.19.bar mockito-core-1.10.19.jar
|
|
||||||
unzip mockito-core-1.10.19.jar META-INF/MANIFEST.MF
|
|
||||||
sed -i -e '2iRequire-Bundle: org.hamcrest.core' META-INF/MANIFEST.MF
|
|
||||||
jar umf META-INF/MANIFEST.MF mockito-core-1.10.19.jar
|
|
||||||
cd ..
|
|
||||||
sed -i -e "s|@version@|1.10.19|g" maven/mockito-core.pom
|
|
||||||
%mvn_artifact maven/mockito-core.pom target/mockito-core-1.10.19.jar
|
|
||||||
%mvn_alias org.mockito:mockito-core org.mockito:mockito-all
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%mvn_install -J target/javadoc
|
%mvn_install
|
||||||
|
|
||||||
%files -f .mfiles
|
%files -f .mfiles
|
||||||
%doc LICENSE
|
%license LICENSE
|
||||||
|
%doc doc/design-docs/custom-argument-matching.md
|
||||||
|
|
||||||
%files help -f .mfiles-javadoc
|
%files javadoc -f .mfiles-javadoc
|
||||||
%doc NOTICE
|
%license LICENSE
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Aug 18 2020 wangyue <wangyue92@huawei.com> - 2.23.9-1
|
||||||
|
- upgrade the version to 2.23.9
|
||||||
|
|
||||||
* Thu Apr 23 2020 wutao <wutao61@huawei.com> 1.10.19-19
|
* Thu Apr 23 2020 wutao <wutao61@huawei.com> 1.10.19-19
|
||||||
* delete useless patches
|
* delete useless patches
|
||||||
|
|
||||||
|
|||||||
5
mockito.yaml
Normal file
5
mockito.yaml
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
git_url: https://github.com/mockito/mockito
|
||||||
|
version_control: github
|
||||||
|
src_repo: mockito/mockito
|
||||||
|
tag_prefix: "^v"
|
||||||
|
seperator: "."
|
||||||
70
use-unbundled-asm.patch
Normal file
70
use-unbundled-asm.patch
Normal file
@ -0,0 +1,70 @@
|
|||||||
|
--- src/main/java/org/mockito/internal/creation/bytebuddy/InlineBytecodeGenerator.java.orig 2018-12-04 23:47:19.396895633 +0000
|
||||||
|
+++ src/main/java/org/mockito/internal/creation/bytebuddy/InlineBytecodeGenerator.java 2018-12-04 23:48:19.129703720 +0000
|
||||||
|
@@ -18,9 +18,9 @@
|
||||||
|
import net.bytebuddy.dynamic.scaffold.MethodGraph;
|
||||||
|
import net.bytebuddy.dynamic.scaffold.TypeValidation;
|
||||||
|
import net.bytebuddy.implementation.Implementation;
|
||||||
|
-import net.bytebuddy.jar.asm.ClassVisitor;
|
||||||
|
-import net.bytebuddy.jar.asm.MethodVisitor;
|
||||||
|
-import net.bytebuddy.jar.asm.Opcodes;
|
||||||
|
+import org.objectweb.asm.ClassVisitor;
|
||||||
|
+import org.objectweb.asm.MethodVisitor;
|
||||||
|
+import org.objectweb.asm.Opcodes;
|
||||||
|
import net.bytebuddy.matcher.ElementMatchers;
|
||||||
|
import net.bytebuddy.pool.TypePool;
|
||||||
|
import net.bytebuddy.utility.OpenedClassReader;
|
||||||
|
--- ./src/test/java/org/mockitointegration/NoJUnitDependenciesTest.java.orig 2018-12-04 23:49:03.170562228 +0000
|
||||||
|
+++ ./src/test/java/org/mockitointegration/NoJUnitDependenciesTest.java 2018-12-04 23:49:46.061424433 +0000
|
||||||
|
@@ -12,6 +12,7 @@
|
||||||
|
import org.mockito.Mockito;
|
||||||
|
import org.mockito.internal.configuration.plugins.Plugins;
|
||||||
|
import org.mockitoutil.ClassLoaders;
|
||||||
|
+import org.objectweb.asm.ClassVisitor;
|
||||||
|
import org.objenesis.Objenesis;
|
||||||
|
|
||||||
|
import java.util.Set;
|
||||||
|
@@ -30,6 +31,7 @@
|
||||||
|
Matcher.class,
|
||||||
|
ByteBuddy.class,
|
||||||
|
ByteBuddyAgent.class,
|
||||||
|
+ ClassVisitor.class,
|
||||||
|
Objenesis.class
|
||||||
|
)
|
||||||
|
.withCodeSourceUrlOf(coverageTool())
|
||||||
|
--- src/test/java/org/mockito/internal/creation/bytebuddy/AbstractByteBuddyMockMakerTest.java.orig 2018-12-05 00:18:50.707528013 +0000
|
||||||
|
+++ src/test/java/org/mockito/internal/creation/bytebuddy/AbstractByteBuddyMockMakerTest.java 2018-12-05 00:19:49.520329138 +0000
|
||||||
|
@@ -19,6 +19,7 @@
|
||||||
|
import org.mockito.stubbing.Answer;
|
||||||
|
import org.mockitoutil.ClassLoaders;
|
||||||
|
import org.mockitoutil.SimpleSerializationUtil;
|
||||||
|
+import org.objectweb.asm.ClassVisitor;
|
||||||
|
import org.objenesis.ObjenesisStd;
|
||||||
|
|
||||||
|
import java.io.Serializable;
|
||||||
|
@@ -138,7 +139,7 @@
|
||||||
|
public void instantiate_fine_when_objenesis_on_the_classpath() throws Exception {
|
||||||
|
// given
|
||||||
|
ClassLoader classpath_with_objenesis = ClassLoaders.excludingClassLoader()
|
||||||
|
- .withCodeSourceUrlOf(Mockito.class, ByteBuddy.class, ObjenesisStd.class)
|
||||||
|
+ .withCodeSourceUrlOf(Mockito.class, ByteBuddy.class, ObjenesisStd.class, ClassVisitor.class)
|
||||||
|
.withCodeSourceUrlOf(coverageTool())
|
||||||
|
.build();
|
||||||
|
|
||||||
|
--- src/test/java/org/mockito/internal/junit/JUnitRuleTest.java.orig 2018-12-05 00:26:24.279002285 +0000
|
||||||
|
+++ src/test/java/org/mockito/internal/junit/JUnitRuleTest.java 2018-12-05 00:27:47.327723119 +0000
|
||||||
|
@@ -4,6 +4,7 @@
|
||||||
|
*/
|
||||||
|
package org.mockito.internal.junit;
|
||||||
|
|
||||||
|
+import org.junit.Ignore;
|
||||||
|
import org.junit.Rule;
|
||||||
|
import org.junit.Test;
|
||||||
|
import org.mockito.Mock;
|
||||||
|
@@ -41,6 +42,7 @@
|
||||||
|
|
||||||
|
@SuppressWarnings({"CheckReturnValue", "MockitoUsage"})
|
||||||
|
@Test
|
||||||
|
+ @Ignore
|
||||||
|
public void does_not_check_invalid_mockito_usage_on_failure() throws Throwable {
|
||||||
|
//This intended behavior is questionable
|
||||||
|
//However, it was like that since the beginning of JUnit rule support
|
||||||
BIN
v1.10.19.tar.gz
BIN
v1.10.19.tar.gz
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user