Adjust tests style as per discussion in #2019

assertj · Oct 31, 2020 · 6ae7dff · 6ae7dff
1 parent 8abd04a
commit 6ae7dff
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 8 deletions.
diff --git a/...st/java/org/assertj/core/internal/classes/Classes_assertHasPackage_with_Package_Test.java b/...st/java/org/assertj/core/internal/classes/Classes_assertHasPackage_with_Package_Test.java
@@ -31,26 +31,31 @@ class Classes_assertHasPackage_with_Package_Test extends ClassesBaseTest {
 
   @Test
   void should_pass_if_actual_declares_given_package() {
+    // GIVEN
+    Class<?> actual = Object.class;
+    Package aPackage = actual.getPackage();
     // WHEN/THEN
-    classes.assertHasPackage(someInfo(), Object.class, Object.class.getPackage());
+    classes.assertHasPackage(someInfo(), actual, aPackage);
   }
 
   @Test
   void should_fail_if_actual_is_null() {
+    // GIVEN
+    Class<?> actual = null;
+    Package aPackage = Object.class.getPackage();
     // WHEN
-    AssertionError assertionError = expectAssertionError(() -> classes.assertHasPackage(someInfo(),
-                                                                                        null,
-                                                                                        Object.class.getPackage()));
+    AssertionError assertionError = expectAssertionError(() -> classes.assertHasPackage(someInfo(), actual, aPackage));
     // THEN
     then(assertionError).hasMessage(actualIsNull());
   }
 
   @Test
   void should_fail_if_aPackage_is_null() {
     // GIVEN
+    Class<?> actual = Object.class;
     Package aPackage = null;
     // WHEN
-    Throwable thrown = catchThrowable(() -> classes.assertHasPackage(someInfo(), Object.class, aPackage));
+    Throwable thrown = catchThrowable(() -> classes.assertHasPackage(someInfo(), actual, aPackage));
     // THEN
     then(thrown).isInstanceOf(NullPointerException.class)
                 .hasMessage(shouldNotBeNull("aPackage").create());

diff --git a/...est/java/org/assertj/core/internal/classes/Classes_assertHasPackage_with_String_Test.java b/...est/java/org/assertj/core/internal/classes/Classes_assertHasPackage_with_String_Test.java
@@ -29,24 +29,31 @@ class Classes_assertHasPackage_with_String_Test extends ClassesBaseTest {
 
   @Test
   void should_pass_if_actual_has_given_package_name() {
+    // GIVEN
+    Class<?> actual = Object.class;
+    String packageName = "java.lang";
     // WHEN/THEN
-    classes.assertHasPackage(someInfo(), Object.class, "java.lang");
+    classes.assertHasPackage(someInfo(), actual, packageName);
   }
 
   @Test
   void should_fail_if_actual_is_null() {
+    // GIVEN
+    Class<?> actual = null;
+    String packageName = "java.lang";
     // WHEN
-    AssertionError assertionError = expectAssertionError(() -> classes.assertHasPackage(someInfo(), null, "java.lang"));
+    AssertionError assertionError = expectAssertionError(() -> classes.assertHasPackage(someInfo(), actual, packageName));
     // THEN
     then(assertionError).hasMessage(actualIsNull());
   }
 
   @Test
   void should_fail_if_packageName_is_null() {
     // GIVEN
+    Class<?> actual = Object.class;
     String packageName = null;
     // WHEN
-    Throwable thrown = catchThrowable(() -> classes.assertHasPackage(someInfo(), Object.class, packageName));
+    Throwable thrown = catchThrowable(() -> classes.assertHasPackage(someInfo(), actual, packageName));
     // THEN
     then(thrown).isInstanceOf(NullPointerException.class)
                 .hasMessage(shouldNotBeNull("packageName").create());