Enable Brotli tests on m1 (#12705)

normanmaurer · web-flow · commit 0123e2445d9a · 2022-08-17T12:12:17.000+02:00
Motivation: a06f851 updated brotli4j version to one that supports m1. Let's enable tests. Modifications: Enable brotli4j tests on m1 as well Result: More testing
diff --git a/codec/src/test/java/io/netty/handler/codec/compression/BrotliDecoderTest.java b/codec/src/test/java/io/netty/handler/codec/compression/BrotliDecoderTest.java
@@ -21,11 +21,9 @@
 import io.netty.buffer.CompositeByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.embedded.EmbeddedChannel;
-import io.netty.util.internal.PlatformDependent;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.condition.DisabledIf;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
@@ -35,9 +33,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
-@DisabledIf(value = "isNotSupported", disabledReason = "Brotli is not supported on this platform")
 public class BrotliDecoderTest {
 
     private static Random RANDOM;
@@ -66,10 +62,6 @@ static void setUp() {
     private static final ByteBuf WRAPPED_BYTES_LARGE = Unpooled.unreleasableBuffer(
             Unpooled.wrappedBuffer(BYTES_LARGE)).asReadOnly();
 
-    static boolean isNotSupported() {
-        return PlatformDependent.isOsx() && "aarch_64".equals(PlatformDependent.normalizedArch());
-    }
-
     private static void fillArrayWithCompressibleData(byte[] array) {
         for (int i = 0; i < array.length; i++) {
             array[i] = i % 4 != 0 ? 0 : (byte) RANDOM.nextInt();
diff --git a/codec/src/test/java/io/netty/handler/codec/compression/BrotliEncoderTest.java b/codec/src/test/java/io/netty/handler/codec/compression/BrotliEncoderTest.java
@@ -22,11 +22,8 @@
 import io.netty.buffer.CompositeByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.embedded.EmbeddedChannel;
-import io.netty.util.internal.PlatformDependent;
 import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.condition.DisabledIf;
 
-@DisabledIf(value = "isNotSupported", disabledReason = "Brotli is not supported on this platform")
 public class BrotliEncoderTest extends AbstractEncoderTest {
 
     @BeforeAll
@@ -71,8 +68,4 @@ protected ByteBuf readDecompressed(final int dataLength) throws Exception {
         }
         return decompressed;
     }
-
-    static boolean isNotSupported() {
-        return PlatformDependent.isOsx() && "aarch_64".equals(PlatformDependent.normalizedArch());
-    }
 }

Original file line number	Diff line number	Diff line change
`@@ -22,11 +22,8 @@`
`22`	`22`	`import io.netty.buffer.CompositeByteBuf;`
`23`	`23`	`import io.netty.buffer.Unpooled;`
`24`	`24`	`import io.netty.channel.embedded.EmbeddedChannel;`
`25`		`-import io.netty.util.internal.PlatformDependent;`
`26`	`25`	`import org.junit.jupiter.api.BeforeAll;`
`27`		`-import org.junit.jupiter.api.condition.DisabledIf;`
`28`	`26`
`29`		`-@DisabledIf(value = "isNotSupported", disabledReason = "Brotli is not supported on this platform")`
`30`	`27`	`public class BrotliEncoderTest extends AbstractEncoderTest {`
`31`	`28`
`32`	`29`	`@BeforeAll`
`@@ -71,8 +68,4 @@ protected ByteBuf readDecompressed(final int dataLength) throws Exception {`
`71`	`68`	`}`
`72`	`69`	`return decompressed;`
`73`	`70`	`}`
`74`		`-`
`75`		`- static boolean isNotSupported() {`
`76`		`- return PlatformDependent.isOsx() && "aarch_64".equals(PlatformDependent.normalizedArch());`
`77`		`- }`
`78`	`71`	`}`