Test code style fixes

open-telemetry · Nov 3, 2022 · bd9807c · bd9807c
1 parent 1e9f265
commit bd9807c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/...ed-deps/src/test/java/io/opentelemetry/sdk/trace/internal/JcToolsSecurityManagerTest.java b/...ed-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/...c/test/java/io/opentelemetry/sdk/trace/internal/SunMiscProhibitedSecurityManagerTest.java b/...c/test/java/io/opentelemetry/sdk/trace/internal/SunMiscProhibitedSecurityManagerTest.java
@@ -5,39 +5,40 @@
 
 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;
 
 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"));
   }