GP-7: fix mismatches of JUnit4 and JUnit5

Author: Shtramak

binary-search-tree/src/test/java/com/bobocode/bst/BinarySearchTreeTest.java

@@ -6,9 +6,9 @@
 import java.util.List;
 
 import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.empty;
-import static org.junit.Assert.assertThat;
 
 public class BinarySearchTreeTest {
 

linked-list/src/test/java/com/bobocode/LinkedListTest.java

@@ -1,10 +1,15 @@
 package com.bobocode;
 
+
 import org.junit.jupiter.api.Test;
 
 import java.util.NoSuchElementException;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 
 public class LinkedListTest {
 
@@ -60,14 +65,14 @@ public void testGetLastElement() {
         assertEquals(42, intList.getLast().intValue());
     }
 
-    @Test(expected = NoSuchElementException.class)
+    @Test
     public void testGetFirstOfEmptyList() {
-        intList.getFirst();
+        assertThrows(NoSuchElementException.class, () -> intList.getFirst());
     }
 
-    @Test(expected = NoSuchElementException.class)
+    @Test
     public void testGetLastOfEmptyList() {
-        intList.getLast();
+        assertThrows(NoSuchElementException.class, () -> intList.getLast());
     }
 
     @Test
@@ -79,23 +84,23 @@ public void testGetElementByIndex() {
         assertEquals(52, intList.get(2).intValue());
     }
 
-    @Test(expected = IndexOutOfBoundsException.class)
+    @Test
     public void testGetElementByIndexOfEmptyTree() {
-        intList.get(1);
+        assertThrows(IndexOutOfBoundsException.class, () -> intList.get(1));
     }
 
-    @Test(expected = IndexOutOfBoundsException.class)
+    @Test
     public void testGetElementByNegativeIndex() {
         intList = LinkedList.of(1, 2, 3);
 
-        intList.get(-2);
+        assertThrows(IndexOutOfBoundsException.class, () -> intList.get(-2));
     }
 
-    @Test(expected = IndexOutOfBoundsException.class)
+    @Test
     public void testGetElementBySizeIndex() {
         intList = LinkedList.of(1, 2, 3);
 
-        intList.get(3);
+        assertThrows(IndexOutOfBoundsException.class, () -> intList.get(3));
     }
 
     @Test
@@ -153,11 +158,11 @@ public void testSetElementByIndex() {
         assertEquals(3, intList.size());
     }
 
-    @Test(expected = IndexOutOfBoundsException.class)
+    @Test
     public void testSetElementByInvalidIndex() {
         intList = LinkedList.of(110, 111);
 
-        intList.set(3, 114);
+        assertThrows(IndexOutOfBoundsException.class, () -> intList.set(3, 114));
     }
 
     @Test
@@ -207,9 +212,9 @@ public void testRemoveSingleElementByIndex() {
         assertEquals(0, intList.size());
     }
 
-    @Test(expected = IndexOutOfBoundsException.class)
+    @Test
     public void testRemoveElementOfEmptyList() {
-        intList.remove(0);
+        assertThrows(IndexOutOfBoundsException.class, () -> intList.remove(0));
     }
 
     @Test

stack/src/test/java/com/bobocode/StackTest.java

@@ -1,12 +1,11 @@
 package com.bobocode;
 
-import org.junit.jupiter.api.Test;
 import com.bobocode.exception.EmptyStackException;
+import org.junit.jupiter.api.Test;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class StackTest {
 
@@ -17,9 +16,9 @@ public void testPushElementOntoEmptyStack() {
         intStack.push(234);
     }
 
-    @Test(expected = EmptyStackException.class)
+    @Test
     public void testPopElementFromEmptyStack() {
-        intStack.pop();
+        assertThrows(EmptyStackException.class, () -> intStack.pop());
     }
 
     @Test