c8-stream-201801
imports/c8-stream-201801/mockito-1.10.19-17.module+el8+2598+06babf2e
commit
548a480ccc
@ -0,0 +1 @@
|
||||
SOURCES/mockito-1.10.19.tar.xz
|
@ -0,0 +1 @@
|
||||
6d394056159acd57b2be3318e1df7ab298b05402 SOURCES/mockito-1.10.19.tar.xz
|
@ -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.*
|
||||
|
@ -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);
|
||||
}
|
||||
}
|
@ -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">
|
@ -0,0 +1,20 @@
|
||||
#!/bin/bash -ex
|
||||
|
||||
VERSION=1.10.19
|
||||
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` build.gradle cglib-and-asm doc gradle gradlew gradlew.bat javadoc
|
||||
dos2unix `find -name *.java`
|
||||
popd
|
||||
|
||||
tar -cvJf mockito-${VERSION}.tar.xz ${SRCDIR}
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -0,0 +1,209 @@
|
||||
Name: mockito
|
||||
Version: 1.10.19
|
||||
Release: 17%{?dist}
|
||||
Summary: A Java mocking framework
|
||||
|
||||
License: MIT
|
||||
URL: http://%{name}.org
|
||||
Source0: %{name}-%{version}.tar.xz
|
||||
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
|
||||
|
||||
BuildArch: noarch
|
||||
BuildRequires: javapackages-local
|
||||
BuildRequires: java-devel
|
||||
BuildRequires: ant
|
||||
BuildRequires: objenesis
|
||||
BuildRequires: cglib
|
||||
BuildRequires: junit
|
||||
BuildRequires: hamcrest
|
||||
BuildRequires: aqute-bnd
|
||||
|
||||
Requires: objenesis
|
||||
Requires: cglib
|
||||
Requires: junit
|
||||
Requires: hamcrest
|
||||
|
||||
%description
|
||||
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
|
||||
because the tests are very readable and they produce clean verification
|
||||
errors.
|
||||
|
||||
%package javadoc
|
||||
Summary: Javadocs for %{name}
|
||||
|
||||
%description javadoc
|
||||
This package contains the API documentation for %{name}.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0
|
||||
%patch1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
|
||||
%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
|
||||
|
||||
%pom_xpath_remove 'target[@name="javadoc"]/copy' build.xml
|
||||
|
||||
%build
|
||||
build-jar-repository lib/compile objenesis cglib junit hamcrest/core
|
||||
ant jar javadoc
|
||||
|
||||
# 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 -J target/javadoc
|
||||
|
||||
%files -f .mfiles
|
||||
%license LICENSE NOTICE
|
||||
|
||||
%files javadoc -f .mfiles-javadoc
|
||||
%license LICENSE NOTICE
|
||||
|
||||
%changelog
|
||||
* Fri Aug 03 2018 Michael Simacek <msimacek@redhat.com> - 1.10.19-17
|
||||
- Remove bundled minified js from javadoc
|
||||
|
||||
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.19-16
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.10.19-15
|
||||
- Escape macros in %%changelog
|
||||
|
||||
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.19-14
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.19-13
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Thu Feb 16 2017 Michael Simacek <msimacek@redhat.com> - 1.10.19-12
|
||||
- Remove conditional for EOL Fedora
|
||||
|
||||
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.19-11
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Mon Feb 22 2016 Mat Booth <mat.booth@redhat.com> - 1.10.19-10
|
||||
- Explicitly import more cglib packages in OSGi metadata to prevent mockito
|
||||
failing under certain circumstances during Eclipse test suites
|
||||
|
||||
* Fri Feb 12 2016 Mat Booth <mat.booth@redhat.com> - 1.10.19-9
|
||||
- Require hamcrest explicitly in OSGi metadata
|
||||
|
||||
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.19-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Fri Dec 25 2015 Raphael Groner <projects.rg@smart.ms> - 1.10.19-7
|
||||
- introduce License tag
|
||||
|
||||
* Fri Dec 25 2015 Raphael Groner <projects.rg@smart.ms> - 1.10.19-6
|
||||
- reenable osgi
|
||||
|
||||
* Fri Dec 18 2015 Raphael Groner <projects.rg@smart.ms> - 1.10.19-5
|
||||
- workaround rhbz#1292777 stylesheet.css not found
|
||||
|
||||
* Thu Jul 16 2015 Michael Simacek <msimacek@redhat.com> - 1.10.19-4
|
||||
- Use aqute-bnd-2.4.1
|
||||
|
||||
* Mon Jun 22 2015 Mat Booth <mat.booth@redhat.com> - 1.10.19-3
|
||||
- Switch to mvn_install
|
||||
|
||||
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.10.19-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
* Wed Apr 29 2015 Michal Srb <msrb@redhat.com> - 1.10.19-1
|
||||
- Update to 1.10.19
|
||||
|
||||
* Mon Aug 25 2014 Darryl L. Pierce <dpierce@redhat.com> - 1.9.0-18
|
||||
- First build for EPEL7
|
||||
- Resolves: BZ#1110030
|
||||
|
||||
* Mon Jun 09 2014 Omair Majid <omajid@redhat.com> - 1.9.0-17
|
||||
- Use .mfiles to pick up xmvn metadata
|
||||
- Don't use obsolete _mavenpomdir and _mavendepmapfragdir macros
|
||||
- Fix FTBFS
|
||||
|
||||
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.9.0-17
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||
|
||||
* Thu May 22 2014 Severin Gehwolf <sgehwolf@redhat.com> - 1.9.0-16
|
||||
- Use junit R/BR over junit4.
|
||||
|
||||
* Fri Mar 28 2014 Michael Simacek <msimacek@redhat.com> - 1.9.0-15
|
||||
- Use Requires: java-headless rebuild (#1067528)
|
||||
|
||||
* Wed Dec 11 2013 Michael Simacek <msimacek@redhat.com> - 1.9.0-14
|
||||
- Workaround for NPE in setting NamingPolicy
|
||||
|
||||
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.9.0-13
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||
|
||||
* Mon Mar 25 2013 Tomas Radej <tradej@redhat.com> - 1.9.0-12
|
||||
- Patched LocalizedMatcher due to hamcrest update, (bug upstream)
|
||||
|
||||
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.9.0-11
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
||||
|
||||
* Thu Sep 6 2012 Severin Gehwolf <sgehwolf@redhat.com> 1.9.0-10
|
||||
- More Import-Package fixes. Note that fix-cglib-refs.patch is
|
||||
not suitable for upstream: issue id=373
|
||||
|
||||
* Tue Sep 4 2012 Severin Gehwolf <sgehwolf@redhat.com> 1.9.0-9
|
||||
- Fix missing Import-Package in manifest.
|
||||
|
||||
* Mon Aug 27 2012 Severin Gehwolf <sgehwolf@redhat.com> 1.9.0-8
|
||||
- Add aqute bnd instructions for OSGi metadata
|
||||
|
||||
* Fri Jul 20 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.9.0-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||
|
||||
* Mon Apr 30 2012 Roman Kennke <rkennke@redhat.com> 1.9.0-6
|
||||
- Place JavaDoc in directly under %%{_javadocdir}/%%{name} instead
|
||||
of %%{_javadocdir}/%%{name}/javadoc
|
||||
|
||||
* Wed Apr 25 2012 Roman Kennke <rkennke@redhat.com> 1.9.0-5
|
||||
- Removed post/postun hook for update_maven_depmap
|
||||
|
||||
* Tue Apr 24 2012 Roman Kennke <rkennke@redhat.com> 1.9.0-4
|
||||
- Fix groupId of cglib dependency
|
||||
- Add additional depmap for mockito-all
|
||||
- Update depmap on post and postun
|
||||
- Fix version in pom
|
||||
|
||||
* Wed Feb 22 2012 Roman Kennke <rkennke@redhat.com> 1.9.0-3
|
||||
- Added cglib dependency to pom
|
||||
|
||||
* Tue Feb 21 2012 Roman Kennke <rkennke@redhat.com> 1.9.0-2
|
||||
- Include upstream Maven pom.xml in package
|
||||
- Added missing Requires for cglib, junit4, hamcrest, objenesis
|
||||
- Added source tarball generating script to sources
|
||||
|
||||
* Thu Feb 16 2012 Roman Kennke <rkennke@redhat.com> 1.9.0-1
|
||||
- Initial package
|
Loading…
Reference in new issue