diff --git a/.classpath b/.classpath index 2fdc457..7a6c390 100644 --- a/.classpath +++ b/.classpath @@ -2,7 +2,7 @@ - + diff --git a/test/ca/mcgill/cs/swevo/minesweeper/TestCell.java b/test/ca/mcgill/cs/swevo/minesweeper/TestCell.java index c43ba68..1a73565 100644 --- 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 index 002a4e5..c5bfa0f 100644 --- 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 index 33c8e27..ca491c1 100644 --- 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 {