Finishing touched on tests

src/testSuite/LoggerTest.java

@@ -0,0 +1,90 @@
+package testSuite;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import org.junit.Test;
+
+import java.util.List;
+import java.util.ArrayList;
+
+import commsProj.*;
+
+public class LoggerTest {
+
+	@Test
+	public void testConstructor() {
+		//ensure construction was successful
+		UserStorage userStorage = new UserStorage();
+		RoomStorage roomStorage = new RoomStorage();
+		Logger logger = new Logger(roomStorage, userStorage);
+		assertNotNull(logger);
+	}
+
+	@Test
+	public void testCreateRoom() {
+		//setup
+		UserStorage userStorage = new UserStorage();
+		RoomStorage roomStorage = new RoomStorage();
+		Logger logger = new Logger(roomStorage, userStorage);
+
+		List<String> users = new ArrayList<String>();
+		users.add("user1");
+		users.add("user2");
+		Room room = new Room(users);
+		//add the room by the logger
+		logger.createRoom(room);
+		//ensure the room storage has the room
+		assertSame(roomStorage.getRoomById(room.getId()), room);
+		//ensure the users have the room
+		assertTrue(userStorage.getUserRooms("user1").contains(room.getId()));
+		assertTrue(userStorage.getUserRooms("user2").contains(room.getId()));
+	}
+
+	@Test
+	public void testAddUserToRoom() {
+		//setup
+		UserStorage userStorage = new UserStorage();
+		RoomStorage roomStorage = new RoomStorage();
+		Logger logger = new Logger(roomStorage, userStorage);
+
+		List<String> users = new ArrayList<String>();
+		users.add("user1");
+		users.add("user2");
+		Room room = new Room(users);
+		//add the room by the logger
+		logger.createRoom(room);
+		//ensure the room does not contain the user and vice versa
+		assertFalse(userStorage.getUserRooms("user3").contains(room.getId()));
+		assertFalse(roomStorage.getRoomById(room.getId()).getUsers().contains("user3"));
+		//add the user to the room
+		logger.addUserToRoom("user3", room.getId());
+		//ensure the users have the room and vice versa
+		assertTrue(userStorage.getUserRooms("user3").contains(room.getId()));
+		assertTrue(roomStorage.getRoomById(room.getId()).getUsers().contains("user3"));
+	}
+
+	@Test
+	public void testRemoveUserFromRoom() {
+		//setup
+		UserStorage userStorage = new UserStorage();
+		RoomStorage roomStorage = new RoomStorage();
+		Logger logger = new Logger(roomStorage, userStorage);
+
+		List<String> users = new ArrayList<String>();
+		users.add("user1");
+		users.add("user2");
+		Room room = new Room(users);
+		//add the room by the logger
+		logger.createRoom(room);
+		//ensure the room does not contain the user and vice versa
+		assertTrue(userStorage.getUserRooms("user2").contains(room.getId()));
+		assertTrue(roomStorage.getRoomById(room.getId()).getUsers().contains("user2"));
+		//remove the user from the room
+		logger.removeUserFromRoom("user2", room.getId());
+		//ensure the users have the room and vice versa
+		assertFalse(userStorage.getUserRooms("user2").contains(room.getId()));
+		assertFalse(roomStorage.getRoomById(room.getId()).getUsers().contains("user2"));
+	}
+
+
+}

src/commsProj/RoomStorageTest.java → src/testSuite/RoomStorageTest.java

@@ -1,8 +1,14 @@
-package commsProj;
+package testSuite;
 import static org.junit.jupiter.api.Assertions.*;
 
 
 import org.junit.Test;
+
+import commsProj.ChatMessage;
+import commsProj.MessageStatus;
+import commsProj.Room;
+import commsProj.RoomStorage;
+
 import java.util.Set;
 import java.util.ArrayList;
 import java.util.List;

src/testSuite/Test.java

@@ -14,7 +14,8 @@
 	UserStorageTest.class, 
 	AuthenticatorTest.class,
 	RoomStorageTest.class,
-	MessageTest.class
+	MessageTest.class,
+	LoggerTest.class
 })
 
 public class Test {

src/testSuite/UserTest.java

@@ -7,7 +7,7 @@
 public class UserTest {
 
 	@Test
-	public void testConstrutor() {
+	public void testConstructor() {
 		//test normal user creation
 		User user = new User("bob", "password", UserRole.Normal);
 		assertNotNull(user);