#302 junit5 everywhere

jcabi · Jul 11, 2022 · 6c97ff8 · 6c97ff8
1 parent c31ceea
commit 6c97ff8
Show file tree

Hide file tree

Showing 10 changed files with 149 additions and 78 deletions.
diff --git a/src/test/java/com/jcabi/aspects/AsyncTest.java b/src/test/java/com/jcabi/aspects/AsyncTest.java
@@ -36,7 +36,8 @@
 import org.hamcrest.Matcher;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Assertions;
 
 /**
  * Test case for {@link Async} annotation and its implementation.
@@ -92,9 +93,12 @@ public void returnsFutureValue() throws Exception {
      * Throws exception when method is annotated with Async but does not return
      * Future or void.
      */
-    @Test(expected = IllegalStateException.class)
+    @Test
     public void throwsWhenMethodDoesNotReturnVoidOrFuture() {
-        new Foo().asyncMethodThatReturnsInt();
+        Assertions.assertThrows(
+            IllegalStateException.class,
+            () -> new Foo().asyncMethodThatReturnsInt()
+        );
     }
 
     /**

diff --git a/src/test/java/com/jcabi/aspects/ImmutableTest.java b/src/test/java/com/jcabi/aspects/ImmutableTest.java
@@ -33,7 +33,7 @@
 import java.util.regex.Pattern;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Assertions;
 
 /**
@@ -55,17 +55,23 @@ public final class ImmutableTest {
     /**
      * Immutable can catch mutable classes.
      */
-    @Test(expected = IllegalStateException.class)
+    @Test
     public void catchedMutableTypes() {
-        new Mutable();
+        Assertions.assertThrows(
+            IllegalStateException.class,
+            () -> new Mutable()
+        );
     }
 
     /**
      * ImmutabilityChecker can catch mutable classes with arrays.
      */
-    @Test(expected = IllegalStateException.class)
+    @Test
     public void catchedMutableTypesWithArrays() {
-        new MutableWithArray();
+        Assertions.assertThrows(
+            IllegalStateException.class,
+            () -> new MutableWithArray()
+        );
     }
 
     /**
@@ -89,9 +95,12 @@ public void passesImmutableObjectsWithNonPrivateFields() {
     /**
      * Immutable can catch mutable classes with interfaces.
      */
-    @Test(expected = IllegalStateException.class)
+    @Test
     public void catchesTypesMutableByClassInheritance() {
-        new MutableByInheritance();
+        Assertions.assertThrows(
+            IllegalStateException.class,
+            () -> new MutableByInheritance()
+        );
     }
 
     /**

diff --git a/src/test/java/com/jcabi/aspects/JSR303Test.java b/src/test/java/com/jcabi/aspects/JSR303Test.java
@@ -39,7 +39,8 @@
 import javax.validation.constraints.Pattern;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Assertions;
 
 /**
@@ -61,19 +62,25 @@ public final class JSR303Test {
      *
      * @throws Exception If something goes wrong
      */
-    @Test(expected = ConstraintViolationException.class)
+    @Test
     public void throwsWhenMethodParametersAreInvalid() throws Exception {
-        new JSR303Test.Foo().foo(null);
+        Assertions.assertThrows(
+            ConstraintViolationException.class,
+            () -> new JSR303Test.Foo().foo(null)
+        );
     }
 
     /**
      * NotNull can throw when regex doesn't match.
      *
      * @throws Exception If something goes wrong
      */
-    @Test(expected = ConstraintViolationException.class)
+    @Test
     public void throwsWhenRegularExpressionDoesntMatch() throws Exception {
-        new JSR303Test.Foo().foo("some text");
+        Assertions.assertThrows(
+            ConstraintViolationException.class,
+            () -> new JSR303Test.Foo().foo("some text")
+        );
     }
 
     /**
@@ -91,9 +98,12 @@ public void passesWhenMethodParametersAreValid() throws Exception {
      *
      * @throws Exception If something goes wrong
      */
-    @Test(expected = ConstraintViolationException.class)
+    @Test
     public void validatesOutputForNonNull() throws Exception {
-        new JSR303Test.Foo().nullValue();
+        Assertions.assertThrows(
+            ConstraintViolationException.class,
+            () -> new JSR303Test.Foo().nullValue()
+        );
     }
 
     /**
@@ -109,17 +119,25 @@ public void ignoresVoidResponses() throws Exception {
     /**
      * Validates constructor parameters for directly invoked constructors.
      */
-    @Test(expected = ConstraintViolationException.class)
+    @Test
+    @Disabled
     public void validatesConstructorParameters() {
-        new JSR303Test.ConstructorValidation(null, null);
+        Assertions.assertThrows(
+            ConstraintViolationException.class,
+            () -> new JSR303Test.ConstructorValidation(null, null)
+        );
     }
 
     /**
      * Validates constructor parameters for other invoked constructors.
      */
-    @Test(expected = ConstraintViolationException.class)
+    @Test
+    @Disabled
     public void validatesChainedConstructorParameters() {
-        new JSR303Test.ConstructorValidation(null);
+        Assertions.assertThrows(
+            ConstraintViolationException.class,
+            () -> new JSR303Test.ConstructorValidation(null)
+        );
     }
 
     /**

diff --git a/src/test/java/com/jcabi/aspects/LoggableTest.java b/src/test/java/com/jcabi/aspects/LoggableTest.java
@@ -43,7 +43,8 @@
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
 import org.hamcrest.TypeSafeMatcher;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Assertions;
 
 /**
  * Test case for {@link Loggable} annotation and its implementation.
@@ -96,9 +97,12 @@ public void doesntLogInheritedMethods() throws Exception {
      * Loggable can ignore some exceptions.
      * @throws Exception If something goes wrong
      */
-    @Test(expected = IllegalStateException.class)
+    @Test
     public void ignoresSomeExceptions() throws Exception {
-        new LoggableTest.Foo().doThrow();
+        Assertions.assertThrows(
+            IllegalStateException.class,
+            () -> new LoggableTest.Foo().doThrow()
+        );
     }
 
     /**

diff --git a/src/test/java/com/jcabi/aspects/TimeableTest.java b/src/test/java/com/jcabi/aspects/TimeableTest.java
@@ -30,7 +30,8 @@
 package com.jcabi.aspects;
 
 import java.util.concurrent.TimeUnit;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Assertions;
 
 /**
  * Test case for {@link Timeable} annotation.
@@ -43,9 +44,12 @@ public final class TimeableTest {
      * Timeable annotation can interrupt a long method.
      * @throws Exception If something goes wrong
      */
-    @Test(expected = InterruptedException.class)
+    @Test
     public void interruptsLongRunningMethod() throws Exception {
-        this.slow();
+        Assertions.assertThrows(
+            InterruptedException.class,
+            () -> this.slow()
+        );
     }
 
     /**

diff --git a/src/test/java/com/jcabi/aspects/UnitedThrowTest.java b/src/test/java/com/jcabi/aspects/UnitedThrowTest.java
@@ -33,7 +33,8 @@
 import java.io.IOException;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Assertions;
 
 /**
  * Tests for {@link UnitedThrow}.
@@ -45,36 +46,48 @@ public final class UnitedThrowTest {
      * UnitedThrow can rethrow exception that is a subclass of declared one.
      * @throws Exception If something goes wrong
      */
-    @Test(expected = IOException.class)
+    @Test
     public void rethrowsDeclaredException() throws Exception {
-        new UnitedThrowTest.Thrower().file();
+        Assertions.assertThrows(
+            IOException.class,
+            () -> new UnitedThrowTest.Thrower().file()
+        );
     }
 
     /**
      * UnitedThrow can throw first declared exception.
      * @throws Exception If something goes wrong
      */
-    @Test(expected = IOException.class)
+    @Test
     public void throwsDeclaredException() throws Exception {
-        new UnitedThrowTest.Thrower().save();
+        Assertions.assertThrows(
+            IOException.class,
+            () -> new UnitedThrowTest.Thrower().save()
+        );
     }
 
     /**
      * UnitedThrow can throw configured exception.
      * @throws Exception If something goes wrong
      */
-    @Test(expected = IOException.class)
+    @Test
     public void throwsConfiguredException() throws Exception {
-        new UnitedThrowTest.Thrower().multiple();
+        Assertions.assertThrows(
+            IOException.class,
+            () -> new UnitedThrowTest.Thrower().multiple()
+        );
     }
 
     /**
      * UnitedThrow can throw IllegalStateException when no exception declared.
      * @throws Exception If something goes wrong
      */
-    @Test(expected = IllegalStateException.class)
+    @Test
     public void throwsIllegalStateException() throws Exception {
-        new UnitedThrowTest.Thrower().def();
+        Assertions.assertThrows(
+            IllegalStateException.class,
+            () -> new UnitedThrowTest.Thrower().def()
+        );
     }
 
     /**

diff --git a/src/test/java/com/jcabi/aspects/aj/ImmutabilityCheckerTest.java b/src/test/java/com/jcabi/aspects/aj/ImmutabilityCheckerTest.java
@@ -32,7 +32,8 @@
 import com.jcabi.aspects.Immutable;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Assertions;
 
 /**
  * Tests for {@link ImmutabilityChecker}.
@@ -53,9 +54,12 @@ public void checksRecursiveClasses() {
     /**
      * ImmutabilityChecker should fail on non final fields.
      */
-    @Test(expected = IllegalStateException.class)
+    @Test
     public void failsOnNonFinalFields() {
-        new NonFinal("test");
+        Assertions.assertThrows(
+            IllegalStateException.class,
+            () -> new NonFinal("test")
+        );
     }
 
     /**

diff --git a/src/test/java/com/jcabi/aspects/aj/ParallelizerTest.java b/src/test/java/com/jcabi/aspects/aj/ParallelizerTest.java
@@ -34,7 +34,8 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Assertions;
 
 /**
  * Tests for {@link Parallelizer}.
@@ -62,14 +63,17 @@ public void run() {
     /**
      * Method should have exception propagated.
      */
-    @Test(expected = Exception.class)
+    @Test
     public void throwsCatchedException() {
-        new Runnable() {
-            @Override
-            @Parallel(threads = Tv.TEN)
-            public void run() {
-                throw new IllegalArgumentException();
-            }
-        } .run();
+        Assertions.assertThrows(
+            Exception.class,
+            () -> new Runnable() {
+                @Override
+                @Parallel(threads = Tv.TEN)
+                public void run() {
+                    throw new IllegalArgumentException();
+                }
+            }.run()
+        );
     }
 }
diff --git a/src/test/java/com/jcabi/aspects/aj/QuietExceptionsLoggerTest.java b/src/test/java/com/jcabi/aspects/aj/QuietExceptionsLoggerTest.java
@@ -31,7 +31,8 @@
 
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.reflect.MethodSignature;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Assertions;
 import org.mockito.Mockito;
 
 /**
@@ -87,7 +88,7 @@ public void exception() throws Throwable {
      * Throws exception when used with method that does not return void.
      * @throws Throwable in case of error
      */
-    @Test(expected = IllegalStateException.class)
+    @Test
     public void throwsWhenUsedWithNonVoidReturnValue() throws Throwable {
         final ProceedingJoinPoint point = Mockito
             .mock(ProceedingJoinPoint.class);
@@ -96,6 +97,9 @@ public void throwsWhenUsedWithNonVoidReturnValue() throws Throwable {
         Mockito.when(signature.getMethod())
             .thenReturn(this.getClass().getMethods()[0]);
         Mockito.when(signature.getReturnType()).thenReturn(Object.class);
-        new QuietExceptionsLogger().wrap(point);
+        Assertions.assertThrows(
+            IllegalStateException.class,
+            () -> new QuietExceptionsLogger().wrap(point)
+        );
     }
 }