From 6e866317d28cfd1e9cadc301bb488b654ee87797 Mon Sep 17 00:00:00 2001
From: Norman Maurer <norman_maurer@apple.com>
Date: Tue, 18 May 2021 08:14:32 +0200
Subject: [PATCH] Ensure we can load the native library or fail the build
 (#11262)

Motivation:

We used assumeTrue(...) in some places before to detect if we could load the native library but this could lead to the sitation that we not notice if we break native loading.

Modifications:

Always fail if we cant load the native library

Result:

Ensure we not cause any regression in the native loading code in the future
---
 .../java/io/netty/channel/epoll/EpollKQueueIovArrayTest.java  | 2 +-
 .../src/test/java/io/netty/channel/epoll/EpollSocketTest.java | 3 +--
 .../src/test/java/io/netty/channel/epoll/LinuxSocketTest.java | 4 +---
 .../test/java/io/netty/channel/kqueue/KQueueIovArrayTest.java | 3 +--
 .../test/java/io/netty/channel/kqueue/KQueueSocketTest.java   | 3 +--
 5 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/transport-native-epoll/src/test/java/io/netty/channel/epoll/EpollKQueueIovArrayTest.java b/transport-native-epoll/src/test/java/io/netty/channel/epoll/EpollKQueueIovArrayTest.java
index ab72958114..3008c6ca45 100644
--- a/transport-native-epoll/src/test/java/io/netty/channel/epoll/EpollKQueueIovArrayTest.java
+++ b/transport-native-epoll/src/test/java/io/netty/channel/epoll/EpollKQueueIovArrayTest.java
@@ -23,6 +23,6 @@ public class EpollKQueueIovArrayTest extends IovArrayTest {
 
     @BeforeClass
     public static void loadNative() {
-        Assume.assumeTrue(Epoll.isAvailable());
+        Epoll.ensureAvailability();
     }
 }
diff --git a/transport-native-epoll/src/test/java/io/netty/channel/epoll/EpollSocketTest.java b/transport-native-epoll/src/test/java/io/netty/channel/epoll/EpollSocketTest.java
index fcbbde01d9..8bfff89f10 100644
--- a/transport-native-epoll/src/test/java/io/netty/channel/epoll/EpollSocketTest.java
+++ b/transport-native-epoll/src/test/java/io/netty/channel/epoll/EpollSocketTest.java
@@ -27,12 +27,11 @@ import java.io.IOException;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assume.assumeTrue;
 
 public class EpollSocketTest extends SocketTest<LinuxSocket> {
     @BeforeClass
     public static void loadJNI() {
-        assumeTrue(Epoll.isAvailable());
+        Epoll.ensureAvailability();
     }
 
     @Test
diff --git a/transport-native-epoll/src/test/java/io/netty/channel/epoll/LinuxSocketTest.java b/transport-native-epoll/src/test/java/io/netty/channel/epoll/LinuxSocketTest.java
index e6f900a968..41e8fa64e2 100644
--- a/transport-native-epoll/src/test/java/io/netty/channel/epoll/LinuxSocketTest.java
+++ b/transport-native-epoll/src/test/java/io/netty/channel/epoll/LinuxSocketTest.java
@@ -22,12 +22,10 @@ import java.io.IOException;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 
-import static org.junit.Assume.assumeTrue;
-
 public class LinuxSocketTest {
     @BeforeClass
     public static void loadJNI() {
-        assumeTrue(Epoll.isAvailable());
+        Epoll.ensureAvailability();
     }
 
     @Test(expected = IOException.class)
diff --git a/transport-native-kqueue/src/test/java/io/netty/channel/kqueue/KQueueIovArrayTest.java b/transport-native-kqueue/src/test/java/io/netty/channel/kqueue/KQueueIovArrayTest.java
index f59db0cc36..42fa8b746c 100644
--- a/transport-native-kqueue/src/test/java/io/netty/channel/kqueue/KQueueIovArrayTest.java
+++ b/transport-native-kqueue/src/test/java/io/netty/channel/kqueue/KQueueIovArrayTest.java
@@ -16,13 +16,12 @@
 package io.netty.channel.kqueue;
 
 import io.netty.channel.unix.tests.IovArrayTest;
-import org.junit.Assume;
 import org.junit.BeforeClass;
 
 public class KQueueIovArrayTest extends IovArrayTest {
 
     @BeforeClass
     public static void loadNative() {
-        Assume.assumeTrue(KQueue.isAvailable());
+        KQueue.ensureAvailability();
     }
 }
diff --git a/transport-native-kqueue/src/test/java/io/netty/channel/kqueue/KQueueSocketTest.java b/transport-native-kqueue/src/test/java/io/netty/channel/kqueue/KQueueSocketTest.java
index 73bc1eda2f..2188101443 100644
--- a/transport-native-kqueue/src/test/java/io/netty/channel/kqueue/KQueueSocketTest.java
+++ b/transport-native-kqueue/src/test/java/io/netty/channel/kqueue/KQueueSocketTest.java
@@ -25,12 +25,11 @@ import org.junit.Test;
 import java.io.IOException;
 
 import static org.junit.Assert.*;
-import static org.junit.Assume.assumeTrue;
 
 public class KQueueSocketTest extends SocketTest<BsdSocket> {
     @BeforeClass
     public static void loadJNI() {
-        assumeTrue(KQueue.isAvailable());
+        KQueue.ensureAvailability();
     }
 
     @Test