This is an automated email from the ASF dual-hosted git repository. sruehl pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
The following commit(s) were added to refs/heads/master by this push: new d594ff6 [General] updated mockito and added assertj for easier testing. d594ff6 is described below commit d594ff64a9e4df30f7d92b6ab8c781f9b298e5e8 Author: Sebastian Rühl <sru...@apache.org> AuthorDate: Thu Sep 27 12:15:05 2018 +0200 [General] updated mockito and added assertj for easier testing. --- plc4j/protocols/driver-bases/base/pom.xml | 5 +++++ plc4j/protocols/driver-bases/test/pom.xml | 6 ++++++ pom.xml | 26 ++++++++++++++++++++++++-- 3 files changed, 35 insertions(+), 2 deletions(-) diff --git a/plc4j/protocols/driver-bases/base/pom.xml b/plc4j/protocols/driver-bases/base/pom.xml index 82c90c0..66753a7 100644 --- a/plc4j/protocols/driver-bases/base/pom.xml +++ b/plc4j/protocols/driver-bases/base/pom.xml @@ -65,6 +65,11 @@ <artifactId>logback-classic</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>org.assertj</groupId> + <artifactId>assertj-core</artifactId> + <version>3.9.1</version> + </dependency> </dependencies> </project> \ No newline at end of file diff --git a/plc4j/protocols/driver-bases/test/pom.xml b/plc4j/protocols/driver-bases/test/pom.xml index 830ea1b..e70cd2c 100644 --- a/plc4j/protocols/driver-bases/test/pom.xml +++ b/plc4j/protocols/driver-bases/test/pom.xml @@ -73,6 +73,12 @@ <scope>compile</scope> </dependency> <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-junit-jupiter</artifactId> + <!-- This is a compile dependency for this test artifact --> + <scope>compile</scope> + </dependency> + <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> </dependency> diff --git a/pom.xml b/pom.xml index 85fcfc2..b4b2867 100644 --- a/pom.xml +++ b/pom.xml @@ -98,7 +98,8 @@ <junit.jupiter.version>5.2.0</junit.jupiter.version> <junit.platform.version>1.2.0</junit.platform.version> <logback.version>1.2.3</logback.version> - <mockito.version>2.13.0</mockito.version> + <mockito.version>2.22.0</mockito.version> + <assertj.version>3.11.1</assertj.version> <netty.version>4.1.23.Final</netty.version> <pcap4j.version>1.7.3</pcap4j.version> <slf4j.version>1.7.25</slf4j.version> @@ -245,6 +246,17 @@ <version>${mockito.version}</version> </dependency> <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-junit-jupiter</artifactId> + <version>${mockito.version}</version> + </dependency> + <dependency> + <groupId>org.assertj</groupId> + <artifactId>assertj-core</artifactId> + <version>${assertj.version}</version> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> <version>${slf4j.version}</version> @@ -1051,7 +1063,16 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>2.13.0</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-junit-jupiter</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.assertj</groupId> + <artifactId>assertj-core</artifactId> <scope>test</scope> </dependency> </dependencies> @@ -1089,6 +1110,7 @@ <ignoredDependency>org.hamcrest:hamcrest-core</ignoredDependency> <ignoredDependency>org.hamcrest:hamcrest-library</ignoredDependency> <ignoredDependency>org.mockito:mockito-core</ignoredDependency> + <ignoredDependency>org.mockito:mockito-junit-jupiter</ignoredDependency> <ignoredDependency>org.slf4j:slf4j-api</ignoredDependency> <ignoredDependency>ch.qos.logback:logback-classic</ignoredDependency> </ignoredDependencies>