홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Priyanka bhaskar
Committed by Gerrit Code Review
da7506b6 1 parent f479bb51

UT for Pcep Update Message (Updated with AssertThat) 

Change-Id: I2d4d0e4463a08532e739e03e4e8c6a54595f1ae4
Inline Side-by-side
Showing 2 changed files with 140 additions and 266 deletions
...@@ -15,9 +15,12 @@ ...@@ -15,9 +15,12 @@
15 */ 15 */
16 package org.onosproject.pcepio; 16 package org.onosproject.pcepio;
17 17
18 +import static org.hamcrest.core.Is.is;
19 +import static org.hamcrest.core.IsSame.sameInstance;
20 +
18 import org.jboss.netty.buffer.ChannelBuffer; 21 import org.jboss.netty.buffer.ChannelBuffer;
19 import org.jboss.netty.buffer.ChannelBuffers; 22 import org.jboss.netty.buffer.ChannelBuffers;
20 -import org.junit.Assert; 23 +import static org.hamcrest.MatcherAssert.assertThat;
21 import org.junit.Test; 24 import org.junit.Test;
22 import org.onosproject.pcepio.exceptions.PcepParseException; 25 import org.onosproject.pcepio.exceptions.PcepParseException;
23 import org.onosproject.pcepio.protocol.PcepFactories; 26 import org.onosproject.pcepio.protocol.PcepFactories;
...@@ -28,8 +31,6 @@ import org.onosproject.pcepio.protocol.PcepUpdateMsg; ...@@ -28,8 +31,6 @@ import org.onosproject.pcepio.protocol.PcepUpdateMsg;
28 public class PcepUpdateMsgTest { 31 public class PcepUpdateMsgTest {
29 /** 32 /**
30 * This test case checks for SRP, LSP (StatefulIPv4LspIdentidiersTlv), ERO in PcUpd message. 33 * This test case checks for SRP, LSP (StatefulIPv4LspIdentidiersTlv), ERO in PcUpd message.
31 - *
32 - * @throws PcepParseException when message paring fails
33 */ 34 */
34 @Test 35 @Test
35 public void pcepUpdateMsgTest1() throws PcepParseException { 36 public void pcepUpdateMsgTest1() throws PcepParseException {
...@@ -50,7 +51,7 @@ public class PcepUpdateMsgTest { ...@@ -50,7 +51,7 @@ public class PcepUpdateMsgTest {
50 51
51 message = reader.readFrom(buffer); 52 message = reader.readFrom(buffer);
52 53
53 - Assert.assertTrue("PcepMessage is not instance of PcUpd", (message instanceof PcepUpdateMsg)); 54 + assertThat(message, sameInstance((PcepUpdateMsg) message));
54 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 55 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
55 message.writeTo(buf); 56 message.writeTo(buf);
56 testupdateMsg = buf.array(); 57 testupdateMsg = buf.array();
...@@ -59,14 +60,12 @@ public class PcepUpdateMsgTest { ...@@ -59,14 +60,12 @@ public class PcepUpdateMsgTest {
59 testupdateMsg = new byte[readLen]; 60 testupdateMsg = new byte[readLen];
60 buf.readBytes(testupdateMsg, 0, readLen); 61 buf.readBytes(testupdateMsg, 0, readLen);
61 62
62 - Assert.assertArrayEquals("PcUpd messages are not equal", updateMsg, testupdateMsg); 63 + assertThat(testupdateMsg, is(updateMsg));
63 } 64 }
64 65
65 /** 66 /**
66 * This test case checks for SRP(SymbolicPathNameTlv), LSP (StatefulIPv4LspIdentidiersTlv, 67 * This test case checks for SRP(SymbolicPathNameTlv), LSP (StatefulIPv4LspIdentidiersTlv,
67 * SymbolicPathNameTlv, StatefulLspErrorCodeTlv), ERO, LSPA, Metric-list in PcUpd message. 68 * SymbolicPathNameTlv, StatefulLspErrorCodeTlv), ERO, LSPA, Metric-list in PcUpd message.
68 - *
69 - * @throws PcepParseException when message paring fails
70 */ 69 */
71 @Test 70 @Test
72 public void pcepUpdateMsgTest2() throws PcepParseException { 71 public void pcepUpdateMsgTest2() throws PcepParseException {
...@@ -96,7 +95,7 @@ public class PcepUpdateMsgTest { ...@@ -96,7 +95,7 @@ public class PcepUpdateMsgTest {
96 PcepMessage message = null; 95 PcepMessage message = null;
97 96
98 message = reader.readFrom(buffer); 97 message = reader.readFrom(buffer);
99 - Assert.assertTrue("PcepMessage is not instance of PcUpd", (message instanceof PcepUpdateMsg)); 98 + assertThat(message, sameInstance((PcepUpdateMsg) message));
100 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 99 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
101 message.writeTo(buf); 100 message.writeTo(buf);
102 testupdateMsg = buf.array(); 101 testupdateMsg = buf.array();
...@@ -105,14 +104,12 @@ public class PcepUpdateMsgTest { ...@@ -105,14 +104,12 @@ public class PcepUpdateMsgTest {
105 testupdateMsg = new byte[readLen]; 104 testupdateMsg = new byte[readLen];
106 buf.readBytes(testupdateMsg, 0, readLen); 105 buf.readBytes(testupdateMsg, 0, readLen);
107 106
108 - Assert.assertArrayEquals("PcUpd messages are not equal", updateMsg, testupdateMsg); 107 + assertThat(testupdateMsg, is(updateMsg));
109 } 108 }
110 109
111 /** 110 /**
112 * This test case checks for SRP, LSP (SymbolicPathNameTlv, StatefulIPv4LspIdentidiersTlv), 111 * This test case checks for SRP, LSP (SymbolicPathNameTlv, StatefulIPv4LspIdentidiersTlv),
113 * ERO objects in PcUpd message. 112 * ERO objects in PcUpd message.
114 - *
115 - * @throws PcepParseException when message paring fails
116 */ 113 */
117 @Test 114 @Test
118 public void pcepUpdateMsgTest3() throws PcepParseException { 115 public void pcepUpdateMsgTest3() throws PcepParseException {
...@@ -135,7 +132,7 @@ public class PcepUpdateMsgTest { ...@@ -135,7 +132,7 @@ public class PcepUpdateMsgTest {
135 132
136 message = reader.readFrom(buffer); 133 message = reader.readFrom(buffer);
137 134
138 - Assert.assertTrue("PcepMessage is not instance of PcUpd", (message instanceof PcepUpdateMsg)); 135 + assertThat(message, sameInstance((PcepUpdateMsg) message));
139 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 136 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
140 message.writeTo(buf); 137 message.writeTo(buf);
141 testupdateMsg = buf.array(); 138 testupdateMsg = buf.array();
...@@ -144,14 +141,12 @@ public class PcepUpdateMsgTest { ...@@ -144,14 +141,12 @@ public class PcepUpdateMsgTest {
144 testupdateMsg = new byte[readLen]; 141 testupdateMsg = new byte[readLen];
145 buf.readBytes(testupdateMsg, 0, readLen); 142 buf.readBytes(testupdateMsg, 0, readLen);
146 143
147 - Assert.assertArrayEquals("PcUpd messages are not equal", updateMsg, testupdateMsg); 144 + assertThat(testupdateMsg, is(updateMsg));
148 } 145 }
149 146
150 /** 147 /**
151 * This test case checks for SRP, LSP (SymbolicPathNameTlv, StatefulIPv4LspIdentidiersTlv, 148 * This test case checks for SRP, LSP (SymbolicPathNameTlv, StatefulIPv4LspIdentidiersTlv,
152 * SymbolicPathNameTlv), ERO objects in PcUpd message. 149 * SymbolicPathNameTlv), ERO objects in PcUpd message.
153 - *
154 - * @throws PcepParseException when message paring fails
155 */ 150 */
156 @Test 151 @Test
157 public void pcepUpdateMsgTest4() throws PcepParseException { 152 public void pcepUpdateMsgTest4() throws PcepParseException {
...@@ -175,7 +170,7 @@ public class PcepUpdateMsgTest { ...@@ -175,7 +170,7 @@ public class PcepUpdateMsgTest {
175 170
176 message = reader.readFrom(buffer); 171 message = reader.readFrom(buffer);
177 172
178 - Assert.assertTrue("PcepMessage is not instance of PcUpd", (message instanceof PcepUpdateMsg)); 173 + assertThat(message, sameInstance((PcepUpdateMsg) message));
179 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 174 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
180 message.writeTo(buf); 175 message.writeTo(buf);
181 testupdateMsg = buf.array(); 176 testupdateMsg = buf.array();
...@@ -184,14 +179,12 @@ public class PcepUpdateMsgTest { ...@@ -184,14 +179,12 @@ public class PcepUpdateMsgTest {
184 testupdateMsg = new byte[readLen]; 179 testupdateMsg = new byte[readLen];
185 buf.readBytes(testupdateMsg, 0, readLen); 180 buf.readBytes(testupdateMsg, 0, readLen);
186 181
187 - Assert.assertArrayEquals("PcUpd messages are not equal", updateMsg, testupdateMsg); 182 + assertThat(testupdateMsg, is(updateMsg));
188 } 183 }
189 184
190 /** 185 /**
191 * This test case checks for SRP, LSP (SymbolicPathNameTlv, StatefulIPv4LspIdentidiersTlv, 186 * This test case checks for SRP, LSP (SymbolicPathNameTlv, StatefulIPv4LspIdentidiersTlv,
192 * SymbolicPathNameTlv), ERO objects in PcUpd message. 187 * SymbolicPathNameTlv), ERO objects in PcUpd message.
193 - *
194 - * @throws PcepParseException when message parsing fails
195 */ 188 */
196 @Test 189 @Test
197 public void pcepUpdateMsgTest5() throws PcepParseException { 190 public void pcepUpdateMsgTest5() throws PcepParseException {
...@@ -215,7 +208,7 @@ public class PcepUpdateMsgTest { ...@@ -215,7 +208,7 @@ public class PcepUpdateMsgTest {
215 208
216 message = reader.readFrom(buffer); 209 message = reader.readFrom(buffer);
217 210
218 - Assert.assertTrue("PcepMessage is not instance of PcUpd", (message instanceof PcepUpdateMsg)); 211 + assertThat(message, sameInstance((PcepUpdateMsg) message));
219 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 212 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
220 message.writeTo(buf); 213 message.writeTo(buf);
221 testupdateMsg = buf.array(); 214 testupdateMsg = buf.array();
...@@ -224,14 +217,12 @@ public class PcepUpdateMsgTest { ...@@ -224,14 +217,12 @@ public class PcepUpdateMsgTest {
224 testupdateMsg = new byte[readLen]; 217 testupdateMsg = new byte[readLen];
225 buf.readBytes(testupdateMsg, 0, readLen); 218 buf.readBytes(testupdateMsg, 0, readLen);
226 219
227 - Assert.assertArrayEquals("PcUpd messages are not equal", updateMsg, testupdateMsg); 220 + assertThat(testupdateMsg, is(updateMsg));
228 } 221 }
229 222
230 /** 223 /**
231 * This test case checks for SRP, LSP (SymbolicPathNameTlv, StatefulIPv4LspIdentidiersTlv, SymbolicPathNameTlv, 224 * This test case checks for SRP, LSP (SymbolicPathNameTlv, StatefulIPv4LspIdentidiersTlv, SymbolicPathNameTlv,
232 * StatefulLspErrorCodeTlv), ERO objects in PcUpd message. 225 * StatefulLspErrorCodeTlv), ERO objects in PcUpd message.
233 - *
234 - * @throws PcepParseException when message parsing fails
235 */ 226 */
236 @Test 227 @Test
237 public void pcepUpdateMsgTest6() throws PcepParseException { 228 public void pcepUpdateMsgTest6() throws PcepParseException {
...@@ -256,7 +247,7 @@ public class PcepUpdateMsgTest { ...@@ -256,7 +247,7 @@ public class PcepUpdateMsgTest {
256 247
257 message = reader.readFrom(buffer); 248 message = reader.readFrom(buffer);
258 249
259 - Assert.assertTrue("PcepMessage is not instance of PcUpd", (message instanceof PcepUpdateMsg)); 250 + assertThat(message, sameInstance((PcepUpdateMsg) message));
260 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 251 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
261 message.writeTo(buf); 252 message.writeTo(buf);
262 testupdateMsg = buf.array(); 253 testupdateMsg = buf.array();
...@@ -265,15 +256,13 @@ public class PcepUpdateMsgTest { ...@@ -265,15 +256,13 @@ public class PcepUpdateMsgTest {
265 testupdateMsg = new byte[readLen]; 256 testupdateMsg = new byte[readLen];
266 buf.readBytes(testupdateMsg, 0, readLen); 257 buf.readBytes(testupdateMsg, 0, readLen);
267 258
268 - Assert.assertArrayEquals("PcUpd messages are not equal", updateMsg, testupdateMsg); 259 + assertThat(testupdateMsg, is(updateMsg));
269 260
270 } 261 }
271 262
272 /** 263 /**
273 * This test case checks for SRP, LSP (StatefulIPv4LspIdentidiersTlv, SymbolicPathNameTlv, 264 * This test case checks for SRP, LSP (StatefulIPv4LspIdentidiersTlv, SymbolicPathNameTlv,
274 * StatefulLspErrorCodeTlv), ERO objects in PcUpd message. 265 * StatefulLspErrorCodeTlv), ERO objects in PcUpd message.
275 - *
276 - * @throws PcepParseException when message parsing fails
277 */ 266 */
278 @Test 267 @Test
279 public void pcepUpdateMsgTest7() throws PcepParseException { 268 public void pcepUpdateMsgTest7() throws PcepParseException {
...@@ -298,7 +287,7 @@ public class PcepUpdateMsgTest { ...@@ -298,7 +287,7 @@ public class PcepUpdateMsgTest {
298 287
299 message = reader.readFrom(buffer); 288 message = reader.readFrom(buffer);
300 289
301 - Assert.assertTrue("PcepMessage is not instance of PcUpd", (message instanceof PcepUpdateMsg)); 290 + assertThat(message, sameInstance((PcepUpdateMsg) message));
302 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 291 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
303 message.writeTo(buf); 292 message.writeTo(buf);
304 testupdateMsg = buf.array(); 293 testupdateMsg = buf.array();
...@@ -306,14 +295,12 @@ public class PcepUpdateMsgTest { ...@@ -306,14 +295,12 @@ public class PcepUpdateMsgTest {
306 int readLen = buf.writerIndex() - 0; 295 int readLen = buf.writerIndex() - 0;
307 testupdateMsg = new byte[readLen]; 296 testupdateMsg = new byte[readLen];
308 buf.readBytes(testupdateMsg, 0, readLen); 297 buf.readBytes(testupdateMsg, 0, readLen);
309 - Assert.assertArrayEquals("PcUpd messages are not equal", updateMsg, testupdateMsg); 298 + assertThat(testupdateMsg, is(updateMsg));
310 } 299 }
311 300
312 /** 301 /**
313 * This test case checks for SRP, LSP (StatefulIPv4LspIdentidiersTlv, SymbolicPathNameTlv, 302 * This test case checks for SRP, LSP (StatefulIPv4LspIdentidiersTlv, SymbolicPathNameTlv,
314 * StatefulLspErrorCodeTlv), ERO (IPv4SubObject) objects in PcUpd message. 303 * StatefulLspErrorCodeTlv), ERO (IPv4SubObject) objects in PcUpd message.
315 - *
316 - * @throws PcepParseException when message parsing fails
317 */ 304 */
318 @Test 305 @Test
319 public void pcepUpdateMsgTest8() throws PcepParseException { 306 public void pcepUpdateMsgTest8() throws PcepParseException {
...@@ -339,7 +326,7 @@ public class PcepUpdateMsgTest { ...@@ -339,7 +326,7 @@ public class PcepUpdateMsgTest {
339 326
340 message = reader.readFrom(buffer); 327 message = reader.readFrom(buffer);
341 328
342 - Assert.assertTrue("PcepMessage is not instance of PcUpd", (message instanceof PcepUpdateMsg)); 329 + assertThat(message, sameInstance((PcepUpdateMsg) message));
343 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 330 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
344 message.writeTo(buf); 331 message.writeTo(buf);
345 testupdateMsg = buf.array(); 332 testupdateMsg = buf.array();
...@@ -348,14 +335,12 @@ public class PcepUpdateMsgTest { ...@@ -348,14 +335,12 @@ public class PcepUpdateMsgTest {
348 testupdateMsg = new byte[readLen]; 335 testupdateMsg = new byte[readLen];
349 buf.readBytes(testupdateMsg, 0, readLen); 336 buf.readBytes(testupdateMsg, 0, readLen);
350 337
351 - Assert.assertArrayEquals("PcUpd messages are not equal", updateMsg, testupdateMsg); 338 + assertThat(testupdateMsg, is(updateMsg));
352 } 339 }
353 340
354 /** 341 /**
355 * This test case checks for SRP, LSP (StatefulIPv4LspIdentidiersTlv, SymbolicPathNameTlv, 342 * This test case checks for SRP, LSP (StatefulIPv4LspIdentidiersTlv, SymbolicPathNameTlv,
356 * StatefulLspErrorCodeTlv), ERO (IPv4SubObject, IPv4SubObject) objects in PcUpd message. 343 * StatefulLspErrorCodeTlv), ERO (IPv4SubObject, IPv4SubObject) objects in PcUpd message.
357 - *
358 - * @throws PcepParseException when message parsing fails
359 */ 344 */
360 @Test 345 @Test
361 public void pcepUpdateMsgTest9() throws PcepParseException { 346 public void pcepUpdateMsgTest9() throws PcepParseException {
...@@ -382,7 +367,7 @@ public class PcepUpdateMsgTest { ...@@ -382,7 +367,7 @@ public class PcepUpdateMsgTest {
382 367
383 message = reader.readFrom(buffer); 368 message = reader.readFrom(buffer);
384 369
385 - Assert.assertTrue("PcepMessage is not instance of PcUpd", (message instanceof PcepUpdateMsg)); 370 + assertThat(message, sameInstance((PcepUpdateMsg) message));
386 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 371 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
387 message.writeTo(buf); 372 message.writeTo(buf);
388 testupdateMsg = buf.array(); 373 testupdateMsg = buf.array();
...@@ -391,14 +376,12 @@ public class PcepUpdateMsgTest { ...@@ -391,14 +376,12 @@ public class PcepUpdateMsgTest {
391 testupdateMsg = new byte[readLen]; 376 testupdateMsg = new byte[readLen];
392 buf.readBytes(testupdateMsg, 0, readLen); 377 buf.readBytes(testupdateMsg, 0, readLen);
393 378
394 - Assert.assertArrayEquals("PcUpd messages are not equal", updateMsg, testupdateMsg); 379 + assertThat(testupdateMsg, is(updateMsg));
395 } 380 }
396 381
397 /** 382 /**
398 * This test case checks for SRP, LSP (StatefulIPv4LspIdentidiersTlv, SymbolicPathNameTlv, 383 * This test case checks for SRP, LSP (StatefulIPv4LspIdentidiersTlv, SymbolicPathNameTlv,
399 * StatefulLspErrorCodeTlv), ERO (IPv4SubObject, IPv4SubObject), LSPA objects in PcUpd message. 384 * StatefulLspErrorCodeTlv), ERO (IPv4SubObject, IPv4SubObject), LSPA objects in PcUpd message.
400 - *
401 - * @throws PcepParseException when message parsing fails
402 */ 385 */
403 @Test 386 @Test
404 public void pcepUpdateMsgTest10() throws PcepParseException { 387 public void pcepUpdateMsgTest10() throws PcepParseException {
...@@ -427,7 +410,7 @@ public class PcepUpdateMsgTest { ...@@ -427,7 +410,7 @@ public class PcepUpdateMsgTest {
427 410
428 message = reader.readFrom(buffer); 411 message = reader.readFrom(buffer);
429 412
430 - Assert.assertTrue("PcepMessage is not instance of PcUpd", (message instanceof PcepUpdateMsg)); 413 + assertThat(message, sameInstance((PcepUpdateMsg) message));
431 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 414 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
432 message.writeTo(buf); 415 message.writeTo(buf);
433 testupdateMsg = buf.array(); 416 testupdateMsg = buf.array();
...@@ -436,14 +419,12 @@ public class PcepUpdateMsgTest { ...@@ -436,14 +419,12 @@ public class PcepUpdateMsgTest {
436 testupdateMsg = new byte[readLen]; 419 testupdateMsg = new byte[readLen];
437 buf.readBytes(testupdateMsg, 0, readLen); 420 buf.readBytes(testupdateMsg, 0, readLen);
438 421
439 - Assert.assertArrayEquals("PcUpd messages are not equal", updateMsg, testupdateMsg); 422 + assertThat(testupdateMsg, is(updateMsg));
440 } 423 }
441 424
442 /** 425 /**
443 * This test case checks for SRP, LSP (StatefulIPv4LspIdentidiersTlv, SymbolicPathNameTlv, 426 * This test case checks for SRP, LSP (StatefulIPv4LspIdentidiersTlv, SymbolicPathNameTlv,
444 * StatefulLspErrorCodeTlv), ERO (IPv4SubObject, IPv4SubObject),LSPA, Metric objects in PcUpd message. 427 * StatefulLspErrorCodeTlv), ERO (IPv4SubObject, IPv4SubObject),LSPA, Metric objects in PcUpd message.
445 - *
446 - * @throws PcepParseException when message parsing fails
447 */ 428 */
448 @Test 429 @Test
449 public void pcepUpdateMsgTest11() throws PcepParseException { 430 public void pcepUpdateMsgTest11() throws PcepParseException {
...@@ -473,7 +454,7 @@ public class PcepUpdateMsgTest { ...@@ -473,7 +454,7 @@ public class PcepUpdateMsgTest {
473 454
474 message = reader.readFrom(buffer); 455 message = reader.readFrom(buffer);
475 456
476 - Assert.assertTrue("PcepMessage is not instance of PcUpd", (message instanceof PcepUpdateMsg)); 457 + assertThat(message, sameInstance((PcepUpdateMsg) message));
477 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 458 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
478 message.writeTo(buf); 459 message.writeTo(buf);
479 testupdateMsg = buf.array(); 460 testupdateMsg = buf.array();
...@@ -482,14 +463,12 @@ public class PcepUpdateMsgTest { ...@@ -482,14 +463,12 @@ public class PcepUpdateMsgTest {
482 testupdateMsg = new byte[readLen]; 463 testupdateMsg = new byte[readLen];
483 buf.readBytes(testupdateMsg, 0, readLen); 464 buf.readBytes(testupdateMsg, 0, readLen);
484 465
485 - Assert.assertArrayEquals("PcUpd messages are not equal", updateMsg, testupdateMsg); 466 + assertThat(testupdateMsg, is(updateMsg));
486 } 467 }
487 468
488 /** 469 /**
489 * This test case checks for SRP, LSP (StatefulIPv4LspIdentidiersTlv, SymbolicPathNameTlv, 470 * This test case checks for SRP, LSP (StatefulIPv4LspIdentidiersTlv, SymbolicPathNameTlv,
490 * StatefulLspErrorCodeTlv), ERO (IPv4SubObject, IPv4SubObject),LSPA, metric objects in PcUpd message. 471 * StatefulLspErrorCodeTlv), ERO (IPv4SubObject, IPv4SubObject),LSPA, metric objects in PcUpd message.
491 - *
492 - * @throws PcepParseException when message parsing fails
493 */ 472 */
494 @Test 473 @Test
495 public void pcepUpdateMsgTest12() throws PcepParseException { 474 public void pcepUpdateMsgTest12() throws PcepParseException {
...@@ -518,7 +497,7 @@ public class PcepUpdateMsgTest { ...@@ -518,7 +497,7 @@ public class PcepUpdateMsgTest {
518 497
519 message = reader.readFrom(buffer); 498 message = reader.readFrom(buffer);
520 499
521 - Assert.assertTrue("PcepMessage is not instance of PcUpd", (message instanceof PcepUpdateMsg)); 500 + assertThat(message, sameInstance((PcepUpdateMsg) message));
522 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 501 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
523 message.writeTo(buf); 502 message.writeTo(buf);
524 testupdateMsg = buf.array(); 503 testupdateMsg = buf.array();
...@@ -527,14 +506,12 @@ public class PcepUpdateMsgTest { ...@@ -527,14 +506,12 @@ public class PcepUpdateMsgTest {
527 testupdateMsg = new byte[readLen]; 506 testupdateMsg = new byte[readLen];
528 buf.readBytes(testupdateMsg, 0, readLen); 507 buf.readBytes(testupdateMsg, 0, readLen);
529 508
530 - Assert.assertArrayEquals("PcUpd messages are not equal", updateMsg, testupdateMsg); 509 + assertThat(testupdateMsg, is(updateMsg));
531 } 510 }
532 511
533 /** 512 /**
534 * This test case checks for SRP, LSP (StatefulIPv4LspIdentidiersTlv, SymbolicPathNameTlv, 513 * This test case checks for SRP, LSP (StatefulIPv4LspIdentidiersTlv, SymbolicPathNameTlv,
535 * StatefulLspErrorCodeTlv), ERO (IPv4SubObject, IPv4SubObject),LSPA, metric objects in PcUpd message. 514 * StatefulLspErrorCodeTlv), ERO (IPv4SubObject, IPv4SubObject),LSPA, metric objects in PcUpd message.
536 - *
537 - * @throws PcepParseException when message parsing fails
538 */ 515 */
539 @Test 516 @Test
540 public void pcepUpdateMsgTest13() throws PcepParseException { 517 public void pcepUpdateMsgTest13() throws PcepParseException {
...@@ -563,7 +540,7 @@ public class PcepUpdateMsgTest { ...@@ -563,7 +540,7 @@ public class PcepUpdateMsgTest {
563 540
564 message = reader.readFrom(buffer); 541 message = reader.readFrom(buffer);
565 542
566 - Assert.assertTrue("PcepMessage is not instance of PcUpd", (message instanceof PcepUpdateMsg)); 543 + assertThat(message, sameInstance((PcepUpdateMsg) message));
567 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 544 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
568 message.writeTo(buf); 545 message.writeTo(buf);
569 testupdateMsg = buf.array(); 546 testupdateMsg = buf.array();
...@@ -572,14 +549,12 @@ public class PcepUpdateMsgTest { ...@@ -572,14 +549,12 @@ public class PcepUpdateMsgTest {
572 testupdateMsg = new byte[readLen]; 549 testupdateMsg = new byte[readLen];
573 buf.readBytes(testupdateMsg, 0, readLen); 550 buf.readBytes(testupdateMsg, 0, readLen);
574 551
575 - Assert.assertArrayEquals("PcUpd messages are not equal", updateMsg, testupdateMsg); 552 + assertThat(testupdateMsg, is(updateMsg));
576 } 553 }
577 554
578 /** 555 /**
579 * This test case checks for SRP, LSP (StatefulIPv4LspIdentidiersTlv, SymbolicPathNameTlv), 556 * This test case checks for SRP, LSP (StatefulIPv4LspIdentidiersTlv, SymbolicPathNameTlv),
580 * ERO (IPv4SubObject, IPv4SubObject),LSPA, metric Object objects in PcUpd message. 557 * ERO (IPv4SubObject, IPv4SubObject),LSPA, metric Object objects in PcUpd message.
581 - *
582 - * @throws PcepParseException when message parsing fails
583 */ 558 */
584 @Test 559 @Test
585 public void pcepUpdateMsgTest14() throws PcepParseException { 560 public void pcepUpdateMsgTest14() throws PcepParseException {
...@@ -607,7 +582,7 @@ public class PcepUpdateMsgTest { ...@@ -607,7 +582,7 @@ public class PcepUpdateMsgTest {
607 582
608 message = reader.readFrom(buffer); 583 message = reader.readFrom(buffer);
609 584
610 - Assert.assertTrue("PcepMessage is not instance of PcUpd", (message instanceof PcepUpdateMsg)); 585 + assertThat(message, sameInstance((PcepUpdateMsg) message));
611 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 586 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
612 message.writeTo(buf); 587 message.writeTo(buf);
613 testupdateMsg = buf.array(); 588 testupdateMsg = buf.array();
...@@ -616,14 +591,12 @@ public class PcepUpdateMsgTest { ...@@ -616,14 +591,12 @@ public class PcepUpdateMsgTest {
616 testupdateMsg = new byte[readLen]; 591 testupdateMsg = new byte[readLen];
617 buf.readBytes(testupdateMsg, 0, readLen); 592 buf.readBytes(testupdateMsg, 0, readLen);
618 593
619 - Assert.assertArrayEquals("PcUpd messages are not equal", updateMsg, testupdateMsg); 594 + assertThat(testupdateMsg, is(updateMsg));
620 } 595 }
621 596
622 /** 597 /**
623 * This test case checks for SRP, LSP (StatefulIPv4LspIdentidiersTlv, SymbolicPathNameTlv), 598 * This test case checks for SRP, LSP (StatefulIPv4LspIdentidiersTlv, SymbolicPathNameTlv),
624 * ERO (IPv4SubObject, IPv4SubObject),LSPA, metric objects in PcUpd message. 599 * ERO (IPv4SubObject, IPv4SubObject),LSPA, metric objects in PcUpd message.
625 - *
626 - * @throws PcepParseException when message parsing fails
627 */ 600 */
628 @Test 601 @Test
629 public void pcepUpdateMsgTest15() throws PcepParseException { 602 public void pcepUpdateMsgTest15() throws PcepParseException {
...@@ -651,7 +624,7 @@ public class PcepUpdateMsgTest { ...@@ -651,7 +624,7 @@ public class PcepUpdateMsgTest {
651 624
652 message = reader.readFrom(buffer); 625 message = reader.readFrom(buffer);
653 626
654 - Assert.assertTrue("PcepMessage is not instance of PcUpd", (message instanceof PcepUpdateMsg)); 627 + assertThat(message, sameInstance((PcepUpdateMsg) message));
655 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 628 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
656 message.writeTo(buf); 629 message.writeTo(buf);
657 testupdateMsg = buf.array(); 630 testupdateMsg = buf.array();
...@@ -660,14 +633,12 @@ public class PcepUpdateMsgTest { ...@@ -660,14 +633,12 @@ public class PcepUpdateMsgTest {
660 testupdateMsg = new byte[readLen]; 633 testupdateMsg = new byte[readLen];
661 buf.readBytes(testupdateMsg, 0, readLen); 634 buf.readBytes(testupdateMsg, 0, readLen);
662 635
663 - Assert.assertArrayEquals("PcUpd messages are not equal", updateMsg, testupdateMsg); 636 + assertThat(testupdateMsg, is(updateMsg));
664 } 637 }
665 638
666 /** 639 /**
667 * This test case checks for SRP, LSP (StatefulIPv4LspIdentidiersTlv), 640 * This test case checks for SRP, LSP (StatefulIPv4LspIdentidiersTlv),
668 * ERO (IPv4SubObject, IPv4SubObject),LSPA, metric objects in PcUpd message. 641 * ERO (IPv4SubObject, IPv4SubObject),LSPA, metric objects in PcUpd message.
669 - *
670 - * @throws PcepParseException when message parsing fails
671 */ 642 */
672 @Test 643 @Test
673 public void pcepUpdateMsgTest16() throws PcepParseException { 644 public void pcepUpdateMsgTest16() throws PcepParseException {
...@@ -694,7 +665,7 @@ public class PcepUpdateMsgTest { ...@@ -694,7 +665,7 @@ public class PcepUpdateMsgTest {
694 665
695 message = reader.readFrom(buffer); 666 message = reader.readFrom(buffer);
696 667
697 - Assert.assertTrue("PcepMessage is not instance of PcUpd", (message instanceof PcepUpdateMsg)); 668 + assertThat(message, sameInstance((PcepUpdateMsg) message));
698 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 669 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
699 message.writeTo(buf); 670 message.writeTo(buf);
700 testupdateMsg = buf.array(); 671 testupdateMsg = buf.array();
...@@ -703,14 +674,12 @@ public class PcepUpdateMsgTest { ...@@ -703,14 +674,12 @@ public class PcepUpdateMsgTest {
703 testupdateMsg = new byte[readLen]; 674 testupdateMsg = new byte[readLen];
704 buf.readBytes(testupdateMsg, 0, readLen); 675 buf.readBytes(testupdateMsg, 0, readLen);
705 676
706 - Assert.assertArrayEquals("PcUpd messages are not equal", updateMsg, testupdateMsg); 677 + assertThat(testupdateMsg, is(updateMsg));
707 } 678 }
708 679
709 /** 680 /**
710 * This test case checks for SRP, LSP (StatefulIPv4LspIdentidiersTlv), 681 * This test case checks for SRP, LSP (StatefulIPv4LspIdentidiersTlv),
711 * ERO (IPv4SubObject, IPv4SubObject),LSPA objects in PcUpd message. 682 * ERO (IPv4SubObject, IPv4SubObject),LSPA objects in PcUpd message.
712 - *
713 - * @throws PcepParseException when message parsing fails
714 */ 683 */
715 @Test 684 @Test
716 public void pcepUpdateMsgTest17() throws PcepParseException { 685 public void pcepUpdateMsgTest17() throws PcepParseException {
...@@ -736,7 +705,7 @@ public class PcepUpdateMsgTest { ...@@ -736,7 +705,7 @@ public class PcepUpdateMsgTest {
736 705
737 message = reader.readFrom(buffer); 706 message = reader.readFrom(buffer);
738 707
739 - Assert.assertTrue("PcepMessage is not instance of PcUpd", (message instanceof PcepUpdateMsg)); 708 + assertThat(message, sameInstance((PcepUpdateMsg) message));
740 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 709 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
741 message.writeTo(buf); 710 message.writeTo(buf);
742 testupdateMsg = buf.array(); 711 testupdateMsg = buf.array();
...@@ -745,14 +714,12 @@ public class PcepUpdateMsgTest { ...@@ -745,14 +714,12 @@ public class PcepUpdateMsgTest {
745 testupdateMsg = new byte[readLen]; 714 testupdateMsg = new byte[readLen];
746 buf.readBytes(testupdateMsg, 0, readLen); 715 buf.readBytes(testupdateMsg, 0, readLen);
747 716
748 - Assert.assertArrayEquals("PcUpd messages are not equal", updateMsg, testupdateMsg); 717 + assertThat(testupdateMsg, is(updateMsg));
749 } 718 }
750 719
751 /** 720 /**
752 * This test case checks for SRP, LSP (StatefulIPv4LspIdentidiersTlv), 721 * This test case checks for SRP, LSP (StatefulIPv4LspIdentidiersTlv),
753 * ERO (IPv4SubObject, IPv4SubObject),Metric objects in PcUpd message. 722 * ERO (IPv4SubObject, IPv4SubObject),Metric objects in PcUpd message.
754 - *
755 - * @throws PcepParseException when message parsing fails
756 */ 723 */
757 @Test 724 @Test
758 public void pcepUpdateMsgTest18() throws PcepParseException { 725 public void pcepUpdateMsgTest18() throws PcepParseException {
...@@ -777,7 +744,7 @@ public class PcepUpdateMsgTest { ...@@ -777,7 +744,7 @@ public class PcepUpdateMsgTest {
777 744
778 message = reader.readFrom(buffer); 745 message = reader.readFrom(buffer);
779 746
780 - Assert.assertTrue("PcepMessage is not instance of PcUpd", (message instanceof PcepUpdateMsg)); 747 + assertThat(message, sameInstance((PcepUpdateMsg) message));
781 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 748 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
782 message.writeTo(buf); 749 message.writeTo(buf);
783 testupdateMsg = buf.array(); 750 testupdateMsg = buf.array();
...@@ -786,14 +753,12 @@ public class PcepUpdateMsgTest { ...@@ -786,14 +753,12 @@ public class PcepUpdateMsgTest {
786 testupdateMsg = new byte[readLen]; 753 testupdateMsg = new byte[readLen];
787 buf.readBytes(testupdateMsg, 0, readLen); 754 buf.readBytes(testupdateMsg, 0, readLen);
788 755
789 - Assert.assertArrayEquals("PcUpd messages are not equal", updateMsg, testupdateMsg); 756 + assertThat(testupdateMsg, is(updateMsg));
790 } 757 }
791 758
792 /** 759 /**
793 * This test case checks for SRP, LSP (StatefulIPv4LspIdentidiersTlv), 760 * This test case checks for SRP, LSP (StatefulIPv4LspIdentidiersTlv),
794 * ERO (IPv4SubObject, IPv4SubObject),Metric-list objects in PcUpd message. 761 * ERO (IPv4SubObject, IPv4SubObject),Metric-list objects in PcUpd message.
795 - *
796 - * @throws PcepParseException when message parsing fails
797 */ 762 */
798 @Test 763 @Test
799 public void pcepUpdateMsgTest19() throws PcepParseException { 764 public void pcepUpdateMsgTest19() throws PcepParseException {
...@@ -819,7 +784,7 @@ public class PcepUpdateMsgTest { ...@@ -819,7 +784,7 @@ public class PcepUpdateMsgTest {
819 784
820 message = reader.readFrom(buffer); 785 message = reader.readFrom(buffer);
821 786
822 - Assert.assertTrue("PcepMessage is not instance of PcUpd", (message instanceof PcepUpdateMsg)); 787 + assertThat(message, sameInstance((PcepUpdateMsg) message));
823 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 788 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
824 message.writeTo(buf); 789 message.writeTo(buf);
825 testupdateMsg = buf.array(); 790 testupdateMsg = buf.array();
...@@ -828,14 +793,12 @@ public class PcepUpdateMsgTest { ...@@ -828,14 +793,12 @@ public class PcepUpdateMsgTest {
828 testupdateMsg = new byte[readLen]; 793 testupdateMsg = new byte[readLen];
829 buf.readBytes(testupdateMsg, 0, readLen); 794 buf.readBytes(testupdateMsg, 0, readLen);
830 795
831 - Assert.assertArrayEquals("PcUpd messages are not equal", updateMsg, testupdateMsg); 796 + assertThat(testupdateMsg, is(updateMsg));
832 } 797 }
833 798
834 /** 799 /**
835 * This test case checks for SRP, LSP (SymbolicPathNameTlv, StatefulIPv4LspIdentidiersTlv, SymbolicPathNameTlv, 800 * This test case checks for SRP, LSP (SymbolicPathNameTlv, StatefulIPv4LspIdentidiersTlv, SymbolicPathNameTlv,
836 * StatefulLspErrorCodeTlv),ERO (IPv4SubObject, IPv4SubObject),LSPA, Bandwidth, Metric objects in PcUpd message. 801 * StatefulLspErrorCodeTlv),ERO (IPv4SubObject, IPv4SubObject),LSPA, Bandwidth, Metric objects in PcUpd message.
837 - *
838 - * @throws PcepParseException when message parsing fails
839 */ 802 */
840 @Test 803 @Test
841 public void pcepUpdateMsgTest20() throws PcepParseException { 804 public void pcepUpdateMsgTest20() throws PcepParseException {
...@@ -866,7 +829,7 @@ public class PcepUpdateMsgTest { ...@@ -866,7 +829,7 @@ public class PcepUpdateMsgTest {
866 829
867 message = reader.readFrom(buffer); 830 message = reader.readFrom(buffer);
868 831
869 - Assert.assertTrue("PcepMessage is not instance of PcUpd", (message instanceof PcepUpdateMsg)); 832 + assertThat(message, sameInstance((PcepUpdateMsg) message));
870 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 833 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
871 message.writeTo(buf); 834 message.writeTo(buf);
872 testupdateMsg = buf.array(); 835 testupdateMsg = buf.array();
...@@ -875,14 +838,12 @@ public class PcepUpdateMsgTest { ...@@ -875,14 +838,12 @@ public class PcepUpdateMsgTest {
875 testupdateMsg = new byte[readLen]; 838 testupdateMsg = new byte[readLen];
876 buf.readBytes(testupdateMsg, 0, readLen); 839 buf.readBytes(testupdateMsg, 0, readLen);
877 840
878 - Assert.assertArrayEquals("PcUpd messages are not equal", updateMsg, testupdateMsg); 841 + assertThat(testupdateMsg, is(updateMsg));
879 } 842 }
880 843
881 /** 844 /**
882 * This test case checks for SRP, LSP (StatefulIPv4LspIdentidiersTlv), 845 * This test case checks for SRP, LSP (StatefulIPv4LspIdentidiersTlv),
883 * ERO (IPv4SubObject, IPv4SubObject), Bandwidth objects in PcUpd message. 846 * ERO (IPv4SubObject, IPv4SubObject), Bandwidth objects in PcUpd message.
884 - *
885 - * @throws PcepParseException when message parsing fails
886 */ 847 */
887 @Test 848 @Test
888 public void pcepUpdateMsgTest21() throws PcepParseException { 849 public void pcepUpdateMsgTest21() throws PcepParseException {
...@@ -907,7 +868,7 @@ public class PcepUpdateMsgTest { ...@@ -907,7 +868,7 @@ public class PcepUpdateMsgTest {
907 868
908 message = reader.readFrom(buffer); 869 message = reader.readFrom(buffer);
909 870
910 - Assert.assertTrue("PcepMessage is not instance of PcUpd", (message instanceof PcepUpdateMsg)); 871 + assertThat(message, sameInstance((PcepUpdateMsg) message));
911 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 872 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
912 message.writeTo(buf); 873 message.writeTo(buf);
913 testupdateMsg = buf.array(); 874 testupdateMsg = buf.array();
...@@ -916,14 +877,12 @@ public class PcepUpdateMsgTest { ...@@ -916,14 +877,12 @@ public class PcepUpdateMsgTest {
916 testupdateMsg = new byte[readLen]; 877 testupdateMsg = new byte[readLen];
917 buf.readBytes(testupdateMsg, 0, readLen); 878 buf.readBytes(testupdateMsg, 0, readLen);
918 879
919 - Assert.assertArrayEquals("PcUpd messages are not equal", updateMsg, testupdateMsg); 880 + assertThat(testupdateMsg, is(updateMsg));
920 } 881 }
921 882
922 /** 883 /**
923 * This test case checks for SRP, LSP (StatefulIPv4LspIdentidiersTlv), 884 * This test case checks for SRP, LSP (StatefulIPv4LspIdentidiersTlv),
924 * ERO (IPv4SubObject, IPv4SubObject), LSPA, Bandwidth objects in PcUpd message. 885 * ERO (IPv4SubObject, IPv4SubObject), LSPA, Bandwidth objects in PcUpd message.
925 - *
926 - * @throws PcepParseException when message parsing fails
927 */ 886 */
928 @Test 887 @Test
929 public void pcepUpdateMsgTest22() throws PcepParseException { 888 public void pcepUpdateMsgTest22() throws PcepParseException {
...@@ -950,7 +909,7 @@ public class PcepUpdateMsgTest { ...@@ -950,7 +909,7 @@ public class PcepUpdateMsgTest {
950 909
951 message = reader.readFrom(buffer); 910 message = reader.readFrom(buffer);
952 911
953 - Assert.assertTrue("PcepMessage is not instance of PcUpd", (message instanceof PcepUpdateMsg)); 912 + assertThat(message, sameInstance((PcepUpdateMsg) message));
954 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 913 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
955 message.writeTo(buf); 914 message.writeTo(buf);
956 testupdateMsg = buf.array(); 915 testupdateMsg = buf.array();
...@@ -959,14 +918,12 @@ public class PcepUpdateMsgTest { ...@@ -959,14 +918,12 @@ public class PcepUpdateMsgTest {
959 testupdateMsg = new byte[readLen]; 918 testupdateMsg = new byte[readLen];
960 buf.readBytes(testupdateMsg, 0, readLen); 919 buf.readBytes(testupdateMsg, 0, readLen);
961 920
962 - Assert.assertArrayEquals("PcUpd messages are not equal", updateMsg, testupdateMsg); 921 + assertThat(testupdateMsg, is(updateMsg));
963 } 922 }
964 923
965 /** 924 /**
966 * This test case checks for SRP, LSP (StatefulIPv4LspIdentidiersTlv), 925 * This test case checks for SRP, LSP (StatefulIPv4LspIdentidiersTlv),
967 * ERO (IPv4SubObject, IPv4SubObject), LSPA, Bandwidth, Metric objects in PcUpd message. 926 * ERO (IPv4SubObject, IPv4SubObject), LSPA, Bandwidth, Metric objects in PcUpd message.
968 - *
969 - * @throws PcepParseException when message parsing fails
970 */ 927 */
971 @Test 928 @Test
972 public void pcepUpdateMsgTest23() throws PcepParseException { 929 public void pcepUpdateMsgTest23() throws PcepParseException {
...@@ -994,7 +951,7 @@ public class PcepUpdateMsgTest { ...@@ -994,7 +951,7 @@ public class PcepUpdateMsgTest {
994 951
995 message = reader.readFrom(buffer); 952 message = reader.readFrom(buffer);
996 953
997 - Assert.assertTrue("PcepMessage is not instance of PcUpd", (message instanceof PcepUpdateMsg)); 954 + assertThat(message, sameInstance((PcepUpdateMsg) message));
998 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 955 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
999 message.writeTo(buf); 956 message.writeTo(buf);
1000 testupdateMsg = buf.array(); 957 testupdateMsg = buf.array();
...@@ -1003,14 +960,12 @@ public class PcepUpdateMsgTest { ...@@ -1003,14 +960,12 @@ public class PcepUpdateMsgTest {
1003 testupdateMsg = new byte[readLen]; 960 testupdateMsg = new byte[readLen];
1004 buf.readBytes(testupdateMsg, 0, readLen); 961 buf.readBytes(testupdateMsg, 0, readLen);
1005 962
1006 - Assert.assertArrayEquals("PcUpd messages are not equal", updateMsg, testupdateMsg); 963 + assertThat(testupdateMsg, is(updateMsg));
1007 } 964 }
1008 965
1009 /** 966 /**
1010 * This test case checks for SRP, LSP (StatefulIPv4LspIdentidiersTlv, SymbolicPathNameTlv) 967 * This test case checks for SRP, LSP (StatefulIPv4LspIdentidiersTlv, SymbolicPathNameTlv)
1011 * ERO (IPv4SubObject, IPv4SubObject), LSPA, Bandwidth, Metric objects in PcUpd message. 968 * ERO (IPv4SubObject, IPv4SubObject), LSPA, Bandwidth, Metric objects in PcUpd message.
1012 - *
1013 - * @throws PcepParseException when message parsing fails
1014 */ 969 */
1015 @Test 970 @Test
1016 public void pcepUpdateMsgTest24() throws PcepParseException { 971 public void pcepUpdateMsgTest24() throws PcepParseException {
...@@ -1039,7 +994,7 @@ public class PcepUpdateMsgTest { ...@@ -1039,7 +994,7 @@ public class PcepUpdateMsgTest {
1039 994
1040 message = reader.readFrom(buffer); 995 message = reader.readFrom(buffer);
1041 996
1042 - Assert.assertTrue("PcepMessage is not instance of PcUpd", (message instanceof PcepUpdateMsg)); 997 + assertThat(message, sameInstance((PcepUpdateMsg) message));
1043 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 998 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
1044 message.writeTo(buf); 999 message.writeTo(buf);
1045 testupdateMsg = buf.array(); 1000 testupdateMsg = buf.array();
...@@ -1048,14 +1003,12 @@ public class PcepUpdateMsgTest { ...@@ -1048,14 +1003,12 @@ public class PcepUpdateMsgTest {
1048 testupdateMsg = new byte[readLen]; 1003 testupdateMsg = new byte[readLen];
1049 buf.readBytes(testupdateMsg, 0, readLen); 1004 buf.readBytes(testupdateMsg, 0, readLen);
1050 1005
1051 - Assert.assertArrayEquals("PcUpd messages are not equal", updateMsg, testupdateMsg); 1006 + assertThat(testupdateMsg, is(updateMsg));
1052 } 1007 }
1053 1008
1054 /** 1009 /**
1055 * This test case checks for SRP, LSP (StatefulIPv4LspIdentidiersTlv, SymbolicPathNameTlv) 1010 * This test case checks for SRP, LSP (StatefulIPv4LspIdentidiersTlv, SymbolicPathNameTlv)
1056 * ERO (IPv4SubObject, IPv4SubObject), LSPA, Bandwidth, Metric objects in PcUpd message. 1011 * ERO (IPv4SubObject, IPv4SubObject), LSPA, Bandwidth, Metric objects in PcUpd message.
1057 - *
1058 - * @throws PcepParseException when message parsing fails
1059 */ 1012 */
1060 @Test 1013 @Test
1061 public void pcepUpdateMsgTest25() throws PcepParseException { 1014 public void pcepUpdateMsgTest25() throws PcepParseException {
...@@ -1084,7 +1037,7 @@ public class PcepUpdateMsgTest { ...@@ -1084,7 +1037,7 @@ public class PcepUpdateMsgTest {
1084 1037
1085 message = reader.readFrom(buffer); 1038 message = reader.readFrom(buffer);
1086 1039
1087 - Assert.assertTrue("PcepMessage is not instance of PcUpd", (message instanceof PcepUpdateMsg)); 1040 + assertThat(message, sameInstance((PcepUpdateMsg) message));
1088 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 1041 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
1089 message.writeTo(buf); 1042 message.writeTo(buf);
1090 testupdateMsg = buf.array(); 1043 testupdateMsg = buf.array();
...@@ -1093,15 +1046,13 @@ public class PcepUpdateMsgTest { ...@@ -1093,15 +1046,13 @@ public class PcepUpdateMsgTest {
1093 testupdateMsg = new byte[readLen]; 1046 testupdateMsg = new byte[readLen];
1094 buf.readBytes(testupdateMsg, 0, readLen); 1047 buf.readBytes(testupdateMsg, 0, readLen);
1095 1048
1096 - Assert.assertArrayEquals("PcUpd messages are not equal", updateMsg, testupdateMsg); 1049 + assertThat(testupdateMsg, is(updateMsg));
1097 } 1050 }
1098 1051
1099 /** 1052 /**
1100 * This test case checks for SRP, LSP (StatefulIPv4LspIdentidiersTlv, SymbolicPathNameTlv, 1053 * This test case checks for SRP, LSP (StatefulIPv4LspIdentidiersTlv, SymbolicPathNameTlv,
1101 * StatefulLspErrorCodeTlv) ERO (IPv4SubObject, IPv4SubObject), LSPA, Bandwidth, 1054 * StatefulLspErrorCodeTlv) ERO (IPv4SubObject, IPv4SubObject), LSPA, Bandwidth,
1102 * Metric objects in PcUpd message. 1055 * Metric objects in PcUpd message.
1103 - *
1104 - * @throws PcepParseException when message parsing fails
1105 */ 1056 */
1106 @Test 1057 @Test
1107 public void pcepUpdateMsgTest26() throws PcepParseException { 1058 public void pcepUpdateMsgTest26() throws PcepParseException {
...@@ -1130,7 +1081,7 @@ public class PcepUpdateMsgTest { ...@@ -1130,7 +1081,7 @@ public class PcepUpdateMsgTest {
1130 PcepMessage message = null; 1081 PcepMessage message = null;
1131 1082
1132 message = reader.readFrom(buffer); 1083 message = reader.readFrom(buffer);
1133 - Assert.assertTrue("PcepMessage is not instance of PcUpd", (message instanceof PcepUpdateMsg)); 1084 + assertThat(message, sameInstance((PcepUpdateMsg) message));
1134 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 1085 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
1135 message.writeTo(buf); 1086 message.writeTo(buf);
1136 testupdateMsg = buf.array(); 1087 testupdateMsg = buf.array();
...@@ -1139,15 +1090,13 @@ public class PcepUpdateMsgTest { ...@@ -1139,15 +1090,13 @@ public class PcepUpdateMsgTest {
1139 testupdateMsg = new byte[readLen]; 1090 testupdateMsg = new byte[readLen];
1140 buf.readBytes(testupdateMsg, 0, readLen); 1091 buf.readBytes(testupdateMsg, 0, readLen);
1141 1092
1142 - Assert.assertArrayEquals("PcUpd messages are not equal", updateMsg, testupdateMsg); 1093 + assertThat(testupdateMsg, is(updateMsg));
1143 } 1094 }
1144 1095
1145 /** 1096 /**
1146 * This test case checks for SRP, LSP (StatefulIPv4LspIdentidiersTlv, SymbolicPathNameTlv, 1097 * This test case checks for SRP, LSP (StatefulIPv4LspIdentidiersTlv, SymbolicPathNameTlv,
1147 * StatefulLspErrorCodeTlv) ERO (IPv4SubObject, IPv4SubObject), LSPA, Bandwidth, 1098 * StatefulLspErrorCodeTlv) ERO (IPv4SubObject, IPv4SubObject), LSPA, Bandwidth,
1148 * Metric objects in PcUpd message. 1099 * Metric objects in PcUpd message.
1149 - *
1150 - * @throws PcepParseException when message parsing fails
1151 */ 1100 */
1152 @Test 1101 @Test
1153 public void pcepUpdateMsgTest27() throws PcepParseException { 1102 public void pcepUpdateMsgTest27() throws PcepParseException {
...@@ -1177,7 +1126,7 @@ public class PcepUpdateMsgTest { ...@@ -1177,7 +1126,7 @@ public class PcepUpdateMsgTest {
1177 1126
1178 message = reader.readFrom(buffer); 1127 message = reader.readFrom(buffer);
1179 1128
1180 - Assert.assertTrue("PcepMessage is not instance of PcUpd", (message instanceof PcepUpdateMsg)); 1129 + assertThat(message, sameInstance((PcepUpdateMsg) message));
1181 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 1130 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
1182 message.writeTo(buf); 1131 message.writeTo(buf);
1183 testupdateMsg = buf.array(); 1132 testupdateMsg = buf.array();
...@@ -1186,15 +1135,13 @@ public class PcepUpdateMsgTest { ...@@ -1186,15 +1135,13 @@ public class PcepUpdateMsgTest {
1186 testupdateMsg = new byte[readLen]; 1135 testupdateMsg = new byte[readLen];
1187 buf.readBytes(testupdateMsg, 0, readLen); 1136 buf.readBytes(testupdateMsg, 0, readLen);
1188 1137
1189 - Assert.assertArrayEquals("PcUpd messages are not equal", updateMsg, testupdateMsg); 1138 + assertThat(testupdateMsg, is(updateMsg));
1190 } 1139 }
1191 1140
1192 /** 1141 /**
1193 * This test case checks for SRP, LSP (SymbolicPathNameTlv, StatefulIPv4LspIdentidiersTlv, 1142 * This test case checks for SRP, LSP (SymbolicPathNameTlv, StatefulIPv4LspIdentidiersTlv,
1194 * SymbolicPathNameTlv, StatefulLspErrorCodeTlv), ERO (IPv4SubObject, IPv4SubObject), 1143 * SymbolicPathNameTlv, StatefulLspErrorCodeTlv), ERO (IPv4SubObject, IPv4SubObject),
1195 * LSPA, Bandwidth, Metric objects in PcUpd message. 1144 * LSPA, Bandwidth, Metric objects in PcUpd message.
1196 - *
1197 - * @throws PcepParseException when message parsing fails
1198 */ 1145 */
1199 @Test 1146 @Test
1200 public void pcepUpdateMsgTest28() throws PcepParseException { 1147 public void pcepUpdateMsgTest28() throws PcepParseException {
...@@ -1225,7 +1172,7 @@ public class PcepUpdateMsgTest { ...@@ -1225,7 +1172,7 @@ public class PcepUpdateMsgTest {
1225 1172
1226 message = reader.readFrom(buffer); 1173 message = reader.readFrom(buffer);
1227 1174
1228 - Assert.assertTrue("PcepMessage is not instance of PcUpd", (message instanceof PcepUpdateMsg)); 1175 + assertThat(message, sameInstance((PcepUpdateMsg) message));
1229 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 1176 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
1230 message.writeTo(buf); 1177 message.writeTo(buf);
1231 testupdateMsg = buf.array(); 1178 testupdateMsg = buf.array();
...@@ -1234,14 +1181,12 @@ public class PcepUpdateMsgTest { ...@@ -1234,14 +1181,12 @@ public class PcepUpdateMsgTest {
1234 testupdateMsg = new byte[readLen]; 1181 testupdateMsg = new byte[readLen];
1235 buf.readBytes(testupdateMsg, 0, readLen); 1182 buf.readBytes(testupdateMsg, 0, readLen);
1236 1183
1237 - Assert.assertArrayEquals("PcUpd messages are not equal", updateMsg, testupdateMsg); 1184 + assertThat(testupdateMsg, is(updateMsg));
1238 } 1185 }
1239 1186
1240 /** 1187 /**
1241 * This test case checks for SRP, LSP (StatefulIPv4LspIdentidiersTlv), 1188 * This test case checks for SRP, LSP (StatefulIPv4LspIdentidiersTlv),
1242 * ERO (IPv4SubObject, IPv4SubObject), LSPA, Bandwidth, Metric objects in PcUpd message. 1189 * ERO (IPv4SubObject, IPv4SubObject), LSPA, Bandwidth, Metric objects in PcUpd message.
1243 - *
1244 - * @throws PcepParseException when message parsing fails
1245 */ 1190 */
1246 @Test 1191 @Test
1247 public void pcepUpdateMsgTest29() throws PcepParseException { 1192 public void pcepUpdateMsgTest29() throws PcepParseException {
...@@ -1269,7 +1214,7 @@ public class PcepUpdateMsgTest { ...@@ -1269,7 +1214,7 @@ public class PcepUpdateMsgTest {
1269 1214
1270 message = reader.readFrom(buffer); 1215 message = reader.readFrom(buffer);
1271 1216
1272 - Assert.assertTrue("PcepMessage is not instance of PcUpd", (message instanceof PcepUpdateMsg)); 1217 + assertThat(message, sameInstance((PcepUpdateMsg) message));
1273 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 1218 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
1274 message.writeTo(buf); 1219 message.writeTo(buf);
1275 testupdateMsg = buf.array(); 1220 testupdateMsg = buf.array();
...@@ -1278,14 +1223,12 @@ public class PcepUpdateMsgTest { ...@@ -1278,14 +1223,12 @@ public class PcepUpdateMsgTest {
1278 testupdateMsg = new byte[readLen]; 1223 testupdateMsg = new byte[readLen];
1279 buf.readBytes(testupdateMsg, 0, readLen); 1224 buf.readBytes(testupdateMsg, 0, readLen);
1280 1225
1281 - Assert.assertArrayEquals("PcUpd messages are not equal", updateMsg, testupdateMsg); 1226 + assertThat(testupdateMsg, is(updateMsg));
1282 } 1227 }
1283 1228
1284 /** 1229 /**
1285 * This test case checks for SRP, LSP, 1230 * This test case checks for SRP, LSP,
1286 * ERO (IPv4SubObject, IPv4SubObject), LSPA, Bandwidth, Metric objects in PcUpd message. 1231 * ERO (IPv4SubObject, IPv4SubObject), LSPA, Bandwidth, Metric objects in PcUpd message.
1287 - *
1288 - * @throws PcepParseException when message parsing fails
1289 */ 1232 */
1290 @Test 1233 @Test
1291 public void pcepUpdateMsgTest30() throws PcepParseException { 1234 public void pcepUpdateMsgTest30() throws PcepParseException {
...@@ -1310,7 +1253,7 @@ public class PcepUpdateMsgTest { ...@@ -1310,7 +1253,7 @@ public class PcepUpdateMsgTest {
1310 1253
1311 message = reader.readFrom(buffer); 1254 message = reader.readFrom(buffer);
1312 1255
1313 - Assert.assertTrue("PcepMessage is not instance of PcUpd", (message instanceof PcepUpdateMsg)); 1256 + assertThat(message, sameInstance((PcepUpdateMsg) message));
1314 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 1257 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
1315 message.writeTo(buf); 1258 message.writeTo(buf);
1316 testupdateMsg = buf.array(); 1259 testupdateMsg = buf.array();
...@@ -1319,14 +1262,12 @@ public class PcepUpdateMsgTest { ...@@ -1319,14 +1262,12 @@ public class PcepUpdateMsgTest {
1319 testupdateMsg = new byte[readLen]; 1262 testupdateMsg = new byte[readLen];
1320 buf.readBytes(testupdateMsg, 0, readLen); 1263 buf.readBytes(testupdateMsg, 0, readLen);
1321 1264
1322 - Assert.assertArrayEquals("PcUpd messages are not equal", updateMsg, testupdateMsg); 1265 + assertThat(testupdateMsg, is(updateMsg));
1323 } 1266 }
1324 1267
1325 /** 1268 /**
1326 * This test case checks for SRP, LSP (StatefulLspErrorCodeTlv), 1269 * This test case checks for SRP, LSP (StatefulLspErrorCodeTlv),
1327 * ERO (IPv4SubObject, IPv4SubObject), LSPA, Bandwidth, Metric objects in PcUpd message. 1270 * ERO (IPv4SubObject, IPv4SubObject), LSPA, Bandwidth, Metric objects in PcUpd message.
1328 - *
1329 - * @throws PcepParseException when message parsing fails
1330 */ 1271 */
1331 @Test 1272 @Test
1332 public void pcepUpdateMsgTest31() throws PcepParseException { 1273 public void pcepUpdateMsgTest31() throws PcepParseException {
...@@ -1352,7 +1293,7 @@ public class PcepUpdateMsgTest { ...@@ -1352,7 +1293,7 @@ public class PcepUpdateMsgTest {
1352 1293
1353 message = reader.readFrom(buffer); 1294 message = reader.readFrom(buffer);
1354 1295
1355 - Assert.assertTrue("PcepMessage is not instance of PcUpd", (message instanceof PcepUpdateMsg)); 1296 + assertThat(message, sameInstance((PcepUpdateMsg) message));
1356 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 1297 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
1357 message.writeTo(buf); 1298 message.writeTo(buf);
1358 testupdateMsg = buf.array(); 1299 testupdateMsg = buf.array();
...@@ -1361,14 +1302,12 @@ public class PcepUpdateMsgTest { ...@@ -1361,14 +1302,12 @@ public class PcepUpdateMsgTest {
1361 testupdateMsg = new byte[readLen]; 1302 testupdateMsg = new byte[readLen];
1362 buf.readBytes(testupdateMsg, 0, readLen); 1303 buf.readBytes(testupdateMsg, 0, readLen);
1363 1304
1364 - Assert.assertArrayEquals("PcUpd messages are not equal", updateMsg, testupdateMsg); 1305 + assertThat(testupdateMsg, is(updateMsg));
1365 } 1306 }
1366 1307
1367 /** 1308 /**
1368 * This test case checks for SRP, LSP, 1309 * This test case checks for SRP, LSP,
1369 * ERO (IPv4SubObject, IPv4SubObject), LSPA, Bandwidth, Metric objects in PcUpd message. 1310 * ERO (IPv4SubObject, IPv4SubObject), LSPA, Bandwidth, Metric objects in PcUpd message.
1370 - *
1371 - * @throws PcepParseException when message parsing fails
1372 */ 1311 */
1373 @Test 1312 @Test
1374 public void pcepUpdateMsgTest32() throws PcepParseException { 1313 public void pcepUpdateMsgTest32() throws PcepParseException {
...@@ -1393,7 +1332,7 @@ public class PcepUpdateMsgTest { ...@@ -1393,7 +1332,7 @@ public class PcepUpdateMsgTest {
1393 1332
1394 message = reader.readFrom(buffer); 1333 message = reader.readFrom(buffer);
1395 1334
1396 - Assert.assertTrue("PcepMessage is not instance of PcUpd", (message instanceof PcepUpdateMsg)); 1335 + assertThat(message, sameInstance((PcepUpdateMsg) message));
1397 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 1336 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
1398 message.writeTo(buf); 1337 message.writeTo(buf);
1399 testupdateMsg = buf.array(); 1338 testupdateMsg = buf.array();
...@@ -1402,14 +1341,12 @@ public class PcepUpdateMsgTest { ...@@ -1402,14 +1341,12 @@ public class PcepUpdateMsgTest {
1402 testupdateMsg = new byte[readLen]; 1341 testupdateMsg = new byte[readLen];
1403 buf.readBytes(testupdateMsg, 0, readLen); 1342 buf.readBytes(testupdateMsg, 0, readLen);
1404 1343
1405 - Assert.assertArrayEquals("PcUpd messages are not equal", updateMsg, testupdateMsg); 1344 + assertThat(testupdateMsg, is(updateMsg));
1406 } 1345 }
1407 1346
1408 /** 1347 /**
1409 * This test case checks for SRP, LSP (SymbolicPathNameTlv), 1348 * This test case checks for SRP, LSP (SymbolicPathNameTlv),
1410 * ERO (IPv4SubObject, IPv4SubObject), LSPA, Bandwidth, Metric objects in PcUpd message. 1349 * ERO (IPv4SubObject, IPv4SubObject), LSPA, Bandwidth, Metric objects in PcUpd message.
1411 - *
1412 - * @throws PcepParseException when message parsing fails
1413 */ 1350 */
1414 @Test 1351 @Test
1415 public void pcepUpdateMsgTest33() throws PcepParseException { 1352 public void pcepUpdateMsgTest33() throws PcepParseException {
...@@ -1435,7 +1372,7 @@ public class PcepUpdateMsgTest { ...@@ -1435,7 +1372,7 @@ public class PcepUpdateMsgTest {
1435 1372
1436 message = reader.readFrom(buffer); 1373 message = reader.readFrom(buffer);
1437 1374
1438 - Assert.assertTrue("PcepMessage is not instance of PcUpd", (message instanceof PcepUpdateMsg)); 1375 + assertThat(message, sameInstance((PcepUpdateMsg) message));
1439 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 1376 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
1440 message.writeTo(buf); 1377 message.writeTo(buf);
1441 testupdateMsg = buf.array(); 1378 testupdateMsg = buf.array();
...@@ -1444,14 +1381,12 @@ public class PcepUpdateMsgTest { ...@@ -1444,14 +1381,12 @@ public class PcepUpdateMsgTest {
1444 testupdateMsg = new byte[readLen]; 1381 testupdateMsg = new byte[readLen];
1445 buf.readBytes(testupdateMsg, 0, readLen); 1382 buf.readBytes(testupdateMsg, 0, readLen);
1446 1383
1447 - Assert.assertArrayEquals("PcUpd messages are not equal", updateMsg, testupdateMsg); 1384 + assertThat(testupdateMsg, is(updateMsg));
1448 } 1385 }
1449 1386
1450 /** 1387 /**
1451 * This test case checks for SRP, LSP (SymbolicPathNameTlv, SymbolicPathNameTlv), 1388 * This test case checks for SRP, LSP (SymbolicPathNameTlv, SymbolicPathNameTlv),
1452 * ERO (IPv4SubObject, IPv4SubObject), LSPA, Bandwidth, Metric objects in PcUpd message. 1389 * ERO (IPv4SubObject, IPv4SubObject), LSPA, Bandwidth, Metric objects in PcUpd message.
1453 - *
1454 - * @throws PcepParseException when message parsing fails
1455 */ 1390 */
1456 @Test 1391 @Test
1457 public void pcepUpdateMsgTest34() throws PcepParseException { 1392 public void pcepUpdateMsgTest34() throws PcepParseException {
...@@ -1478,7 +1413,7 @@ public class PcepUpdateMsgTest { ...@@ -1478,7 +1413,7 @@ public class PcepUpdateMsgTest {
1478 1413
1479 message = reader.readFrom(buffer); 1414 message = reader.readFrom(buffer);
1480 1415
1481 - Assert.assertTrue("PcepMessage is not instance of PcUpd", (message instanceof PcepUpdateMsg)); 1416 + assertThat(message, sameInstance((PcepUpdateMsg) message));
1482 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 1417 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
1483 message.writeTo(buf); 1418 message.writeTo(buf);
1484 testupdateMsg = buf.array(); 1419 testupdateMsg = buf.array();
...@@ -1487,6 +1422,6 @@ public class PcepUpdateMsgTest { ...@@ -1487,6 +1422,6 @@ public class PcepUpdateMsgTest {
1487 testupdateMsg = new byte[readLen]; 1422 testupdateMsg = new byte[readLen];
1488 buf.readBytes(testupdateMsg, 0, readLen); 1423 buf.readBytes(testupdateMsg, 0, readLen);
1489 1424
1490 - Assert.assertArrayEquals("PcUpd messages are not equal", updateMsg, testupdateMsg); 1425 + assertThat(testupdateMsg, is(updateMsg));
1491 } 1426 }
1492 } 1427 }
......
...@@ -15,9 +15,12 @@ ...@@ -15,9 +15,12 @@
15 */ 15 */
16 package org.onosproject.pcepio; 16 package org.onosproject.pcepio;
17 17
18 +import static org.hamcrest.core.Is.is;
19 +import static org.hamcrest.core.IsSame.sameInstance;
20 +
18 import org.jboss.netty.buffer.ChannelBuffer; 21 import org.jboss.netty.buffer.ChannelBuffer;
19 import org.jboss.netty.buffer.ChannelBuffers; 22 import org.jboss.netty.buffer.ChannelBuffers;
20 -import org.junit.Assert; 23 +import static org.hamcrest.MatcherAssert.assertThat;
21 import org.junit.Test; 24 import org.junit.Test;
22 import org.onosproject.pcepio.exceptions.PcepParseException; 25 import org.onosproject.pcepio.exceptions.PcepParseException;
23 import org.onosproject.pcepio.protocol.PcepFactories; 26 import org.onosproject.pcepio.protocol.PcepFactories;
...@@ -33,8 +36,6 @@ public class PcepUpdateMsgTest2 { ...@@ -33,8 +36,6 @@ public class PcepUpdateMsgTest2 {
33 /** 36 /**
34 * This test case is for SRP object(symbolic path tlv), LSP object(StatefulLspDbVerTlv), ERO object, 37 * This test case is for SRP object(symbolic path tlv), LSP object(StatefulLspDbVerTlv), ERO object,
35 * Metric object in PcepUpdate message. 38 * Metric object in PcepUpdate message.
36 - *
37 - * @throws PcepParseException while parsing PCEP message
38 */ 39 */
39 @Test 40 @Test
40 public void pcepUpdateMsgTest1() throws PcepParseException { 41 public void pcepUpdateMsgTest1() throws PcepParseException {
...@@ -65,7 +66,7 @@ public class PcepUpdateMsgTest2 { ...@@ -65,7 +66,7 @@ public class PcepUpdateMsgTest2 {
65 PcepMessage message = null; 66 PcepMessage message = null;
66 67
67 message = reader.readFrom(buffer); 68 message = reader.readFrom(buffer);
68 - Assert.assertTrue("PcepMessage is not instance of PcepUpdateMsg", message instanceof PcepUpdateMsg); 69 + assertThat(message, sameInstance((PcepUpdateMsg) message));
69 70
70 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 71 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
71 message.writeTo(buf); 72 message.writeTo(buf);
...@@ -75,14 +76,12 @@ public class PcepUpdateMsgTest2 { ...@@ -75,14 +76,12 @@ public class PcepUpdateMsgTest2 {
75 testupdateMsg = new byte[readLen]; 76 testupdateMsg = new byte[readLen];
76 buf.readBytes(testupdateMsg, 0, readLen); 77 buf.readBytes(testupdateMsg, 0, readLen);
77 78
78 - Assert.assertArrayEquals("PcepUpdatemsg messages are not equal", updateMsg, testupdateMsg); 79 + assertThat(testupdateMsg, is(updateMsg));
79 } 80 }
80 81
81 /** 82 /**
82 * This test case is for SRP object, LSP object(StatefulIPv4LspIdentidiersTlv), ERO object, 83 * This test case is for SRP object, LSP object(StatefulIPv4LspIdentidiersTlv), ERO object,
83 * LSPA, Bandwidth object in PcepUpdate message. 84 * LSPA, Bandwidth object in PcepUpdate message.
84 - *
85 - * @throws PcepParseException while parsing PCEP message
86 */ 85 */
87 @Test 86 @Test
88 public void pcepUpdateMsgTest2() throws PcepParseException { 87 public void pcepUpdateMsgTest2() throws PcepParseException {
...@@ -109,7 +108,7 @@ public class PcepUpdateMsgTest2 { ...@@ -109,7 +108,7 @@ public class PcepUpdateMsgTest2 {
109 108
110 message = reader.readFrom(buffer); 109 message = reader.readFrom(buffer);
111 110
112 - Assert.assertTrue("PcepMessage is not instance of PcepUpdateMsg", message instanceof PcepUpdateMsg); 111 + assertThat(message, sameInstance((PcepUpdateMsg) message));
113 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 112 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
114 message.writeTo(buf); 113 message.writeTo(buf);
115 testupdateMsg = buf.array(); 114 testupdateMsg = buf.array();
...@@ -118,14 +117,12 @@ public class PcepUpdateMsgTest2 { ...@@ -118,14 +117,12 @@ public class PcepUpdateMsgTest2 {
118 testupdateMsg = new byte[readLen]; 117 testupdateMsg = new byte[readLen];
119 buf.readBytes(testupdateMsg, 0, readLen); 118 buf.readBytes(testupdateMsg, 0, readLen);
120 119
121 - Assert.assertArrayEquals("PcepUpdatemsg messages are not equal", updateMsg, testupdateMsg); 120 + assertThat(testupdateMsg, is(updateMsg));
122 } 121 }
123 122
124 /** 123 /**
125 * This test case is for SRP object, LSP object, ERO object, LSPA, bandwidth object 124 * This test case is for SRP object, LSP object, ERO object, LSPA, bandwidth object
126 * Metric object in PcepUpdate message. 125 * Metric object in PcepUpdate message.
127 - *
128 - * @throws PcepParseException while parsing PCEP message
129 */ 126 */
130 @Test 127 @Test
131 public void pcepUpdateMsgTest3() throws PcepParseException { 128 public void pcepUpdateMsgTest3() throws PcepParseException {
...@@ -149,7 +146,7 @@ public class PcepUpdateMsgTest2 { ...@@ -149,7 +146,7 @@ public class PcepUpdateMsgTest2 {
149 146
150 message = reader.readFrom(buffer); 147 message = reader.readFrom(buffer);
151 148
152 - Assert.assertTrue("PcepMessage is not instance of PcepUpdateMsg", message instanceof PcepUpdateMsg); 149 + assertThat(message, sameInstance((PcepUpdateMsg) message));
153 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 150 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
154 message.writeTo(buf); 151 message.writeTo(buf);
155 testupdateMsg = buf.array(); 152 testupdateMsg = buf.array();
...@@ -158,14 +155,12 @@ public class PcepUpdateMsgTest2 { ...@@ -158,14 +155,12 @@ public class PcepUpdateMsgTest2 {
158 testupdateMsg = new byte[readLen]; 155 testupdateMsg = new byte[readLen];
159 buf.readBytes(testupdateMsg, 0, readLen); 156 buf.readBytes(testupdateMsg, 0, readLen);
160 157
161 - Assert.assertArrayEquals("PcepUpdatemsg messages are not equal", updateMsg, testupdateMsg); 158 + assertThat(testupdateMsg, is(updateMsg));
162 } 159 }
163 160
164 /** 161 /**
165 * This test case is for SRP object, LSP object(StatefulLspErrorCodeTlv), ERO object,bandwidth object 162 * This test case is for SRP object, LSP object(StatefulLspErrorCodeTlv), ERO object,bandwidth object
166 * Metric object in PcepUpdate message. 163 * Metric object in PcepUpdate message.
167 - *
168 - * @throws PcepParseException while parsing PCEP message
169 */ 164 */
170 @Test 165 @Test
171 public void pcepUpdateMsgTest4() throws PcepParseException { 166 public void pcepUpdateMsgTest4() throws PcepParseException {
...@@ -190,7 +185,7 @@ public class PcepUpdateMsgTest2 { ...@@ -190,7 +185,7 @@ public class PcepUpdateMsgTest2 {
190 185
191 message = reader.readFrom(buffer); 186 message = reader.readFrom(buffer);
192 187
193 - Assert.assertTrue("PcepMessage is not instance of PcepUpdateMsg", message instanceof PcepUpdateMsg); 188 + assertThat(message, sameInstance((PcepUpdateMsg) message));
194 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 189 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
195 message.writeTo(buf); 190 message.writeTo(buf);
196 testupdateMsg = buf.array(); 191 testupdateMsg = buf.array();
...@@ -199,14 +194,12 @@ public class PcepUpdateMsgTest2 { ...@@ -199,14 +194,12 @@ public class PcepUpdateMsgTest2 {
199 testupdateMsg = new byte[readLen]; 194 testupdateMsg = new byte[readLen];
200 buf.readBytes(testupdateMsg, 0, readLen); 195 buf.readBytes(testupdateMsg, 0, readLen);
201 196
202 - Assert.assertArrayEquals("PcepUpdatemsg messages are not equal", updateMsg, testupdateMsg); 197 + assertThat(testupdateMsg, is(updateMsg));
203 } 198 }
204 199
205 /** 200 /**
206 * This test case is for SRP object, LSP object(StatefulLspDbVerTlv), ERO object,bandwidth object 201 * This test case is for SRP object, LSP object(StatefulLspDbVerTlv), ERO object,bandwidth object
207 * Metric object in PcepUpdate message. 202 * Metric object in PcepUpdate message.
208 - *
209 - * @throws PcepParseException while parsing PCEP message
210 */ 203 */
211 @Test 204 @Test
212 public void pcepUpdateMsgTest5() throws PcepParseException { 205 public void pcepUpdateMsgTest5() throws PcepParseException {
...@@ -232,7 +225,7 @@ public class PcepUpdateMsgTest2 { ...@@ -232,7 +225,7 @@ public class PcepUpdateMsgTest2 {
232 225
233 message = reader.readFrom(buffer); 226 message = reader.readFrom(buffer);
234 227
235 - Assert.assertTrue("PcepMessage is not instance of PcepUpdateMsg", message instanceof PcepUpdateMsg); 228 + assertThat(message, sameInstance((PcepUpdateMsg) message));
236 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 229 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
237 message.writeTo(buf); 230 message.writeTo(buf);
238 testupdateMsg = buf.array(); 231 testupdateMsg = buf.array();
...@@ -241,14 +234,12 @@ public class PcepUpdateMsgTest2 { ...@@ -241,14 +234,12 @@ public class PcepUpdateMsgTest2 {
241 testupdateMsg = new byte[readLen]; 234 testupdateMsg = new byte[readLen];
242 buf.readBytes(testupdateMsg, 0, readLen); 235 buf.readBytes(testupdateMsg, 0, readLen);
243 236
244 - Assert.assertArrayEquals("PcepUpdatemsg messages are not equal", updateMsg, testupdateMsg); 237 + assertThat(testupdateMsg, is(updateMsg));
245 } 238 }
246 239
247 /** 240 /**
248 * This test case is for SRP object, LSP object(SymbolicPathNameTlv), ERO object, LSPA, bandwidth object 241 * This test case is for SRP object, LSP object(SymbolicPathNameTlv), ERO object, LSPA, bandwidth object
249 * Metric object in PcepUpdate message. 242 * Metric object in PcepUpdate message.
250 - *
251 - * @throws PcepParseException while parsing PCEP message
252 */ 243 */
253 @Test 244 @Test
254 public void pcepUpdateMsgTest6() throws PcepParseException { 245 public void pcepUpdateMsgTest6() throws PcepParseException {
...@@ -273,7 +264,7 @@ public class PcepUpdateMsgTest2 { ...@@ -273,7 +264,7 @@ public class PcepUpdateMsgTest2 {
273 264
274 message = reader.readFrom(buffer); 265 message = reader.readFrom(buffer);
275 266
276 - Assert.assertTrue("PcepMessage is not instance of PcepUpdateMsg", message instanceof PcepUpdateMsg); 267 + assertThat(message, sameInstance((PcepUpdateMsg) message));
277 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 268 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
278 message.writeTo(buf); 269 message.writeTo(buf);
279 testupdateMsg = buf.array(); 270 testupdateMsg = buf.array();
...@@ -282,14 +273,12 @@ public class PcepUpdateMsgTest2 { ...@@ -282,14 +273,12 @@ public class PcepUpdateMsgTest2 {
282 testupdateMsg = new byte[readLen]; 273 testupdateMsg = new byte[readLen];
283 buf.readBytes(testupdateMsg, 0, readLen); 274 buf.readBytes(testupdateMsg, 0, readLen);
284 275
285 - Assert.assertArrayEquals("PcepUpdatemsg messages are not equal", updateMsg, testupdateMsg); 276 + assertThat(testupdateMsg, is(updateMsg));
286 } 277 }
287 278
288 /** 279 /**
289 * This test case is for SRP object(SymbolicPathNameTlv), LSP object(SymbolicPathNameTlv), ERO object, 280 * This test case is for SRP object(SymbolicPathNameTlv), LSP object(SymbolicPathNameTlv), ERO object,
290 * bandwidth object Metric object in PcepUpdate message. 281 * bandwidth object Metric object in PcepUpdate message.
291 - *
292 - * @throws PcepParseException while parsing PCEP message
293 */ 282 */
294 @Test 283 @Test
295 public void pcepUpdateMsgTest7() throws PcepParseException { 284 public void pcepUpdateMsgTest7() throws PcepParseException {
...@@ -315,7 +304,7 @@ public class PcepUpdateMsgTest2 { ...@@ -315,7 +304,7 @@ public class PcepUpdateMsgTest2 {
315 304
316 message = reader.readFrom(buffer); 305 message = reader.readFrom(buffer);
317 306
318 - Assert.assertTrue("PcepMessage is not instance of PcepUpdateMsg", message instanceof PcepUpdateMsg); 307 + assertThat(message, sameInstance((PcepUpdateMsg) message));
319 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 308 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
320 message.writeTo(buf); 309 message.writeTo(buf);
321 testupdateMsg = buf.array(); 310 testupdateMsg = buf.array();
...@@ -324,14 +313,12 @@ public class PcepUpdateMsgTest2 { ...@@ -324,14 +313,12 @@ public class PcepUpdateMsgTest2 {
324 testupdateMsg = new byte[readLen]; 313 testupdateMsg = new byte[readLen];
325 buf.readBytes(testupdateMsg, 0, readLen); 314 buf.readBytes(testupdateMsg, 0, readLen);
326 315
327 - Assert.assertArrayEquals("PcepUpdatemsg messages are not equal", updateMsg, testupdateMsg); 316 + assertThat(testupdateMsg, is(updateMsg));
328 } 317 }
329 318
330 /** 319 /**
331 * This test case is for SRP object, LSP object(StatefulIPv4LspIdentidiersTlv), ERO object,LSPA 320 * This test case is for SRP object, LSP object(StatefulIPv4LspIdentidiersTlv), ERO object,LSPA
332 * bandwidth object in PcepUpdate message. 321 * bandwidth object in PcepUpdate message.
333 - *
334 - * @throws PcepParseException while parsing PCEP message
335 */ 322 */
336 @Test 323 @Test
337 public void pcepUpdateMsgTest8() throws PcepParseException { 324 public void pcepUpdateMsgTest8() throws PcepParseException {
...@@ -357,7 +344,7 @@ public class PcepUpdateMsgTest2 { ...@@ -357,7 +344,7 @@ public class PcepUpdateMsgTest2 {
357 344
358 message = reader.readFrom(buffer); 345 message = reader.readFrom(buffer);
359 346
360 - Assert.assertTrue("PcepMessage is not instance of PcepUpdateMsg", message instanceof PcepUpdateMsg); 347 + assertThat(message, sameInstance((PcepUpdateMsg) message));
361 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 348 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
362 message.writeTo(buf); 349 message.writeTo(buf);
363 testupdateMsg = buf.array(); 350 testupdateMsg = buf.array();
...@@ -366,14 +353,12 @@ public class PcepUpdateMsgTest2 { ...@@ -366,14 +353,12 @@ public class PcepUpdateMsgTest2 {
366 testupdateMsg = new byte[readLen]; 353 testupdateMsg = new byte[readLen];
367 buf.readBytes(testupdateMsg, 0, readLen); 354 buf.readBytes(testupdateMsg, 0, readLen);
368 355
369 - Assert.assertArrayEquals("PcepUpdatemsg messages are not equal", updateMsg, testupdateMsg); 356 + assertThat(testupdateMsg, is(updateMsg));
370 } 357 }
371 358
372 /** 359 /**
373 * This test case is for SRP object, LSP object(StatefulRsvpErrorSpecTlv), ERO object,LSPA 360 * This test case is for SRP object, LSP object(StatefulRsvpErrorSpecTlv), ERO object,LSPA
374 * bandwidth object in PcepUpdate message. 361 * bandwidth object in PcepUpdate message.
375 - *
376 - * @throws PcepParseException while parsing PCEP message
377 */ 362 */
378 @Test 363 @Test
379 public void pcepUpdateMsgTest9() throws PcepParseException { 364 public void pcepUpdateMsgTest9() throws PcepParseException {
...@@ -398,7 +383,7 @@ public class PcepUpdateMsgTest2 { ...@@ -398,7 +383,7 @@ public class PcepUpdateMsgTest2 {
398 383
399 message = reader.readFrom(buffer); 384 message = reader.readFrom(buffer);
400 385
401 - Assert.assertTrue("PcepMessage is not instance of PcepUpdateMsg", message instanceof PcepUpdateMsg); 386 + assertThat(message, sameInstance((PcepUpdateMsg) message));
402 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 387 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
403 message.writeTo(buf); 388 message.writeTo(buf);
404 testupdateMsg = buf.array(); 389 testupdateMsg = buf.array();
...@@ -407,14 +392,12 @@ public class PcepUpdateMsgTest2 { ...@@ -407,14 +392,12 @@ public class PcepUpdateMsgTest2 {
407 testupdateMsg = new byte[readLen]; 392 testupdateMsg = new byte[readLen];
408 buf.readBytes(testupdateMsg, 0, readLen); 393 buf.readBytes(testupdateMsg, 0, readLen);
409 394
410 - Assert.assertArrayEquals("PcepUpdatemsg messages are not equal", updateMsg, testupdateMsg); 395 + assertThat(testupdateMsg, is(updateMsg));
411 } 396 }
412 397
413 /** 398 /**
414 * This test case is for SRP object, LSP object(StatefulRsvpErrorSpecTlv), ERO object,LSPA 399 * This test case is for SRP object, LSP object(StatefulRsvpErrorSpecTlv), ERO object,LSPA
415 * bandwidth object in PcepUpdate message. 400 * bandwidth object in PcepUpdate message.
416 - *
417 - * @throws PcepParseException while parsing PCEP message
418 */ 401 */
419 @Test 402 @Test
420 public void pcepUpdateMsgTest10() throws PcepParseException { 403 public void pcepUpdateMsgTest10() throws PcepParseException {
...@@ -438,7 +421,7 @@ public class PcepUpdateMsgTest2 { ...@@ -438,7 +421,7 @@ public class PcepUpdateMsgTest2 {
438 421
439 message = reader.readFrom(buffer); 422 message = reader.readFrom(buffer);
440 423
441 - Assert.assertTrue("PcepMessage is not instance of PcepUpdateMsg", message instanceof PcepUpdateMsg); 424 + assertThat(message, sameInstance((PcepUpdateMsg) message));
442 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 425 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
443 message.writeTo(buf); 426 message.writeTo(buf);
444 testupdateMsg = buf.array(); 427 testupdateMsg = buf.array();
...@@ -447,14 +430,12 @@ public class PcepUpdateMsgTest2 { ...@@ -447,14 +430,12 @@ public class PcepUpdateMsgTest2 {
447 testupdateMsg = new byte[readLen]; 430 testupdateMsg = new byte[readLen];
448 buf.readBytes(testupdateMsg, 0, readLen); 431 buf.readBytes(testupdateMsg, 0, readLen);
449 432
450 - Assert.assertArrayEquals("PcepUpdatemsg messages are not equal", updateMsg, testupdateMsg); 433 + assertThat(testupdateMsg, is(updateMsg));
451 } 434 }
452 435
453 /** 436 /**
454 * This test case is for SRP object, LSP object(StatefulLspDbVerTlv), ERO object,LSPA 437 * This test case is for SRP object, LSP object(StatefulLspDbVerTlv), ERO object,LSPA
455 * bandwidth object in PcepUpdate message. 438 * bandwidth object in PcepUpdate message.
456 - *
457 - * @throws PcepParseException while parsing PCEP message
458 */ 439 */
459 @Test 440 @Test
460 public void pcepUpdateMsgTest11() throws PcepParseException { 441 public void pcepUpdateMsgTest11() throws PcepParseException {
...@@ -477,7 +458,7 @@ public class PcepUpdateMsgTest2 { ...@@ -477,7 +458,7 @@ public class PcepUpdateMsgTest2 {
477 PcepFactories.getGenericReader(); 458 PcepFactories.getGenericReader();
478 PcepMessage message = null; 459 PcepMessage message = null;
479 460
480 - Assert.assertTrue("PcepMessage is not instance of PcepUpdateMsg", message instanceof PcepUpdateMsg); 461 + assertThat(message, sameInstance((PcepUpdateMsg) message));
481 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 462 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
482 message.writeTo(buf); 463 message.writeTo(buf);
483 testupdateMsg = buf.array(); 464 testupdateMsg = buf.array();
...@@ -486,14 +467,12 @@ public class PcepUpdateMsgTest2 { ...@@ -486,14 +467,12 @@ public class PcepUpdateMsgTest2 {
486 testupdateMsg = new byte[readLen]; 467 testupdateMsg = new byte[readLen];
487 buf.readBytes(testupdateMsg, 0, readLen); 468 buf.readBytes(testupdateMsg, 0, readLen);
488 469
489 - Assert.assertArrayEquals("PcepUpdatemsg messages are not equal", updateMsg, testupdateMsg); 470 + assertThat(testupdateMsg, is(updateMsg));
490 } 471 }
491 472
492 /** 473 /**
493 * This test case is for SRP object, LSP object(SymbolicPathNameTlv), ERO object,LSPA 474 * This test case is for SRP object, LSP object(SymbolicPathNameTlv), ERO object,LSPA
494 * bandwidth object in PcepUpdate message. 475 * bandwidth object in PcepUpdate message.
495 - *
496 - * @throws PcepParseException while parsing PCEP message
497 */ 476 */
498 @Test 477 @Test
499 public void pcepUpdateMsgTest12() throws PcepParseException { 478 public void pcepUpdateMsgTest12() throws PcepParseException {
...@@ -517,7 +496,7 @@ public class PcepUpdateMsgTest2 { ...@@ -517,7 +496,7 @@ public class PcepUpdateMsgTest2 {
517 496
518 message = reader.readFrom(buffer); 497 message = reader.readFrom(buffer);
519 498
520 - Assert.assertTrue("PcepMessage is not instance of PcepUpdateMsg", message instanceof PcepUpdateMsg); 499 + assertThat(message, sameInstance((PcepUpdateMsg) message));
521 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 500 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
522 message.writeTo(buf); 501 message.writeTo(buf);
523 testupdateMsg = buf.array(); 502 testupdateMsg = buf.array();
...@@ -526,14 +505,12 @@ public class PcepUpdateMsgTest2 { ...@@ -526,14 +505,12 @@ public class PcepUpdateMsgTest2 {
526 testupdateMsg = new byte[readLen]; 505 testupdateMsg = new byte[readLen];
527 buf.readBytes(testupdateMsg, 0, readLen); 506 buf.readBytes(testupdateMsg, 0, readLen);
528 507
529 - Assert.assertArrayEquals("PcepUpdatemsg messages are not equal", updateMsg, testupdateMsg); 508 + assertThat(testupdateMsg, is(updateMsg));
530 } 509 }
531 510
532 /** 511 /**
533 * This test case is for SRP object(SymbolicPathNameTlv), LSP object(SymbolicPathNameTlv), ERO object,LSPA 512 * This test case is for SRP object(SymbolicPathNameTlv), LSP object(SymbolicPathNameTlv), ERO object,LSPA
534 * bandwidth object in PcepUpdate message. 513 * bandwidth object in PcepUpdate message.
535 - *
536 - * @throws PcepParseException while parsing PCEP message
537 */ 514 */
538 @Test 515 @Test
539 public void pcepUpdateMsgTest13() throws PcepParseException { 516 public void pcepUpdateMsgTest13() throws PcepParseException {
...@@ -558,7 +535,7 @@ public class PcepUpdateMsgTest2 { ...@@ -558,7 +535,7 @@ public class PcepUpdateMsgTest2 {
558 535
559 message = reader.readFrom(buffer); 536 message = reader.readFrom(buffer);
560 537
561 - Assert.assertTrue("PcepMessage is not instance of PcepUpdateMsg", message instanceof PcepUpdateMsg); 538 + assertThat(message, sameInstance((PcepUpdateMsg) message));
562 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 539 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
563 message.writeTo(buf); 540 message.writeTo(buf);
564 testupdateMsg = buf.array(); 541 testupdateMsg = buf.array();
...@@ -567,14 +544,12 @@ public class PcepUpdateMsgTest2 { ...@@ -567,14 +544,12 @@ public class PcepUpdateMsgTest2 {
567 testupdateMsg = new byte[readLen]; 544 testupdateMsg = new byte[readLen];
568 buf.readBytes(testupdateMsg, 0, readLen); 545 buf.readBytes(testupdateMsg, 0, readLen);
569 546
570 - Assert.assertArrayEquals("PcepUpdatemsg messages are not equal", updateMsg, testupdateMsg); 547 + assertThat(testupdateMsg, is(updateMsg));
571 } 548 }
572 549
573 /** 550 /**
574 * This test case is for SRP object, LSP object(StatefulIPv4LspIdentidiersTlv), ERO object,LSPA 551 * This test case is for SRP object, LSP object(StatefulIPv4LspIdentidiersTlv), ERO object,LSPA
575 * metric object in PcepUpdate message. 552 * metric object in PcepUpdate message.
576 - *
577 - * @throws PcepParseException while parsing PCEP message
578 */ 553 */
579 @Test 554 @Test
580 public void pcepUpdateMsgTest14() throws PcepParseException { 555 public void pcepUpdateMsgTest14() throws PcepParseException {
...@@ -600,7 +575,7 @@ public class PcepUpdateMsgTest2 { ...@@ -600,7 +575,7 @@ public class PcepUpdateMsgTest2 {
600 575
601 message = reader.readFrom(buffer); 576 message = reader.readFrom(buffer);
602 577
603 - Assert.assertTrue("PcepMessage is not instance of PcepUpdateMsg", message instanceof PcepUpdateMsg); 578 + assertThat(message, sameInstance((PcepUpdateMsg) message));
604 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 579 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
605 message.writeTo(buf); 580 message.writeTo(buf);
606 testupdateMsg = buf.array(); 581 testupdateMsg = buf.array();
...@@ -609,14 +584,12 @@ public class PcepUpdateMsgTest2 { ...@@ -609,14 +584,12 @@ public class PcepUpdateMsgTest2 {
609 testupdateMsg = new byte[readLen]; 584 testupdateMsg = new byte[readLen];
610 buf.readBytes(testupdateMsg, 0, readLen); 585 buf.readBytes(testupdateMsg, 0, readLen);
611 586
612 - Assert.assertArrayEquals("PcepUpdatemsg messages are not equal", updateMsg, testupdateMsg); 587 + assertThat(testupdateMsg, is(updateMsg));
613 } 588 }
614 589
615 /** 590 /**
616 * This test case is for SRP object, LSP object, ERO object,LSPA 591 * This test case is for SRP object, LSP object, ERO object,LSPA
617 * metric object in PcepUpdate message. 592 * metric object in PcepUpdate message.
618 - *
619 - * @throws PcepParseException while parsing PCEP message
620 */ 593 */
621 @Test 594 @Test
622 public void pcepUpdateMsgTest15() throws PcepParseException { 595 public void pcepUpdateMsgTest15() throws PcepParseException {
...@@ -639,7 +612,7 @@ public class PcepUpdateMsgTest2 { ...@@ -639,7 +612,7 @@ public class PcepUpdateMsgTest2 {
639 612
640 message = reader.readFrom(buffer); 613 message = reader.readFrom(buffer);
641 614
642 - Assert.assertTrue("PcepMessage is not instance of PcepUpdateMsg", message instanceof PcepUpdateMsg); 615 + assertThat(message, sameInstance((PcepUpdateMsg) message));
643 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 616 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
644 message.writeTo(buf); 617 message.writeTo(buf);
645 testupdateMsg = buf.array(); 618 testupdateMsg = buf.array();
...@@ -648,14 +621,12 @@ public class PcepUpdateMsgTest2 { ...@@ -648,14 +621,12 @@ public class PcepUpdateMsgTest2 {
648 testupdateMsg = new byte[readLen]; 621 testupdateMsg = new byte[readLen];
649 buf.readBytes(testupdateMsg, 0, readLen); 622 buf.readBytes(testupdateMsg, 0, readLen);
650 623
651 - Assert.assertArrayEquals("PcepUpdatemsg messages are not equal", updateMsg, testupdateMsg); 624 + assertThat(testupdateMsg, is(updateMsg));
652 } 625 }
653 626
654 /** 627 /**
655 * This test case is for SRP object, LSP object(StatefulLspErrorCodeTlv), ERO object,LSPA 628 * This test case is for SRP object, LSP object(StatefulLspErrorCodeTlv), ERO object,LSPA
656 * metric object in PcepUpdate message. 629 * metric object in PcepUpdate message.
657 - *
658 - * @throws PcepParseException while parsing PCEP message
659 */ 630 */
660 @Test 631 @Test
661 public void pcepUpdateMsgTest16() throws PcepParseException { 632 public void pcepUpdateMsgTest16() throws PcepParseException {
...@@ -679,7 +650,7 @@ public class PcepUpdateMsgTest2 { ...@@ -679,7 +650,7 @@ public class PcepUpdateMsgTest2 {
679 650
680 message = reader.readFrom(buffer); 651 message = reader.readFrom(buffer);
681 652
682 - Assert.assertTrue("PcepMessage is not instance of PcepUpdateMsg", message instanceof PcepUpdateMsg); 653 + assertThat(message, sameInstance((PcepUpdateMsg) message));
683 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 654 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
684 message.writeTo(buf); 655 message.writeTo(buf);
685 testupdateMsg = buf.array(); 656 testupdateMsg = buf.array();
...@@ -688,14 +659,12 @@ public class PcepUpdateMsgTest2 { ...@@ -688,14 +659,12 @@ public class PcepUpdateMsgTest2 {
688 testupdateMsg = new byte[readLen]; 659 testupdateMsg = new byte[readLen];
689 buf.readBytes(testupdateMsg, 0, readLen); 660 buf.readBytes(testupdateMsg, 0, readLen);
690 661
691 - Assert.assertArrayEquals("PcepUpdatemsg messages are not equal", updateMsg, testupdateMsg); 662 + assertThat(testupdateMsg, is(updateMsg));
692 } 663 }
693 664
694 /** 665 /**
695 * This test case is for SRP object, LSP object(StatefulLspDbVerTlv), ERO object,LSPA 666 * This test case is for SRP object, LSP object(StatefulLspDbVerTlv), ERO object,LSPA
696 * metric object in PcepUpdate message. 667 * metric object in PcepUpdate message.
697 - *
698 - * @throws PcepParseException while parsing PCEP message
699 */ 668 */
700 @Test 669 @Test
701 public void pcepUpdateMsgTest17() throws PcepParseException { 670 public void pcepUpdateMsgTest17() throws PcepParseException {
...@@ -720,7 +689,7 @@ public class PcepUpdateMsgTest2 { ...@@ -720,7 +689,7 @@ public class PcepUpdateMsgTest2 {
720 689
721 message = reader.readFrom(buffer); 690 message = reader.readFrom(buffer);
722 691
723 - Assert.assertTrue("PcepMessage is not instance of PcepUpdateMsg", message instanceof PcepUpdateMsg); 692 + assertThat(message, sameInstance((PcepUpdateMsg) message));
724 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 693 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
725 message.writeTo(buf); 694 message.writeTo(buf);
726 testupdateMsg = buf.array(); 695 testupdateMsg = buf.array();
...@@ -729,14 +698,12 @@ public class PcepUpdateMsgTest2 { ...@@ -729,14 +698,12 @@ public class PcepUpdateMsgTest2 {
729 testupdateMsg = new byte[readLen]; 698 testupdateMsg = new byte[readLen];
730 buf.readBytes(testupdateMsg, 0, readLen); 699 buf.readBytes(testupdateMsg, 0, readLen);
731 700
732 - Assert.assertArrayEquals("PcepUpdatemsg messages are not equal", updateMsg, testupdateMsg); 701 + assertThat(testupdateMsg, is(updateMsg));
733 } 702 }
734 703
735 /** 704 /**
736 * This test case is for SRP object, LSP object(SymbolicPathNameTlv), ERO object,LSPA 705 * This test case is for SRP object, LSP object(SymbolicPathNameTlv), ERO object,LSPA
737 * metric object in PcepUpdate message. 706 * metric object in PcepUpdate message.
738 - *
739 - * @throws PcepParseException while parsing PCEP message
740 */ 707 */
741 @Test 708 @Test
742 public void pcepUpdateMsgTest18() throws PcepParseException { 709 public void pcepUpdateMsgTest18() throws PcepParseException {
...@@ -760,7 +727,7 @@ public class PcepUpdateMsgTest2 { ...@@ -760,7 +727,7 @@ public class PcepUpdateMsgTest2 {
760 727
761 message = reader.readFrom(buffer); 728 message = reader.readFrom(buffer);
762 729
763 - Assert.assertTrue("PcepMessage is not instance of PcepUpdateMsg", message instanceof PcepUpdateMsg); 730 + assertThat(message, sameInstance((PcepUpdateMsg) message));
764 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 731 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
765 message.writeTo(buf); 732 message.writeTo(buf);
766 testupdateMsg = buf.array(); 733 testupdateMsg = buf.array();
...@@ -769,14 +736,12 @@ public class PcepUpdateMsgTest2 { ...@@ -769,14 +736,12 @@ public class PcepUpdateMsgTest2 {
769 testupdateMsg = new byte[readLen]; 736 testupdateMsg = new byte[readLen];
770 buf.readBytes(testupdateMsg, 0, readLen); 737 buf.readBytes(testupdateMsg, 0, readLen);
771 738
772 - Assert.assertArrayEquals("PcepUpdatemsg messages are not equal", updateMsg, testupdateMsg); 739 + assertThat(testupdateMsg, is(updateMsg));
773 } 740 }
774 741
775 /** 742 /**
776 * This test case is for SRP object(SymbolicPathNameTlv), LSP object(SymbolicPathNameTlv), ERO object, 743 * This test case is for SRP object(SymbolicPathNameTlv), LSP object(SymbolicPathNameTlv), ERO object,
777 * metric object in PcepUpdate message. 744 * metric object in PcepUpdate message.
778 - *
779 - * @throws PcepParseException while parsing PCEP message
780 */ 745 */
781 @Test 746 @Test
782 public void pcepUpdateMsgTest19() throws PcepParseException { 747 public void pcepUpdateMsgTest19() throws PcepParseException {
...@@ -801,7 +766,7 @@ public class PcepUpdateMsgTest2 { ...@@ -801,7 +766,7 @@ public class PcepUpdateMsgTest2 {
801 766
802 message = reader.readFrom(buffer); 767 message = reader.readFrom(buffer);
803 768
804 - Assert.assertTrue("PcepMessage is not instance of PcepUpdateMsg", message instanceof PcepUpdateMsg); 769 + assertThat(message, sameInstance((PcepUpdateMsg) message));
805 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 770 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
806 message.writeTo(buf); 771 message.writeTo(buf);
807 testupdateMsg = buf.array(); 772 testupdateMsg = buf.array();
...@@ -810,14 +775,12 @@ public class PcepUpdateMsgTest2 { ...@@ -810,14 +775,12 @@ public class PcepUpdateMsgTest2 {
810 testupdateMsg = new byte[readLen]; 775 testupdateMsg = new byte[readLen];
811 buf.readBytes(testupdateMsg, 0, readLen); 776 buf.readBytes(testupdateMsg, 0, readLen);
812 777
813 - Assert.assertArrayEquals("PcepUpdatemsg messages are not equal", updateMsg, testupdateMsg); 778 + assertThat(testupdateMsg, is(updateMsg));
814 } 779 }
815 780
816 /** 781 /**
817 * This test case is for SRP object, LSP object(StatefulIPv4LspIdentidiersTlv), ERO object, 782 * This test case is for SRP object, LSP object(StatefulIPv4LspIdentidiersTlv), ERO object,
818 * Bandwidth , metric object in PcepUpdate message. 783 * Bandwidth , metric object in PcepUpdate message.
819 - *
820 - * @throws PcepParseException while parsing PCEP message
821 */ 784 */
822 @Test 785 @Test
823 public void pcepUpdateMsgTest20() throws PcepParseException { 786 public void pcepUpdateMsgTest20() throws PcepParseException {
...@@ -842,7 +805,7 @@ public class PcepUpdateMsgTest2 { ...@@ -842,7 +805,7 @@ public class PcepUpdateMsgTest2 {
842 805
843 message = reader.readFrom(buffer); 806 message = reader.readFrom(buffer);
844 807
845 - Assert.assertTrue("PcepMessage is not instance of PcepUpdateMsg", message instanceof PcepUpdateMsg); 808 + assertThat(message, sameInstance((PcepUpdateMsg) message));
846 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 809 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
847 message.writeTo(buf); 810 message.writeTo(buf);
848 testupdateMsg = buf.array(); 811 testupdateMsg = buf.array();
...@@ -851,14 +814,12 @@ public class PcepUpdateMsgTest2 { ...@@ -851,14 +814,12 @@ public class PcepUpdateMsgTest2 {
851 testupdateMsg = new byte[readLen]; 814 testupdateMsg = new byte[readLen];
852 buf.readBytes(testupdateMsg, 0, readLen); 815 buf.readBytes(testupdateMsg, 0, readLen);
853 816
854 - Assert.assertArrayEquals("PcepUpdatemsg messages are not equal", updateMsg, testupdateMsg); 817 + assertThat(testupdateMsg, is(updateMsg));
855 } 818 }
856 819
857 /** 820 /**
858 * This test case is for SRP object, LSP object, ERO object, 821 * This test case is for SRP object, LSP object, ERO object,
859 * Bandwidth , metric object in PcepUpdate message. 822 * Bandwidth , metric object in PcepUpdate message.
860 - *
861 - * @throws PcepParseException while parsing PCEP message
862 */ 823 */
863 @Test 824 @Test
864 public void pcepUpdateMsgTest21() throws PcepParseException { 825 public void pcepUpdateMsgTest21() throws PcepParseException {
...@@ -880,7 +841,7 @@ public class PcepUpdateMsgTest2 { ...@@ -880,7 +841,7 @@ public class PcepUpdateMsgTest2 {
880 841
881 message = reader.readFrom(buffer); 842 message = reader.readFrom(buffer);
882 843
883 - Assert.assertTrue("PcepMessage is not instance of PcepUpdateMsg", message instanceof PcepUpdateMsg); 844 + assertThat(message, sameInstance((PcepUpdateMsg) message));
884 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 845 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
885 message.writeTo(buf); 846 message.writeTo(buf);
886 testupdateMsg = buf.array(); 847 testupdateMsg = buf.array();
...@@ -889,14 +850,12 @@ public class PcepUpdateMsgTest2 { ...@@ -889,14 +850,12 @@ public class PcepUpdateMsgTest2 {
889 testupdateMsg = new byte[readLen]; 850 testupdateMsg = new byte[readLen];
890 buf.readBytes(testupdateMsg, 0, readLen); 851 buf.readBytes(testupdateMsg, 0, readLen);
891 852
892 - Assert.assertArrayEquals("PcepUpdatemsg messages are not equal", updateMsg, testupdateMsg); 853 + assertThat(testupdateMsg, is(updateMsg));
893 } 854 }
894 855
895 /** 856 /**
896 * This test case is for SRP object, LSP object(StatefulLspErrorCodeTlv), ERO object, 857 * This test case is for SRP object, LSP object(StatefulLspErrorCodeTlv), ERO object,
897 * Bandwidth , metric object in PcepUpdate message. 858 * Bandwidth , metric object in PcepUpdate message.
898 - *
899 - * @throws PcepParseException while parsing PCEP message
900 */ 859 */
901 @Test 860 @Test
902 public void pcepUpdateMsgTest22() throws PcepParseException { 861 public void pcepUpdateMsgTest22() throws PcepParseException {
...@@ -919,7 +878,7 @@ public class PcepUpdateMsgTest2 { ...@@ -919,7 +878,7 @@ public class PcepUpdateMsgTest2 {
919 878
920 message = reader.readFrom(buffer); 879 message = reader.readFrom(buffer);
921 880
922 - Assert.assertTrue("PcepMessage is not instance of PcepUpdateMsg", message instanceof PcepUpdateMsg); 881 + assertThat(message, sameInstance((PcepUpdateMsg) message));
923 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 882 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
924 message.writeTo(buf); 883 message.writeTo(buf);
925 testupdateMsg = buf.array(); 884 testupdateMsg = buf.array();
...@@ -928,14 +887,12 @@ public class PcepUpdateMsgTest2 { ...@@ -928,14 +887,12 @@ public class PcepUpdateMsgTest2 {
928 testupdateMsg = new byte[readLen]; 887 testupdateMsg = new byte[readLen];
929 buf.readBytes(testupdateMsg, 0, readLen); 888 buf.readBytes(testupdateMsg, 0, readLen);
930 889
931 - Assert.assertArrayEquals("PcepUpdatemsg messages are not equal", updateMsg, testupdateMsg); 890 + assertThat(testupdateMsg, is(updateMsg));
932 } 891 }
933 892
934 /** 893 /**
935 * This test case is for SRP object, LSP object(StatefulLspDbVerTlv), ERO object, 894 * This test case is for SRP object, LSP object(StatefulLspDbVerTlv), ERO object,
936 * Bandwidth , metric object in PcepUpdate message. 895 * Bandwidth , metric object in PcepUpdate message.
937 - *
938 - * @throws PcepParseException while parsing PCEP message
939 */ 896 */
940 @Test 897 @Test
941 public void pcepUpdateMsgTest23() throws PcepParseException { 898 public void pcepUpdateMsgTest23() throws PcepParseException {
...@@ -959,7 +916,7 @@ public class PcepUpdateMsgTest2 { ...@@ -959,7 +916,7 @@ public class PcepUpdateMsgTest2 {
959 916
960 message = reader.readFrom(buffer); 917 message = reader.readFrom(buffer);
961 918
962 - Assert.assertTrue("PcepMessage is not instance of PcepUpdateMsg", message instanceof PcepUpdateMsg); 919 + assertThat(message, sameInstance((PcepUpdateMsg) message));
963 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 920 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
964 message.writeTo(buf); 921 message.writeTo(buf);
965 testupdateMsg = buf.array(); 922 testupdateMsg = buf.array();
...@@ -968,14 +925,12 @@ public class PcepUpdateMsgTest2 { ...@@ -968,14 +925,12 @@ public class PcepUpdateMsgTest2 {
968 testupdateMsg = new byte[readLen]; 925 testupdateMsg = new byte[readLen];
969 buf.readBytes(testupdateMsg, 0, readLen); 926 buf.readBytes(testupdateMsg, 0, readLen);
970 927
971 - Assert.assertArrayEquals("PcepUpdatemsg messages are not equal", updateMsg, testupdateMsg); 928 + assertThat(testupdateMsg, is(updateMsg));
972 } 929 }
973 930
974 /** 931 /**
975 * This test case is for SRP object, LSP object(SymbolicPathNameTlv), ERO object, 932 * This test case is for SRP object, LSP object(SymbolicPathNameTlv), ERO object,
976 * Bandwidth , metric object in PcepUpdate message. 933 * Bandwidth , metric object in PcepUpdate message.
977 - *
978 - * @throws PcepParseException while parsing PCEP message
979 */ 934 */
980 @Test 935 @Test
981 public void pcepUpdateMsgTest24() throws PcepParseException { 936 public void pcepUpdateMsgTest24() throws PcepParseException {
...@@ -998,7 +953,7 @@ public class PcepUpdateMsgTest2 { ...@@ -998,7 +953,7 @@ public class PcepUpdateMsgTest2 {
998 953
999 message = reader.readFrom(buffer); 954 message = reader.readFrom(buffer);
1000 955
1001 - Assert.assertTrue("PcepMessage is not instance of PcepUpdateMsg", message instanceof PcepUpdateMsg); 956 + assertThat(message, sameInstance((PcepUpdateMsg) message));
1002 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 957 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
1003 message.writeTo(buf); 958 message.writeTo(buf);
1004 testupdateMsg = buf.array(); 959 testupdateMsg = buf.array();
...@@ -1007,14 +962,12 @@ public class PcepUpdateMsgTest2 { ...@@ -1007,14 +962,12 @@ public class PcepUpdateMsgTest2 {
1007 testupdateMsg = new byte[readLen]; 962 testupdateMsg = new byte[readLen];
1008 buf.readBytes(testupdateMsg, 0, readLen); 963 buf.readBytes(testupdateMsg, 0, readLen);
1009 964
1010 - Assert.assertArrayEquals("PcepUpdatemsg messages are not equal", updateMsg, testupdateMsg); 965 + assertThat(testupdateMsg, is(updateMsg));
1011 } 966 }
1012 967
1013 /** 968 /**
1014 * This test case is for SRP object(SymbolicPathNameTlv), LSP object(SymbolicPathNameTlv), ERO object, 969 * This test case is for SRP object(SymbolicPathNameTlv), LSP object(SymbolicPathNameTlv), ERO object,
1015 * Bandwidth , metric object in PcepUpdate message. 970 * Bandwidth , metric object in PcepUpdate message.
1016 - *
1017 - * @throws PcepParseException while parsing PCEP message
1018 */ 971 */
1019 @Test 972 @Test
1020 public void pcepUpdateMsgTest25() throws PcepParseException { 973 public void pcepUpdateMsgTest25() throws PcepParseException {
...@@ -1038,7 +991,7 @@ public class PcepUpdateMsgTest2 { ...@@ -1038,7 +991,7 @@ public class PcepUpdateMsgTest2 {
1038 991
1039 message = reader.readFrom(buffer); 992 message = reader.readFrom(buffer);
1040 993
1041 - Assert.assertTrue("PcepMessage is not instance of PcepUpdateMsg", message instanceof PcepUpdateMsg); 994 + assertThat(message, sameInstance((PcepUpdateMsg) message));
1042 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 995 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
1043 message.writeTo(buf); 996 message.writeTo(buf);
1044 testupdateMsg = buf.array(); 997 testupdateMsg = buf.array();
...@@ -1047,14 +1000,12 @@ public class PcepUpdateMsgTest2 { ...@@ -1047,14 +1000,12 @@ public class PcepUpdateMsgTest2 {
1047 testupdateMsg = new byte[readLen]; 1000 testupdateMsg = new byte[readLen];
1048 buf.readBytes(testupdateMsg, 0, readLen); 1001 buf.readBytes(testupdateMsg, 0, readLen);
1049 1002
1050 - Assert.assertArrayEquals("PcepUpdatemsg messages are not equal", updateMsg, testupdateMsg); 1003 + assertThat(testupdateMsg, is(updateMsg));
1051 } 1004 }
1052 1005
1053 /** 1006 /**
1054 * This test case is for SRP object, LSP object(StatefulIPv4LspIdentidiersTlv), ERO object, 1007 * This test case is for SRP object, LSP object(StatefulIPv4LspIdentidiersTlv), ERO object,
1055 * LSPA object in PcepUpdate message. 1008 * LSPA object in PcepUpdate message.
1056 - *
1057 - * @throws PcepParseException while parsing PCEP message
1058 */ 1009 */
1059 @Test 1010 @Test
1060 public void pcepUpdateMsgTest26() throws PcepParseException { 1011 public void pcepUpdateMsgTest26() throws PcepParseException {
...@@ -1079,7 +1030,7 @@ public class PcepUpdateMsgTest2 { ...@@ -1079,7 +1030,7 @@ public class PcepUpdateMsgTest2 {
1079 1030
1080 message = reader.readFrom(buffer); 1031 message = reader.readFrom(buffer);
1081 1032
1082 - Assert.assertTrue("PcepMessage is not instance of PcepUpdateMsg", message instanceof PcepUpdateMsg); 1033 + assertThat(message, sameInstance((PcepUpdateMsg) message));
1083 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 1034 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
1084 message.writeTo(buf); 1035 message.writeTo(buf);
1085 testupdateMsg = buf.array(); 1036 testupdateMsg = buf.array();
...@@ -1088,14 +1039,12 @@ public class PcepUpdateMsgTest2 { ...@@ -1088,14 +1039,12 @@ public class PcepUpdateMsgTest2 {
1088 testupdateMsg = new byte[readLen]; 1039 testupdateMsg = new byte[readLen];
1089 buf.readBytes(testupdateMsg, 0, readLen); 1040 buf.readBytes(testupdateMsg, 0, readLen);
1090 1041
1091 - Assert.assertArrayEquals("PcepUpdatemsg messages are not equal", updateMsg, testupdateMsg); 1042 + assertThat(testupdateMsg, is(updateMsg));
1092 } 1043 }
1093 1044
1094 /** 1045 /**
1095 * This test case is for SRP object, LSP object, ERO object, 1046 * This test case is for SRP object, LSP object, ERO object,
1096 * bandwidth object in PcepUpdate message. 1047 * bandwidth object in PcepUpdate message.
1097 - *
1098 - * @throws PcepParseException while parsing PCEP message
1099 */ 1048 */
1100 @Test 1049 @Test
1101 public void pcepUpdateMsgTest27() throws PcepParseException { 1050 public void pcepUpdateMsgTest27() throws PcepParseException {
...@@ -1116,7 +1065,7 @@ public class PcepUpdateMsgTest2 { ...@@ -1116,7 +1065,7 @@ public class PcepUpdateMsgTest2 {
1116 1065
1117 message = reader.readFrom(buffer); 1066 message = reader.readFrom(buffer);
1118 1067
1119 - Assert.assertTrue("PcepMessage is not instance of PcepUpdateMsg", message instanceof PcepUpdateMsg); 1068 + assertThat(message, sameInstance((PcepUpdateMsg) message));
1120 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 1069 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
1121 message.writeTo(buf); 1070 message.writeTo(buf);
1122 testupdateMsg = buf.array(); 1071 testupdateMsg = buf.array();
...@@ -1125,14 +1074,12 @@ public class PcepUpdateMsgTest2 { ...@@ -1125,14 +1074,12 @@ public class PcepUpdateMsgTest2 {
1125 testupdateMsg = new byte[readLen]; 1074 testupdateMsg = new byte[readLen];
1126 buf.readBytes(testupdateMsg, 0, readLen); 1075 buf.readBytes(testupdateMsg, 0, readLen);
1127 1076
1128 - Assert.assertArrayEquals("PcepUpdatemsg messages are not equal", updateMsg, testupdateMsg); 1077 + assertThat(testupdateMsg, is(updateMsg));
1129 } 1078 }
1130 1079
1131 /** 1080 /**
1132 * This test case is for SRP object, LSP object(StatefulLspErrorCodeTlv), ERO object, 1081 * This test case is for SRP object, LSP object(StatefulLspErrorCodeTlv), ERO object,
1133 * metric object in PcepUpdate message. 1082 * metric object in PcepUpdate message.
1134 - *
1135 - * @throws PcepParseException while parsing PCEP message
1136 */ 1083 */
1137 @Test 1084 @Test
1138 public void pcepUpdateMsgTest28() throws PcepParseException { 1085 public void pcepUpdateMsgTest28() throws PcepParseException {
...@@ -1154,7 +1101,7 @@ public class PcepUpdateMsgTest2 { ...@@ -1154,7 +1101,7 @@ public class PcepUpdateMsgTest2 {
1154 1101
1155 message = reader.readFrom(buffer); 1102 message = reader.readFrom(buffer);
1156 1103
1157 - Assert.assertTrue("PcepMessage is not instance of PcepUpdateMsg", message instanceof PcepUpdateMsg); 1104 + assertThat(message, sameInstance((PcepUpdateMsg) message));
1158 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 1105 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
1159 message.writeTo(buf); 1106 message.writeTo(buf);
1160 testupdateMsg = buf.array(); 1107 testupdateMsg = buf.array();
...@@ -1163,14 +1110,12 @@ public class PcepUpdateMsgTest2 { ...@@ -1163,14 +1110,12 @@ public class PcepUpdateMsgTest2 {
1163 testupdateMsg = new byte[readLen]; 1110 testupdateMsg = new byte[readLen];
1164 buf.readBytes(testupdateMsg, 0, readLen); 1111 buf.readBytes(testupdateMsg, 0, readLen);
1165 1112
1166 - Assert.assertArrayEquals("PcepUpdatemsg messages are not equal", updateMsg, testupdateMsg); 1113 + assertThat(testupdateMsg, is(updateMsg));
1167 } 1114 }
1168 1115
1169 /** 1116 /**
1170 * This test case is for SRP object(SymbolicPathNameTlv), LSP object(StatefulLspErrorCodeTlv), ERO object, 1117 * This test case is for SRP object(SymbolicPathNameTlv), LSP object(StatefulLspErrorCodeTlv), ERO object,
1171 * lspa object in PcepUpdate message. 1118 * lspa object in PcepUpdate message.
1172 - *
1173 - * @throws PcepParseException while parsing PCEP message
1174 */ 1119 */
1175 @Test 1120 @Test
1176 public void pcepUpdateMsgTest29() throws PcepParseException { 1121 public void pcepUpdateMsgTest29() throws PcepParseException {
...@@ -1195,7 +1140,7 @@ public class PcepUpdateMsgTest2 { ...@@ -1195,7 +1140,7 @@ public class PcepUpdateMsgTest2 {
1195 1140
1196 message = reader.readFrom(buffer); 1141 message = reader.readFrom(buffer);
1197 1142
1198 - Assert.assertTrue("PcepMessage is not instance of PcepUpdateMsg", message instanceof PcepUpdateMsg); 1143 + assertThat(message, sameInstance((PcepUpdateMsg) message));
1199 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 1144 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
1200 message.writeTo(buf); 1145 message.writeTo(buf);
1201 testupdateMsg = buf.array(); 1146 testupdateMsg = buf.array();
...@@ -1204,14 +1149,12 @@ public class PcepUpdateMsgTest2 { ...@@ -1204,14 +1149,12 @@ public class PcepUpdateMsgTest2 {
1204 testupdateMsg = new byte[readLen]; 1149 testupdateMsg = new byte[readLen];
1205 buf.readBytes(testupdateMsg, 0, readLen); 1150 buf.readBytes(testupdateMsg, 0, readLen);
1206 1151
1207 - Assert.assertArrayEquals("PcepUpdatemsg messages are not equal", updateMsg, testupdateMsg); 1152 + assertThat(testupdateMsg, is(updateMsg));
1208 } 1153 }
1209 1154
1210 /** 1155 /**
1211 * This test case is for SRP object(SymbolicPathNameTlv), LSP object(StatefulLspErrorCodeTlv), ERO object, 1156 * This test case is for SRP object(SymbolicPathNameTlv), LSP object(StatefulLspErrorCodeTlv), ERO object,
1212 * bandwidth object in PcepUpdate message. 1157 * bandwidth object in PcepUpdate message.
1213 - *
1214 - * @throws PcepParseException while parsing PCEP message
1215 */ 1158 */
1216 @Test 1159 @Test
1217 public void pcepUpdateMsgTest30() throws PcepParseException { 1160 public void pcepUpdateMsgTest30() throws PcepParseException {
...@@ -1235,7 +1178,7 @@ public class PcepUpdateMsgTest2 { ...@@ -1235,7 +1178,7 @@ public class PcepUpdateMsgTest2 {
1235 1178
1236 message = reader.readFrom(buffer); 1179 message = reader.readFrom(buffer);
1237 1180
1238 - Assert.assertTrue("PcepMessage is not instance of PcepUpdateMsg", message instanceof PcepUpdateMsg); 1181 + assertThat(message, sameInstance((PcepUpdateMsg) message));
1239 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 1182 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
1240 message.writeTo(buf); 1183 message.writeTo(buf);
1241 testupdateMsg = buf.array(); 1184 testupdateMsg = buf.array();
...@@ -1244,14 +1187,12 @@ public class PcepUpdateMsgTest2 { ...@@ -1244,14 +1187,12 @@ public class PcepUpdateMsgTest2 {
1244 testupdateMsg = new byte[readLen]; 1187 testupdateMsg = new byte[readLen];
1245 buf.readBytes(testupdateMsg, 0, readLen); 1188 buf.readBytes(testupdateMsg, 0, readLen);
1246 1189
1247 - Assert.assertArrayEquals("PcepUpdatemsg messages are not equal", updateMsg, testupdateMsg); 1190 + assertThat(testupdateMsg, is(updateMsg));
1248 } 1191 }
1249 1192
1250 /** 1193 /**
1251 * This test case is for SRP object(SymbolicPathNameTlv), LSP object(StatefulLspErrorCodeTlv), ERO object, 1194 * This test case is for SRP object(SymbolicPathNameTlv), LSP object(StatefulLspErrorCodeTlv), ERO object,
1252 * metric object in PcepUpdate message. 1195 * metric object in PcepUpdate message.
1253 - *
1254 - * @throws PcepParseException while parsing PCEP message
1255 */ 1196 */
1256 @Test 1197 @Test
1257 public void pcepUpdateMsgTest31() throws PcepParseException { 1198 public void pcepUpdateMsgTest31() throws PcepParseException {
...@@ -1275,7 +1216,7 @@ public class PcepUpdateMsgTest2 { ...@@ -1275,7 +1216,7 @@ public class PcepUpdateMsgTest2 {
1275 1216
1276 message = reader.readFrom(buffer); 1217 message = reader.readFrom(buffer);
1277 1218
1278 - Assert.assertTrue("PcepMessage is not instance of PcepUpdateMsg", message instanceof PcepUpdateMsg); 1219 + assertThat(message, sameInstance((PcepUpdateMsg) message));
1279 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 1220 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
1280 message.writeTo(buf); 1221 message.writeTo(buf);
1281 testupdateMsg = buf.array(); 1222 testupdateMsg = buf.array();
...@@ -1284,14 +1225,12 @@ public class PcepUpdateMsgTest2 { ...@@ -1284,14 +1225,12 @@ public class PcepUpdateMsgTest2 {
1284 testupdateMsg = new byte[readLen]; 1225 testupdateMsg = new byte[readLen];
1285 buf.readBytes(testupdateMsg, 0, readLen); 1226 buf.readBytes(testupdateMsg, 0, readLen);
1286 1227
1287 - Assert.assertArrayEquals("PcepUpdatemsg messages are not equal", updateMsg, testupdateMsg); 1228 + assertThat(testupdateMsg, is(updateMsg));
1288 } 1229 }
1289 1230
1290 /** 1231 /**
1291 * This test case is for SRP object(symbolic path tlv), LSP object(StatefulLspDbVerTlv), ERO object, 1232 * This test case is for SRP object(symbolic path tlv), LSP object(StatefulLspDbVerTlv), ERO object,
1292 * Metric object in PcepUpdate message. 1233 * Metric object in PcepUpdate message.
1293 - *
1294 - * @throws PcepParseException while parsing PCEP message
1295 */ 1234 */
1296 @Test 1235 @Test
1297 public void pcepUpdateMsgTest32() throws PcepParseException { 1236 public void pcepUpdateMsgTest32() throws PcepParseException {
...@@ -1317,7 +1256,7 @@ public class PcepUpdateMsgTest2 { ...@@ -1317,7 +1256,7 @@ public class PcepUpdateMsgTest2 {
1317 1256
1318 message = reader.readFrom(buffer); 1257 message = reader.readFrom(buffer);
1319 1258
1320 - Assert.assertTrue("PcepMessage is not instance of PcepUpdateMsg", message instanceof PcepUpdateMsg); 1259 + assertThat(message, sameInstance((PcepUpdateMsg) message));
1321 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 1260 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
1322 message.writeTo(buf); 1261 message.writeTo(buf);
1323 testupdateMsg = buf.array(); 1262 testupdateMsg = buf.array();
...@@ -1326,7 +1265,7 @@ public class PcepUpdateMsgTest2 { ...@@ -1326,7 +1265,7 @@ public class PcepUpdateMsgTest2 {
1326 testupdateMsg = new byte[readLen]; 1265 testupdateMsg = new byte[readLen];
1327 buf.readBytes(testupdateMsg, 0, readLen); 1266 buf.readBytes(testupdateMsg, 0, readLen);
1328 1267
1329 - Assert.assertArrayEquals("PcepUpdatemsg messages are not equal", updateMsg, testupdateMsg); 1268 + assertThat(testupdateMsg, is(updateMsg));
1330 } 1269 }
1331 } 1270 }
1332 1271
......