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 e056bb8 added missing tests of command and generic factory methods e056bb8 is described below commit e056bb822b497c5f9bf6c411505b4ed0d859c36b Author: Sebastian Rühl <sru...@apache.org> AuthorDate: Sat Feb 17 01:39:27 2018 +0100 added missing tests of command and generic factory methods --- .../java/ads/api/commands/UnknownCommand.java | 11 +++- .../java/ads/api/commands/types/TimeStamp.java | 2 +- .../ads/api/commands/CommandFactoryMethodTest.java | 75 ++++++++++++++++++++++ .../types/CommandTypesFactoryMethodTest.java | 29 ++++++++- .../ads/api/generic/GenericFactoryMethodTest.java | 70 ++++++++++++++++++++ .../plc4x/java/ads/netty/ADSProtocolTest.java | 2 +- 6 files changed, 184 insertions(+), 5 deletions(-) diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/UnknownCommand.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/UnknownCommand.java index 77c3bbe..4a363bd 100644 --- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/UnknownCommand.java +++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/UnknownCommand.java @@ -23,7 +23,7 @@ import org.apache.plc4x.java.ads.api.generic.ADSData; import org.apache.plc4x.java.ads.api.generic.AMSHeader; import org.apache.plc4x.java.ads.api.generic.AMSTCPHeader; import org.apache.plc4x.java.ads.api.generic.AMSTCPPacket; -import org.apache.plc4x.java.ads.api.generic.types.Command; +import org.apache.plc4x.java.ads.api.generic.types.*; import static java.util.Objects.requireNonNull; @@ -40,6 +40,11 @@ public class UnknownCommand extends AMSTCPPacket { this.remainingBytes = requireNonNull(remainingBytes); } + private UnknownCommand(AMSNetId targetAmsNetId, AMSPort targetAmsPort, AMSNetId sourceAmsNetId, AMSPort sourceAmsPort, State stateId, Invoke invokeId, ByteBuf remainingBytes) { + super(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, stateId, invokeId); + this.remainingBytes = requireNonNull(remainingBytes); + } + @Override public ADSData getAdsData() { return () -> remainingBytes; @@ -48,4 +53,8 @@ public class UnknownCommand extends AMSTCPPacket { public static AMSTCPPacket of(AMSTCPHeader amstcpHeader, AMSHeader amsHeader, ByteBuf remainingBytes) { return new UnknownCommand(amstcpHeader, amsHeader, remainingBytes); } + + public static UnknownCommand of(AMSNetId targetAmsNetId, AMSPort targetAmsPort, AMSNetId sourceAmsNetId, AMSPort sourceAmsPort, State stateId, Invoke invokeId, ByteBuf remainingBytes) { + return new UnknownCommand(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, stateId, invokeId, remainingBytes); + } } diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/TimeStamp.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/TimeStamp.java index df4b079..76b5d3d 100644 --- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/TimeStamp.java +++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/TimeStamp.java @@ -94,7 +94,7 @@ public class TimeStamp extends ByteValue { } public static TimeStamp ofWinTime(long value) { - return of(javaToWinTime(BigInteger.valueOf(value))); + return of(BigInteger.valueOf(value)); } public static TimeStamp ofWinTime(String value) { diff --git a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/commands/CommandFactoryMethodTest.java b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/commands/CommandFactoryMethodTest.java new file mode 100644 index 0000000..71649e8 --- /dev/null +++ b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/commands/CommandFactoryMethodTest.java @@ -0,0 +1,75 @@ +/* + 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.api.commands; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; + +import java.lang.reflect.Method; +import java.util.Arrays; +import java.util.Collection; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import static org.mockito.Mockito.RETURNS_DEEP_STUBS; +import static org.mockito.Mockito.mock; + +@RunWith(Parameterized.class) +public class CommandFactoryMethodTest { + + @Parameterized.Parameter + public Class<?> clazz; + + @Parameterized.Parameters(name = "{index} {0}") + public static Collection<Object[]> data() { + return Stream.of( + ADSAbstractRequest.class, + ADSAbstractResponse.class, + ADSAddDeviceNotificationRequest.class, + ADSAddDeviceNotificationResponse.class, + ADSDeleteDeviceNotificationRequest.class, + ADSDeleteDeviceNotificationResponse.class, + ADSDeviceNotificationRequest.class, + ADSDeviceNotificationResponse.class, + ADSReadDeviceInfoRequest.class, + ADSReadDeviceInfoResponse.class, + ADSReadRequest.class, + ADSReadResponse.class, + ADSReadStateRequest.class, + ADSReadStateResponse.class, + ADSReadWriteRequest.class, + ADSReadWriteResponse.class, + ADSWriteControlRequest.class, + ADSWriteControlResponse.class, + ADSWriteRequest.class, + ADSWriteResponse.class, + UnknownCommand.class + ).map(clazz -> new Object[]{clazz}).collect(Collectors.toList()); + } + + @Test + public void testOf() throws Exception { + for (Method method : clazz.getDeclaredMethods()) { + if (method.getName().equals("of")) { + method.invoke(null, Arrays.stream(method.getParameterTypes()).map(aClass -> mock(aClass, RETURNS_DEEP_STUBS)).toArray()); + } + } + } +} diff --git a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/commands/types/CommandTypesFactoryMethodTest.java b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/commands/types/CommandTypesFactoryMethodTest.java index 9b71709..1ffe66a 100644 --- a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/commands/types/CommandTypesFactoryMethodTest.java +++ b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/commands/types/CommandTypesFactoryMethodTest.java @@ -26,12 +26,13 @@ import org.junit.runners.Parameterized; import java.lang.reflect.Field; import java.lang.reflect.Method; +import java.math.BigInteger; +import java.nio.charset.Charset; import java.util.Collection; import java.util.stream.Collectors; import java.util.stream.Stream; -import static org.hamcrest.Matchers.instanceOf; -import static org.hamcrest.Matchers.not; +import static org.hamcrest.Matchers.*; import static org.junit.Assume.assumeThat; @RunWith(Parameterized.class) @@ -88,6 +89,30 @@ public class CommandTypesFactoryMethodTest { } @Test + public void testOfStringCharset() throws Exception { + assumeThat(clazz, isOneOf(Device.class, Data.class)); + Method ofMethod = clazz.getDeclaredMethod("of", String.class, Charset.class); + ofMethod.invoke(null, "1", Charset.defaultCharset()); + } + + @Test + public void testOfWintime() throws Exception { + assumeThat(clazz, isOneOf(TimeStamp.class)); + { + Method ofMethod = clazz.getDeclaredMethod("ofWinTime", BigInteger.class); + ofMethod.invoke(null, BigInteger.valueOf(1)); + } + { + Method ofMethod = clazz.getDeclaredMethod("ofWinTime", String.class); + ofMethod.invoke(null, "1"); + } + { + Method ofMethod = clazz.getDeclaredMethod("ofWinTime", long.class); + ofMethod.invoke(null, 1L); + } + } + + @Test public void testOfBytes() throws Exception { assumeThat(clazz, not(Data.class)); Field num_bytes_field = clazz.getDeclaredField("NUM_BYTES"); diff --git a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/generic/GenericFactoryMethodTest.java b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/generic/GenericFactoryMethodTest.java new file mode 100644 index 0000000..85917f9 --- /dev/null +++ b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/api/generic/GenericFactoryMethodTest.java @@ -0,0 +1,70 @@ +/* + 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.api.generic; + +import org.apache.plc4x.java.ads.api.generic.types.Command; +import org.apache.plc4x.java.ads.api.util.LengthSupplier; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; + +import java.lang.reflect.Method; +import java.util.Arrays; +import java.util.Collection; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import static org.mockito.Mockito.RETURNS_DEEP_STUBS; +import static org.mockito.Mockito.mock; + +@RunWith(Parameterized.class) +public class GenericFactoryMethodTest { + + @Parameterized.Parameter + public Class<?> clazz; + + @Parameterized.Parameters(name = "{index} {0}") + public static Collection<Object[]> data() { + return Stream.of( + ADSData.class, + AMSHeader.class, + AMSTCPHeader.class, + AMSTCPPacket.class + ).map(clazz -> new Object[]{clazz}).collect(Collectors.toList()); + } + + @Test + public void testOf() throws Exception { + for (Method method : clazz.getDeclaredMethods()) { + if (method.getName().equals("of")) { + method.invoke(null, Arrays.stream(method.getParameterTypes()).map(aClass -> { + if (aClass == Command.class) { + return Command.UNKNOWN; + } else if (aClass == LengthSupplier[].class) { + return new LengthSupplier[]{() -> 0}; + } else if (aClass == long.class) { + return 1L; + } else { + return mock(aClass, RETURNS_DEEP_STUBS); + } + }).toArray()); + } + } + } +} diff --git a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/netty/ADSProtocolTest.java b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/netty/ADSProtocolTest.java index a9b2ff0..07f3512 100644 --- a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/netty/ADSProtocolTest.java +++ b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/netty/ADSProtocolTest.java @@ -155,7 +155,7 @@ public class ADSProtocolTest { Result.of(0) )/*, UnknownCommand.of( - targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, + targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, State.DEFAULT, invokeId, Unpooled.wrappedBuffer(new byte[]{42}) )*/ ).map(amstcpPacket -> new Object[]{amstcpPacket}).collect(Collectors.toList()); -- To stop receiving notification emails like this one, please contact sru...@apache.org.