You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by cd...@apache.org on 2019/01/16 21:01:01 UTC
[incubator-plc4x] branch develop updated: - Fixed some tests now
failling due to the tape change of blockNumber and byteOffset
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
The following commit(s) were added to refs/heads/develop by this push:
new 248068e - Fixed some tests now failling due to the tape change of blockNumber and byteOffset
248068e is described below
commit 248068ebc7208f4c566d08f187d1c8e61852c391
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Wed Jan 16 22:00:58 2019 +0100
- Fixed some tests now failling due to the tape change of blockNumber and byteOffset
---
.../test/java/org/apache/plc4x/java/s7/model/S7FieldTests.java | 8 +++-----
.../org/apache/plc4x/java/s7/netty/Plc4XS7ProtocolTest.java | 8 ++++----
.../plc4x/java/s7/netty/model/messages/S7MessageTests.java | 9 ++++-----
.../s7/netty/strategies/DefaultS7MessageProcessorTest.java | 10 +++++-----
4 files changed, 16 insertions(+), 19 deletions(-)
diff --git a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/model/S7FieldTests.java b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/model/S7FieldTests.java
index 0f3545e..015562d 100644
--- a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/model/S7FieldTests.java
+++ b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/model/S7FieldTests.java
@@ -33,9 +33,7 @@ import java.util.stream.Stream;
import static org.hamcrest.core.IsEqual.equalTo;
import static org.hamcrest.core.IsNull.notNullValue;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.*;
class S7FieldTests {
@@ -70,8 +68,8 @@ class S7FieldTests {
assertThat(field, notNullValue());
assertThat(field.getDataType(), equalTo(expectedClientType));
assertThat(field.getMemoryArea(), equalTo(expectedMemoryArea));
- assertThat(field.getBlockNumber(), equalTo((short) expectedMemoryBlockNumber));
- assertThat(field.getByteOffset(), equalTo((short) expectedByteOffset));
+ assertThat(field.getBlockNumber(), equalTo(expectedMemoryBlockNumber));
+ assertThat(field.getByteOffset(), equalTo(expectedByteOffset));
assertThat(field.getBitOffset(), equalTo((short) expectedBitOffset));
}
diff --git a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/Plc4XS7ProtocolTest.java b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/Plc4XS7ProtocolTest.java
index d4f401b..b2d4111 100644
--- a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/Plc4XS7ProtocolTest.java
+++ b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/Plc4XS7ProtocolTest.java
@@ -128,8 +128,8 @@ public class Plc4XS7ProtocolTest {
S7AnyVarParameterItem s7AnyVarParameterItem = (S7AnyVarParameterItem) varParameter.getItems().get(0);
assertThat(s7AnyVarParameterItem.getSpecificationType(), equalTo(SpecificationType.VARIABLE_SPECIFICATION));
assertThat(s7AnyVarParameterItem.getMemoryArea(), equalTo(MemoryArea.OUTPUTS));
- assertThat(s7AnyVarParameterItem.getDataBlockNumber(), equalTo((short) 0));
- assertThat(s7AnyVarParameterItem.getByteOffset(), equalTo((short) 0));
+ assertThat(s7AnyVarParameterItem.getDataBlockNumber(), equalTo(0));
+ assertThat(s7AnyVarParameterItem.getByteOffset(), equalTo(0));
assertThat(s7AnyVarParameterItem.getBitOffset(), equalTo((byte) 0));
assertThat(s7AnyVarParameterItem.getNumElements(), equalTo(1));
assertThat(s7AnyVarParameterItem.getDataType(), equalTo(TransportSize.BYTE));
@@ -163,8 +163,8 @@ public class Plc4XS7ProtocolTest {
S7AnyVarParameterItem s7AnyVarParameterItem = (S7AnyVarParameterItem) varParameter.getItems().get(0);
assertThat(s7AnyVarParameterItem.getSpecificationType(), equalTo(SpecificationType.VARIABLE_SPECIFICATION));
assertThat(s7AnyVarParameterItem.getMemoryArea(), equalTo(MemoryArea.OUTPUTS));
- assertThat(s7AnyVarParameterItem.getDataBlockNumber(), equalTo((short) 0));
- assertThat(s7AnyVarParameterItem.getByteOffset(), equalTo((short) 0));
+ assertThat(s7AnyVarParameterItem.getDataBlockNumber(), equalTo(0));
+ assertThat(s7AnyVarParameterItem.getByteOffset(), equalTo(0));
assertThat(s7AnyVarParameterItem.getBitOffset(), equalTo((byte) 0));
assertThat(s7AnyVarParameterItem.getNumElements(), equalTo(1));
assertThat(s7AnyVarParameterItem.getDataType(), equalTo(TransportSize.BYTE));
diff --git a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/model/messages/S7MessageTests.java b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/model/messages/S7MessageTests.java
index 0d5ba10..27c2cd1 100644
--- a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/model/messages/S7MessageTests.java
+++ b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/model/messages/S7MessageTests.java
@@ -28,7 +28,6 @@ import org.apache.plc4x.java.s7.netty.model.payloads.S7Payload;
import org.apache.plc4x.java.s7.netty.model.payloads.VarPayload;
import org.apache.plc4x.java.s7.netty.model.payloads.items.VarPayloadItem;
import org.apache.plc4x.java.s7.netty.model.types.*;
-import org.apache.plc4x.java.s7.netty.model.types.TransportSize;
import org.apache.plc4x.test.FastTests;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -172,8 +171,8 @@ public class S7MessageTests {
MemoryArea memoryArea = MemoryArea.DATA_BLOCKS;
TransportSize dataType = TransportSize.INT;
int numElements = 1;
- byte dataBlock = (byte) 0x1;
- byte byteOffset = (byte) 0x10;
+ int dataBlock = 0x1;
+ int byteOffset = 0x10;
byte bitOffset = (byte) 0x0;
S7AnyVarParameterItem parameterItem = new S7AnyVarParameterItem(
@@ -183,8 +182,8 @@ public class S7MessageTests {
assertThat("Unexpected memory area", parameterItem.getMemoryArea(), equalTo(MemoryArea.DATA_BLOCKS));
assertThat("Unexpected transport size", parameterItem.getDataType(), equalTo(dataType));
assertThat("Unexpected number elements", parameterItem.getNumElements(), equalTo(numElements));
- assertThat("Unexpected data block", parameterItem.getDataBlockNumber(), equalTo((short) dataBlock));
- assertThat("Unexpected byte offset", parameterItem.getByteOffset(), equalTo((short) byteOffset));
+ assertThat("Unexpected data block", parameterItem.getDataBlockNumber(), equalTo(dataBlock));
+ assertThat("Unexpected byte offset", parameterItem.getByteOffset(), equalTo(byteOffset));
assertThat("Unexpected bit offset", parameterItem.getBitOffset(), equalTo(bitOffset));
assertThat("Unexpected adressing mode", parameterItem.getAddressingMode(), equalTo(VariableAddressingMode.S7ANY));
}
diff --git a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/strategies/DefaultS7MessageProcessorTest.java b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/strategies/DefaultS7MessageProcessorTest.java
index 3b6405d..9e087b4 100644
--- a/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/strategies/DefaultS7MessageProcessorTest.java
+++ b/plc4j/protocols/s7/src/test/java/org/apache/plc4x/java/s7/netty/strategies/DefaultS7MessageProcessorTest.java
@@ -396,7 +396,7 @@ public class DefaultS7MessageProcessorTest {
S7RequestMessage request = createWriteMessage(
Collections.singletonList(
new S7AnyVarParameterItem(SpecificationType.VARIABLE_SPECIFICATION, MemoryArea.DATA_BLOCKS,
- TransportSize.BYTE, (short) 10, (short) 1, (short) 0, (byte) 0)),
+ TransportSize.BYTE, 10, 1, (short) 0, (byte) 0)),
Collections.singletonList(
new VarPayloadItem(DataTransportErrorCode.OK, DataTransportSize.BYTE_WORD_DWORD, new byte[] {
0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A}))
@@ -404,9 +404,9 @@ public class DefaultS7MessageProcessorTest {
Collection<S7RequestMessage> processedRequests = SUT.processRequest(request, 250);
// Initialize a set of expected fields.
- Set<Short> expectedFields = new HashSet<>(10);
+ Set<Integer> expectedFields = new HashSet<>(10);
for(int i = 0; i < 10; i++) {
- expectedFields.add((short) i);
+ expectedFields.add(i);
}
// We are expecting to receive 10 messages as we had an array of 10 items.
@@ -475,9 +475,9 @@ public class DefaultS7MessageProcessorTest {
Collection<S7RequestMessage> processedRequests = SUT.processRequest(request, 250);
// Initialize a set of expected fields.
- Set<Short> expectedFields = new HashSet<>(10);
+ Set<Integer> expectedFields = new HashSet<>(10);
for(int i = 0; i < 10; i++) {
- expectedFields.add((short) (i * 4));
+ expectedFields.add((i * 4));
}
// We are expecting to receive 10 messages as we had an array of 10 items.