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

BAEL-8143 Update Mockito articles

Browse Source 
-Mockito version fixes
-MessageMatcher implementation changed as ArugmentMatcher is an Interface now
This commit is contained in:
Dhawal Kapil 2018-08-16 14:33:58 +05:30
parent aa28e56545
commit fb61a7ea3a
3 changed files with 8 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
spring-core/pom.xml
View File

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

2
spring-mockito/pom.xml
View File

@ -24,7 +24,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.mockito</groupId> <groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId> <artifactId>mockito-core</artifactId>
<version>${mockito.version}</version> <version>${mockito.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>

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