UT for Pcep close message updated with assertThat

Change-Id: I6c51af5aefcf49a2bdc304dd9bd6e3f25f18ae21

@@ -17,44 +17,44 @@ package org.onosproject.pcepio;
 
 
 import org.jboss.netty.buffer.ChannelBuffer;
 import org.jboss.netty.buffer.ChannelBuffer;
 import org.jboss.netty.buffer.ChannelBuffers;
 import org.jboss.netty.buffer.ChannelBuffers;
-import org.junit.Assert;
 import org.junit.Test;
 import org.junit.Test;
 import org.onosproject.pcepio.exceptions.PcepParseException;
 import org.onosproject.pcepio.exceptions.PcepParseException;
+import org.onosproject.pcepio.protocol.PcepCloseMsg;
 import org.onosproject.pcepio.protocol.PcepFactories;
 import org.onosproject.pcepio.protocol.PcepFactories;
 import org.onosproject.pcepio.protocol.PcepMessage;
 import org.onosproject.pcepio.protocol.PcepMessage;
 import org.onosproject.pcepio.protocol.PcepMessageReader;
 import org.onosproject.pcepio.protocol.PcepMessageReader;
-import org.onosproject.pcepio.protocol.PcepCloseMsg;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.Is.is;
+import static org.hamcrest.core.IsSame.sameInstance;
 
 
 public class PcepCloseMsgTest {
 public class PcepCloseMsgTest {
 
 
     /**
     /**
      * Common header, reason to close.
      * Common header, reason to close.
-     *
-     * @throws PcepParseException while parsing the PCEP message.
      */
      */
     @Test
     @Test
     public void closeMessageTest1() throws PcepParseException {
     public void closeMessageTest1() throws PcepParseException {
 
 
-        byte[] closeMsg = new byte[] {0x20, 0x07, 0x00, 0x0C,
-                0x0f, 0x10, 0x00, 0x08, 0x00, 0x00, 0x00, 0x02 };
+        byte[] closeMsg = new byte[] {0x20, 0x07, 0x00, 0x0C, 0x0f, 0x10, 0x00, 0x08, 0x00, 0x00, 0x00, 0x02 };
 
 
         byte[] testCloseMsg = {0 };
         byte[] testCloseMsg = {0 };
         ChannelBuffer buffer = ChannelBuffers.dynamicBuffer();
         ChannelBuffer buffer = ChannelBuffers.dynamicBuffer();
         buffer.writeBytes(closeMsg);
         buffer.writeBytes(closeMsg);
 
 
         PcepMessageReader<PcepMessage> reader = PcepFactories.getGenericReader();
         PcepMessageReader<PcepMessage> reader = PcepFactories.getGenericReader();
-        PcepMessage message = null;
+        PcepMessage message;
 
 
         message = reader.readFrom(buffer);
         message = reader.readFrom(buffer);
-        Assert.assertTrue("PcepMessage is not instance of PcepCloseMsg", message instanceof PcepCloseMsg);
+        assertThat(message, sameInstance((PcepCloseMsg) message));
 
 
         ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
         ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
         message.writeTo(buf);
         message.writeTo(buf);
         testCloseMsg = buf.array();
         testCloseMsg = buf.array();
 
 
-        int readLen = buf.writerIndex() - 0;
+        int readLen = buf.writerIndex();
         testCloseMsg = new byte[readLen];
         testCloseMsg = new byte[readLen];
         buf.readBytes(testCloseMsg, 0, readLen);
         buf.readBytes(testCloseMsg, 0, readLen);
-        Assert.assertArrayEquals("PcTERpt messages are not equal", closeMsg, testCloseMsg);
+        assertThat(testCloseMsg, is(closeMsg));
     }
     }
 }
 }