rpms/mockito
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to upstream version 3.4.5

Browse Source
This commit is contained in:
Marian Koncek 2020-07-22 13:34:51 +02:00
parent c767ee45c6
commit e400377077
3 changed files with 36 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mockito.spec
View File

@ -1,6 +1,6 @@
Name: mockito
Version: 3.1.2
Release: 2%{?dist}
Version: 3.4.5
Release: 1%{?dist}
Summary: Tasty mocking framework for unit tests in Java
License: MIT
URL: https://site.mockito.org/
@ -79,6 +79,9 @@ mv target/classes/org/mockito/internal/creation/bytebuddy/inject/MockMethodDispa
%license LICENSE
%changelog
* Wed Jul 22 2020 Marian Koncek <mkoncek@redhat.com> - 3.4.5-1
- Update to upstream version 3.4.5
* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.1.2-2
- Mass rebuild for javapackages-tools 201902

2
sources
View File

@ -1 +1 @@
SHA512 (mockito-3.1.2.tar.xz) = f151abde97ed310be00e2e7359030e3cba3b7c06bb5c38faa9c84979e81e0582f6a6503e370d61eed36ed64fcdc2f52aa30b3f2cf2f6cd03fbc298bf57862f67
SHA512 (mockito-3.4.5.tar.xz) = d85b7de6b2d286f5e6cd6b5e871f7354f66a106462bab78221df8cfc1c3a393a2f92c32ecdd297467b32f4fc9c21c362b9334d0834b3f04b255ea03b334cb2e6

60
use-unbundled-asm.patch
View File

@ -1,8 +1,8 @@
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
index 187f1ea..f8fa355 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;
@@ -30,8 +30,8 @@ import net.bytebuddy.dynamic.ClassFileLocator;
import net.bytebuddy.dynamic.scaffold.MethodGraph;
import net.bytebuddy.dynamic.scaffold.TypeValidation;
import net.bytebuddy.implementation.Implementation;
@ -14,63 +14,63 @@ index 34b1e89..326a64f 100644
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
index f5b807a..c9ca662 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;
@@ -26,6 +26,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 {
public abstract class AbstractByteBuddyMockMakerTest<MM extends MockMaker> {
@@ -154,7 +155,7 @@ public abstract class AbstractByteBuddyMockMakerTest<MM extends MockMaker> {
// 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();
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
index f971893..63af9cd 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;
@@ -8,6 +8,7 @@ import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mockingDetails;
import static org.mockito.Mockito.when;
+import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
import org.mockito.Mock;
@@ -41,6 +42,7 @@ public class JUnitRuleTest {
@@ -42,6 +43,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
// 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
index 9cd47da..356a3e0 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;
@@ -16,6 +16,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())
public class NoJUnitDependenciesTest {
@@ -32,6 +33,7 @@ public class NoJUnitDependenciesTest {
Matcher.class,
ByteBuddy.class,
ByteBuddyAgent.class,
+ ClassVisitor.class,
Objenesis.class)
.withCodeSourceUrlOf(coverageTool())
.without("junit", "org.junit", "org.opentest4j")