Skip to content

Commit

Permalink
Merge pull request #146 from zalando/dependabot/maven/org.mockito-moc…
Browse files Browse the repository at this point in the history
…kito-core-3.4.4

Bump mockito-core from 3.3.3 to 3.4.4
  • Loading branch information
Willi Schönborn committed Jul 29, 2020
2 parents 00fda59 + 5d0437f commit 8af3a60
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 8 deletions.
9 changes: 8 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
<maven.compiler.target>1.8</maven.compiler.target>
<slf4j.version>1.7.30</slf4j.version>
<junit-jupiter.version>5.6.2</junit-jupiter.version>
<mockito.version>3.4.4</mockito.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -110,7 +111,13 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.3.3</version>
<version>${mockito.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-junit-jupiter</artifactId>
<version>${mockito.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
10 changes: 3 additions & 7 deletions src/test/java/org/zalando/fauxpas/FailedWithTest.java
Original file line number Diff line number Diff line change
@@ -1,26 +1,22 @@
package org.zalando.fauxpas;

import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.mockito.junit.jupiter.MockitoExtension;

import java.util.concurrent.CompletableFuture;

import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoInteractions;
import static org.zalando.fauxpas.FauxPas.failedWith;

@ExtendWith(MockitoExtension.class)
class FailedWithTest {

@Mock
private ThrowingConsumer<Throwable, Throwable> action;

@BeforeEach
void init() {
MockitoAnnotations.initMocks(this);
}

@Test
void shouldMatch() throws Throwable {
final CompletableFuture<String> original = new CompletableFuture<>();
Expand Down

0 comments on commit 8af3a60

Please sign in to comment.