From 5ec9406c145768bc5c73abdad0fe94c96a472a43 Mon Sep 17 00:00:00 2001
From: Norman Maurer <norman_maurer@apple.com>
Date: Tue, 18 May 2021 08:13:39 +0200
Subject: [PATCH] Ensure we fail if native lib can not be loaded on macos
 (#11261)

Motivation:

ccca3959fd64b133edca855925fb68d077c3a8a2 fixed a regression which caused the native resolver code to not be loaded but this was not reported by the tests.

Modifications:

Adjust tests to actually fail the build if we cant load the native lib

Result:

Ensure we don't introduce another regression in the future
---
 ...cOSDnsServerAddressStreamProviderTest.java | 26 +++++++++----------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/resolver-dns-native-macos/src/test/java/io/netty/resolver/dns/macos/MacOSDnsServerAddressStreamProviderTest.java b/resolver-dns-native-macos/src/test/java/io/netty/resolver/dns/macos/MacOSDnsServerAddressStreamProviderTest.java
index d53cf98bb5..434eec039e 100644
--- a/resolver-dns-native-macos/src/test/java/io/netty/resolver/dns/macos/MacOSDnsServerAddressStreamProviderTest.java
+++ b/resolver-dns-native-macos/src/test/java/io/netty/resolver/dns/macos/MacOSDnsServerAddressStreamProviderTest.java
@@ -18,24 +18,21 @@ package io.netty.resolver.dns.macos;
 import io.netty.resolver.dns.DnsServerAddressStream;
 import io.netty.resolver.dns.DnsServerAddressStreamProvider;
 import io.netty.resolver.dns.DnsServerAddressStreamProviders;
-import org.junit.Assume;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledOnOs;
+import org.junit.jupiter.api.condition.OS;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.instanceOf;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
 
-public class MacOSDnsServerAddressStreamProviderTest {
-
-    @BeforeClass
-    public static void assume() {
-        Assume.assumeTrue(MacOSDnsServerAddressStreamProvider.isAvailable());
-    }
+@EnabledOnOs(OS.MAC)
+class MacOSDnsServerAddressStreamProviderTest {
 
     @Test
-    public void testStream() {
+    void testStream() {
+        MacOSDnsServerAddressStreamProvider.ensureAvailability();
         DnsServerAddressStreamProvider provider = new MacOSDnsServerAddressStreamProvider();
         DnsServerAddressStream stream = provider.nameServerAddressStream("netty.io");
         assertNotNull(stream);
@@ -47,9 +44,10 @@ public class MacOSDnsServerAddressStreamProviderTest {
     }
 
     @Test
-    public void testDefaultUseCorrectInstance() {
+    @EnabledOnOs(OS.MAC)
+    void testDefaultUseCorrectInstance() {
+        MacOSDnsServerAddressStreamProvider.ensureAvailability();
         assertThat(DnsServerAddressStreamProviders.platformDefault(),
                 instanceOf(MacOSDnsServerAddressStreamProvider.class));
     }
-
 }