From bd9807cf7f9c8a5f7aa920d541f1441e1e93961e Mon Sep 17 00:00:00 2001
From: Ragnar Rova <ragnar.rova@gmail.com>
Date: Fri, 4 Nov 2022 00:03:45 +0100
Subject: [PATCH] Test code style fixes

---
 .../internal/JcToolsSecurityManagerTest.java  |  5 ++--
 .../SunMiscProhibitedSecurityManagerTest.java | 27 ++++++++++---------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/sdk/trace-shaded-deps/src/test/java/io/opentelemetry/sdk/trace/internal/JcToolsSecurityManagerTest.java b/sdk/trace-shaded-deps/src/test/java/io/opentelemetry/sdk/trace/internal/JcToolsSecurityManagerTest.java
index 3ebd44aa6cf..1e4914197b9 100644
--- a/sdk/trace-shaded-deps/src/test/java/io/opentelemetry/sdk/trace/internal/JcToolsSecurityManagerTest.java
+++ b/sdk/trace-shaded-deps/src/test/java/io/opentelemetry/sdk/trace/internal/JcToolsSecurityManagerTest.java
@@ -11,7 +11,6 @@
 import java.security.PrivilegedAction;
 import java.util.Queue;
 import java.util.concurrent.ArrayBlockingQueue;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.EnabledOnJre;
 import org.junit.jupiter.api.condition.JRE;
@@ -20,8 +19,8 @@ public class JcToolsSecurityManagerTest {
 
   @Test
   @EnabledOnJre({JRE.JAVA_8, JRE.JAVA_11, JRE.JAVA_17})
-  void newFixedSizeQueue_works_with_sunMisc_prohibited() {
-    Assertions.assertNull(System.getSecurityManager());
+  void newFixedSizeQueue_SunMiscProhibited() {
+    assertThat(System.getSecurityManager()).isNull();
     SunMiscProhibitedSecurityManager testingSecurityManager =
         new SunMiscProhibitedSecurityManager();
     try {
diff --git a/sdk/trace-shaded-deps/src/test/java/io/opentelemetry/sdk/trace/internal/SunMiscProhibitedSecurityManagerTest.java b/sdk/trace-shaded-deps/src/test/java/io/opentelemetry/sdk/trace/internal/SunMiscProhibitedSecurityManagerTest.java
index e4a8ca71cb3..8123a12637b 100644
--- a/sdk/trace-shaded-deps/src/test/java/io/opentelemetry/sdk/trace/internal/SunMiscProhibitedSecurityManagerTest.java
+++ b/sdk/trace-shaded-deps/src/test/java/io/opentelemetry/sdk/trace/internal/SunMiscProhibitedSecurityManagerTest.java
@@ -5,6 +5,9 @@
 
 package io.opentelemetry.sdk.trace.internal;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
 import java.security.AccessControlException;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
@@ -12,32 +15,30 @@
 class SunMiscProhibitedSecurityManagerTest {
 
   @Test
-  public void test_prohibits_sun_misc_package_access() {
+  public void checkPackageAccess_ProhibitsSunMisc() {
     SunMiscProhibitedSecurityManager sm = new SunMiscProhibitedSecurityManager();
     AccessControlException thrown =
         Assertions.assertThrows(
             AccessControlException.class, () -> sm.checkPackageAccess("sun.misc"));
 
-    Assertions.assertEquals(
-        "access denied (\"java.lang.RuntimePermission\" \"accessClassInPackage.sun.misc\")",
-        thrown.getMessage());
+    assertThat(thrown.getMessage())
+        .isEqualTo(
+            "access denied (\"java.lang.RuntimePermission\" \"accessClassInPackage.sun.misc\")");
   }
 
   @Test
-  public void test_prohibits_sun_misc_access_runtime_permission() {
+  public void checkPackageAccess_ProhibitsSunMiscRuntimePermission() {
     SunMiscProhibitedSecurityManager sm = new SunMiscProhibitedSecurityManager();
-    AccessControlException thrown =
-        Assertions.assertThrows(
-            AccessControlException.class,
-            () -> sm.checkPermission(new RuntimePermission("accessClassInPackage.sun.misc")));
 
-    Assertions.assertEquals(
-        "access denied (\"java.lang.RuntimePermission\" \"accessClassInPackage.sun.misc\")",
-        thrown.getMessage());
+    assertThatThrownBy(
+            () -> sm.checkPermission(new RuntimePermission("accessClassInPackage.sun.misc")))
+        .isInstanceOf(AccessControlException.class)
+        .hasMessage(
+            "access denied (\"java.lang.RuntimePermission\" \"accessClassInPackage.sun.misc\")");
   }
 
   @Test
-  public void test_allows_other_package_access() {
+  public void checkPackageAccess_AllowsOtherPackage() {
     SunMiscProhibitedSecurityManager sm = new SunMiscProhibitedSecurityManager();
     Assertions.assertDoesNotThrow(() -> sm.checkPackageAccess("io.opentelemetry.sdk"));
   }