Build 1.0.2

Author: Jay Honnold

.classpath

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="pics"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="lib" path="lib/jfxrt.jar"/>

builds/voto-desktop-v1.0.2.jar

@@ -9,19 +9,19 @@ public class ClientTest {
 	@org.junit.Test(timeout=1000)
 	public void Test1() throws Throwable {
 
-		Client c = new Client("Nick");
+		Client c = new Client("Nick", "111.111.111.111");
 
-		if (!c.equals(new Client("Nick"))) {
+		if (!c.equals(new Client("Nick", "111.111.111.111"))) {
 			org.junit.Assert.fail("Nick is not registered as the same client!");
 		}
 	}
 
 	@org.junit.Test(timeout=1000)
 	public void Test2() throws Throwable {
 
-		Client c = new Client("Nick");
+		Client c = new Client("Nick", "111.111.111.111");
 
-		if (c.equals(new Client("Jay"))) {
+		if (c.equals(new Client("Jay", "123.123.123.123"))) {
 			org.junit.Assert.fail("Jay and Nick are thought as same client!");
 		}
 

builds/voto-desktop-v1.0.2.zip

@@ -1,5 +1,7 @@
 package JUnit;
 
+import java.net.DatagramPacket;
+
 import org.junit.*;
 
 import controller.Controller;
@@ -23,7 +25,7 @@ public void setup() {
 	@org.junit.Test(timeout = 5000)
 	public void Test1() throws Throwable {
 
-		byte[] data = c.parseNetworkCommand(fakeMsg);
+		byte[] data = c.parseNetworkCommand(new DatagramPacket(fakeMsg, fakeMsg.length));
 
 		if (data[0] != 'E') {
 			org.junit.Assert.fail("Doesn't reply error to empty packet");
@@ -36,7 +38,7 @@ public void Test2() throws Throwable {
 		for (int i = 0; i < characters.length; i++) {
 			fakeMsg[0] = characters[i];
 
-			byte[] data = c.parseNetworkCommand(fakeMsg);
+			byte[] data = c.parseNetworkCommand(new DatagramPacket(fakeMsg, fakeMsg.length));
 
 			if (data[0] != 'E') {
 				org.junit.Assert.fail("Doesn't reply error to bad packet");
@@ -59,7 +61,7 @@ public void Test3() throws Throwable {
 				fakeMsg[2 + j] = characters[(int)(Math.random() * 25)];
 			}
 
-			byte[] data = c.parseNetworkCommand(fakeMsg);
+			byte[] data = c.parseNetworkCommand(new DatagramPacket(fakeMsg, fakeMsg.length));
 
 			if (data[0] != 'R' && data[1] != (byte) 4 && data[2] != 't' && data[3] != 'e' && data[4] != 's' && data[5] != 't') {
 				org.junit.Assert.fail("Doesn't properly add handshake");
@@ -70,7 +72,7 @@ public void Test3() throws Throwable {
 	@org.junit.Test(timeout = 5000)
 	public void Test4() throws Throwable {
 
-		s.addClient("T");
+		s.addClient("T", "111.111.111.111");
 		s.setCurrentQuestion("testimage.jpg", "A");
 
 		byte[] fakeMsg = new byte[1024];
@@ -82,7 +84,7 @@ public void Test4() throws Throwable {
 		fakeMsg[4] = (byte) 1;
 		fakeMsg[5] = 'A';
 
-		byte[] data = c.parseNetworkCommand(fakeMsg);
+		byte[] data = c.parseNetworkCommand(new DatagramPacket(fakeMsg, fakeMsg.length));
 
 		if (data == null) {
 			Assert.fail("Doesn't accept votes properly!");

src/JUnit/ClientTest.java

@@ -36,7 +36,7 @@ public void Test1() throws Throwable {
 
 		boolean error = false;
 		for (String name : nameList) {
-			if (!s.addClient(name)) {
+			if (!s.addClient(name, name)) {
 				error = true;
 				break;
 			}
@@ -53,11 +53,11 @@ public void Test2() throws Throwable {
 
 		boolean error = false;
 		for (String name : nameList) {
-			s.addClient(name);
+			s.addClient(name, name);
 		}
 
 		for (String name : nameList) {
-			if (s.addClient(name)) {
+			if (s.addClient(name, name)) {
 				error = true;
 				break;
 			}
@@ -74,7 +74,7 @@ public void Test3() throws Throwable {
 
 		boolean error = false;
 		for (String name : nameList) {
-			s.addClient(name);
+			s.addClient(name, name);
 		}
 
 		for (String name : nameList) {
@@ -116,7 +116,7 @@ public void Test5() throws Throwable {
 		boolean error = false;
 
 		for (int i = 0; i < 30; i++) {
-			s.addClient(nameList.get(i));
+			s.addClient(nameList.get(i), nameList.get(i));
 		}
 
 		for (int i = 30; i < nameList.size(); i++) {
@@ -145,7 +145,7 @@ public void Test6() throws Throwable {
 		Random rnd = new Random();
 
 		for (String name : nameList) {
-			s.addClient(name);
+			s.addClient(name, name);
 		}
 
 		s.setCurrentQuestion("testimage.jpg", "A");
@@ -194,7 +194,7 @@ public void Test8() throws Throwable {
 		s.setCurrentQuestion("testimage.jpg", "A");
 
 		for (String name : nameList) {
-			s.addClient(name);
+			s.addClient(name, name);
 		}
 
 		for (String name : nameList) {
@@ -225,7 +225,7 @@ public void Test9() throws Throwable {
 		HashMap<String, ArrayList<String>> votes = new HashMap<>();
 
 		for (String name : nameList) {
-			s.addClient(name);
+			s.addClient(name, name);
 			votes.put(name, new ArrayList<String>());
 		}
 
@@ -272,7 +272,7 @@ public void Test10() throws Throwable {
 		int voteNum = 0;
 
 		for (String name : nameList) {
-			s.addClient(name);
+			s.addClient(name, name);
 		}