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 cb3082f added test for serial protocol and added todo for
implementing a crc-16
cb3082f is described below
commit cb3082f5a3fc2028bafbf38af97dba86b365ceb4
Author: Sebastian Rühl <sru...@apache.org>
AuthorDate: Thu Mar 8 12:39:41 2018 +0100
added test for serial protocol and added todo for implementing a crc-16
---
.../plc4x/java/ads/api/serial/AMSSerialFrame.java | 8 +
.../java/ads/protocol/ADS2SerialProtocol.java | 1 +
.../java/ads/protocol/ADS2SerialProtocolTest.java | 203 +++++++++++++++++++++
3 files changed, 212 insertions(+)
diff --git
a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/serial/AMSSerialFrame.java
b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/serial/AMSSerialFrame.java
index 7e548cd..d807a7e 100644
---
a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/serial/AMSSerialFrame.java
+++
b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/serial/AMSSerialFrame.java
@@ -74,6 +74,7 @@ public class AMSSerialFrame implements ByteReadable {
/**
* The AMS packet to be sent.
*/
+ private AMSPacket amsPacket;
private final UserData userData;
private final CRC crc;
@@ -98,8 +99,10 @@ public class AMSSerialFrame implements ByteReadable {
throw new IllegalArgumentException("Paket length must not exceed
255");
}
this.userDataLength = UserDataLength.of((byte) calculatedLength);
+ this.amsPacket = amsPacket;
byte[] amsPacketBytes = amsPacket.getBytes();
this.userData = UserData.of(amsPacketBytes);
+ // TODO: java has no CRC-16 implementation so we better be of
implementing it by ourself.
MessageDigest messageDigest;
try {
messageDigest = MessageDigest.getInstance("CRC-16");
@@ -126,8 +129,13 @@ public class AMSSerialFrame implements ByteReadable {
return new AMSSerialFrame(fragmentNumber, amsPacket);
}
+ public AMSPacket getAmsPacket() {
+ return amsPacket;
+ }
+
@Override
public ByteBuf getByteBuf() {
return buildByteBuff(magicCookie, transmitterAddress, receiverAddress,
fragmentNumber, userDataLength, userData, crc);
}
+
}
diff --git
a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/ADS2SerialProtocol.java
b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/ADS2SerialProtocol.java
index a79cdb3..51cc11b 100644
---
a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/ADS2SerialProtocol.java
+++
b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/ADS2SerialProtocol.java
@@ -109,6 +109,7 @@ public class ADS2SerialProtocol extends
MessageToMessageCodec<ByteBuf, AMSPacket
break;
}
+ // TODO: java has no CRC-16 implementation so we better be of
implementing it by ourself.
MessageDigest messageDigest;
try {
messageDigest = MessageDigest.getInstance("CRC-16");
diff --git
a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/protocol/ADS2SerialProtocolTest.java
b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/protocol/ADS2SerialProtocolTest.java
new file mode 100644
index 0000000..6364a7e
--- /dev/null
+++
b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/protocol/ADS2SerialProtocolTest.java
@@ -0,0 +1,203 @@
+/*
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+package org.apache.plc4x.java.ads.protocol;
+
+import io.netty.buffer.ByteBuf;
+import org.apache.plc4x.java.ads.api.commands.*;
+import org.apache.plc4x.java.ads.api.commands.types.*;
+import org.apache.plc4x.java.ads.api.generic.AMSPacket;
+import org.apache.plc4x.java.ads.api.generic.types.AMSNetId;
+import org.apache.plc4x.java.ads.api.generic.types.AMSPort;
+import org.apache.plc4x.java.ads.api.generic.types.Invoke;
+import org.apache.plc4x.java.ads.api.serial.AMSSerialFrame;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
+
+@RunWith(Parameterized.class)
+public class ADS2SerialProtocolTest {
+
+ private static final Logger LOGGER =
LoggerFactory.getLogger(ADS2SerialProtocolTest.class);
+
+ private ADS2SerialProtocol SUT;
+
+ @Parameterized.Parameter
+ public AMSSerialFrame amsSerialFrame;
+
+ @Parameterized.Parameter(1)
+ public String clazzName;
+
+ @Parameterized.Parameters(name = "{index} {1}")
+ public static Collection<Object[]> data() {
+ AMSNetId targetAmsNetId = AMSNetId.of("1.2.3.4.5.6");
+ AMSPort targetAmsPort = AMSPort.of(7);
+ AMSNetId sourceAmsNetId = AMSNetId.of("8.9.10.11.12.13");
+ AMSPort sourceAmsPort = AMSPort.of(14);
+ Invoke invokeId = Invoke.of(15);
+ Data data = Data.of("Hello World!".getBytes());
+ return Stream.of(
+ ADSAddDeviceNotificationRequest.of(
+ targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort,
invokeId,
+ IndexGroup.of(1), IndexOffset.of(1), Length.of(1),
TransmissionMode.of(1), MaxDelay.of(1),
CycleTime.of(1)).toAmsSerialFrame((byte) 0),
+ ADSAddDeviceNotificationResponse.of(
+ targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort,
invokeId,
+ Result.of(0),
+ NotificationHandle.of(0)
+ ).toAmsSerialFrame((byte) 0),
+ ADSDeleteDeviceNotificationRequest.of(
+ targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort,
invokeId,
+ NotificationHandle.of(0)
+ ).toAmsSerialFrame((byte) 0),
+ ADSDeleteDeviceNotificationResponse.of(
+ targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort,
invokeId,
+ Result.of(0)
+ ).toAmsSerialFrame((byte) 0),
+ ADSDeviceNotificationRequest.of(
+ targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort,
invokeId,
+ Stamps.of(1),
+ Collections.singletonList(
+ // Nano times need to be offset by (1.1.1970 - 1.1.1601)
years in nanos
+ AdsStampHeader.of(TimeStamp.of(new Date()),
+ Collections.singletonList(
+ AdsNotificationSample.of(NotificationHandle.of(0),
data))
+ )
+ )
+ ).toAmsSerialFrame((byte) 0),
+ ADSReadDeviceInfoRequest.of(
+ targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort,
invokeId
+ ).toAmsSerialFrame((byte) 0),
+ ADSReadDeviceInfoResponse.of(
+ targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort,
invokeId,
+ Result.of(0),
+ MajorVersion.of((byte) 1),
+ MinorVersion.of((byte) 2),
+ Version.of(3),
+ Device.of("Random DeviceId")
+ ).toAmsSerialFrame((byte) 0),
+ ADSReadRequest.of(
+ targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort,
invokeId,
+ IndexGroup.of(0),
+ IndexOffset.of(0),
+ Length.of(1)
+ ).toAmsSerialFrame((byte) 0),
+ ADSReadResponse.of(
+ targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort,
invokeId,
+ Result.of(0),
+ data
+ ).toAmsSerialFrame((byte) 0),
+ ADSReadStateRequest.of(
+ targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort,
invokeId
+ ).toAmsSerialFrame((byte) 0),
+ ADSReadStateResponse.of(
+ targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort,
invokeId,
+ Result.of(0)
+ ).toAmsSerialFrame((byte) 0),
+ ADSReadWriteRequest.of(
+ targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort,
invokeId,
+ IndexGroup.of(0),
+ IndexOffset.of(0),
+ ReadLength.of(data.getCalculatedLength()),
+ data
+ ).toAmsSerialFrame((byte) 0),
+ ADSReadWriteResponse.of(
+ targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort,
invokeId,
+ Result.of(0),
+ data
+ ).toAmsSerialFrame((byte) 0),
+ ADSWriteControlRequest.of(
+ targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort,
invokeId,
+ ADSState.of(0xaffe),
+ DeviceState.of(0xaffe),
+ data
+ ).toAmsSerialFrame((byte) 0),
+ ADSWriteControlResponse.of(
+ targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort,
invokeId,
+ Result.of(0)
+ ).toAmsSerialFrame((byte) 0),
+ ADSWriteRequest.of(
+ targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort,
invokeId,
+ IndexGroup.of(0),
+ IndexOffset.of(0),
+ data
+ ).toAmsSerialFrame((byte) 0),
+ ADSWriteResponse.of(
+ targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort,
invokeId,
+ Result.of(0)
+ ).toAmsSerialFrame((byte) 0)
+ /*,
+ UnknownCommand.of(
+ targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort,
State.DEFAULT, invokeId,
+ Unpooled.wrappedBuffer(new byte[]{42})
+ )*/
+ ).map(amstcpPacket -> new Object[]{amstcpPacket,
amstcpPacket.getClass().getSimpleName()}).collect(Collectors.toList());
+ }
+
+ @Before
+ public void setUp() throws Exception {
+ SUT = new ADS2SerialProtocol();
+ byte[] bytes = amsSerialFrame.getBytes();
+ LOGGER.info("amsPacket:\n{} has \n{}bytes\nHexDump:\n{}",
amsSerialFrame, bytes.length, amsSerialFrame.dump());
+ }
+
+ @Test
+ public void encode() throws Exception {
+ ArrayList<Object> out = new ArrayList<>();
+ SUT.encode(null, amsSerialFrame.getAmsPacket(), out);
+ assertEquals(1, out.size());
+ assertThat(out, hasSize(1));
+ }
+
+ @Test
+ public void decode() throws Exception {
+ ArrayList<Object> out = new ArrayList<>();
+ SUT.decode(null, amsSerialFrame.getByteBuf(), out);
+ assertThat(out, hasSize(1));
+ }
+
+ @Test
+ public void roundTrip() throws Exception {
+ ArrayList<Object> outbound = new ArrayList<>();
+ SUT.encode(null, amsSerialFrame.getAmsPacket(), outbound);
+ assertEquals(1, outbound.size());
+ assertThat(outbound, hasSize(1));
+ assertThat(outbound.get(0), instanceOf(ByteBuf.class));
+ ByteBuf byteBuf = (ByteBuf) outbound.get(0);
+ ArrayList<Object> inbound = new ArrayList<>();
+ SUT.decode(null, byteBuf, inbound);
+ assertEquals(1, inbound.size());
+ assertThat(inbound, hasSize(1));
+ assertThat(inbound.get(0), instanceOf(AMSPacket.class));
+ AMSPacket inboundAmsPacket = (AMSPacket) inbound.get(0);
+ assertThat("inbound divers from outbound", this.amsSerialFrame,
equalTo(inboundAmsPacket.toAmsSerialFrame((byte) 0)));
+ }
+}
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
sru...@apache.org.
