iSharkFly-Docs
/
java-tutorials
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4977 from dkapil/task/BAEL-8143 

Task/bael 8143
This commit is contained in:
Loredana Crusoveanu 2018-08-16 22:26:39 +03:00 committed by GitHub
parent 89d48625f9 6019d03fbf
commit 72e3444eb2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 16 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
aws/pom.xml
View File

@ -137,7 +137,7 @@
<aws-lambda-java-core.version>1.1.0</aws-lambda-java-core.version>
<gson.version>2.8.0</gson.version>
<aws-java-sdk.version>1.11.290</aws-java-sdk.version>
<mockito-core.version>2.8.9</mockito-core.version>
<mockito-core.version>2.21.0</mockito-core.version>
<assertj-core.version>3.8.0</assertj-core.version>
<dynamodblocal.version>1.11.86</dynamodblocal.version>
<dynamodblocal.repository.url>https://s3-us-west-2.amazonaws.com/dynamodb-local/release</dynamodblocal.repository.url>

2
ethereum/pom.xml
View File

@ -213,7 +213,7 @@
<web3j.core.version>3.3.1</web3j.core.version>
<springframework.version>5.0.5.RELEASE</springframework.version>
<spring.boot.version>1.5.6.RELEASE</spring.boot.version>
<mockito.version>1.10.19</mockito.version>
<mockito.version>2.21.0</mockito.version>
<jackson-databind.version>2.5.0</jackson-databind.version>
<hamcrest.version>1.3</hamcrest.version>
<jackson.version>2.9.3</jackson.version>

2
javax-servlets/pom.xml
View File

@ -84,7 +84,7 @@
<spring-test.version>5.0.5.RELEASE</spring-test.version>
<gson.version>2.8.2</gson.version>
<assertj.version>3.9.1</assertj.version>
<mockito.version>2.18.3</mockito.version>
<mockito.version>2.21.0</mockito.version>
<commons-fileupload.version>1.3.3</commons-fileupload.version>
<commons-io.version>2.6</commons-io.version>
<javax.servlet-api.version>4.0.1</javax.servlet-api.version>

2
pom.xml
View File

@ -1238,7 +1238,7 @@
<!-- <gib.enabled>false</gib.enabled> -->
<junit.version>4.12</junit.version>
<org.hamcrest.version>1.3</org.hamcrest.version>
<mockito.version>2.8.9</mockito.version>
<mockito.version>2.21.0</mockito.version>
<!-- logging -->
<org.slf4j.version>1.7.21</org.slf4j.version>
<logback.version>1.1.7</logback.version>

13
spring-core/pom.xml
View File

@ -16,11 +16,6 @@
</parent>
<dependencies>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<version>${mockito.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
@ -82,15 +77,7 @@
</plugins>
</build>
<repositories>
<repository>
<id>java.net</id>
<url>https://maven.java.net/content/repositories/releases/</url>
</repository>
</repositories>
<properties>
<mockito.version>1.10.19</mockito.version>
<mockito.spring.boot.version>1.4.4.RELEASE</mockito.spring.boot.version>
<javax.inject.version>1</javax.inject.version>
<guava.version>20.0</guava.version>

4
spring-mockito/pom.xml
View File

@ -24,13 +24,13 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<artifactId>mockito-core</artifactId>
<version>${mockito.version}</version>
</dependency>
</dependencies>
<properties>
<mockito.version>1.10.19</mockito.version>
<mockito.version>2.21.0</mockito.version>
</properties>
</project>

19
spring-mockito/src/main/java/com/baeldung/domain/util/MessageMatcher.java
View File

@ -3,7 +3,7 @@ package com.baeldung.domain.util;
import com.baeldung.domain.model.Message;
import org.mockito.ArgumentMatcher;
public class MessageMatcher extends ArgumentMatcher<Message> {
public class MessageMatcher implements ArgumentMatcher<Message> {
private Message left;
@ -12,16 +12,11 @@ public class MessageMatcher extends ArgumentMatcher<Message> {
}
@Override
public boolean matches(Object object) {
if (object instanceof Message) {
Message right = (Message) object;
return left.getFrom().equals(right.getFrom()) &&
left.getTo().equals(right.getTo()) &&
left.getText().equals(right.getText()) &&
right.getDate() != null &&
right.getId() != null;
}
return false;
public boolean matches(Message right) {
return left.getFrom().equals(right.getFrom()) &&
left.getTo().equals(right.getTo()) &&
left.getText().equals(right.getText()) &&
right.getDate() != null &&
right.getId() != null;
}
}

2
testing-modules/mockito-2/pom.xml
View File

@ -15,6 +15,6 @@
</parent>
<properties>
<mockito.version>2.8.9</mockito.version>
<mockito.version>2.21.0</mockito.version>
</properties>
</project>

2
testing-modules/mocks/mock-comparisons/pom.xml
View File

@ -46,7 +46,7 @@
</build>
<properties>
<mockito.version>2.9.0</mockito.version>
<mockito.version>2.21.0</mockito.version>
<easymock.version>3.5.1</easymock.version>
<jmockit.version>1.34</jmockit.version>
</properties>

2
testing-modules/test-containers/pom.xml
View File

@ -104,7 +104,7 @@
<junit.vintage.version>4.12.1</junit.vintage.version>
<log4j2.version>2.8.2</log4j2.version>
<h2.version>1.4.196</h2.version>
<mockito.version>2.11.0</mockito.version>
<mockito.version>2.21.0</mockito.version>
<spring.version>5.0.1.RELEASE</spring.version>
<testcontainers.version>1.7.2</testcontainers.version>
<postgresql.version>42.2.2</postgresql.version>