You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by sr...@apache.org on 2018/02/16 18:52:13 UTC
[incubator-plc4x] 02/03: post merge fixes
This is an automated email from the ASF dual-hosted git repository.
sruehl pushed a commit to branch hamcrest_migration
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit 98c1a422c120dff3d972ef18ed2f936a8c4b7245
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Fri Feb 16 19:50:21 2018 +0100
post merge fixes
---
.../plc4x/java/s7/netty/model/types/S7TypeTests.java | 19 ++++++++-----------
1 file changed, 8 insertions(+), 11 deletions(-)
diff --git a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/model/types/S7TypeTests.java b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/model/types/S7TypeTests.java
index fcb6e63..748e4ab 100644
--- a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/model/types/S7TypeTests.java
+++ b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/model/types/S7TypeTests.java
@@ -45,10 +45,9 @@ public class S7TypeTests {
DataTransportErrorCode dataTransportErrorCode = DataTransportErrorCode.INVALID_ADDRESS;
assertThat(DataTransportErrorCode.valueOf((byte) 0xFE), nullValue());
- assertThat(DataTransportErrorCode.valueOf((byte)0xFE)).isNull();
+ assertThat(DataTransportErrorCode.valueOf((byte) 0xFE), nullValue());
- DataTransportErrorCode dataTransportErrorCode = DataTransportErrorCode.INVALID_ADDRESS;
- assertThat(dataTransportErrorCode.getCode()).isEqualTo((byte) 0x05).withFailMessage("code is not 0x05");
+ assertThat(dataTransportErrorCode.getCode(), equalTo((byte) 0x05));
}
@Test
@@ -64,10 +63,10 @@ public class S7TypeTests {
@Test
@Category(FastTests.class)
public void headerErrorClass() {
- assertThat(HeaderErrorClass.valueOf((byte) 0x87)).isEqualTo(HeaderErrorClass.ACCESS_ERROR).withFailMessage("0x87 incorrectly mapped");
+ assertThat("incorrectly mapped", HeaderErrorClass.valueOf((byte) 0x87), equalTo(HeaderErrorClass.ACCESS_ERROR));
HeaderErrorClass headerErrorClass = HeaderErrorClass.ACCESS_ERROR;
- assertThat(headerErrorClass.getCode()).isEqualTo((byte) 0x87).withFailMessage("code is not 0x87");
+ assertThat(headerErrorClass.getCode(), equalTo((byte) 0x87));
}
@Test
@@ -77,19 +76,18 @@ public class S7TypeTests {
assertThat("2 incorrectly mapped", MessageType.valueOf((byte) 2), equalTo(MessageType.ACK));
assertThat("code is not 2", messageType.getCode(), equalTo((byte) 2));
- assertThat(MessageType.valueOf((byte)2)).isEqualTo(MessageType.ACK).withFailMessage("2 incorrectly mapped");
+ assertThat("2 incorrectly mapped", MessageType.valueOf((byte) 2), equalTo(MessageType.ACK));
- MessageType messageType = MessageType.ACK;
- assertThat(messageType.getCode()).isEqualTo((byte)2).withFailMessage("code is not 2");
+ assertThat(messageType.getCode(), equalTo((byte) 2));
}
@Test
@Category(FastTests.class)
public void parameterError() {
- assertThat(ParameterError.valueOf((short) 0x011C)).isEqualTo(ParameterError.PROTOCOL_ERROR).withFailMessage("0x011C incorrectly mapped");;
+ assertThat("incorrectly mapped", ParameterError.valueOf((short) 0x011C), equalTo(ParameterError.PROTOCOL_ERROR));
ParameterError parameterError = ParameterError.PROTOCOL_ERROR;
- assertThat(parameterError.getCode()).isEqualTo((short) 0x011C).withFailMessage("code is not 0x011C");
+ assertThat(parameterError.getCode(), equalTo((short) 0x011C));
}
@Test
@@ -107,7 +105,6 @@ public class S7TypeTests {
ParameterType parameterType = ParameterType.UPLOAD;
assertThat(ParameterType.valueOf((byte) 0xFF), nullValue());
- ;
}
@Test
--
To stop receiving notification emails like this one, please contact
sruehl@apache.org.