Skip to content

Commit 71ec9fd

Browse files
committed
Update test files column-rule shorthand
DEVSIX-7564
1 parent f065c06 commit 71ec9fd

File tree

83 files changed

+17
-16
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+17
-16
lines changed

src/main/java/com/itextpdf/html2pdf/attach/impl/tags/TdTagWorker.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ public TdTagWorker(IElementNode element, ProcessorContext context) {
9090
multicolContainer = new MulticolContainer();
9191
childOfMulticolContainer = new Div();
9292
multicolContainer.add(childOfMulticolContainer);
93-
// TODO DEVSIX-7564, DEVSIX-7562 apply other multicol properties
9493
MultiColumnCssApplierUtil.applyMultiCol(styles, context, multicolContainer);
9594
cell.add(multicolContainer);
9695
}

src/main/java/com/itextpdf/html2pdf/css/CssConstants.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,6 @@ public class CssConstants extends CommonCssConstants {
5353
/** The Constant COUNTER_RESET. */
5454
public static final String COUNTER_RESET = "counter-reset";
5555

56-
/** The Constant COLUMN_RULE_WIDTH. */
57-
public static final String COLUMN_RULE_WIDTH = "column-rule-width";
58-
59-
/** The Constant COLUMN_RULE_STYLE. */
60-
public static final String COLUMN_RULE_STYLE = "column-rule-style";
61-
62-
/** The Constant COLUMN_RULE_COLOR. */
63-
public static final String COLUMN_RULE_COLOR = "column-rule-color";
64-
6556
/** The Constant DISPLAY. */
6657
public static final String DISPLAY = "display";
6758

src/main/java/com/itextpdf/html2pdf/css/apply/impl/MultiColumnCssApplierUtil.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ This file is part of the iText (R) project.
3737
/**
3838
* Utility class to apply column-count values.
3939
*/
40-
public class MultiColumnCssApplierUtil {
40+
public final class MultiColumnCssApplierUtil {
4141
private MultiColumnCssApplierUtil() {
4242
}
4343

@@ -58,14 +58,14 @@ public static void applyMultiCol(Map<String, String> cssProps, ProcessorContext
5858
final float emValue = CssDimensionParsingUtils.parseAbsoluteFontSize(cssProps.get(CssConstants.FONT_SIZE));
5959
final float remValue = context.getCssContext().getRootFontSize();
6060

61-
UnitValue width = CssDimensionParsingUtils.parseLengthValueToPt(cssProps.get(CssConstants.COLUMN_WIDTH),
61+
final UnitValue width = CssDimensionParsingUtils.parseLengthValueToPt(cssProps.get(CssConstants.COLUMN_WIDTH),
6262
emValue, remValue);
6363
if (width != null) {
6464
element.setProperty(Property.COLUMN_WIDTH, width.getValue());
6565
}
6666

67-
UnitValue gap = CssDimensionParsingUtils.parseLengthValueToPt(cssProps.get(CssConstants.COLUMN_GAP), emValue,
68-
remValue);
67+
final UnitValue gap = CssDimensionParsingUtils.parseLengthValueToPt(cssProps.get(CssConstants.COLUMN_GAP),
68+
emValue, remValue);
6969
if (gap != null) {
7070
element.setProperty(Property.COLUMN_GAP, gap.getValue());
7171
}
@@ -80,8 +80,7 @@ public static void applyMultiCol(Map<String, String> cssProps, ProcessorContext
8080
element.setProperty(Property.COLUMN_COUNT, 1);
8181
}
8282

83-
String cssPropsColumnRuleWidth = cssProps.get(CssConstants.COLUMN_RULE_WIDTH);
84-
Border borderFromCssProperties = BorderStyleApplierUtil.getCertainBorder(
83+
final Border borderFromCssProperties = BorderStyleApplierUtil.getCertainBorder(
8584
cssProps.get(CssConstants.COLUMN_RULE_WIDTH), cssProps.get(CssConstants.COLUMN_RULE_STYLE),
8685
getColumnGapColorOrDefault(cssProps), emValue, remValue);
8786
element.setProperty(Property.COLUMN_GAP_BORDER, borderFromCssProperties);

src/test/java/com/itextpdf/html2pdf/css/w3c/css_multicol/MulticolRuleShorthand001Test.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,13 @@ This file is part of the iText (R) project.
2323
package com.itextpdf.html2pdf.css.w3c.css_multicol;
2424

2525
import com.itextpdf.html2pdf.css.w3c.W3CCssTest;
26+
import com.itextpdf.styledxmlparser.logs.StyledXmlParserLogMessageConstant;
27+
import com.itextpdf.test.annotations.LogMessage;
28+
import com.itextpdf.test.annotations.LogMessages;
2629

30+
31+
@LogMessages(messages = @LogMessage(messageTemplate =
32+
StyledXmlParserLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION, count = 12))
2733
public class MulticolRuleShorthand001Test extends W3CCssTest {
2834
@Override
2935
protected String getHtmlFileName() {

src/test/java/com/itextpdf/html2pdf/css/w3c/css_multicol/MulticolRuleShorthand2Test.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,13 @@ This file is part of the iText (R) project.
2323
package com.itextpdf.html2pdf.css.w3c.css_multicol;
2424

2525
import com.itextpdf.html2pdf.css.w3c.W3CCssTest;
26+
import com.itextpdf.styledxmlparser.logs.StyledXmlParserLogMessageConstant;
27+
import com.itextpdf.test.annotations.LogMessage;
28+
import com.itextpdf.test.annotations.LogMessages;
2629

30+
31+
@LogMessages(messages = @LogMessage(messageTemplate =
32+
StyledXmlParserLogMessageConstant.INVALID_CSS_PROPERTY_DECLARATION, count = 1))
2733
public class MulticolRuleShorthand2Test extends W3CCssTest {
2834
@Override
2935
protected String getHtmlFileName() {

0 commit comments

Comments
 (0)