JaCoCo: гейт покрытия 90% строк + сводка/артефакты репортов в CI
PR checks / web (pull_request) Successful in 54s
PR checks / java (pull_request) Failing after 1m9s

Корневой pom: jacoco-maven-plugin 0.8.15 (prepare-agent, report+check на
verify, report раньше check — отчёт готов даже при провале гейта), surefire
argLine через @{argLine}. pr.yml/main.yml job java: Coverage summary в
step summary + артефакт jacoco-html (оба шага if: always()).

Тесты ради гейта (23 класса / 218 @Test): app ConversionService/
ApiExceptionHandler/ConversionTimeout +1 в ConvertController; core
DrawMlColor/DrawMlText + инкременты ChartSpec/PresetGeometry.
Покрытие: core 91,0%, app 92,9% строк.
This commit is contained in:
Pjandro
2026-10-24 18:39:44 +00:00
parent dfa6135701
commit 8a07597d4c
12 changed files with 1411 additions and 6 deletions
@@ -1,17 +1,71 @@
package ru.pjandro.wordpdf.internal.chart;
import org.docx4j.dml.CTLineProperties;
import org.docx4j.dml.CTNoFillProperties;
import org.docx4j.dml.CTRegularTextRun;
import org.docx4j.dml.CTShapeProperties;
import org.docx4j.dml.CTSolidColorFillProperties;
import org.docx4j.dml.CTSRgbColor;
import org.docx4j.dml.CTTextBody;
import org.docx4j.dml.CTTextParagraph;
import org.docx4j.dml.chart.CTAreaChart;
import org.docx4j.dml.chart.CTAreaSer;
import org.docx4j.dml.chart.CTAxDataSource;
import org.docx4j.dml.chart.CTAxPos;
import org.docx4j.dml.chart.CTAxisUnit;
import org.docx4j.dml.chart.CTBandFmt;
import org.docx4j.dml.chart.CTBandFmts;
import org.docx4j.dml.chart.CTBarChart;
import org.docx4j.dml.chart.CTBarDir;
import org.docx4j.dml.chart.CTBarSer;
import org.docx4j.dml.chart.CTBoolean;
import org.docx4j.dml.chart.CTChart;
import org.docx4j.dml.chart.CTChartLines;
import org.docx4j.dml.chart.CTChartSpace;
import org.docx4j.dml.chart.CTDPt;
import org.docx4j.dml.chart.CTDateAx;
import org.docx4j.dml.chart.CTDepthPercent;
import org.docx4j.dml.chart.CTDouble;
import org.docx4j.dml.chart.CTDoughnutChart;
import org.docx4j.dml.chart.CTFirstSliceAng;
import org.docx4j.dml.chart.CTGapAmount;
import org.docx4j.dml.chart.CTHoleSize;
import org.docx4j.dml.chart.CTLegend;
import org.docx4j.dml.chart.CTLegendPos;
import org.docx4j.dml.chart.CTLineChart;
import org.docx4j.dml.chart.CTLineSer;
import org.docx4j.dml.chart.CTMarker;
import org.docx4j.dml.chart.CTMarkerStyle;
import org.docx4j.dml.chart.CTNumData;
import org.docx4j.dml.chart.CTNumDataSource;
import org.docx4j.dml.chart.CTNumFmt;
import org.docx4j.dml.chart.CTNumRef;
import org.docx4j.dml.chart.CTNumVal;
import org.docx4j.dml.chart.CTOverlap;
import org.docx4j.dml.chart.CTPerspective;
import org.docx4j.dml.chart.CTPieChart;
import org.docx4j.dml.chart.CTPieSer;
import org.docx4j.dml.chart.CTPlotArea;
import org.docx4j.dml.chart.CTRotY;
import org.docx4j.dml.chart.CTScaling;
import org.docx4j.dml.chart.CTSerAx;
import org.docx4j.dml.chart.CTSerTx;
import org.docx4j.dml.chart.CTStrData;
import org.docx4j.dml.chart.CTStrRef;
import org.docx4j.dml.chart.CTStrVal;
import org.docx4j.dml.chart.CTSurface3DChart;
import org.docx4j.dml.chart.CTTitle;
import org.docx4j.dml.chart.CTTx;
import org.docx4j.dml.chart.CTUnsignedInt;
import org.docx4j.dml.chart.CTValAx;
import org.docx4j.dml.chart.CTView3D;
import org.docx4j.dml.chart.STAxPos;
import org.docx4j.dml.chart.STBarDir;
import org.docx4j.dml.chart.STLegendPos;
import org.docx4j.dml.chart.STMarkerStyle;
import org.junit.jupiter.api.Test;
import java.awt.Color;
import java.util.List;
import static org.junit.jupiter.api.Assertions.*;
@@ -92,11 +146,13 @@ class ChartSpecTest {
CTHoleSize hole = new CTHoleSize();
hole.setVal((short) 75);
chart.setHoleSize(hole);
chart.getSer().add(new CTPieSer());
ChartSpec spec = new ChartSpec();
ChartSpec.readGroup(chart, spec, new DrawMlColor(null), List.of());
assertEquals(ChartSpec.Type.DOUGHNUT, spec.type);
assertEquals(45, spec.firstSliceAng);
assertEquals(75, spec.holeSize);
assertEquals(1, spec.series.size());
}
/**
@@ -115,6 +171,492 @@ class ChartSpecTest {
assertEquals(0, bar.overlap);
}
@Test
void parseWithoutChartStaysUnsupported() {
ChartSpec spec = ChartSpec.parse(new CTChartSpace(), new DrawMlColor(null));
assertEquals(ChartSpec.Type.UNSUPPORTED, spec.type);
}
/** Пустой chartSpace без spPr/legend/title — только дефолты модели. */
@Test
void bareChartKeepsDefaults() {
ChartSpec spec = ChartSpec.parse(spaceWith(new CTChart()), new DrawMlColor(null));
assertEquals(Color.WHITE, spec.chartFill);
assertNull(spec.legendPos, "без c:legend легенды нет");
assertNull(spec.title);
}
@Test
void chartFrameFillAndBorderParsed() {
CTChartSpace space = spaceWith(new CTChart());
CTShapeProperties sp = new CTShapeProperties();
sp.setSolidFill(fill("FFEEEE"));
CTLineProperties ln = new CTLineProperties();
ln.setSolidFill(fill("EE0000"));
ln.setW(25400);
sp.setLn(ln);
space.setSpPr(sp);
ChartSpec spec = ChartSpec.parse(space, new DrawMlColor(null));
assertEquals(new Color(0xFF, 0xEE, 0xEE), spec.chartFill);
assertEquals(new Color(0xEE, 0, 0), spec.chartBorder);
assertEquals(2.0, spec.chartBorderWidth, 0.001);
}
@Test
void chartFrameBorderNoFillClearsBorder() {
CTChartSpace space = spaceWith(new CTChart());
CTShapeProperties sp = new CTShapeProperties();
CTLineProperties ln = new CTLineProperties();
ln.setNoFill(new CTNoFillProperties());
sp.setLn(ln);
space.setSpPr(sp);
ChartSpec spec = ChartSpec.parse(space, new DrawMlColor(null));
assertNull(spec.chartBorder);
}
@Test
void view3DPerspectiveAndNegativeRotY() {
CTChart chart = new CTChart();
CTView3D v = new CTView3D();
CTRotY ry = new CTRotY();
ry.setVal(-45);
CTPerspective p = new CTPerspective();
p.setVal((short) 45);
CTDepthPercent d = new CTDepthPercent();
d.setVal(80);
CTBoolean ra = new CTBoolean();
ra.setVal(Boolean.FALSE);
v.setRotY(ry);
v.setPerspective(p);
v.setDepthPercent(d);
v.setRAngAx(ra);
chart.setView3D(v);
ChartSpec spec = ChartSpec.parse(spaceWith(chart), new DrawMlColor(null));
assertEquals(315, spec.rotY);
assertEquals(45, spec.perspective);
assertEquals(80, spec.depthPercent);
assertFalse(spec.rightAngledAxes);
}
@Test
void horizontalBarDirectionParsed() {
CTBarChart bar = new CTBarChart();
CTBarDir dir = new CTBarDir();
dir.setVal(STBarDir.BAR);
bar.setBarDir(dir);
ChartSpec spec = new ChartSpec();
ChartSpec.readGroup(bar, spec, new DrawMlColor(null), List.of());
assertEquals(ChartSpec.Type.BAR_HORIZONTAL, spec.type);
}
/** c:val с дырявыми c:pt и ptCount больше числа точек — дыры dobиваются null. */
@Test
void barSeriesSparseValuesPadded() {
CTBarChart bar = new CTBarChart();
CTBarSer ser = new CTBarSer();
CTSerTx tx = new CTSerTx();
tx.setStrRef(strRef("Продажи"));
ser.setTx(tx);
ser.setCat(catStr("Q1", "Q2"));
CTNumDataSource val = new CTNumDataSource();
CTNumRef numRef = new CTNumRef();
CTNumData cache = new CTNumData();
cache.setPtCount(uint(4));
cache.getPt().add(numPt(0, "1.0"));
cache.getPt().add(numPt(2, "abc"));
numRef.setNumCache(cache);
val.setNumRef(numRef);
ser.setVal(val);
CTShapeProperties sp = new CTShapeProperties();
sp.setSolidFill(fill("00FF00"));
ser.setSpPr(sp);
bar.getSer().add(ser);
ChartSpec spec = new ChartSpec();
ChartSpec.readGroup(bar, spec, new DrawMlColor(null), List.of());
ChartSpec.Series s = spec.series.get(0);
assertEquals("Продажи", s.name);
assertEquals(List.of("Q1", "Q2"), s.categories);
assertEquals(4, s.values.size());
assertEquals(1.0, s.values.get(0));
assertNull(s.values.get(1));
assertNull(s.values.get(2), "не-число — null, не падение");
assertNull(s.values.get(3));
assertEquals(new Color(0, 0xFF, 0), s.fill);
}
@Test
void areaSeriesFillAndLinePropsParsed() {
CTAreaChart area = new CTAreaChart();
CTAreaSer ser = new CTAreaSer();
CTShapeProperties sp = new CTShapeProperties();
sp.setSolidFill(fill("0000FF"));
CTLineProperties ln = new CTLineProperties();
ln.setSolidFill(fill("FF0000"));
ln.setW(12700);
sp.setLn(ln);
ser.setSpPr(sp);
area.getSer().add(ser);
CTAreaSer noSpPr = new CTAreaSer();
CTAreaSer fillOnly = new CTAreaSer();
CTShapeProperties fillSp = new CTShapeProperties();
fillSp.setSolidFill(fill("000001"));
fillOnly.setSpPr(fillSp);
area.getSer().add(noSpPr);
area.getSer().add(fillOnly);
ChartSpec spec = new ChartSpec();
ChartSpec.readGroup(area, spec, new DrawMlColor(null), List.of());
assertEquals(ChartSpec.Type.AREA, spec.type);
ChartSpec.Series s = spec.series.get(0);
assertNull(s.name, "c:tx без c:v и без strRef — имени нет");
assertEquals(new Color(0, 0, 0xFF), s.fill);
assertEquals(new Color(0xFF, 0, 0), s.lineColor);
assertEquals(1.0, s.lineWidth, 0.001);
assertNull(spec.series.get(1).lineColor, "spPr=null — линия не задана");
assertNull(spec.series.get(2).lineColor, "spPr без a:ln — линия не задана");
}
/** c:tx/c:v, пустой c:tx, дырявые строковые categories, пустое c:v. */
@Test
void seriesNameVariantsAndSparseCategories() {
CTBarChart bar = new CTBarChart();
CTBarSer withV = new CTBarSer();
CTSerTx txV = new CTSerTx();
txV.setV("Ряд1");
withV.setTx(txV);
CTAxDataSource cat = new CTAxDataSource();
CTStrRef strRef = new CTStrRef();
CTStrData cache = new CTStrData();
CTStrVal pt = new CTStrVal();
pt.setIdx(2);
pt.setV("Март");
cache.getPt().add(pt);
strRef.setStrCache(cache);
cat.setStrRef(strRef);
withV.setCat(cat);
CTBarSer emptyTx = new CTBarSer();
emptyTx.setTx(new CTSerTx());
CTBarSer blankVal = new CTBarSer();
CTNumDataSource val = new CTNumDataSource();
CTNumData lit = new CTNumData();
lit.getPt().add(numPt(0, " "));
val.setNumLit(lit);
blankVal.setVal(val);
bar.getSer().add(withV);
bar.getSer().add(emptyTx);
bar.getSer().add(blankVal);
ChartSpec spec = new ChartSpec();
ChartSpec.readGroup(bar, spec, new DrawMlColor(null), List.of());
assertEquals("Ряд1", spec.series.get(0).name);
assertEquals(List.of("", "", "Март"), spec.series.get(0).categories);
assertNull(spec.series.get(1).name);
assertEquals(1, spec.series.get(2).values.size());
assertNull(spec.series.get(2).values.get(0), "пустое значение — null");
}
@Test
void lineSeriesNoFillAndMarkerNone() {
CTLineChart line = new CTLineChart();
CTLineSer ser = new CTLineSer();
CTShapeProperties sp = new CTShapeProperties();
CTLineProperties ln = new CTLineProperties();
ln.setNoFill(new CTNoFillProperties());
sp.setLn(ln);
ser.setSpPr(sp);
CTMarker m = new CTMarker();
CTMarkerStyle sym = new CTMarkerStyle();
sym.setVal(STMarkerStyle.NONE);
m.setSymbol(sym);
ser.setMarker(m);
line.getSer().add(ser);
ChartSpec spec = new ChartSpec();
ChartSpec.readGroup(line, spec, new DrawMlColor(null), List.of());
assertTrue(spec.series.get(0).lineNoFill);
assertFalse(spec.series.get(0).marker);
assertEquals("none", spec.series.get(0).markerSymbol);
}
@Test
void pieSeriesOutlineParsed() {
CTPieChart pie = new CTPieChart();
CTPieSer ser = new CTPieSer();
CTShapeProperties sp = new CTShapeProperties();
sp.setSolidFill(fill("112233"));
CTLineProperties ln = new CTLineProperties();
ln.setSolidFill(fill("445566"));
ln.setW(12700);
sp.setLn(ln);
ser.setSpPr(sp);
pie.getSer().add(ser);
ChartSpec spec = new ChartSpec();
ChartSpec.readGroup(pie, spec, new DrawMlColor(null), List.of());
ChartSpec.Series s = spec.series.get(0);
assertEquals(new Color(0x11, 0x22, 0x33), s.fill);
assertEquals(new Color(0x44, 0x55, 0x66), s.outlineColor);
assertEquals(1.0, s.outlineWidth, 0.001);
}
@Test
void pieSeriesOutlineNoFill() {
CTPieChart pie = new CTPieChart();
CTPieSer ser = new CTPieSer();
CTShapeProperties sp = new CTShapeProperties();
CTLineProperties ln = new CTLineProperties();
ln.setNoFill(new CTNoFillProperties());
sp.setLn(ln);
ser.setSpPr(sp);
pie.getSer().add(ser);
ChartSpec spec = new ChartSpec();
ChartSpec.readGroup(pie, spec, new DrawMlColor(null), List.of());
assertTrue(spec.series.get(0).outlineNoFill);
}
/** c:bandFmt без своего цвета — цвет из палитры по c:idx. */
@Test
void surfaceBandFmtsExplicitAndPalette() {
CTSurface3DChart surf = new CTSurface3DChart();
CTBoolean wf = new CTBoolean();
wf.setVal(Boolean.TRUE);
surf.setWireframe(wf);
CTBandFmts fmts = new CTBandFmts();
CTBandFmt withColor = new CTBandFmt();
withColor.setIdx(uint(0));
CTShapeProperties sp = new CTShapeProperties();
sp.setSolidFill(fill("ABCDEF"));
withColor.setSpPr(sp);
CTBandFmt fallback = new CTBandFmt();
fallback.setIdx(uint(1));
fmts.getBandFmt().add(withColor);
fmts.getBandFmt().add(fallback);
surf.setBandFmts(fmts);
ChartSpec spec = new ChartSpec();
ChartSpec.readGroup(surf, spec, new DrawMlColor(null),
List.of(Color.RED, Color.GREEN, Color.BLUE));
assertTrue(spec.wireframe);
assertEquals(List.of(new Color(0xAB, 0xCD, 0xEF), Color.GREEN), spec.bandColors);
}
/** c:dPt без c:spPr/c:solidFill пропускается, валидная точка получает цвет. */
@Test
void dataPointFillAppliedAndIncompleteSkipped() {
CTPieChart pie = new CTPieChart();
CTPieSer ser = new CTPieSer();
CTDPt good = new CTDPt();
good.setIdx(uint(1));
CTShapeProperties sp = new CTShapeProperties();
sp.setSolidFill(fill("FF00FF"));
good.setSpPr(sp);
CTDPt noFill = new CTDPt();
noFill.setIdx(uint(2));
ser.getDPt().add(good);
ser.getDPt().add(noFill);
pie.getSer().add(ser);
ChartSpec spec = new ChartSpec();
ChartSpec.readGroup(pie, spec, new DrawMlColor(null), List.of());
assertEquals(new Color(0xFF, 0, 0xFF), spec.series.get(0).pointFills.get(1));
assertEquals(1, spec.series.get(0).pointFills.size());
}
@Test
void legendOverlayClearsPosExplicitPosWins() {
CTChart chart = new CTChart();
CTLegend legend = new CTLegend();
CTBoolean overlay = new CTBoolean();
overlay.setVal(Boolean.TRUE);
legend.setOverlay(overlay);
chart.setLegend(legend);
ChartSpec spec = ChartSpec.parse(spaceWith(chart), new DrawMlColor(null));
assertNull(spec.legendPos, "overlay-легенда не резервирует место");
CTChart chart2 = new CTChart();
CTLegend legend2 = new CTLegend();
CTBoolean overlay2 = new CTBoolean();
overlay2.setVal(Boolean.TRUE);
legend2.setOverlay(overlay2);
CTLegendPos pos = new CTLegendPos();
pos.setVal(STLegendPos.T);
legend2.setLegendPos(pos);
chart2.setLegend(legend2);
ChartSpec spec2 = ChartSpec.parse(spaceWith(chart2), new DrawMlColor(null));
assertEquals("t", spec2.legendPos);
}
@Test
void titleFromStrRefAndRichText() {
CTChart chart = new CTChart();
CTTitle title = new CTTitle();
CTTx tx = new CTTx();
tx.setStrRef(strRef("Отчёт"));
title.setTx(tx);
chart.setTitle(title);
ChartSpec spec = new ChartSpec();
ChartSpec.readTitle(chart, spec, new DrawMlColor(null));
assertEquals("Отчёт", spec.title);
CTChart chart2 = new CTChart();
CTTitle title2 = new CTTitle();
CTTx tx2 = new CTTx();
CTTextBody rich = new CTTextBody();
CTTextParagraph p = new CTTextParagraph();
CTRegularTextRun run = new CTRegularTextRun();
run.setT("Привет");
p.getEGTextRun().add(run);
rich.getP().add(p);
tx2.setRich(rich);
title2.setTx(tx2);
chart2.setTitle(title2);
ChartSpec spec2 = new ChartSpec();
ChartSpec.readTitle(chart2, spec2, new DrawMlColor(null));
assertEquals("Привет", spec2.title);
}
/** valAx со scaling/единицами/сеткой/numFmt, dateAx как catAxis, serAx. */
@Test
void axesParsedIncludingDateAxisFallback() {
CTChart chart = new CTChart();
CTPlotArea pa = new CTPlotArea();
CTValAx val = new CTValAx();
CTScaling scaling = new CTScaling();
CTDouble min = new CTDouble();
min.setVal(-5.0);
CTDouble max = new CTDouble();
max.setVal(50.0);
scaling.setMin(min);
scaling.setMax(max);
val.setScaling(scaling);
CTAxisUnit unit = new CTAxisUnit();
unit.setVal(10.0);
val.setMajorUnit(unit);
CTChartLines grid = new CTChartLines();
CTShapeProperties gsp = new CTShapeProperties();
CTLineProperties gln = new CTLineProperties();
gln.setSolidFill(fill("00FF00"));
gsp.setLn(gln);
grid.setSpPr(gsp);
val.setMajorGridlines(grid);
CTNumFmt fmt = new CTNumFmt();
fmt.setFormatCode("0.0");
val.setNumFmt(fmt);
CTBoolean del = new CTBoolean();
del.setVal(Boolean.TRUE);
val.setDelete(del);
CTAxPos pos = new CTAxPos();
pos.setVal(STAxPos.R);
val.setAxPos(pos);
CTShapeProperties asp = new CTShapeProperties();
CTLineProperties aln = new CTLineProperties();
aln.setNoFill(new CTNoFillProperties());
asp.setLn(aln);
val.setSpPr(asp);
pa.getValAxOrCatAxOrDateAx().add(val);
pa.getValAxOrCatAxOrDateAx().add(new CTDateAx());
pa.getValAxOrCatAxOrDateAx().add(new CTSerAx());
pa.getValAxOrCatAxOrDateAx().add("не-ось");
chart.setPlotArea(pa);
ChartSpec spec = ChartSpec.parse(spaceWith(chart), new DrawMlColor(null));
assertEquals(-5.0, spec.valAxis.min);
assertEquals(50.0, spec.valAxis.max);
assertEquals(10.0, spec.valAxis.majorUnit);
assertTrue(spec.valAxis.gridlines);
assertEquals(new Color(0, 0xFF, 0), spec.valAxis.gridColor);
assertEquals("0.0", spec.valAxis.numFmt);
assertTrue(spec.valAxis.deleted);
assertEquals("r", spec.valAxis.pos);
assertNull(spec.valAxis.axisLineColor);
assertNotNull(spec.catAxis, "c:dateAx становится catAxis");
assertEquals("General", spec.catAxis.numFmt);
assertNotNull(spec.serAxis);
assertEquals("General", spec.serAxis.numFmt);
}
@Test
void numericCategoriesSparsePadded() {
CTBarChart bar = new CTBarChart();
CTBarSer ser = new CTBarSer();
CTAxDataSource cat = new CTAxDataSource();
CTNumRef numRef = new CTNumRef();
CTNumData cache = new CTNumData();
CTNumVal pt = new CTNumVal();
pt.setIdx(2);
pt.setV("2024");
cache.getPt().add(pt);
numRef.setNumCache(cache);
cat.setNumRef(numRef);
ser.setCat(cat);
bar.getSer().add(ser);
ChartSpec spec = new ChartSpec();
ChartSpec.readGroup(bar, spec, new DrawMlColor(null), List.of());
assertEquals(List.of("", "", "2024"), spec.series.get(0).categories);
}
/** Общие categories пустые — берутся из первого ряда. */
@Test
void categoriesCopiedFromFirstSeries() {
CTChart chart = new CTChart();
CTPlotArea pa = new CTPlotArea();
CTBarChart bar = new CTBarChart();
CTBarSer ser = new CTBarSer();
ser.setCat(catStr("Я", "Ф", "М"));
bar.getSer().add(ser);
pa.getAreaChartOrArea3DChartOrLineChart().add(bar);
chart.setPlotArea(pa);
ChartSpec spec = ChartSpec.parse(spaceWith(chart), new DrawMlColor(null));
assertEquals(List.of("Я", "Ф", "М"), spec.categories);
}
private static CTChartSpace spaceWith(CTChart chart) {
CTChartSpace space = new CTChartSpace();
space.setChart(chart);
return space;
}
private static CTSolidColorFillProperties fill(String hex) {
CTSolidColorFillProperties f = new CTSolidColorFillProperties();
CTSRgbColor s = new CTSRgbColor();
s.setVal(hex);
f.setSrgbClr(s);
return f;
}
private static CTUnsignedInt uint(long v) {
CTUnsignedInt u = new CTUnsignedInt();
u.setVal(v);
return u;
}
private static CTStrRef strRef(String v) {
CTStrRef ref = new CTStrRef();
CTStrData cache = new CTStrData();
CTStrVal pt = new CTStrVal();
pt.setIdx(0);
pt.setV(v);
cache.getPt().add(pt);
ref.setStrCache(cache);
return ref;
}
private static CTAxDataSource catStr(String... names) {
CTAxDataSource cat = new CTAxDataSource();
CTStrRef ref = new CTStrRef();
CTStrData cache = new CTStrData();
for (int i = 0; i < names.length; i++) {
CTStrVal pt = new CTStrVal();
pt.setIdx(i);
pt.setV(names[i]);
cache.getPt().add(pt);
}
ref.setStrCache(cache);
cat.setStrRef(ref);
return cat;
}
private static CTNumVal numPt(long idx, String v) {
CTNumVal pt = new CTNumVal();
pt.setIdx(idx);
pt.setV(v);
return pt;
}
private static CTChart emptyTitleChart() {
CTChart chart = new CTChart();
chart.setTitle(new CTTitle());
@@ -0,0 +1,245 @@
package ru.pjandro.wordpdf.internal.chart;
import jakarta.xml.bind.JAXBElement;
import org.docx4j.dml.BaseStyles;
import org.docx4j.dml.CTColor;
import org.docx4j.dml.CTColorScheme;
import org.docx4j.dml.CTFixedPercentage;
import org.docx4j.dml.CTFontReference;
import org.docx4j.dml.CTGradientStop;
import org.docx4j.dml.CTHslColor;
import org.docx4j.dml.CTPercentage;
import org.docx4j.dml.CTPositiveFixedAngle;
import org.docx4j.dml.CTPositiveFixedPercentage;
import org.docx4j.dml.CTPositivePercentage;
import org.docx4j.dml.CTScRgbColor;
import org.docx4j.dml.CTSchemeColor;
import org.docx4j.dml.CTSRgbColor;
import org.docx4j.dml.CTSolidColorFillProperties;
import org.docx4j.dml.CTSystemColor;
import org.docx4j.dml.FontCollection;
import org.docx4j.dml.STSchemeColorVal;
import org.docx4j.dml.TextFont;
import org.docx4j.dml.Theme;
import org.junit.jupiter.api.Test;
import javax.xml.namespace.QName;
import java.awt.Color;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Палитра DrawingML: тема/дефолтная Office-палитра, базовые цвета
* (srgb/scrgb/hsl/sys/scheme) и цепочки трансформаций (lumMod/lumOff/
* satMod/satOff/hueMod/hueOff/tint/shade/alpha) со всеми классами
* процентных значений; неизвестная трансформация пропускается.
*/
class DrawMlColorTest {
private static final String DML_NS = "http://schemas.openxmlformats.org/drawingml/2006/main";
private static final Color OFFICE_ACCENT1 = new Color(0x44, 0x72, 0xC4);
private static final Color OFFICE_ACCENT2 = new Color(0xED, 0x7D, 0x31);
private static <T> JAXBElement<T> transform(String kind, Class<T> cls, T value) {
return new JAXBElement<>(new QName(DML_NS, kind), cls, value);
}
private static CTSRgbColor srgbColor(String hex) {
CTSRgbColor s = new CTSRgbColor();
s.setVal(hex);
return s;
}
private static CTColor srgb(String hex) {
CTColor c = new CTColor();
c.setSrgbClr(srgbColor(hex));
return c;
}
private static CTColor scheme(STSchemeColorVal val) {
CTColor c = new CTColor();
CTSchemeColor sc = new CTSchemeColor();
sc.setVal(val);
c.setSchemeClr(sc);
return c;
}
private static CTPositiveFixedPercentage fixedPct(int val) {
CTPositiveFixedPercentage p = new CTPositiveFixedPercentage();
p.setVal(val);
return p;
}
private static CTFixedPercentage fixed(int val) {
CTFixedPercentage p = new CTFixedPercentage();
p.setVal(val);
return p;
}
private static CTPositivePercentage positive(int val) {
CTPositivePercentage p = new CTPositivePercentage();
p.setVal(val);
return p;
}
private static CTPercentage pct(int val) {
CTPercentage p = new CTPercentage();
p.setVal(val);
return p;
}
private static CTPositiveFixedAngle angle(int val) {
CTPositiveFixedAngle a = new CTPositiveFixedAngle();
a.setVal(val);
return a;
}
@Test
void themeColorsAndFontsParsed() {
Theme theme = new Theme();
BaseStyles el = new BaseStyles();
CTColorScheme cs = new CTColorScheme();
cs.setAccent1(srgb("FF0000"));
el.setClrScheme(cs);
BaseStyles.FontScheme fs = new BaseStyles.FontScheme();
FontCollection minor = new FontCollection();
TextFont latin = new TextFont();
latin.setTypeface("Arimo");
minor.setLatin(latin);
fs.setMinorFont(minor);
// majorFont без a:latin — имя остаётся дефолтным
fs.setMajorFont(new FontCollection());
el.setFontScheme(fs);
theme.setThemeElements(el);
DrawMlColor colors = new DrawMlColor(theme);
assertEquals(new Color(0xFF, 0, 0), colors.schemeColor("accent1"));
assertEquals("Arimo", colors.minorFontName());
assertEquals("Calibri Light", colors.majorFontName());
}
@Test
void schemeColorNullAndUnknownFallBackToBlack() {
DrawMlColor colors = new DrawMlColor(null);
assertEquals(Color.BLACK, colors.schemeColor(null));
assertEquals(Color.BLACK, colors.schemeColor("no-such-color"));
assertEquals(OFFICE_ACCENT1, colors.schemeColor("ACCENT1"));
assertEquals(colors.schemeColor("dk1"), colors.schemeColor("tx1"));
assertEquals(colors.schemeColor("lt1"), colors.schemeColor("bg1"));
}
@Test
void resolveNullsReturnNull() {
DrawMlColor colors = new DrawMlColor(null);
assertNull(colors.resolve(null));
assertNull(colors.resolve(new CTColor()));
assertNull(colors.resolveFill(null));
assertNull(colors.resolveStop(null));
assertNull(colors.resolveFontRef(null));
}
@Test
void baseColorKindsResolved() {
DrawMlColor colors = new DrawMlColor(null);
CTColor scrgb = new CTColor();
CTScRgbColor s = new CTScRgbColor();
s.setR(1);
s.setG(0);
s.setB(0);
scrgb.setScrgbClr(s);
assertEquals(Color.RED, colors.resolve(scrgb));
CTColor hsl = new CTColor();
CTHslColor h = new CTHslColor();
h.setHue(0);
h.setSat(100000);
h.setLum(50000);
hsl.setHslClr(h);
assertEquals(Color.RED, colors.resolve(hsl));
CTColor window = new CTColor();
CTSystemColor w = new CTSystemColor();
w.setVal("window");
window.setSysClr(w);
assertEquals(Color.WHITE, colors.resolve(window));
assertEquals(OFFICE_ACCENT1, colors.resolve(scheme(STSchemeColorVal.ACCENT_1)));
}
@Test
void srgbTransformsChainApplied() {
DrawMlColor colors = new DrawMlColor(null);
CTColor c = srgb("808080");
var transforms = c.getSrgbClr().getEGColorTransform();
transforms.add(transform("lumMod", CTPositiveFixedPercentage.class, fixedPct(50000)));
transforms.add(transform("lumOff", CTFixedPercentage.class, fixed(10000)));
transforms.add(transform("satMod", CTPositivePercentage.class, positive(200000)));
transforms.add(transform("satOff", CTPositivePercentage.class, positive(10000)));
transforms.add(transform("hueMod", CTPositiveFixedPercentage.class, fixedPct(50000)));
transforms.add(transform("hueOff", CTPositiveFixedAngle.class, angle(5400000)));
transforms.add(transform("tint", CTPositiveFixedPercentage.class, fixedPct(80000)));
transforms.add(transform("shade", CTPositiveFixedPercentage.class, fixedPct(90000)));
transforms.add(transform("alpha", CTPercentage.class, pct(50000)));
Color resolved = colors.resolve(c);
assertNotNull(resolved);
assertEquals(128, resolved.getAlpha());
}
@Test
void unknownTransformSkipped() {
DrawMlColor colors = new DrawMlColor(null);
CTColor c = srgb("123456");
c.getSrgbClr().getEGColorTransform()
.add(transform("bogus", String.class, "x"));
assertEquals(new Color(0x12, 0x34, 0x56), colors.resolve(c));
}
@Test
void schemeAndSystemColorTransformsApplied() {
DrawMlColor colors = new DrawMlColor(null);
CTColor accent = scheme(STSchemeColorVal.ACCENT_1);
accent.getSchemeClr().getEGColorTransform()
.add(transform("tint", CTPositiveFixedPercentage.class, fixedPct(60000)));
Color resolved = colors.resolve(accent);
assertNotNull(resolved);
assertTrue(resolved.getRed() >= OFFICE_ACCENT1.getRed()
&& resolved.getBlue() >= OFFICE_ACCENT1.getBlue(),
"tint обязан осветлять, а не темнить");
CTColor sys = new CTColor();
CTSystemColor w = new CTSystemColor();
w.setVal("windowText");
w.getEGColorTransform()
.add(transform("shade", CTPositiveFixedPercentage.class, fixedPct(50000)));
sys.setSysClr(w);
assertEquals(Color.BLACK, colors.resolve(sys));
}
@Test
void gradientStopAndFontRefResolve() {
DrawMlColor colors = new DrawMlColor(null);
CTGradientStop gs = new CTGradientStop();
gs.setSrgbClr(srgbColor("FF8000"));
assertEquals(new Color(0xFF, 0x80, 0), colors.resolveStop(gs));
CTFontReference ref = new CTFontReference();
CTSchemeColor sc = new CTSchemeColor();
sc.setVal(STSchemeColorVal.ACCENT_2);
ref.setSchemeClr(sc);
assertEquals(OFFICE_ACCENT2, colors.resolveFontRef(ref));
}
@Test
void resolveFillWrapsColorSet() {
DrawMlColor colors = new DrawMlColor(null);
CTSolidColorFillProperties fill = new CTSolidColorFillProperties();
CTSchemeColor sc = new CTSchemeColor();
sc.setVal(STSchemeColorVal.DK_1);
fill.setSchemeClr(sc);
assertEquals(Color.BLACK, colors.resolveFill(fill));
}
@Test
void withAlphaScalesAlphaChannel() {
Color c = DrawMlColor.withAlpha(Color.BLUE, 0.5);
assertEquals(128, c.getAlpha());
assertEquals(Color.BLUE.getRGB() & 0xFFFFFF, c.getRGB() & 0xFFFFFF);
}
}
@@ -0,0 +1,164 @@
package ru.pjandro.wordpdf.internal.chart;
import org.docx4j.dml.CTNoFillProperties;
import org.docx4j.dml.CTRegularTextRun;
import org.docx4j.dml.CTTextBody;
import org.docx4j.dml.CTTextCharacterProperties;
import org.docx4j.dml.CTTextParagraph;
import org.docx4j.dml.CTTextParagraphProperties;
import org.docx4j.dml.STTextAlignType;
import org.docx4j.dml.TextFont;
import org.junit.jupiter.api.Test;
import ru.pjandro.wordpdf.fonts.BundledFonts;
import java.awt.Color;
import java.awt.Graphics2D;
import java.awt.geom.Rectangle2D;
import java.awt.image.BufferedImage;
import java.util.List;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Текст DrawingML: наследование defRPr/rPr (включая a:noFill → прозрачный
* цвет и алиас «+mj-lt» → семейство темы), фолбэк шрифта для неизвестного
* семейства и растеризация: вертикальный/горизонтальный align, перенос
* длинного слова, жёсткий перевод строки, двойные пробелы.
*/
class DrawMlTextTest {
private static final DrawMlText.Style STYLE =
new DrawMlText.Style(10, false, false, Color.BLACK, "DejaVu Sans");
private static DrawMlText.Style style(String family, boolean bold, boolean italic) {
return new DrawMlText.Style(10, bold, italic, Color.BLACK, family);
}
private static final int MIN_INK_PER_ROW = 2;
/** Полосы строк: ряды не менее чем с двумя тёмными пикселями
* (одиночная вершина «A» не полоса). */
private static int inkBands(BufferedImage img) {
int bands = 0;
boolean in = false;
for (int y = 0; y < img.getHeight(); y++) {
int cnt = 0;
for (int x = 0; x < img.getWidth(); x++) {
int argb = img.getRGB(x, y);
if (argb >>> 24 > 0 && (argb & 0xFFFFFF) < 0x808080) {
cnt++;
}
}
boolean dark = cnt >= MIN_INK_PER_ROW;
if (dark && !in) {
bands++;
in = true;
} else if (!dark) {
in = false;
}
}
return bands;
}
private static BufferedImage paint(List<DrawMlText.Paragraph> paragraphs,
Rectangle2D box, String defAlign, String vAlign) {
BufferedImage img = new BufferedImage((int) box.getWidth() + 10,
(int) box.getHeight() + 10, BufferedImage.TYPE_INT_ARGB);
Graphics2D g = img.createGraphics();
DrawMlText.paint(g, paragraphs, box, defAlign, vAlign, 1.2);
g.dispose();
return img;
}
@Test
void defaultStyleNullPaths() {
DrawMlColor colors = new DrawMlColor(null);
DrawMlText.Style def = DrawMlText.defaultStyle(null, colors,
"DejaVu Sans", 9, Color.GRAY);
assertEquals(9, def.sizePt());
CTTextBody body = new CTTextBody();
body.getP().add(new CTTextParagraph());
DrawMlText.Style base = DrawMlText.defaultStyle(body, colors,
"DejaVu Sans", 9, Color.GRAY);
assertEquals(Color.GRAY, base.color(), "без a:pPr/a:defRPr — фолбэк-цвет");
}
@Test
void paragraphsNullBodyAndRunStyles() {
BundledFonts.init();
DrawMlColor colors = new DrawMlColor(null);
assertTrue(DrawMlText.paragraphs(null, colors, "DejaVu Sans", 9, Color.GRAY).isEmpty());
CTTextBody body = new CTTextBody();
CTTextParagraph p = new CTTextParagraph();
CTTextParagraphProperties pPr = new CTTextParagraphProperties();
pPr.setAlgn(STTextAlignType.CTR);
CTTextCharacterProperties defRPr = new CTTextCharacterProperties();
defRPr.setSz(1400);
TextFont major = new TextFont();
major.setTypeface("+mj-lt");
defRPr.setLatin(major);
pPr.setDefRPr(defRPr);
p.setPPr(pPr);
CTRegularTextRun run = new CTRegularTextRun();
CTTextCharacterProperties rPr = new CTTextCharacterProperties();
rPr.setNoFill(new CTNoFillProperties());
run.setRPr(rPr);
run.setT("Привет");
p.getEGTextRun().add(run);
body.getP().add(p);
List<DrawMlText.Paragraph> paras = DrawMlText.paragraphs(body, colors,
"DejaVu Sans", 9, Color.GRAY);
assertEquals(1, paras.size());
assertEquals("Привет", paras.get(0).text());
assertEquals("ctr", paras.get(0).align());
assertEquals(14.0, paras.get(0).style().sizePt());
assertEquals("carlito", paras.get(0).style().family(),
"«+mj-lt» разрешается в major-шрифт темы");
assertEquals(0, paras.get(0).style().color().getAlpha(),
"a:noFill в a:rPr — прозрачный цвет");
}
@Test
void fontForUnknownFamilyFallsBack() {
assertNotNull(DrawMlText.fontFor(style("NoSuchFamily", true, true)));
assertNotNull(DrawMlText.fontFor(style("Noto Naskh Arabic", false, true)),
"нет bold-italic в семействе — фолбэк без null");
}
@Test
void paintEmptyIsNoop() {
BufferedImage img = paint(List.of(),
new Rectangle2D.Double(0, 0, 50, 50), null, null);
assertEquals(0, inkBands(img));
}
@Test
void paintBottomAndRightAlignDrawsInk() {
BufferedImage img = paint(
List.of(new DrawMlText.Paragraph("Тест", STYLE, "r")),
new Rectangle2D.Double(0, 0, 120, 60), null, "b");
assertTrue(inkBands(img) >= 1, "right/bottom-выравнивание рисует текст");
}
@Test
void paintHardNewlineCreatesGap() {
BufferedImage gap = paint(
List.of(new DrawMlText.Paragraph("A\n\nB", STYLE, null)),
new Rectangle2D.Double(0, 0, 120, 80), "ctr", "t");
assertEquals(2, inkBands(gap), "пустая строка между A и B — разрыв полос");
BufferedImage one = paint(
List.of(new DrawMlText.Paragraph("A B", STYLE, null)),
new Rectangle2D.Double(0, 0, 120, 40), null, "t");
assertEquals(1, inkBands(one), "двойной пробел не рвёт строку");
}
@Test
void paintLongWordSplitsIntoLines() {
BufferedImage img = paint(
List.of(new DrawMlText.Paragraph("A WWWWWWWWWWWWWWWWW", STYLE, null)),
new Rectangle2D.Double(0, 0, 20, 120), null, "t");
assertTrue(inkBands(img) >= 3, "длинное слово режется по символам");
}
}
@@ -272,4 +272,22 @@ class PresetGeometryTest {
}
assertEquals(4, segments);
}
/** Арифметика префиксных формул (+, -, *, /), голый литерал, пустая/битая fmla → 0. */
@Test
void adjustValuesEvaluatesFormulasAndBlanks() {
CTPresetGeometry2D geom = new CTPresetGeometry2D();
CTGeomGuideList av = new CTGeomGuideList();
av.getGd().add(guide("adj1", "45000"));
av.getGd().add(guide("adj2", "+ 1 2"));
av.getGd().add(guide("adj3", "- 5 2"));
av.getGd().add(guide("adj4", "* 2 3 4"));
av.getGd().add(guide("adj5", "/ 2 4 6"));
av.getGd().add(guide("adj6", null));
av.getGd().add(guide("adj7", "+ 1"));
geom.setAvLst(av);
assertArrayEquals(new int[]{45000, 3, 3, 1, 1, 0, 0},
PresetGeometry.adjustValues(geom),
"* = a*b/c, / = (a+b)/c; пустая и оборванная формула — 0");
}
}