moved crc to cpMsg

src/main/java/apps/CPClient.java

@@ -45,7 +45,7 @@ public class CPClient {
                 System.out.println("Command: ");
                 sentence = inFromUser.readLine();
                 // Currently only these two commands are supported by the specification
-                if(!(sentence.equals("status") || sentence.startsWith("print")))
+                if(!(sentence.equals("status") || sentence.equals("print")))
                     continue;
 
                 cp.send(sentence.trim(), null);

src/main/java/cp/CPCommandMessage.java

@@ -49,10 +49,4 @@ public class CPCommandMessage extends CPMsg{
     public static int getMaxMessageId() {
         return MAX_ID;
     }
-
-    public static long calcCRC(String data) {
-        Checksum tmp = new CRC32();
-        tmp.update(data.getBytes());
-        return tmp.getValue();
-    }
 }

src/main/java/cp/CPMsg.java

@@ -34,4 +34,10 @@ class CPMsg extends Msg {
         return parsedMsg;
     }
 
+    protected long calcCRC(String data) {
+        Checksum tmp = new CRC32();
+        tmp.update(data.getBytes());
+        return tmp.getValue();
+    }
+
 }

src/test/java/phy/CPClientCookieRequestTest.java

@@ -30,6 +30,7 @@ public class CPClientCookieRequestTest {
     @Mock
     PhyProtocol phyProtocolMock;
     PhyMsg testMsg;
+    PhyMsg corruptedMsg;
     CPProtocol cProtocol;
 
     @BeforeEach
@@ -39,6 +40,7 @@ public class CPClientCookieRequestTest {
         try {
             phyConfig = new PhyConfiguration(InetAddress.getByName(serverName), serverPort, Protocol.proto_id.CP);
             testMsg = new PhyMsg(phyConfig);
+            corruptedMsg = new PhyMsg(phyConfig);
         } catch (UnknownHostException e) {
             fail();
         }
@@ -56,7 +58,7 @@ public class CPClientCookieRequestTest {
         when(phyProtocolMock.receive(anyInt())).thenReturn(testMsg);
 
         // Run the test
-        assertDoesNotThrow(()->cProtocol.requestCookie(0));
+        assertDoesNotThrow(()->cProtocol.requestCookie());
 
         // verify a specified behavior
         verify(phyProtocolMock, times(1)).receive(2000);
@@ -75,7 +77,7 @@ public class CPClientCookieRequestTest {
 
         // Run the test
         assertThrows(CookieRequestException.class,
-                ()->cProtocol.requestCookie(0));
+                ()->cProtocol.requestCookie());
         verify(phyProtocolMock, times(1)).receive(2000);
 
     }
@@ -85,17 +87,18 @@ public class CPClientCookieRequestTest {
 
         // Fill the message object that is going to be returned to the object-under-test
         // with the message needed for this test case (also create corresponding configuration object)
-        PhyConfiguration phyConfig = new PhyConfiguration(InetAddress.getByName(serverName), serverPort, Protocol.proto_id.SLP);
-        testMsg = new PhyMsg(phyConfig);
-        testMsg = (PhyMsg) testMsg.parse("phy 5 cp cres ACK 12345");
+        PhyConfiguration corruptedPhyConfig = new PhyConfiguration(InetAddress.getByName(serverName), serverPort, Protocol.proto_id.SLP);
+        PhyMsg corruptedPhyMsg = new PhyMsg(corruptedPhyConfig);
+        corruptedPhyMsg = (PhyMsg) corruptedPhyMsg.parse("phy 5 cp cres ACK 12345");
+        testMsg = (PhyMsg) testMsg.parse("phy 7 cp cres ACK 12345");
 
         // Implement behavior of the mocked object
-        when(phyProtocolMock.receive(anyInt())).thenReturn(testMsg);
+        when(phyProtocolMock.receive(anyInt())).thenReturn(corruptedPhyMsg).thenReturn(testMsg);
 
         // Run the test
-        assertThrows(IllegalMsgException.class,
-                ()->cProtocol.requestCookie(0));
-        verify(phyProtocolMock, times(1)).receive(2000);
+        assertDoesNotThrow(()->cProtocol.requestCookie());
+
+        verify(phyProtocolMock, times(2)).receive(2000);
     }
 
     @Test
@@ -103,17 +106,16 @@ public class CPClientCookieRequestTest {
 
         // Fill the message object that is going to be returned to the object-under-test
         // with the message needed for this test case (also create corresponding configuration object)
-        PhyConfiguration phyConfig = new PhyConfiguration(InetAddress.getByName(serverName), serverPort, Protocol.proto_id.SLP);
-        testMsg = new PhyMsg(phyConfig);
+        corruptedMsg = (PhyMsg) corruptedMsg.parse("phy 7 cp cres ACK abc");
         testMsg = (PhyMsg) testMsg.parse("phy 7 cp cres ACK 12345");
 
         // Implement behavior of the mocked object
-        when(phyProtocolMock.receive(anyInt())).thenReturn(testMsg);
+        when(phyProtocolMock.receive(anyInt())).thenReturn(corruptedMsg).thenReturn(testMsg);
 
         // Run the test
-        assertThrows(IllegalMsgException.class,
-                ()->cProtocol.requestCookie(0));
-        verify(phyProtocolMock, times(1)).receive(2000);
+        assertDoesNotThrow(()->cProtocol.requestCookie());
+
+        verify(phyProtocolMock, times(2)).receive(2000);
     }
 
     @Test
@@ -121,17 +123,16 @@ public class CPClientCookieRequestTest {
 
         // Fill the message object that is going to be returned to the object-under-test
         // with the message needed for this test case (also create corresponding configuration object)
-        PhyConfiguration phyConfig = new PhyConfiguration(InetAddress.getByName(serverName), serverPort, Protocol.proto_id.SLP);
-        testMsg = new PhyMsg(phyConfig);
-        testMsg = (PhyMsg) testMsg.parse("phy 5 cp cres ACK");
+        corruptedMsg = (PhyMsg) corruptedMsg.parse("phy 7 cp cres ACK");
+        testMsg = (PhyMsg) testMsg.parse("phy 7 cp cres ACK 12345");
 
         // Implement behavior of the mocked object
-        when(phyProtocolMock.receive(anyInt())).thenReturn(testMsg);
+        when(phyProtocolMock.receive(anyInt())).thenReturn(corruptedMsg).thenReturn(testMsg);
 
         // Run the test
-        assertThrows(IllegalMsgException.class,
-                ()->cProtocol.requestCookie(0));
-        verify(phyProtocolMock, times(1)).receive(2000);
+        assertDoesNotThrow(()->cProtocol.requestCookie());
+
+        verify(phyProtocolMock, times(2)).receive(anyInt());
     }
 
     @Test
@@ -142,7 +143,7 @@ public class CPClientCookieRequestTest {
 
         // Run the test
         assertThrows(CookieRequestException.class,
-                ()->cProtocol.requestCookie(0));
+                ()->cProtocol.requestCookie());
         verify(phyProtocolMock, times(3)).receive(2000);
     }