#1 Migrate to JUnit5

prmr · May 13, 2020 · 2a584ff · 2a584ff
1 parent e94671a
commit 2a584ff
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/.classpath b/.classpath
@@ -2,7 +2,7 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="test"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/5"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk-14.0.1">
 		<attributes>
 			<attribute name="module" value="true"/>

diff --git a/test/ca/mcgill/cs/swevo/minesweeper/TestCell.java b/test/ca/mcgill/cs/swevo/minesweeper/TestCell.java
@@ -20,9 +20,10 @@
  *******************************************************************************/
 package ca.mcgill.cs.swevo.minesweeper;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class TestCell
 {

diff --git a/test/ca/mcgill/cs/swevo/minesweeper/TestMinefield.java b/test/ca/mcgill/cs/swevo/minesweeper/TestMinefield.java
@@ -20,16 +20,17 @@
  *******************************************************************************/
 package ca.mcgill.cs.swevo.minesweeper;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class TestMinefield
 {
 	private Minefield aMinefield;
 
-	@Before
+	@BeforeEach
 	public void setUp()
 	{
 		aMinefield = new Minefield(5, 5, 5);

diff --git a/test/ca/mcgill/cs/swevo/minesweeper/TestPosition.java b/test/ca/mcgill/cs/swevo/minesweeper/TestPosition.java
@@ -20,9 +20,11 @@
  *******************************************************************************/
 package ca.mcgill.cs.swevo.minesweeper;
 
-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.assertTrue;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class TestPosition
 {