Refactored tests.

Author: danmigdev

src/test/java/project_16x16/OptionsTest.java

@@ -6,12 +6,10 @@
 
 import org.junit.jupiter.api.Test;
 
-import project_16x16.Options;
-
-public class OptionsTest {
+class OptionsTest {
 
 	@Test
-	public void callingSaveWithIntShouldUpdateOptions() {
+	void callingSaveWithIntShouldUpdateOptions() {
 		int expected = 5;
 		Preferences options = Preferences.userNodeForPackage(Options.class);
 
@@ -21,7 +19,7 @@ public void callingSaveWithIntShouldUpdateOptions() {
 	}
 
 	@Test
-	public void callingSaveWithFloatShouldUpdateOptions() {
+	void callingSaveWithFloatShouldUpdateOptions() {
 		float expected = 5.5f;
 		Preferences options = Preferences.userNodeForPackage(Options.class);
 
@@ -31,7 +29,7 @@ public void callingSaveWithFloatShouldUpdateOptions() {
 	}
 
 	@Test
-	public void callingSaveWithBooleanShouldUpdateOptions() {
+	void callingSaveWithBooleanShouldUpdateOptions() {
 		Preferences options = Preferences.userNodeForPackage(Options.class);
 
 		Options.save(Options.Option.testKey, true);

src/test/java/project_16x16/components/TileTest.java

@@ -11,7 +11,7 @@
 import processing.core.PVector;
 import project_16x16.Tileset;
 
-public class TileTest {
+class TileTest {
 
 	private Tile tile;
 	private PImage image;
@@ -23,33 +23,33 @@ void setup() {
 	}
 
 	@Test
-	void constructorTest() {
+	void callingConstructor_shouldNotFail() {
 		assertNotNull(tile);
 	}
 
 	@Test
-	void getIDTest() {
-		assertEquals(tile.getId(), 1);
+	void callingGetId_shouldReturnExpected() {
+		assertEquals(1, tile.getId());
 	}
 
 	@Test
-	void getNameTest() {
-		assertEquals(tile.getName(), "tile");
+	void callingGetName_shouldReturnExpected() {
+		assertEquals("tile", tile.getName());
 	}
 
 	@Test
-	void getPImageTest() {
-		assertEquals(tile.getPImage(), image);
+	void callingGetPImage_shouldReturnExpected() {
+		assertEquals(image, tile.getPImage());
 	}
 
 	@Test
-	void getTileTypeTest() {
-		assertEquals(tile.getTileType(), Tile.TileType.BACKGROUND);
+	void callingGetTileType_shouldReturnExpected() {
+		assertEquals(Tile.TileType.BACKGROUND, tile.getTileType());
 	}
 
 	@Test
-	void getPositionTest() {
-		PVector vector = new PVector(Tileset.TILESETWIDTH, 0); // as ID = 1
-		assertEquals(tile.getPosition(), vector);
+	void callingGetPosition_shouldReturnExpected() {
+		PVector vector = new PVector(Tileset.TILESETWIDTH, 0);
+		assertEquals(vector, tile.getPosition());
 	}
 }

src/test/java/project_16x16/multiplayer/MultiplayerTest.java

@@ -22,19 +22,18 @@
 import processing.net.Client;
 import processing.net.Server;
 import project_16x16.SideScroller;
-import project_16x16.multiplayer.Multiplayer;
 
 @ExtendWith(MockitoExtension.class)
-public class MultiplayerTest {
+class MultiplayerTest {
 
 	@Mock
 	private SideScroller player;
 
 	@Test
-	public void callingConstructorAsServer_ok() {
+	void callingConstructorAsServer_ok() {
 		ConnectException ce = null;
 		try {
-			Multiplayer multiplayer = new Multiplayer(player, false);
+			new Multiplayer(player, false);
 		}
 		catch (ConnectException e) {
 			ce = e;
@@ -44,10 +43,10 @@ public void callingConstructorAsServer_ok() {
 	}
 
 	@Test
-	public void callingConstructorAsClient_ok() {
+	void callingConstructorAsClient_ok() {
 		ConnectException ce = null;
 		try {
-			Multiplayer multiplayer = new Multiplayer(player, true);
+			new Multiplayer(player, true);
 		}
 		catch (ConnectException e) {
 			ce = e;
@@ -57,13 +56,13 @@ public void callingConstructorAsClient_ok() {
 	}
 
 	@Test
-	public void callingConstructorAsServer_raisesException() {
+	void callingConstructorAsServer_raisesException() {
 		ConnectException ce = null;
 		try (MockedConstruction<Server> mocked = mockConstruction(Server.class, (mock, context) -> {
 			when(mock.active()).thenReturn(false);
 		})) {
 			try {
-				Multiplayer multiplayer = new Multiplayer(player, true);
+				new Multiplayer(player, true);
 			}
 			catch (ConnectException e) {
 				ce = e;
@@ -74,13 +73,13 @@ public void callingConstructorAsServer_raisesException() {
 	}
 
 	@Test
-	public void callingConstructorAsClient_raisesException() {
+	void callingConstructorAsClient_raisesException() {
 		ConnectException ce = null;
 		try (MockedConstruction<Client> mocked = mockConstruction(Client.class, (mock, context) -> {
 			when(mock.active()).thenReturn(false);
 		})) {
 			try {
-				Multiplayer multiplayer = new Multiplayer(player, false);
+				new Multiplayer(player, false);
 			}
 			catch (ConnectException e) {
 				ce = e;
@@ -91,7 +90,7 @@ public void callingConstructorAsClient_raisesException() {
 	}
 
 	@Test
-	public void callingReadDataAsServerWithNoClient_returnsNullData() {
+	void callingReadDataAsServerWithNoClient_returnsNullData() {
 		ConnectException ce = null;
 		JSONObject data = null;
 		try (MockedConstruction<Server> mocked = mockConstruction(Server.class, (mock, context) -> {
@@ -112,7 +111,7 @@ public void callingReadDataAsServerWithNoClient_returnsNullData() {
 	}
 
 	@Test
-	public void callingReadDataAsServerWithClient_returnsData() {
+	void callingReadDataAsServerWithClient_returnsData() {
 		ConnectException ce = null;
 		JSONObject data = null;
 
@@ -138,7 +137,7 @@ public void callingReadDataAsServerWithClient_returnsData() {
 	}
 
 	@Test
-	public void callingReadDataAsClientWithNoAvailableData_returnsNullData() {
+	void callingReadDataAsClientWithNoAvailableData_returnsNullData() {
 		ConnectException ce = null;
 		JSONObject data = null;
 		try (MockedConstruction<Client> client = mockConstruction(Client.class, (mock, context) -> {
@@ -159,7 +158,7 @@ public void callingReadDataAsClientWithNoAvailableData_returnsNullData() {
 	}
 
 	@Test
-	public void callingReadDataAsClient_returnsData() {
+	void callingReadDataAsClient_returnsData() {
 		ConnectException ce = null;
 		JSONObject data = null;
 		try (MockedConstruction<Client> client = mockConstruction(Client.class, (mock, context) -> {
@@ -182,7 +181,7 @@ public void callingReadDataAsClient_returnsData() {
 	}
 
 	@Test
-	public void callingWriteDataAsServer() {
+	void callingWriteDataAsServer() {
 		ConnectException ce = null;
 		try (MockedConstruction<Server> mocked = mockConstruction(Server.class, (mock, context) -> {
 			when(mock.active()).thenReturn(true);
@@ -203,7 +202,7 @@ public void callingWriteDataAsServer() {
 	}
 
 	@Test
-	public void callingWriteDataAsClient() {
+	void callingWriteDataAsClient() {
 		ConnectException ce = null;
 		try (MockedConstruction<Client> mocked = mockConstruction(Client.class, (mock, context) -> {
 			when(mock.active()).thenReturn(true);
@@ -224,7 +223,7 @@ public void callingWriteDataAsClient() {
 	}
 
 	@Test
-	public void callingWriteDataAsClientNotActive_doNotWrites() {
+	void callingWriteDataAsClientNotActive_doNotWrites() {
 		ConnectException ce = null;
 		try (MockedConstruction<Client> mocked = mockConstruction(Client.class, (mock, context) -> {
 			when(mock.active()).thenReturn(true);
@@ -246,7 +245,7 @@ public void callingWriteDataAsClientNotActive_doNotWrites() {
 	}
 
 	@Test
-	public void callingExitAsServer() {
+	void callingExitAsServer() {
 		ConnectException ce = null;
 		try (MockedConstruction<Server> mocked = mockConstruction(Server.class, (mock, context) -> {
 			when(mock.active()).thenReturn(true);
@@ -267,7 +266,7 @@ public void callingExitAsServer() {
 	}
 
 	@Test
-	public void callingExitAsClient() {
+	void callingExitAsClient() {
 		ConnectException ce = null;
 		try (MockedConstruction<Client> mocked = mockConstruction(Client.class, (mock, context) -> {
 			when(mock.active()).thenReturn(true);