fix(plc4j/testing): Fixed a bug not correctly detecting the libpcap v…

…ersion on Windows.
apache · Feb 17, 2022 · 4ee0ca5 · 4ee0ca5
1 parent 321da0b
commit 4ee0ca5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/plc4j/utils/test-utils/src/main/java/org/apache/plc4x/test/RequirePcapCondition.java b/plc4j/utils/test-utils/src/main/java/org/apache/plc4x/test/RequirePcapCondition.java
@@ -37,7 +37,7 @@ public class RequirePcapCondition implements ExecutionCondition {
     public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext extensionContext) {
         try {
             String libVersion = Pcaps.libVersion();
-            Pattern pattern = Pattern.compile("^libpcap version (?<version>\\d+\\.\\d+(?:\\.\\d+)?)[^\\d]?.*$");
+            Pattern pattern = Pattern.compile("^.*libpcap version (?<version>\\d+\\.\\d+(?:\\.\\d+)?)[^\\d]?.*$");
             Matcher matcher = pattern.matcher(libVersion);
             if (matcher.matches()) {
                 String versionString = matcher.group("version");

diff --git a/plc4j/utils/test-utils/src/main/java/org/apache/plc4x/test/RequirePcapNgCondition.java b/plc4j/utils/test-utils/src/main/java/org/apache/plc4x/test/RequirePcapNgCondition.java
@@ -41,7 +41,7 @@ public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext ext
         // Windows: WinPcap version 4.1.3 (packet.dll version 4.1.0.2980), based on libpcap version 1.0 branch 1_0_rel0b (20091008)
         try {
             String libVersion = Pcaps.libVersion();
-            Pattern pattern = Pattern.compile("^libpcap version (?<version>\\d+\\.\\d+(?:\\.\\d+)?)[^\\d]?.*$");
+            Pattern pattern = Pattern.compile("^.*libpcap version (?<version>\\d+\\.\\d+(?:\\.\\d+)?)[^\\d]?.*$");
             Matcher matcher = pattern.matcher(libVersion);
             if (matcher.matches()) {
                 String versionString = matcher.group("version");