Compare commits

...

No commits in common. "c8-stream-201902" and "stream-javapackages-tools-201801-rhel-8.10.0" have entirely different histories.

12 changed files with 269 additions and 849 deletions

5
.gitignore vendored
View File

@ -1 +1,4 @@
SOURCES/mockito-3.1.2.tar.xz
/mockito-*.tar.xz
/.build-*.log
/noarch/
/*.src.rpm

View File

@ -1 +1 @@
15683d23b64ec2b289dccd9898efcbbde7741765 SOURCES/mockito-3.1.2.tar.xz
6d394056159acd57b2be3318e1df7ab298b05402 mockito-1.10.19.tar.xz

View File

@ -1,698 +0,0 @@
<?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.2</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>3.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.opentest4j</groupId>
<artifactId>opentest4j</artifactId>
<version>1.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest</artifactId>
<version>2.2</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>3.13.2</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
<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.sourceDirectory}/org/mockito/internal/creation/bytebuddy/inject/MockMethodDispatcher.class</argument>
<argument>${project.build.outputDirectory}/org/mockito/internal/creation/bytebuddy/inject/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>

View File

@ -1,76 +0,0 @@
diff --git a/src/main/java/org/mockito/internal/creation/bytebuddy/InlineBytecodeGenerator.java b/src/main/java/org/mockito/internal/creation/bytebuddy/InlineBytecodeGenerator.java
index 34b1e89..326a64f 100644
--- a/src/main/java/org/mockito/internal/creation/bytebuddy/InlineBytecodeGenerator.java
+++ b/src/main/java/org/mockito/internal/creation/bytebuddy/InlineBytecodeGenerator.java
@@ -18,8 +18,8 @@ import net.bytebuddy.dynamic.ClassFileLocator;
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 org.objectweb.asm.ClassVisitor;
+import org.objectweb.asm.MethodVisitor;
import net.bytebuddy.matcher.ElementMatchers;
import net.bytebuddy.pool.TypePool;
import net.bytebuddy.utility.OpenedClassReader;
diff --git a/src/test/java/org/mockito/internal/creation/bytebuddy/AbstractByteBuddyMockMakerTest.java b/src/test/java/org/mockito/internal/creation/bytebuddy/AbstractByteBuddyMockMakerTest.java
index 2b08c10..a19ffa1 100644
--- a/src/test/java/org/mockito/internal/creation/bytebuddy/AbstractByteBuddyMockMakerTest.java
+++ b/src/test/java/org/mockito/internal/creation/bytebuddy/AbstractByteBuddyMockMakerTest.java
@@ -19,6 +19,7 @@ import org.mockito.plugins.MockMaker;
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 abstract class AbstractByteBuddyMockMakerTest<MM extends MockMaker> {
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();
diff --git a/src/test/java/org/mockito/internal/junit/JUnitRuleTest.java b/src/test/java/org/mockito/internal/junit/JUnitRuleTest.java
index 7d5968d..f5c1644 100644
--- a/src/test/java/org/mockito/internal/junit/JUnitRuleTest.java
+++ b/src/test/java/org/mockito/internal/junit/JUnitRuleTest.java
@@ -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 @@ public class JUnitRuleTest {
@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
diff --git a/src/test/java/org/mockitointegration/NoJUnitDependenciesTest.java b/src/test/java/org/mockitointegration/NoJUnitDependenciesTest.java
index 85e0113..64f2083 100644
--- a/src/test/java/org/mockitointegration/NoJUnitDependenciesTest.java
+++ b/src/test/java/org/mockitointegration/NoJUnitDependenciesTest.java
@@ -12,6 +12,7 @@ import org.junit.Test;
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 @@ public class NoJUnitDependenciesTest {
Matcher.class,
ByteBuddy.class,
ByteBuddyAgent.class,
+ ClassVisitor.class,
Objenesis.class
)
.withCodeSourceUrlOf(coverageTool())

29
fix-bnd-config.patch Normal file
View File

@ -0,0 +1,29 @@
--- conf/mockito-core.bnd.orig 2014-12-31 16:43:56.000000000 +0000
+++ 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.*

View File

@ -0,0 +1,12 @@
diff --git a/src/org/mockito/internal/creation/instance/ObjenesisInstantiator.java b/src/org/mockito/internal/creation/instance/ObjenesisInstantiator.java
index 1ca0003..15172bd 100644
--- a/src/org/mockito/internal/creation/instance/ObjenesisInstantiator.java
+++ b/src/org/mockito/internal/creation/instance/ObjenesisInstantiator.java
@@ -11,6 +11,6 @@ class ObjenesisInstantiator implements Instantiator {
private final ObjenesisStd objenesis = new ObjenesisStd(new GlobalConfiguration().enableClassCache());
public <T> T newInstance(Class<T> cls) {
- return objenesis.newInstance(cls);
+ return (T) objenesis.newInstance(cls);
}
}

87
fixup-ant-script.patch Normal file
View File

@ -0,0 +1,87 @@
--- build.xml.orig 2014-12-31 16:43:56.000000000 +0000
+++ 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">

View File

@ -1,6 +1,6 @@
#!/bin/bash -ex
VERSION="$(sed -n 's/Version:\s*//p' *.spec)"
VERSION=1.10.19
SRCDIR=mockito-${VERSION}
git clone https://github.com/mockito/mockito.git ${SRCDIR}
@ -13,8 +13,8 @@ rm -rf ${SRCDIR}
tar -xf ${SRCDIR}.tar
rm ${SRCDIR}.tar
pushd ${SRCDIR}
find -name '*.jar' -delete
rm -rf gradlew gradlew.bat src/javadoc
rm -rf `find -name *.jar` build.gradle cglib-and-asm doc gradle gradlew gradlew.bat javadoc
dos2unix `find -name *.java`
popd
tar -cvJf mockito-${VERSION}.tar.xz ${SRCDIR}

39
mockito-matcher.patch Normal file
View File

@ -0,0 +1,39 @@
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

View File

@ -1,33 +1,34 @@
Name: mockito
Version: 3.1.2
Release: 2%{?dist}
Summary: Tasty mocking framework for unit tests in Java
Version: 1.10.19
Release: 17%{?dist}
Summary: A Java mocking framework
License: MIT
URL: https://site.mockito.org/
BuildArch: noarch
# Source tarball and the script to generate it
URL: http://%{name}.org
Source0: %{name}-%{version}.tar.xz
Source1: make-mockito-sourcetarball.sh
Source1: make-%{name}-sourcetarball.sh
Patch0: fixup-ant-script.patch
Patch1: fix-bnd-config.patch
Patch2: %{name}-matcher.patch
# Workaround for NPE in setting NamingPolicy in cglib
Patch3: setting-naming-policy.patch
# because we have old objenesis
Patch4: fix-incompatible-types.patch
# A custom build script to allow building with maven instead of gradle
Source2: mockito-core.pom
BuildArch: noarch
BuildRequires: javapackages-local
BuildRequires: java-devel
BuildRequires: ant
BuildRequires: objenesis
BuildRequires: cglib
BuildRequires: junit
BuildRequires: hamcrest
BuildRequires: aqute-bnd
# Mockito expects byte-buddy to have a shaded/bundled version of ASM, but
# we don't bundle in Fedora, so this patch makes mockito use ASM explicitly
Patch0: use-unbundled-asm.patch
BuildRequires: maven-local
BuildRequires: mvn(junit:junit)
BuildRequires: mvn(net.bytebuddy:byte-buddy)
BuildRequires: mvn(net.bytebuddy:byte-buddy-agent)
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
BuildRequires: mvn(org.assertj:assertj-core)
BuildRequires: mvn(org.codehaus.mojo:exec-maven-plugin)
BuildRequires: mvn(org.hamcrest:hamcrest)
BuildRequires: mvn(org.objenesis:objenesis)
BuildRequires: mvn(org.opentest4j:opentest4j)
BuildRequires: mvn(org.ow2.asm:asm)
Requires: objenesis
Requires: cglib
Requires: junit
Requires: hamcrest
%description
Mockito is a mocking framework that tastes really good. It lets you write
@ -36,70 +37,58 @@ because the tests are very readable and they produce clean verification
errors.
%package javadoc
Summary: Javadocs for %{name}
Summary: Javadocs for %{name}
%description javadoc
This package contains the API documentation for %{name}.
%prep
%setup -q
%patch0 -p1
%patch0
%patch1
%patch2 -p1
%patch3 -p1
%patch4 -p1
# Use our custom build script
sed -e 's/@VERSION@/%{version}/' %{SOURCE2} > pom.xml
%pom_add_dep net.sf.cglib:cglib:3.1 maven/mockito-core.pom
find . -name "*.java" -exec sed -i "s|org\.%{name}\.cglib|net\.sf\.cglib|g" {} +
mkdir -p lib/compile
# OGGi metadata configuration
cat > osgi.bnd <<EOF
Automatic-Module-Name: org.mockito
Bundle-SymbolicName: org.mockito
Bundle-Name: Mockito Mock Library for Java.
Import-Package: junit.*;resolution:=optional,org.junit.*;resolution:=optional,org.hamcrest;resolution:=optional,org.mockito*;version="%{version}",*
Private-Package: org.mockito.*
-removeheaders: Bnd-LastModified,Include-Resource,Private-Package
EOF
# Compatibility alias
%mvn_alias org.%{name}:%{name}-core org.%{name}:%{name}-all
%pom_xpath_remove 'target[@name="javadoc"]/copy' build.xml
%build
# See the usage of exec-maven-plugin in the pom
javac src/main/java/org/mockito/internal/creation/bytebuddy/inject/MockMethodDispatcher.java
build-jar-repository lib/compile objenesis cglib junit hamcrest/core
ant jar javadoc
%mvn_build -- -Dproject.build.sourceEncoding=UTF-8
# Convert to OSGi bundle
pushd target
bnd wrap \
--version %{version} \
--output %{name}-core-%{version}.bar \
--properties ../conf/%{name}-core.bnd \
%{name}-core-%{version}.jar
mv %{name}-core-%{version}.bar %{name}-core-%{version}.jar
# Explicit Require-Bundle on hamcrest
unzip mockito-core-%{version}.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-%{version}.jar
popd
sed -i -e "s|@version@|%{version}|g" maven/%{name}-core.pom
%mvn_artifact maven/%{name}-core.pom target/%{name}-core-%{version}.jar
%mvn_alias org.%{name}:%{name}-core org.%{name}:%{name}-all
%install
%mvn_install
%mvn_install -J target/javadoc
%files -f .mfiles
%license LICENSE
%doc README.md doc/design-docs/custom-argument-matching.md
%license LICENSE NOTICE
%files javadoc -f .mfiles-javadoc
%license LICENSE
%license LICENSE NOTICE
%changelog
* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.1.2-2
- Mass rebuild for javapackages-tools 201902
* Wed Oct 16 2019 Marian Koncek <mkoncek@redhat.com> - 3.1.2-1
- Update to upstream version 3.1.2
* Thu Sep 19 2019 Marian Koncek <mkoncek@redhat.com> - 3.0.8-1
- Update to upstream version 3.0.8
* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.23.9-4
- Mass rebuild for javapackages-tools 201901
* Wed Dec 12 2018 Mat Booth <mat.booth@redhat.com> - 2.23.9-3
- Set the source encoding for the build
* Wed Dec 05 2018 Mat Booth <mat.booth@redhat.com> - 2.23.9-2
- Re-add compatibility alias for 'mockito-all'
* Tue Dec 04 2018 Mat Booth <mat.booth@redhat.com> - 2.23.9-1
- Update to latest upstream version
- Switch to maven build system using a custom pom to avoid a dep on gradle
* Fri Aug 03 2018 Michael Simacek <msimacek@redhat.com> - 1.10.19-17
- Remove bundled minified js from javadoc

View File

@ -0,0 +1,34 @@
From 04e36a01e93c3b79caa9f7e9e8573fe2a0d65d1a Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek@redhat.com>
Date: Thu, 5 Dec 2013 16:53:36 +0100
Subject: [PATCH] Setting naming policy
Signed-off-by: Michael Simacek <msimacek@redhat.com>
---
src/org/mockito/internal/creation/cglib/CGLIBHacker.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/org/mockito/internal/creation/cglib/CGLIBHacker.java b/src/org/mockito/internal/creation/cglib/CGLIBHacker.java
index 172f744..de53ab1 100644
--- a/src/org/mockito/internal/creation/cglib/CGLIBHacker.java
+++ b/src/org/mockito/internal/creation/cglib/CGLIBHacker.java
@@ -20,6 +20,9 @@ public class CGLIBHacker implements Serializable {
Field createInfoField = reflectOnCreateInfo(methodProxy);
createInfoField.setAccessible(true);
Object createInfo = createInfoField.get(methodProxy);
+ if (createInfo == null) {
+ return;
+ }
Field namingPolicyField = createInfo.getClass().getDeclaredField("namingPolicy");
namingPolicyField.setAccessible(true);
if (namingPolicyField.get(createInfo) == null) {
@@ -43,4 +46,4 @@ public class CGLIBHacker implements Serializable {
}
return cglibMethodProxyClass.getDeclaredField("createInfo");
}
-}
\ No newline at end of file
+}
--
1.8.3.1

1
sources Normal file
View File

@ -0,0 +1 @@
SHA512 (mockito-1.10.19.tar.xz) = 339f173ce800dcad8a827069f6e3b08f39e3035a9c16a7051883303e5aa61be6a127664184f2b99349fc095d208ee90cf1824b4a37e349c35bacb785eacc7297