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/plc4x.git
The following commit(s) were added to refs/heads/develop by this push:
new 4fc0433 fix(plc4j): Made the bacnet RandomPackagesTest.java execute
on Windows and updated the documentation on setting up libpcap on Windows.
4fc0433 is described below
commit 4fc04331abffce1d0c9f0fd6bb45c441aa9bd27a
Author: cdutz <[email protected]>
AuthorDate: Sat Feb 26 19:04:04 2022 +0100
fix(plc4j): Made the bacnet RandomPackagesTest.java execute on Windows and
updated the documentation on setting up libpcap on Windows.
---
.../java/org/apache/plc4x/java/bacnetip/RandomPackagesTest.java | 6 ------
.../src/main/java/org/apache/plc4x/test/RequirePcapNgCondition.java | 2 +-
2 files changed, 1 insertion(+), 7 deletions(-)
diff --git
a/plc4j/drivers/bacnet/src/test/java/org/apache/plc4x/java/bacnetip/RandomPackagesTest.java
b/plc4j/drivers/bacnet/src/test/java/org/apache/plc4x/java/bacnetip/RandomPackagesTest.java
index 6e485d4..ce12c72 100644
---
a/plc4j/drivers/bacnet/src/test/java/org/apache/plc4x/java/bacnetip/RandomPackagesTest.java
+++
b/plc4j/drivers/bacnet/src/test/java/org/apache/plc4x/java/bacnetip/RandomPackagesTest.java
@@ -65,12 +65,6 @@ public class RandomPackagesTest {
Queue<Closeable> toBeClosed = new ConcurrentLinkedDeque<>();
- @BeforeAll
- static void beforeAll() {
- // TODO: somehow this test doesn't run on windows anymore since the
transition to the @RequirePcapNg annotation
- assumeTrue(!System.getProperty( "os.name" ).startsWith( "Windows" ));
- }
-
@AfterEach
void closeStuff() {
for (Closeable closeable = toBeClosed.poll(); closeable != null;
closeable = toBeClosed.poll()) {
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
index a19bc09..b497c9d 100644
---
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
@@ -59,7 +59,7 @@ public class RequirePcapNgCondition implements
ExecutionCondition {
logger.info("Error detecting libpcap version.", e);
}
if(SystemUtils.IS_OS_WINDOWS) {
- return ConditionEvaluationResult.disabled("Test disabled due to
missing or invalid Npcap version. Please install from here: https://npcap.com/
as this version supports all needed freatures.");
+ return ConditionEvaluationResult.disabled("Test disabled due to
missing or invalid Npcap version. Please install from here: https://npcap.com/
as this version supports all needed features.");
} else {
return ConditionEvaluationResult.disabled("Test disabled due to
missing or invalid libpcap version. Please install at least version 1.1.0 to
support all features.");
}