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/17 09:22:14 UTC

[incubator-plc4x] branch master updated: switched test-name generation to class names.

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 606b952  switched test-name generation to class names.
606b952 is described below

commit 606b952e066e2488288ea1d6142d4b08abb61cef
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Sat Feb 17 10:22:10 2018 +0100

    switched test-name generation to class names.
---
 .../java/org/apache/plc4x/java/ads/netty/ADSProtocolTest.java  |  7 +++++--
 .../org/apache/plc4x/java/ads/netty/Plc4XADSProtocolTest.java  | 10 ++++++++--
 2 files changed, 13 insertions(+), 4 deletions(-)

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 e09bd81..568a761 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
@@ -54,7 +54,10 @@ public class ADSProtocolTest {
     @Parameterized.Parameter
     public AMSTCPPacket amstcpPacket;
 
-    @Parameterized.Parameters(name = "{0} {index}")
+    @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);
@@ -155,7 +158,7 @@ public class ADSProtocolTest {
                 targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, State.DEFAULT, invokeId,
                 Unpooled.wrappedBuffer(new byte[]{42})
             )*/
-        ).map(amstcpPacket -> new Object[]{amstcpPacket}).collect(Collectors.toList());
+        ).map(amstcpPacket -> new Object[]{amstcpPacket, amstcpPacket.getClass().getSimpleName()}).collect(Collectors.toList());
     }
 
     @Before
diff --git a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/netty/Plc4XADSProtocolTest.java b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/netty/Plc4XADSProtocolTest.java
index 79ed81e..c11e932 100644
--- a/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/netty/Plc4XADSProtocolTest.java
+++ b/plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/netty/Plc4XADSProtocolTest.java
@@ -66,9 +66,15 @@ public class Plc4XADSProtocolTest {
     public CompletableFuture completableFuture;
 
     @Parameterized.Parameter(2)
+    public String plcRequestContainerClassName;
+
+    @Parameterized.Parameter(3)
     public AMSTCPPacket amstcpPacket;
 
-    @Parameterized.Parameters(name = "{2} {index}")
+    @Parameterized.Parameter(4)
+    public String aMSTCPPacketClassName;
+
+    @Parameterized.Parameters(name = " {index} {2} {4}")
     public static Collection<Object[]> data() {
         AMSNetId targetAmsNetId = AMSNetId.of("1.2.3.4.5.6");
         AMSPort targetAmsPort = AMSPort.of(7);
@@ -93,7 +99,7 @@ public class Plc4XADSProtocolTest {
                         .build(), new CompletableFuture<>()),
                 ADSReadResponse.of(targetAmsNetId, targetAmsPort, sourceAmsNetId, sourceAmsPort, invokeId, Result.of(0), data)
             )
-        ).map(pair -> new Object[]{pair.left, pair.left.getResponseFuture(), pair.right}).collect(Collectors.toList());
+        ).map(pair -> new Object[]{pair.left, pair.left.getResponseFuture(), pair.left.getRequest().getClass().getSimpleName(), pair.right, pair.right.getClass().getSimpleName()}).collect(Collectors.toList());
     }
 
     @Before

-- 
To stop receiving notification emails like this one, please contact
sruehl@apache.org.