@@ -23,6 +23,7 @@ You should have received a copy of the GNU Affero General Public License
2323using System ;
2424using iText . Html2pdf ;
2525using iText . Html2pdf . Logs ;
26+ using iText . Layout . Logs ;
2627using iText . Test . Attributes ;
2728
2829namespace iText . Html2pdf . Css . Flex {
@@ -34,7 +35,7 @@ public class FlexContainerTest : ExtendedHtmlConversionITextTest {
3435 private static readonly String DESTINATION_FOLDER = NUnit . Framework . TestContext . CurrentContext . TestDirectory
3536 + "/test/itext/html2pdf/css/flex/FlexContainerTest/" ;
3637
37- //TODO DEVSIX-7402 : Update cmp / tests
38+ //TODO DEVSIX-9519 : Update cmp / tests for ul ol li button p tags
3839 [ NUnit . Framework . OneTimeSetUp ]
3940 public static void BeforeClass ( ) {
4041 CreateOrClearDestinationFolder ( DESTINATION_FOLDER ) ;
@@ -65,7 +66,6 @@ public virtual void ANestedTest() {
6566 ConvertToPdfAndCompare ( "aNested" , SOURCE_FOLDER , DESTINATION_FOLDER ) ;
6667 }
6768
68- //TODO DEVSIX-8730: Update after fix
6969 [ NUnit . Framework . Test ]
7070 public virtual void AUlNestedTest ( ) {
7171 ConvertToPdfAndCompare ( "aUlNested" , SOURCE_FOLDER , DESTINATION_FOLDER ) ;
@@ -96,7 +96,6 @@ public virtual void ArticleNestedTest() {
9696 ConvertToPdfAndCompare ( "articleNested" , SOURCE_FOLDER , DESTINATION_FOLDER ) ;
9797 }
9898
99- //TODO DEVSIX-8730: Update after fix
10099 [ NUnit . Framework . Test ]
101100 public virtual void ArticleUlNestedTest ( ) {
102101 ConvertToPdfAndCompare ( "articleUlNested" , SOURCE_FOLDER , DESTINATION_FOLDER ) ;
@@ -109,28 +108,28 @@ public virtual void ArticleWideTest() {
109108
110109 [ NUnit . Framework . Test ]
111110 public virtual void ButtonBasicTest ( ) {
112- ConvertToPdfAndCompare ( "buttonBasic" , SOURCE_FOLDER , DESTINATION_FOLDER ) ;
111+ ConvertToPdfAndCompare ( "buttonBasic" , SOURCE_FOLDER , DESTINATION_FOLDER , true ) ;
113112 }
114113
115114 [ NUnit . Framework . Test ]
116115 public virtual void ButtonBasic2ColTest ( ) {
117- ConvertToPdfAndCompare ( "buttonBasic2Col" , SOURCE_FOLDER , DESTINATION_FOLDER ) ;
116+ ConvertToPdfAndCompare ( "buttonBasic2Col" , SOURCE_FOLDER , DESTINATION_FOLDER , true ) ;
118117 }
119118
120119 [ NUnit . Framework . Test ]
121- [ LogMessage ( Html2PdfLogMessageConstant . ELEMENT_DOES_NOT_FIT_CURRENT_AREA ) ]
120+ [ LogMessage ( LayoutLogMessageConstant . ELEMENT_DOES_NOT_FIT_AREA ) ]
122121 public virtual void ButtonLongTest ( ) {
123- ConvertToPdfAndCompare ( "buttonLong" , SOURCE_FOLDER , DESTINATION_FOLDER ) ;
122+ ConvertToPdfAndCompare ( "buttonLong" , SOURCE_FOLDER , DESTINATION_FOLDER , true ) ;
124123 }
125124
126125 [ NUnit . Framework . Test ]
127126 public virtual void ButtonNestedTest ( ) {
128- ConvertToPdfAndCompare ( "buttonNested" , SOURCE_FOLDER , DESTINATION_FOLDER ) ;
127+ ConvertToPdfAndCompare ( "buttonNested" , SOURCE_FOLDER , DESTINATION_FOLDER , true ) ;
129128 }
130129
131130 [ NUnit . Framework . Test ]
132131 public virtual void ButtonWideTest ( ) {
133- ConvertToPdfAndCompare ( "buttonWide" , SOURCE_FOLDER , DESTINATION_FOLDER ) ;
132+ ConvertToPdfAndCompare ( "buttonWide" , SOURCE_FOLDER , DESTINATION_FOLDER , true ) ;
134133 }
135134
136135 [ NUnit . Framework . Test ]
@@ -295,30 +294,28 @@ public virtual void OlWideTest() {
295294
296295 [ NUnit . Framework . Test ]
297296 public virtual void PBasicTest ( ) {
298- ConvertToPdfAndCompare ( "pBasic" , SOURCE_FOLDER , DESTINATION_FOLDER ) ;
297+ ConvertToPdfAndCompare ( "pBasic" , SOURCE_FOLDER , DESTINATION_FOLDER , true ) ;
299298 }
300299
301300 [ NUnit . Framework . Test ]
302- [ LogMessage ( Html2PdfLogMessageConstant . WORKER_UNABLE_TO_PROCESS_OTHER_WORKER , Count = 80 ) ]
301+ [ LogMessage ( iText . IO . Logs . IoLogMessageConstant . CLIP_ELEMENT ) ]
303302 public virtual void PLongTest ( ) {
304- ConvertToPdfAndCompare ( "pLong" , SOURCE_FOLDER , DESTINATION_FOLDER ) ;
303+ ConvertToPdfAndCompare ( "pLong" , SOURCE_FOLDER , DESTINATION_FOLDER , true ) ;
305304 }
306305
307306 [ NUnit . Framework . Test ]
308- [ LogMessage ( Html2PdfLogMessageConstant . WORKER_UNABLE_TO_PROCESS_OTHER_WORKER , Count = 4 ) ]
309307 public virtual void PNestedTest ( ) {
310- ConvertToPdfAndCompare ( "pNested" , SOURCE_FOLDER , DESTINATION_FOLDER ) ;
308+ ConvertToPdfAndCompare ( "pNested" , SOURCE_FOLDER , DESTINATION_FOLDER , true ) ;
311309 }
312310
313311 [ NUnit . Framework . Test ]
314- [ LogMessage ( Html2PdfLogMessageConstant . WORKER_UNABLE_TO_PROCESS_OTHER_WORKER , Count = 8 ) ]
315312 public virtual void PWideTest ( ) {
316- ConvertToPdfAndCompare ( "pWide" , SOURCE_FOLDER , DESTINATION_FOLDER ) ;
313+ ConvertToPdfAndCompare ( "pWide" , SOURCE_FOLDER , DESTINATION_FOLDER , true ) ;
317314 }
318315
319316 [ NUnit . Framework . Test ]
320317 public virtual void PBasic2ColTest ( ) {
321- ConvertToPdfAndCompare ( "pBasic2Col" , SOURCE_FOLDER , DESTINATION_FOLDER ) ;
318+ ConvertToPdfAndCompare ( "pBasic2Col" , SOURCE_FOLDER , DESTINATION_FOLDER , true ) ;
322319 }
323320
324321 [ NUnit . Framework . Test ]
@@ -346,31 +343,26 @@ public virtual void SectionWideTest() {
346343 ConvertToPdfAndCompare ( "sectionWide" , SOURCE_FOLDER , DESTINATION_FOLDER ) ;
347344 }
348345
349- //TODO DEVSIX-8730: Update after fix
350346 [ NUnit . Framework . Test ]
351347 public virtual void UlBasicTest ( ) {
352348 ConvertToPdfAndCompare ( "ulBasic" , SOURCE_FOLDER , DESTINATION_FOLDER ) ;
353349 }
354350
355- //TODO DEVSIX-8730: Update after fix
356351 [ NUnit . Framework . Test ]
357352 public virtual void UlBasic2ColTest ( ) {
358353 ConvertToPdfAndCompare ( "ulBasic2Col" , SOURCE_FOLDER , DESTINATION_FOLDER ) ;
359354 }
360355
361- //TODO DEVSIX-8730: Update after fix
362356 [ NUnit . Framework . Test ]
363357 public virtual void UlLongTest ( ) {
364358 ConvertToPdfAndCompare ( "ulLong" , SOURCE_FOLDER , DESTINATION_FOLDER ) ;
365359 }
366360
367- //TODO DEVSIX-8730: Update after fix
368361 [ NUnit . Framework . Test ]
369362 public virtual void UlNestedTest ( ) {
370363 ConvertToPdfAndCompare ( "ulNested" , SOURCE_FOLDER , DESTINATION_FOLDER ) ;
371364 }
372365
373- //TODO DEVSIX-8730: Update after fix
374366 [ NUnit . Framework . Test ]
375367 public virtual void UlWideTest ( ) {
376368 ConvertToPdfAndCompare ( "ulWide" , SOURCE_FOLDER , DESTINATION_FOLDER ) ;
@@ -386,7 +378,6 @@ public virtual void DeepNestingTest() {
386378 ConvertToPdfAndCompare ( "deepNesting" , SOURCE_FOLDER , DESTINATION_FOLDER ) ;
387379 }
388380
389- //TODO DEVSIX-8730: Update after fix
390381 [ NUnit . Framework . Test ]
391382 public virtual void DeepNesting2Test ( ) {
392383 ConvertToPdfAndCompare ( "deepNesting2" , SOURCE_FOLDER , DESTINATION_FOLDER ) ;
@@ -402,23 +393,17 @@ public virtual void SectionFormNestedTest() {
402393 ConvertToPdfAndCompare ( "sectionFormNested" , SOURCE_FOLDER , DESTINATION_FOLDER ) ;
403394 }
404395
405- //TODO DEVSIX-8730: Update after fix
406396 [ NUnit . Framework . Test ]
407- [ LogMessage ( Html2PdfLogMessageConstant . WORKER_UNABLE_TO_PROCESS_OTHER_WORKER , Count = 4 ) ]
408397 public virtual void LargeMarginTest ( ) {
409398 ConvertToPdfAndCompare ( "largeMargin" , SOURCE_FOLDER , DESTINATION_FOLDER ) ;
410399 }
411400
412- //TODO DEVSIX-8730: Update after fix
413401 [ NUnit . Framework . Test ]
414- [ LogMessage ( Html2PdfLogMessageConstant . WORKER_UNABLE_TO_PROCESS_OTHER_WORKER , Count = 4 ) ]
415402 public virtual void LargeMarginsAndPaddingsTest ( ) {
416403 ConvertToPdfAndCompare ( "largeMarginsAndPaddings" , SOURCE_FOLDER , DESTINATION_FOLDER ) ;
417404 }
418405
419- //TODO DEVSIX-8730: Update after fix
420406 [ NUnit . Framework . Test ]
421- [ LogMessage ( Html2PdfLogMessageConstant . WORKER_UNABLE_TO_PROCESS_OTHER_WORKER , Count = 4 ) ]
422407 public virtual void LargePaddingTest ( ) {
423408 ConvertToPdfAndCompare ( "largePadding" , SOURCE_FOLDER , DESTINATION_FOLDER ) ;
424409 }
@@ -433,16 +418,15 @@ public virtual void ArticleJustifyContentTest() {
433418 ConvertToPdfAndCompare ( "articleJustifyContent" , SOURCE_FOLDER , DESTINATION_FOLDER ) ;
434419 }
435420
436- //TODO DEVSIX-8730: Update after fix
437421 [ NUnit . Framework . Test ]
438422 public virtual void UlJustifyContentTest ( ) {
439423 ConvertToPdfAndCompare ( "ulJustifyContent" , SOURCE_FOLDER , DESTINATION_FOLDER ) ;
440424 }
441425
442426 [ NUnit . Framework . Test ]
443- [ LogMessage ( Html2PdfLogMessageConstant . WORKER_UNABLE_TO_PROCESS_OTHER_WORKER , Count = 36 ) ]
427+ [ LogMessage ( iText . IO . Logs . IoLogMessageConstant . CLIP_ELEMENT , Count = 6 ) ]
444428 public virtual void PJustifyContentTest ( ) {
445- ConvertToPdfAndCompare ( "pJustifyContent" , SOURCE_FOLDER , DESTINATION_FOLDER ) ;
429+ ConvertToPdfAndCompare ( "pJustifyContent" , SOURCE_FOLDER , DESTINATION_FOLDER , true ) ;
446430 }
447431
448432 [ NUnit . Framework . Test ]
@@ -482,11 +466,10 @@ public virtual void FigureJustifyContentTest() {
482466
483467 [ NUnit . Framework . Test ]
484468 public virtual void ButtonJustifyContentTest ( ) {
485- ConvertToPdfAndCompare ( "buttonJustifyContent" , SOURCE_FOLDER , DESTINATION_FOLDER ) ;
469+ ConvertToPdfAndCompare ( "buttonJustifyContent" , SOURCE_FOLDER , DESTINATION_FOLDER , true ) ;
486470 }
487471
488472 [ NUnit . Framework . Test ]
489- [ LogMessage ( iText . IO . Logs . IoLogMessageConstant . CLIP_ELEMENT , Count = 6 ) ]
490473 public virtual void ArticleAlignContentTest ( ) {
491474 ConvertToPdfAndCompare ( "articleAlignContent" , SOURCE_FOLDER , DESTINATION_FOLDER ) ;
492475 }
@@ -496,7 +479,6 @@ public virtual void AAlignContentTest() {
496479 ConvertToPdfAndCompare ( "aAlignContent" , SOURCE_FOLDER , DESTINATION_FOLDER ) ;
497480 }
498481
499- //TODO DEVSIX-8730: Update after fix
500482 [ NUnit . Framework . Test ]
501483 [ LogMessage ( iText . IO . Logs . IoLogMessageConstant . CLIP_ELEMENT , Count = 6 ) ]
502484 public virtual void UlAlignContentTest ( ) {
@@ -516,104 +498,88 @@ public virtual void LiAlignContentTest() {
516498 }
517499
518500 [ NUnit . Framework . Test ]
519- [ LogMessage ( iText . IO . Logs . IoLogMessageConstant . CLIP_ELEMENT , Count = 6 ) ]
520501 public virtual void FormAlignContentTest ( ) {
521502 ConvertToPdfAndCompare ( "formAlignContent" , SOURCE_FOLDER , DESTINATION_FOLDER ) ;
522503 }
523504
524505 [ NUnit . Framework . Test ]
525- [ LogMessage ( iText . IO . Logs . IoLogMessageConstant . CLIP_ELEMENT , Count = 6 ) ]
526506 public virtual void FigureAlignContentTest ( ) {
527507 ConvertToPdfAndCompare ( "figureAlignContent" , SOURCE_FOLDER , DESTINATION_FOLDER ) ;
528508 }
529509
530510 [ NUnit . Framework . Test ]
531511 public virtual void ButtonAlignContentTest ( ) {
532- ConvertToPdfAndCompare ( "buttonAlignContent" , SOURCE_FOLDER , DESTINATION_FOLDER ) ;
512+ ConvertToPdfAndCompare ( "buttonAlignContent" , SOURCE_FOLDER , DESTINATION_FOLDER , true ) ;
533513 }
534514
535515 [ NUnit . Framework . Test ]
536- [ LogMessage ( Html2PdfLogMessageConstant . WORKER_UNABLE_TO_PROCESS_OTHER_WORKER , Count = 42 ) ]
516+ [ LogMessage ( iText . IO . Logs . IoLogMessageConstant . CLIP_ELEMENT , Count = 6 ) ]
537517 public virtual void PAlignContentTest ( ) {
538- ConvertToPdfAndCompare ( "pAlignContent" , SOURCE_FOLDER , DESTINATION_FOLDER ) ;
518+ ConvertToPdfAndCompare ( "pAlignContent" , SOURCE_FOLDER , DESTINATION_FOLDER , true ) ;
539519 }
540520
541521 [ NUnit . Framework . Test ]
542- [ LogMessage ( iText . IO . Logs . IoLogMessageConstant . CLIP_ELEMENT , Count = 6 ) ]
543522 public virtual void FooterAlignContentTest ( ) {
544523 ConvertToPdfAndCompare ( "footerAlignContent" , SOURCE_FOLDER , DESTINATION_FOLDER ) ;
545524 }
546525
547526 [ NUnit . Framework . Test ]
548- [ LogMessage ( iText . IO . Logs . IoLogMessageConstant . CLIP_ELEMENT , Count = 6 ) ]
549527 public virtual void HeaderAlignContentTest ( ) {
550528 ConvertToPdfAndCompare ( "headerAlignContent" , SOURCE_FOLDER , DESTINATION_FOLDER ) ;
551529 }
552530
553531 [ NUnit . Framework . Test ]
554- [ LogMessage ( iText . IO . Logs . IoLogMessageConstant . CLIP_ELEMENT , Count = 6 ) ]
555532 public virtual void SectionAlignContentTest ( ) {
556533 ConvertToPdfAndCompare ( "sectionAlignContent" , SOURCE_FOLDER , DESTINATION_FOLDER ) ;
557534 }
558535
559- //TODO DEVSIX-8730: Update after fix
560536 [ NUnit . Framework . Test ]
561- [ LogMessage ( Html2PdfLogMessageConstant . WORKER_UNABLE_TO_PROCESS_OTHER_WORKER , Count = 4 ) ]
562537 public virtual void GapOnFlexTagsTest ( ) {
563538 ConvertToPdfAndCompare ( "gapOnFlexTags" , SOURCE_FOLDER , DESTINATION_FOLDER ) ;
564539 }
565540
566- //TODO DEVSIX-8730: Update after fix
567541 [ NUnit . Framework . Test ]
568542 [ LogMessage ( Html2PdfLogMessageConstant . FLEX_PROPERTY_IS_NOT_SUPPORTED_YET , Count = 10 ) ]
569- [ LogMessage ( iText . IO . Logs . IoLogMessageConstant . CLIP_ELEMENT , Count = 8 ) ]
543+ [ LogMessage ( iText . IO . Logs . IoLogMessageConstant . CLIP_ELEMENT , Count = 2 ) ]
570544 public virtual void FlexTagAlignSelfTest ( ) {
571545 ConvertToPdfAndCompare ( "flexTagAlignSelf" , SOURCE_FOLDER , DESTINATION_FOLDER ) ;
572546 }
573547
574548 [ NUnit . Framework . Test ]
575549 [ LogMessage ( Html2PdfLogMessageConstant . FLEX_PROPERTY_IS_NOT_SUPPORTED_YET ) ]
576- [ LogMessage ( Html2PdfLogMessageConstant . WORKER_UNABLE_TO_PROCESS_OTHER_WORKER , Count = 5 ) ]
550+ [ LogMessage ( iText . IO . Logs . IoLogMessageConstant . CLIP_ELEMENT ) ]
577551 public virtual void PAlignSelfTest ( ) {
578- ConvertToPdfAndCompare ( "pAlignSelf" , SOURCE_FOLDER , DESTINATION_FOLDER ) ;
552+ ConvertToPdfAndCompare ( "pAlignSelf" , SOURCE_FOLDER , DESTINATION_FOLDER , true ) ;
579553 }
580554
581- //TODO DEVSIX-8730: Update after fix
582555 [ NUnit . Framework . Test ]
583556 [ LogMessage ( Html2PdfLogMessageConstant . FLEX_PROPERTY_IS_NOT_SUPPORTED_YET , Count = 10 ) ]
584557 public virtual void FlexTagAlignItemsTest ( ) {
585558 ConvertToPdfAndCompare ( "flexTagAlignItems" , SOURCE_FOLDER , DESTINATION_FOLDER ) ;
586559 }
587560
588561 [ NUnit . Framework . Test ]
562+ [ LogMessage ( Html2PdfLogMessageConstant . FLEX_PROPERTY_IS_NOT_SUPPORTED_YET ) ]
589563 public virtual void PAlignItemsTest ( ) {
590- ConvertToPdfAndCompare ( "pAlignItems" , SOURCE_FOLDER , DESTINATION_FOLDER ) ;
564+ ConvertToPdfAndCompare ( "pAlignItems" , SOURCE_FOLDER , DESTINATION_FOLDER , true ) ;
591565 }
592566
593- //TODO DEVSIX-8730: Update after fix
594567 [ NUnit . Framework . Test ]
595- [ LogMessage ( Html2PdfLogMessageConstant . WORKER_UNABLE_TO_PROCESS_OTHER_WORKER , Count = 4 ) ]
596568 public virtual void GapOnFlexTags2Test ( ) {
597569 ConvertToPdfAndCompare ( "gapOnFlexTags2" , SOURCE_FOLDER , DESTINATION_FOLDER ) ;
598570 }
599571
600- //TODO DEVSIX-8730: Update after fix
601572 [ NUnit . Framework . Test ]
602- [ LogMessage ( Html2PdfLogMessageConstant . WORKER_UNABLE_TO_PROCESS_OTHER_WORKER , Count = 4 ) ]
603573 public virtual void FlexWrapTest ( ) {
604574 ConvertToPdfAndCompare ( "flexWrap" , SOURCE_FOLDER , DESTINATION_FOLDER ) ;
605575 }
606576
607- //TODO DEVSIX-8730: Update after fix
608577 [ NUnit . Framework . Test ]
609- [ LogMessage ( Html2PdfLogMessageConstant . WORKER_UNABLE_TO_PROCESS_OTHER_WORKER , Count = 4 ) ]
610578 public virtual void FlexNoWrapTest ( ) {
611579 ConvertToPdfAndCompare ( "flexNoWrap" , SOURCE_FOLDER , DESTINATION_FOLDER ) ;
612580 }
613581
614- //TODO DEVSIX-8730: Update after fix
615582 [ NUnit . Framework . Test ]
616- [ LogMessage ( Html2PdfLogMessageConstant . WORKER_UNABLE_TO_PROCESS_OTHER_WORKER , Count = 4 ) ]
617583 public virtual void FlexWrapReverseTest ( ) {
618584 ConvertToPdfAndCompare ( "flexWrapReverse" , SOURCE_FOLDER , DESTINATION_FOLDER ) ;
619585 }
0 commit comments