홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Sho SHIMIZU
Committed by Gerrit Code Review
e090a422 1 parent e79b0252

Replace useless assertion with type check by instanceof 

Change-Id: I6b80e42e47579914776497f2314b9aa75d98dabf
Expand all
Inline Side-by-side
Showing 5 changed files with 67 additions and 67 deletions
...@@ -25,8 +25,8 @@ import org.onosproject.pcepio.protocol.PcepMessage; ...@@ -25,8 +25,8 @@ import org.onosproject.pcepio.protocol.PcepMessage;
25 import org.onosproject.pcepio.protocol.PcepMessageReader; 25 import org.onosproject.pcepio.protocol.PcepMessageReader;
26 26
27 import static org.hamcrest.MatcherAssert.assertThat; 27 import static org.hamcrest.MatcherAssert.assertThat;
28 +import static org.hamcrest.Matchers.instanceOf;
28 import static org.hamcrest.core.Is.is; 29 import static org.hamcrest.core.Is.is;
29 -import static org.hamcrest.core.IsSame.sameInstance;
30 30
31 public class PcepCloseMsgTest { 31 public class PcepCloseMsgTest {
32 32
...@@ -46,7 +46,7 @@ public class PcepCloseMsgTest { ...@@ -46,7 +46,7 @@ public class PcepCloseMsgTest {
46 PcepMessage message; 46 PcepMessage message;
47 47
48 message = reader.readFrom(buffer); 48 message = reader.readFrom(buffer);
49 - assertThat(message, sameInstance((PcepCloseMsg) message)); 49 + assertThat(message, instanceOf(PcepCloseMsg.class));
50 50
51 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 51 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
52 message.writeTo(buf); 52 message.writeTo(buf);
......
...@@ -26,8 +26,8 @@ import org.onosproject.pcepio.protocol.PcepMessage; ...@@ -26,8 +26,8 @@ import org.onosproject.pcepio.protocol.PcepMessage;
26 import org.onosproject.pcepio.protocol.PcepMessageReader; 26 import org.onosproject.pcepio.protocol.PcepMessageReader;
27 27
28 import static org.hamcrest.MatcherAssert.assertThat; 28 import static org.hamcrest.MatcherAssert.assertThat;
29 +import static org.hamcrest.Matchers.instanceOf;
29 import static org.hamcrest.core.Is.is; 30 import static org.hamcrest.core.Is.is;
30 -import static org.hamcrest.core.IsSame.sameInstance;
31 31
32 /** 32 /**
33 * Test cases for PCEP ERROR Message. 33 * Test cases for PCEP ERROR Message.
...@@ -64,7 +64,7 @@ public class PcepErrorMsgTest { ...@@ -64,7 +64,7 @@ public class PcepErrorMsgTest {
64 byte[] testErrorMsg = {0}; 64 byte[] testErrorMsg = {0};
65 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 65 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
66 66
67 - assertThat(message, sameInstance((PcepErrorMsg) message)); 67 + assertThat(message, instanceOf(PcepErrorMsg.class));
68 message.writeTo(buf); 68 message.writeTo(buf);
69 int iReadLen = buf.writerIndex(); 69 int iReadLen = buf.writerIndex();
70 testErrorMsg = new byte[iReadLen]; 70 testErrorMsg = new byte[iReadLen];
...@@ -103,7 +103,7 @@ public class PcepErrorMsgTest { ...@@ -103,7 +103,7 @@ public class PcepErrorMsgTest {
103 103
104 byte[] testErrorMsg = {0}; 104 byte[] testErrorMsg = {0};
105 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 105 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
106 - assertThat(message, sameInstance((PcepErrorMsg) message)); 106 + assertThat(message, instanceOf(PcepErrorMsg.class));
107 message.writeTo(buf); 107 message.writeTo(buf);
108 int iReadLen = buf.writerIndex(); 108 int iReadLen = buf.writerIndex();
109 testErrorMsg = new byte[iReadLen]; 109 testErrorMsg = new byte[iReadLen];
...@@ -141,7 +141,7 @@ public class PcepErrorMsgTest { ...@@ -141,7 +141,7 @@ public class PcepErrorMsgTest {
141 141
142 byte[] testErrorMsg = {0}; 142 byte[] testErrorMsg = {0};
143 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 143 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
144 - assertThat(message, sameInstance((PcepErrorMsg) message)); 144 + assertThat(message, instanceOf(PcepErrorMsg.class));
145 message.writeTo(buf); 145 message.writeTo(buf);
146 int iReadLen = buf.writerIndex(); 146 int iReadLen = buf.writerIndex();
147 testErrorMsg = new byte[iReadLen]; 147 testErrorMsg = new byte[iReadLen];
...@@ -177,7 +177,7 @@ public class PcepErrorMsgTest { ...@@ -177,7 +177,7 @@ public class PcepErrorMsgTest {
177 177
178 byte[] testErrorMsg = {0}; 178 byte[] testErrorMsg = {0};
179 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 179 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
180 - assertThat(message, sameInstance((PcepErrorMsg) message)); 180 + assertThat(message, instanceOf(PcepErrorMsg.class));
181 message.writeTo(buf); 181 message.writeTo(buf);
182 int iReadLen = buf.writerIndex(); 182 int iReadLen = buf.writerIndex();
183 testErrorMsg = new byte[iReadLen]; 183 testErrorMsg = new byte[iReadLen];
...@@ -212,7 +212,7 @@ public class PcepErrorMsgTest { ...@@ -212,7 +212,7 @@ public class PcepErrorMsgTest {
212 212
213 byte[] testErrorMsg = {0}; 213 byte[] testErrorMsg = {0};
214 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 214 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
215 - assertThat(message, sameInstance((PcepErrorMsg) message)); 215 + assertThat(message, instanceOf(PcepErrorMsg.class));
216 message.writeTo(buf); 216 message.writeTo(buf);
217 int iReadLen = buf.writerIndex(); 217 int iReadLen = buf.writerIndex();
218 testErrorMsg = new byte[iReadLen]; 218 testErrorMsg = new byte[iReadLen];
...@@ -246,7 +246,7 @@ public class PcepErrorMsgTest { ...@@ -246,7 +246,7 @@ public class PcepErrorMsgTest {
246 246
247 byte[] testErrorMsg = {0}; 247 byte[] testErrorMsg = {0};
248 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 248 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
249 - assertThat(message, sameInstance((PcepErrorMsg) message)); 249 + assertThat(message, instanceOf(PcepErrorMsg.class));
250 message.writeTo(buf); 250 message.writeTo(buf);
251 int iReadLen = buf.writerIndex(); 251 int iReadLen = buf.writerIndex();
252 testErrorMsg = new byte[iReadLen]; 252 testErrorMsg = new byte[iReadLen];
...@@ -279,7 +279,7 @@ public class PcepErrorMsgTest { ...@@ -279,7 +279,7 @@ public class PcepErrorMsgTest {
279 279
280 byte[] testErrorMsg = {0}; 280 byte[] testErrorMsg = {0};
281 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 281 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
282 - assertThat(message, sameInstance((PcepErrorMsg) message)); 282 + assertThat(message, instanceOf(PcepErrorMsg.class));
283 message.writeTo(buf); 283 message.writeTo(buf);
284 int iReadLen = buf.writerIndex(); 284 int iReadLen = buf.writerIndex();
285 testErrorMsg = new byte[iReadLen]; 285 testErrorMsg = new byte[iReadLen];
...@@ -312,7 +312,7 @@ public class PcepErrorMsgTest { ...@@ -312,7 +312,7 @@ public class PcepErrorMsgTest {
312 312
313 byte[] testErrorMsg = {0}; 313 byte[] testErrorMsg = {0};
314 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 314 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
315 - assertThat(message, sameInstance((PcepErrorMsg) message)); 315 + assertThat(message, instanceOf(PcepErrorMsg.class));
316 message.writeTo(buf); 316 message.writeTo(buf);
317 int iReadLen = buf.writerIndex(); 317 int iReadLen = buf.writerIndex();
318 testErrorMsg = new byte[iReadLen]; 318 testErrorMsg = new byte[iReadLen];
...@@ -344,7 +344,7 @@ public class PcepErrorMsgTest { ...@@ -344,7 +344,7 @@ public class PcepErrorMsgTest {
344 344
345 byte[] testErrorMsg = {0}; 345 byte[] testErrorMsg = {0};
346 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 346 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
347 - assertThat(message, sameInstance((PcepErrorMsg) message)); 347 + assertThat(message, instanceOf(PcepErrorMsg.class));
348 message.writeTo(buf); 348 message.writeTo(buf);
349 int iReadLen = buf.writerIndex(); 349 int iReadLen = buf.writerIndex();
350 testErrorMsg = new byte[iReadLen]; 350 testErrorMsg = new byte[iReadLen];
...@@ -376,7 +376,7 @@ public class PcepErrorMsgTest { ...@@ -376,7 +376,7 @@ public class PcepErrorMsgTest {
376 376
377 byte[] testErrorMsg = {0}; 377 byte[] testErrorMsg = {0};
378 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 378 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
379 - assertThat(message, sameInstance((PcepErrorMsg) message)); 379 + assertThat(message, instanceOf(PcepErrorMsg.class));
380 message.writeTo(buf); 380 message.writeTo(buf);
381 int iReadLen = buf.writerIndex(); 381 int iReadLen = buf.writerIndex();
382 testErrorMsg = new byte[iReadLen]; 382 testErrorMsg = new byte[iReadLen];
...@@ -409,7 +409,7 @@ public class PcepErrorMsgTest { ...@@ -409,7 +409,7 @@ public class PcepErrorMsgTest {
409 409
410 byte[] testErrorMsg = {0}; 410 byte[] testErrorMsg = {0};
411 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 411 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
412 - assertThat(message, sameInstance((PcepErrorMsg) message)); 412 + assertThat(message, instanceOf(PcepErrorMsg.class));
413 message.writeTo(buf); 413 message.writeTo(buf);
414 int iReadLen = buf.writerIndex(); 414 int iReadLen = buf.writerIndex();
415 testErrorMsg = new byte[iReadLen]; 415 testErrorMsg = new byte[iReadLen];
...@@ -442,7 +442,7 @@ public class PcepErrorMsgTest { ...@@ -442,7 +442,7 @@ public class PcepErrorMsgTest {
442 442
443 byte[] testErrorMsg = {0}; 443 byte[] testErrorMsg = {0};
444 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 444 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
445 - assertThat(message, sameInstance((PcepErrorMsg) message)); 445 + assertThat(message, instanceOf(PcepErrorMsg.class));
446 message.writeTo(buf); 446 message.writeTo(buf);
447 int iReadLen = buf.writerIndex(); 447 int iReadLen = buf.writerIndex();
448 testErrorMsg = new byte[iReadLen]; 448 testErrorMsg = new byte[iReadLen];
...@@ -475,7 +475,7 @@ public class PcepErrorMsgTest { ...@@ -475,7 +475,7 @@ public class PcepErrorMsgTest {
475 475
476 byte[] testErrorMsg = {0}; 476 byte[] testErrorMsg = {0};
477 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 477 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
478 - assertThat(message, sameInstance((PcepErrorMsg) message)); 478 + assertThat(message, instanceOf(PcepErrorMsg.class));
479 message.writeTo(buf); 479 message.writeTo(buf);
480 int iReadLen = buf.writerIndex(); 480 int iReadLen = buf.writerIndex();
481 testErrorMsg = new byte[iReadLen]; 481 testErrorMsg = new byte[iReadLen];
...@@ -510,7 +510,7 @@ public class PcepErrorMsgTest { ...@@ -510,7 +510,7 @@ public class PcepErrorMsgTest {
510 510
511 byte[] testErrorMsg = {0}; 511 byte[] testErrorMsg = {0};
512 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 512 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
513 - assertThat(message, sameInstance((PcepErrorMsg) message)); 513 + assertThat(message, instanceOf(PcepErrorMsg.class));
514 message.writeTo(buf); 514 message.writeTo(buf);
515 int iReadLen = buf.writerIndex(); 515 int iReadLen = buf.writerIndex();
516 testErrorMsg = new byte[iReadLen]; 516 testErrorMsg = new byte[iReadLen];
...@@ -544,7 +544,7 @@ public class PcepErrorMsgTest { ...@@ -544,7 +544,7 @@ public class PcepErrorMsgTest {
544 544
545 byte[] testErrorMsg = {0}; 545 byte[] testErrorMsg = {0};
546 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 546 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
547 - assertThat(message, sameInstance((PcepErrorMsg) message)); 547 + assertThat(message, instanceOf(PcepErrorMsg.class));
548 message.writeTo(buf); 548 message.writeTo(buf);
549 int iReadLen = buf.writerIndex(); 549 int iReadLen = buf.writerIndex();
550 testErrorMsg = new byte[iReadLen]; 550 testErrorMsg = new byte[iReadLen];
...@@ -578,7 +578,7 @@ public class PcepErrorMsgTest { ...@@ -578,7 +578,7 @@ public class PcepErrorMsgTest {
578 578
579 byte[] testErrorMsg = {0}; 579 byte[] testErrorMsg = {0};
580 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 580 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
581 - assertThat(message, sameInstance((PcepErrorMsg) message)); 581 + assertThat(message, instanceOf(PcepErrorMsg.class));
582 message.writeTo(buf); 582 message.writeTo(buf);
583 int iReadLen = buf.writerIndex(); 583 int iReadLen = buf.writerIndex();
584 testErrorMsg = new byte[iReadLen]; 584 testErrorMsg = new byte[iReadLen];
...@@ -614,7 +614,7 @@ public class PcepErrorMsgTest { ...@@ -614,7 +614,7 @@ public class PcepErrorMsgTest {
614 614
615 byte[] testErrorMsg = {0}; 615 byte[] testErrorMsg = {0};
616 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 616 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
617 - assertThat(message, sameInstance((PcepErrorMsg) message)); 617 + assertThat(message, instanceOf(PcepErrorMsg.class));
618 message.writeTo(buf); 618 message.writeTo(buf);
619 int iReadLen = buf.writerIndex(); 619 int iReadLen = buf.writerIndex();
620 testErrorMsg = new byte[iReadLen]; 620 testErrorMsg = new byte[iReadLen];
...@@ -650,7 +650,7 @@ public class PcepErrorMsgTest { ...@@ -650,7 +650,7 @@ public class PcepErrorMsgTest {
650 650
651 byte[] testErrorMsg = {0}; 651 byte[] testErrorMsg = {0};
652 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 652 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
653 - assertThat(message, sameInstance((PcepErrorMsg) message)); 653 + assertThat(message, instanceOf(PcepErrorMsg.class));
654 message.writeTo(buf); 654 message.writeTo(buf);
655 int iReadLen = buf.writerIndex(); 655 int iReadLen = buf.writerIndex();
656 testErrorMsg = new byte[iReadLen]; 656 testErrorMsg = new byte[iReadLen];
...@@ -688,7 +688,7 @@ public class PcepErrorMsgTest { ...@@ -688,7 +688,7 @@ public class PcepErrorMsgTest {
688 688
689 byte[] testErrorMsg = {0}; 689 byte[] testErrorMsg = {0};
690 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 690 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
691 - assertThat(message, sameInstance((PcepErrorMsg) message)); 691 + assertThat(message, instanceOf(PcepErrorMsg.class));
692 message.writeTo(buf); 692 message.writeTo(buf);
693 int iReadLen = buf.writerIndex(); 693 int iReadLen = buf.writerIndex();
694 testErrorMsg = new byte[iReadLen]; 694 testErrorMsg = new byte[iReadLen];
...@@ -727,7 +727,7 @@ public class PcepErrorMsgTest { ...@@ -727,7 +727,7 @@ public class PcepErrorMsgTest {
727 727
728 byte[] testErrorMsg = {0}; 728 byte[] testErrorMsg = {0};
729 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 729 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
730 - assertThat(message, sameInstance((PcepErrorMsg) message)); 730 + assertThat(message, instanceOf(PcepErrorMsg.class));
731 731
732 message.writeTo(buf); 732 message.writeTo(buf);
733 int iReadLen = buf.writerIndex(); 733 int iReadLen = buf.writerIndex();
......
...@@ -25,8 +25,8 @@ import org.onosproject.pcepio.protocol.PcepMessage; ...@@ -25,8 +25,8 @@ import org.onosproject.pcepio.protocol.PcepMessage;
25 import org.onosproject.pcepio.protocol.PcepMessageReader; 25 import org.onosproject.pcepio.protocol.PcepMessageReader;
26 26
27 import static org.hamcrest.MatcherAssert.assertThat; 27 import static org.hamcrest.MatcherAssert.assertThat;
28 +import static org.hamcrest.Matchers.instanceOf;
28 import static org.hamcrest.core.Is.is; 29 import static org.hamcrest.core.Is.is;
29 -import static org.hamcrest.core.IsSame.sameInstance;
30 30
31 public class PcepInitiateMsgTest { 31 public class PcepInitiateMsgTest {
32 32
...@@ -60,7 +60,7 @@ public class PcepInitiateMsgTest { ...@@ -60,7 +60,7 @@ public class PcepInitiateMsgTest {
60 60
61 message = reader.readFrom(buffer); 61 message = reader.readFrom(buffer);
62 62
63 - assertThat(message, sameInstance((PcepInitiateMsg) message)); 63 + assertThat(message, instanceOf(PcepInitiateMsg.class));
64 64
65 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 65 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
66 66
...@@ -99,7 +99,7 @@ public class PcepInitiateMsgTest { ...@@ -99,7 +99,7 @@ public class PcepInitiateMsgTest {
99 99
100 message = reader.readFrom(buffer); 100 message = reader.readFrom(buffer);
101 101
102 - assertThat(message, sameInstance((PcepInitiateMsg) message)); 102 + assertThat(message, instanceOf(PcepInitiateMsg.class));
103 103
104 104
105 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 105 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
...@@ -147,7 +147,7 @@ public class PcepInitiateMsgTest { ...@@ -147,7 +147,7 @@ public class PcepInitiateMsgTest {
147 147
148 message = reader.readFrom(buffer); 148 message = reader.readFrom(buffer);
149 149
150 - assertThat(message, sameInstance((PcepInitiateMsg) message)); 150 + assertThat(message, instanceOf(PcepInitiateMsg.class));
151 151
152 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 152 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
153 153
...@@ -194,7 +194,7 @@ public class PcepInitiateMsgTest { ...@@ -194,7 +194,7 @@ public class PcepInitiateMsgTest {
194 194
195 message = reader.readFrom(buffer); 195 message = reader.readFrom(buffer);
196 196
197 - assertThat(message, sameInstance((PcepInitiateMsg) message)); 197 + assertThat(message, instanceOf(PcepInitiateMsg.class));
198 198
199 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 199 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
200 message.writeTo(buf); 200 message.writeTo(buf);
...@@ -239,7 +239,7 @@ public class PcepInitiateMsgTest { ...@@ -239,7 +239,7 @@ public class PcepInitiateMsgTest {
239 239
240 message = reader.readFrom(buffer); 240 message = reader.readFrom(buffer);
241 241
242 - assertThat(message, sameInstance((PcepInitiateMsg) message)); 242 + assertThat(message, instanceOf(PcepInitiateMsg.class));
243 243
244 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 244 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
245 245
...@@ -287,7 +287,7 @@ public class PcepInitiateMsgTest { ...@@ -287,7 +287,7 @@ public class PcepInitiateMsgTest {
287 287
288 message = reader.readFrom(buffer); 288 message = reader.readFrom(buffer);
289 289
290 - assertThat(message, sameInstance((PcepInitiateMsg) message)); 290 + assertThat(message, instanceOf(PcepInitiateMsg.class));
291 291
292 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 292 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
293 293
...@@ -334,7 +334,7 @@ public class PcepInitiateMsgTest { ...@@ -334,7 +334,7 @@ public class PcepInitiateMsgTest {
334 334
335 message = reader.readFrom(buffer); 335 message = reader.readFrom(buffer);
336 336
337 - assertThat(message, sameInstance((PcepInitiateMsg) message)); 337 + assertThat(message, instanceOf(PcepInitiateMsg.class));
338 338
339 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 339 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
340 340
...@@ -380,7 +380,7 @@ public class PcepInitiateMsgTest { ...@@ -380,7 +380,7 @@ public class PcepInitiateMsgTest {
380 380
381 message = reader.readFrom(buffer); 381 message = reader.readFrom(buffer);
382 382
383 - assertThat(message, sameInstance((PcepInitiateMsg) message)); 383 + assertThat(message, instanceOf(PcepInitiateMsg.class));
384 384
385 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 385 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
386 386
...@@ -424,7 +424,7 @@ public class PcepInitiateMsgTest { ...@@ -424,7 +424,7 @@ public class PcepInitiateMsgTest {
424 424
425 message = reader.readFrom(buffer); 425 message = reader.readFrom(buffer);
426 426
427 - assertThat(message, sameInstance((PcepInitiateMsg) message)); 427 + assertThat(message, instanceOf(PcepInitiateMsg.class));
428 428
429 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 429 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
430 430
...@@ -468,7 +468,7 @@ public class PcepInitiateMsgTest { ...@@ -468,7 +468,7 @@ public class PcepInitiateMsgTest {
468 468
469 message = reader.readFrom(buffer); 469 message = reader.readFrom(buffer);
470 470
471 - assertThat(message, sameInstance((PcepInitiateMsg) message)); 471 + assertThat(message, instanceOf(PcepInitiateMsg.class));
472 472
473 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 473 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
474 474
...@@ -512,7 +512,7 @@ public class PcepInitiateMsgTest { ...@@ -512,7 +512,7 @@ public class PcepInitiateMsgTest {
512 512
513 message = reader.readFrom(buffer); 513 message = reader.readFrom(buffer);
514 514
515 - assertThat(message, sameInstance((PcepInitiateMsg) message)); 515 + assertThat(message, instanceOf(PcepInitiateMsg.class));
516 516
517 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 517 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
518 518
...@@ -555,7 +555,7 @@ public class PcepInitiateMsgTest { ...@@ -555,7 +555,7 @@ public class PcepInitiateMsgTest {
555 555
556 message = reader.readFrom(buffer); 556 message = reader.readFrom(buffer);
557 557
558 - assertThat(message, sameInstance((PcepInitiateMsg) message)); 558 + assertThat(message, instanceOf(PcepInitiateMsg.class));
559 559
560 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 560 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
561 561
...@@ -597,7 +597,7 @@ public class PcepInitiateMsgTest { ...@@ -597,7 +597,7 @@ public class PcepInitiateMsgTest {
597 597
598 message = reader.readFrom(buffer); 598 message = reader.readFrom(buffer);
599 599
600 - assertThat(message, sameInstance((PcepInitiateMsg) message)); 600 + assertThat(message, instanceOf(PcepInitiateMsg.class));
601 601
602 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 602 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
603 603
...@@ -639,7 +639,7 @@ public class PcepInitiateMsgTest { ...@@ -639,7 +639,7 @@ public class PcepInitiateMsgTest {
639 639
640 message = reader.readFrom(buffer); 640 message = reader.readFrom(buffer);
641 641
642 - assertThat(message, sameInstance((PcepInitiateMsg) message)); 642 + assertThat(message, instanceOf(PcepInitiateMsg.class));
643 643
644 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 644 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
645 645
...@@ -680,7 +680,7 @@ public class PcepInitiateMsgTest { ...@@ -680,7 +680,7 @@ public class PcepInitiateMsgTest {
680 680
681 message = reader.readFrom(buffer); 681 message = reader.readFrom(buffer);
682 682
683 - assertThat(message, sameInstance((PcepInitiateMsg) message)); 683 + assertThat(message, instanceOf(PcepInitiateMsg.class));
684 684
685 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 685 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
686 686
...@@ -724,7 +724,7 @@ public class PcepInitiateMsgTest { ...@@ -724,7 +724,7 @@ public class PcepInitiateMsgTest {
724 724
725 message = reader.readFrom(buffer); 725 message = reader.readFrom(buffer);
726 726
727 - assertThat(message, sameInstance((PcepInitiateMsg) message)); 727 + assertThat(message, instanceOf(PcepInitiateMsg.class));
728 728
729 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 729 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
730 730
...@@ -769,7 +769,7 @@ public class PcepInitiateMsgTest { ...@@ -769,7 +769,7 @@ public class PcepInitiateMsgTest {
769 769
770 message = reader.readFrom(buffer); 770 message = reader.readFrom(buffer);
771 771
772 - assertThat(message, sameInstance((PcepInitiateMsg) message)); 772 + assertThat(message, instanceOf(PcepInitiateMsg.class));
773 773
774 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 774 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
775 775
...@@ -813,7 +813,7 @@ public class PcepInitiateMsgTest { ...@@ -813,7 +813,7 @@ public class PcepInitiateMsgTest {
813 813
814 message = reader.readFrom(buffer); 814 message = reader.readFrom(buffer);
815 815
816 - assertThat(message, sameInstance((PcepInitiateMsg) message)); 816 + assertThat(message, instanceOf(PcepInitiateMsg.class));
817 817
818 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 818 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
819 819
...@@ -860,7 +860,7 @@ public class PcepInitiateMsgTest { ...@@ -860,7 +860,7 @@ public class PcepInitiateMsgTest {
860 860
861 message = reader.readFrom(buffer); 861 message = reader.readFrom(buffer);
862 862
863 - assertThat(message, sameInstance((PcepInitiateMsg) message)); 863 + assertThat(message, instanceOf(PcepInitiateMsg.class));
864 864
865 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 865 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
866 866
...@@ -908,7 +908,7 @@ public class PcepInitiateMsgTest { ...@@ -908,7 +908,7 @@ public class PcepInitiateMsgTest {
908 908
909 message = reader.readFrom(buffer); 909 message = reader.readFrom(buffer);
910 910
911 - assertThat(message, sameInstance((PcepInitiateMsg) message)); 911 + assertThat(message, instanceOf(PcepInitiateMsg.class));
912 912
913 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 913 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
914 914
...@@ -962,7 +962,7 @@ public class PcepInitiateMsgTest { ...@@ -962,7 +962,7 @@ public class PcepInitiateMsgTest {
962 962
963 message = reader.readFrom(buffer); 963 message = reader.readFrom(buffer);
964 964
965 - assertThat(message, sameInstance((PcepInitiateMsg) message)); 965 + assertThat(message, instanceOf(PcepInitiateMsg.class));
966 966
967 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 967 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
968 968
...@@ -1017,7 +1017,7 @@ public class PcepInitiateMsgTest { ...@@ -1017,7 +1017,7 @@ public class PcepInitiateMsgTest {
1017 1017
1018 message = reader.readFrom(buffer); 1018 message = reader.readFrom(buffer);
1019 1019
1020 - assertThat(message, sameInstance((PcepInitiateMsg) message)); 1020 + assertThat(message, instanceOf(PcepInitiateMsg.class));
1021 1021
1022 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 1022 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
1023 1023
...@@ -1074,7 +1074,7 @@ public class PcepInitiateMsgTest { ...@@ -1074,7 +1074,7 @@ public class PcepInitiateMsgTest {
1074 1074
1075 message = reader.readFrom(buffer); 1075 message = reader.readFrom(buffer);
1076 1076
1077 - assertThat(message, sameInstance((PcepInitiateMsg) message)); 1077 + assertThat(message, instanceOf(PcepInitiateMsg.class));
1078 1078
1079 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 1079 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
1080 1080
...@@ -1131,7 +1131,7 @@ public class PcepInitiateMsgTest { ...@@ -1131,7 +1131,7 @@ public class PcepInitiateMsgTest {
1131 1131
1132 message = reader.readFrom(buffer); 1132 message = reader.readFrom(buffer);
1133 1133
1134 - assertThat(message, sameInstance((PcepInitiateMsg) message)); 1134 + assertThat(message, instanceOf(PcepInitiateMsg.class));
1135 1135
1136 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 1136 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
1137 1137
...@@ -1192,7 +1192,7 @@ public class PcepInitiateMsgTest { ...@@ -1192,7 +1192,7 @@ public class PcepInitiateMsgTest {
1192 1192
1193 message = reader.readFrom(buffer); 1193 message = reader.readFrom(buffer);
1194 1194
1195 - assertThat(message, sameInstance((PcepInitiateMsg) message)); 1195 + assertThat(message, instanceOf(PcepInitiateMsg.class));
1196 1196
1197 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 1197 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
1198 1198
...@@ -1254,7 +1254,7 @@ public class PcepInitiateMsgTest { ...@@ -1254,7 +1254,7 @@ public class PcepInitiateMsgTest {
1254 1254
1255 message = reader.readFrom(buffer); 1255 message = reader.readFrom(buffer);
1256 1256
1257 - assertThat(message, sameInstance((PcepInitiateMsg) message)); 1257 + assertThat(message, instanceOf(PcepInitiateMsg.class));
1258 1258
1259 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 1259 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
1260 1260
...@@ -1318,7 +1318,7 @@ public class PcepInitiateMsgTest { ...@@ -1318,7 +1318,7 @@ public class PcepInitiateMsgTest {
1318 1318
1319 message = reader.readFrom(buffer); 1319 message = reader.readFrom(buffer);
1320 1320
1321 - assertThat(message, sameInstance((PcepInitiateMsg) message)); 1321 + assertThat(message, instanceOf(PcepInitiateMsg.class));
1322 1322
1323 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 1323 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
1324 1324
......
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
16 package org.onosproject.pcepio; 16 package org.onosproject.pcepio;
17 17
18 import static org.hamcrest.MatcherAssert.assertThat; 18 import static org.hamcrest.MatcherAssert.assertThat;
19 +import static org.hamcrest.Matchers.instanceOf;
19 import static org.hamcrest.core.Is.is; 20 import static org.hamcrest.core.Is.is;
20 -import static org.hamcrest.core.IsSame.sameInstance;
21 21
22 import org.jboss.netty.buffer.ChannelBuffer; 22 import org.jboss.netty.buffer.ChannelBuffer;
23 import org.jboss.netty.buffer.ChannelBuffers; 23 import org.jboss.netty.buffer.ChannelBuffers;
...@@ -54,7 +54,7 @@ public class PcepOpenMsgTest { ...@@ -54,7 +54,7 @@ public class PcepOpenMsgTest {
54 54
55 message = reader.readFrom(buffer); 55 message = reader.readFrom(buffer);
56 56
57 - assertThat(message, sameInstance((PcepOpenMsg) message)); 57 + assertThat(message, instanceOf(PcepOpenMsg.class));
58 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 58 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
59 message.writeTo(buf); 59 message.writeTo(buf);
60 testOpenMsg = buf.array(); 60 testOpenMsg = buf.array();
...@@ -86,7 +86,7 @@ public class PcepOpenMsgTest { ...@@ -86,7 +86,7 @@ public class PcepOpenMsgTest {
86 86
87 message = reader.readFrom(buffer); 87 message = reader.readFrom(buffer);
88 88
89 - assertThat(message, sameInstance((PcepOpenMsg) message)); 89 + assertThat(message, instanceOf(PcepOpenMsg.class));
90 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 90 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
91 message.writeTo(buf); 91 message.writeTo(buf);
92 testOpenMsg = buf.array(); 92 testOpenMsg = buf.array();
...@@ -119,7 +119,7 @@ public class PcepOpenMsgTest { ...@@ -119,7 +119,7 @@ public class PcepOpenMsgTest {
119 119
120 message = reader.readFrom(buffer); 120 message = reader.readFrom(buffer);
121 121
122 - assertThat(message, sameInstance((PcepOpenMsg) message)); 122 + assertThat(message, instanceOf(PcepOpenMsg.class));
123 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 123 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
124 message.writeTo(buf); 124 message.writeTo(buf);
125 testOpenMsg = buf.array(); 125 testOpenMsg = buf.array();
...@@ -152,7 +152,7 @@ public class PcepOpenMsgTest { ...@@ -152,7 +152,7 @@ public class PcepOpenMsgTest {
152 152
153 message = reader.readFrom(buffer); 153 message = reader.readFrom(buffer);
154 154
155 - assertThat(message, sameInstance((PcepOpenMsg) message)); 155 + assertThat(message, instanceOf(PcepOpenMsg.class));
156 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 156 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
157 message.writeTo(buf); 157 message.writeTo(buf);
158 testOpenMsg = buf.array(); 158 testOpenMsg = buf.array();
...@@ -183,7 +183,7 @@ public class PcepOpenMsgTest { ...@@ -183,7 +183,7 @@ public class PcepOpenMsgTest {
183 183
184 message = reader.readFrom(buffer); 184 message = reader.readFrom(buffer);
185 185
186 - assertThat(message, sameInstance((PcepOpenMsg) message)); 186 + assertThat(message, instanceOf(PcepOpenMsg.class));
187 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 187 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
188 message.writeTo(buf); 188 message.writeTo(buf);
189 testOpenMsg = buf.array(); 189 testOpenMsg = buf.array();
...@@ -219,7 +219,7 @@ public class PcepOpenMsgTest { ...@@ -219,7 +219,7 @@ public class PcepOpenMsgTest {
219 219
220 message = reader.readFrom(buffer); 220 message = reader.readFrom(buffer);
221 221
222 - assertThat(message, sameInstance((PcepOpenMsg) message)); 222 + assertThat(message, instanceOf(PcepOpenMsg.class));
223 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 223 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
224 message.writeTo(buf); 224 message.writeTo(buf);
225 testOpenMsg = buf.array(); 225 testOpenMsg = buf.array();
...@@ -255,7 +255,7 @@ public class PcepOpenMsgTest { ...@@ -255,7 +255,7 @@ public class PcepOpenMsgTest {
255 255
256 message = reader.readFrom(buffer); 256 message = reader.readFrom(buffer);
257 257
258 - assertThat(message, sameInstance((PcepOpenMsg) message)); 258 + assertThat(message, instanceOf(PcepOpenMsg.class));
259 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 259 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
260 message.writeTo(buf); 260 message.writeTo(buf);
261 testOpenMsg = buf.array(); 261 testOpenMsg = buf.array();
...@@ -294,7 +294,7 @@ public class PcepOpenMsgTest { ...@@ -294,7 +294,7 @@ public class PcepOpenMsgTest {
294 294
295 message = reader.readFrom(buffer); 295 message = reader.readFrom(buffer);
296 296
297 - assertThat(message, sameInstance((PcepOpenMsg) message)); 297 + assertThat(message, instanceOf(PcepOpenMsg.class));
298 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 298 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
299 message.writeTo(buf); 299 message.writeTo(buf);
300 testOpenMsg = buf.array(); 300 testOpenMsg = buf.array();
...@@ -330,7 +330,7 @@ public class PcepOpenMsgTest { ...@@ -330,7 +330,7 @@ public class PcepOpenMsgTest {
330 330
331 message = reader.readFrom(buffer); 331 message = reader.readFrom(buffer);
332 332
333 - assertThat(message, sameInstance((PcepOpenMsg) message)); 333 + assertThat(message, instanceOf(PcepOpenMsg.class));
334 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 334 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
335 message.writeTo(buf); 335 message.writeTo(buf);
336 testOpenMsg = buf.array(); 336 testOpenMsg = buf.array();
...@@ -368,7 +368,7 @@ public class PcepOpenMsgTest { ...@@ -368,7 +368,7 @@ public class PcepOpenMsgTest {
368 368
369 message = reader.readFrom(buffer); 369 message = reader.readFrom(buffer);
370 370
371 - assertThat(message, sameInstance((PcepOpenMsg) message)); 371 + assertThat(message, instanceOf(PcepOpenMsg.class));
372 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 372 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
373 message.writeTo(buf); 373 message.writeTo(buf);
374 testOpenMsg = buf.array(); 374 testOpenMsg = buf.array();
...@@ -406,7 +406,7 @@ public class PcepOpenMsgTest { ...@@ -406,7 +406,7 @@ public class PcepOpenMsgTest {
406 406
407 message = reader.readFrom(buffer); 407 message = reader.readFrom(buffer);
408 408
409 - assertThat(message, sameInstance((PcepOpenMsg) message)); 409 + assertThat(message, instanceOf(PcepOpenMsg.class));
410 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 410 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
411 message.writeTo(buf); 411 message.writeTo(buf);
412 testOpenMsg = buf.array(); 412 testOpenMsg = buf.array();
...@@ -443,7 +443,7 @@ public class PcepOpenMsgTest { ...@@ -443,7 +443,7 @@ public class PcepOpenMsgTest {
443 443
444 message = reader.readFrom(buffer); 444 message = reader.readFrom(buffer);
445 445
446 - assertThat(message, sameInstance((PcepOpenMsg) message)); 446 + assertThat(message, instanceOf(PcepOpenMsg.class));
447 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 447 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
448 message.writeTo(buf); 448 message.writeTo(buf);
449 testOpenMsg = buf.array(); 449 testOpenMsg = buf.array();
...@@ -479,7 +479,7 @@ public class PcepOpenMsgTest { ...@@ -479,7 +479,7 @@ public class PcepOpenMsgTest {
479 479
480 message = reader.readFrom(buffer); 480 message = reader.readFrom(buffer);
481 481
482 - assertThat(message, sameInstance((PcepOpenMsg) message)); 482 + assertThat(message, instanceOf(PcepOpenMsg.class));
483 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 483 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
484 message.writeTo(buf); 484 message.writeTo(buf);
485 testOpenMsg = buf.array(); 485 testOpenMsg = buf.array();
...@@ -514,7 +514,7 @@ public class PcepOpenMsgTest { ...@@ -514,7 +514,7 @@ public class PcepOpenMsgTest {
514 514
515 message = reader.readFrom(buffer); 515 message = reader.readFrom(buffer);
516 516
517 - assertThat(message, sameInstance((PcepOpenMsg) message)); 517 + assertThat(message, instanceOf(PcepOpenMsg.class));
518 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 518 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
519 message.writeTo(buf); 519 message.writeTo(buf);
520 testOpenMsg = buf.array(); 520 testOpenMsg = buf.array();
...@@ -547,7 +547,7 @@ public class PcepOpenMsgTest { ...@@ -547,7 +547,7 @@ public class PcepOpenMsgTest {
547 547
548 message = reader.readFrom(buffer); 548 message = reader.readFrom(buffer);
549 549
550 - assertThat(message, sameInstance((PcepOpenMsg) message)); 550 + assertThat(message, instanceOf(PcepOpenMsg.class));
551 551
552 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 552 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
553 message.writeTo(buf); 553 message.writeTo(buf);
......