octoleo/plantuml
1
0
Fork 0
mirror of https://github.com/octoleo/plantuml.git synced 2024-12-28 04:55:58 +00:00
Code Issues Releases Wiki Activity

Simplify default & boolean values in SkinParam. Change "sameClassWidth" param to case insensitive. Rename a few SkinParam tests for consistency.

Browse Source
This commit is contained in:
matthew16550 2021-04-04 21:25:02 +10:00
parent 33ba37318c
commit 75f80fa2df
2 changed files with 198 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
src/net/sourceforge/plantuml/SkinParam.java
View File

@ -300,6 +300,19 @@ public class SkinParam implements ISkinParam {
return null; return null;
} }
public String getValue(String key, String defaultValue) {
final String result = getValue(key);
return result == null ? defaultValue : result;
}
private boolean valueIs(String key, String expected) {
return expected.equalsIgnoreCase(getValue(key));
}
private boolean isTrue(String key) {
return valueIs(key, "true");
}
static String humanName(String key) { static String humanName(String key) {
final StringBuilder sb = new StringBuilder(); final StringBuilder sb = new StringBuilder();
boolean upper = true; boolean upper = true;
@ -818,24 +831,18 @@ public class SkinParam implements ISkinParam {
} }
public boolean stereotypePositionTop() { public boolean stereotypePositionTop() {
final String value = getValue("stereotypePosition"); return !valueIs("stereotypePosition", "bottom");
if ("bottom".equalsIgnoreCase(value)) {
return false;
}
return true;
} }
public boolean useSwimlanes(UmlDiagramType type) { public boolean useSwimlanes(UmlDiagramType type) {
if (type != UmlDiagramType.ACTIVITY) { if (type != UmlDiagramType.ACTIVITY) {
return false; return false;
} }
if ("true".equalsIgnoreCase(getValue("swimlane"))) { return swimlanes();
return true; }
}
if ("true".equalsIgnoreCase(getValue("swimlanes"))) { public boolean swimlanes() {
return true; return isTrue("swimlane") || isTrue("swimlanes");
}
return false;
} }
public double getNodesep() { public double getNodesep() {
@ -949,19 +956,11 @@ public class SkinParam implements ISkinParam {
} }
public boolean strictUmlStyle() { public boolean strictUmlStyle() {
final String value = getValue("style"); return valueIs("style", "strictuml");
if ("strictuml".equalsIgnoreCase(value)) {
return true;
}
return false;
} }
public boolean forceSequenceParticipantUnderlined() { public boolean forceSequenceParticipantUnderlined() {
final String value = getValue("sequenceParticipant"); return valueIs("sequenceParticipant", "underline");
if ("underline".equalsIgnoreCase(value)) {
return true;
}
return false;
} }
public ConditionStyle getConditionStyle() { public ConditionStyle getConditionStyle() {
@ -987,7 +986,7 @@ public class SkinParam implements ISkinParam {
} }
public boolean sameClassWidth() { public boolean sameClassWidth() {
return "true".equals(getValue("sameclasswidth")); return isTrue("sameclasswidth");
} }
public final Rankdir getRankdir() { public final Rankdir getRankdir() {
@ -1023,11 +1022,7 @@ public class SkinParam implements ISkinParam {
} }
public boolean useUnderlineForHyperlink() { public boolean useUnderlineForHyperlink() {
final String value = getValue("hyperlinkunderline"); return !valueIs("hyperlinkunderline", "false");
if ("false".equalsIgnoreCase(value)) {
return false;
}
return true;
} }
public int groupInheritance() { public int groupInheritance() {
@ -1041,35 +1036,19 @@ public class SkinParam implements ISkinParam {
} }
public boolean handwritten() { public boolean handwritten() {
final String value = getValue("handwritten"); return isTrue("handwritten");
if ("true".equalsIgnoreCase(value)) {
return true;
}
return false;
} }
public String getSvgLinkTarget() { public String getSvgLinkTarget() {
final String value = getValue("svglinktarget"); return getValue("svglinktarget", "_top");
if (value == null) {
return "_top";
}
return value;
} }
public String getPreserveAspectRatio() { public String getPreserveAspectRatio() {
final String value = getValue("preserveaspectratio"); return getValue("preserveaspectratio", DEFAULT_PRESERVE_ASPECT_RATIO);
if (value == null) {
return DEFAULT_PRESERVE_ASPECT_RATIO;
}
return value;
} }
public String getMonospacedFamily() { public String getMonospacedFamily() {
final String value = getValue("defaultMonospacedFontName"); return getValue("defaultMonospacedFontName", Parser.MONOSPACED);
if (value == null) {
return Parser.MONOSPACED;
}
return value;
} }
public int getTabSize() { public int getTabSize() {
@ -1147,19 +1126,11 @@ public class SkinParam implements ISkinParam {
} }
public boolean displayGenericWithOldFashion() { public boolean displayGenericWithOldFashion() {
final String value = getValue("genericDisplay"); return valueIs("genericDisplay", "old");
if ("old".equalsIgnoreCase(value)) {
return true;
}
return false;
} }
public boolean responseMessageBelowArrow() { public boolean responseMessageBelowArrow() {
final String value = getValue("responsemessagebelowarrow"); return isTrue("responsemessagebelowarrow");
if ("true".equalsIgnoreCase(value)) {
return true;
}
return false;
} }
public TikzFontDistortion getTikzFontDistortion() { public TikzFontDistortion getTikzFontDistortion() {
@ -1168,19 +1139,11 @@ public class SkinParam implements ISkinParam {
} }
public boolean svgDimensionStyle() { public boolean svgDimensionStyle() {
final String value = getValue("svgdimensionstyle"); return !valueIs("svgdimensionstyle", "false");
if ("false".equalsIgnoreCase(value)) {
return false;
}
return true;
} }
public boolean fixCircleLabelOverlapping() { public boolean fixCircleLabelOverlapping() {
final String value = getValue("fixcirclelabeloverlapping"); return isTrue("fixcirclelabeloverlapping");
if ("true".equalsIgnoreCase(value)) {
return true;
}
return false;
} }
public void setUseVizJs(boolean useVizJs) { public void setUseVizJs(boolean useVizJs) {

176
test/net/sourceforge/plantuml/SkinParamTest.java
View File

@ -12,6 +12,7 @@ import net.sourceforge.plantuml.svek.PackageStyle;
import net.sourceforge.plantuml.svg.LengthAdjust; import net.sourceforge.plantuml.svg.LengthAdjust;
import net.sourceforge.plantuml.ugraphic.color.ColorMapperIdentity; import net.sourceforge.plantuml.ugraphic.color.ColorMapperIdentity;
import net.sourceforge.plantuml.ugraphic.color.HColorUtils; import net.sourceforge.plantuml.ugraphic.color.HColorUtils;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.CsvSource; import org.junit.jupiter.params.provider.CsvSource;
@ -265,23 +266,53 @@ class SkinParamTest {
} }
@Test @Test
public void testCircledCharacterRadius() { public void test_circledCharacterRadius() {
final SkinParam skinParam = createSkinParam("circledCharacterRadius", "123"); final SkinParam skinParam = createSkinParam("circledCharacterRadius", "123");
assertThat(skinParam.getCircledCharacterRadius()).isEqualTo(123); assertThat(skinParam.getCircledCharacterRadius()).isEqualTo(123);
} }
@Test @Test
public void testClassAttributeIconSize() { public void test_classAttributeIconSize() {
final SkinParam skinParam = createSkinParam("classAttributeIconSize", "123"); final SkinParam skinParam = createSkinParam("classAttributeIconSize", "123");
assertThat(skinParam.classAttributeIconSize()).isEqualTo(123); assertThat(skinParam.classAttributeIconSize()).isEqualTo(123);
} }
@Test @Test
public void testDpi() { public void test_defaultMonospacedFontName() {
final SkinParam skinParam = createSkinParam("defaultMonospacedFontName", "foo");
assertThat(skinParam.getMonospacedFamily()).isEqualTo("foo");
}
@Test
public void test_dpi() {
final SkinParam skinParam = createSkinParam("dpi", "123"); final SkinParam skinParam = createSkinParam("dpi", "123");
assertThat(skinParam.getDpi()).isEqualTo(123); assertThat(skinParam.getDpi()).isEqualTo(123);
} }
@ParameterizedTest
@CsvSource({
"true, true",
"tRUe, true",
"TRUE, true",
"other_value, false",
})
public void test_fixCircleLabelOverlapping(String paramValue, boolean expected) {
final SkinParam skinParam = createSkinParam("fixCircleLabelOverlapping", paramValue);
assertThat(skinParam.fixCircleLabelOverlapping()).isEqualTo(expected);
}
@ParameterizedTest
@CsvSource({
"old, true",
"oLd, true",
"OLD, true",
"other_value, false",
})
public void test_genericDisplay(String paramValue, boolean expected) {
final SkinParam skinParam = createSkinParam("genericDisplay", paramValue);
assertThat(skinParam.displayGenericWithOldFashion()).isEqualTo(expected);
}
@ParameterizedTest @ParameterizedTest
@CsvSource({ @CsvSource({
"0, MAX_VALUE", "0, MAX_VALUE",
@ -289,35 +320,101 @@ class SkinParamTest {
"2, 2", "2, 2",
"123, 123" "123, 123"
}) })
public void testGroupInheritance(String paramValue, String expectedValue) { public void test_groupInheritance(String paramValue, String expectedValue) {
final SkinParam skinParam = createSkinParam("groupInheritance", paramValue); final SkinParam skinParam = createSkinParam("groupInheritance", paramValue);
assertThat(skinParam.groupInheritance()).isEqualTo(intFromCsv(expectedValue)); assertThat(skinParam.groupInheritance()).isEqualTo(intFromCsv(expectedValue));
} }
@ParameterizedTest
@CsvSource({
"true, true",
"tRUe, true",
"TRUE, true",
"other_value, false",
})
public void test_handwritten(String paramValue, boolean expected) {
final SkinParam skinParam = createSkinParam("handwritten", paramValue);
assertThat(skinParam.handwritten()).isEqualTo(expected);
}
@ParameterizedTest
@CsvSource({
"false, false",
"fALSe, false",
"FALSE, false",
"other_value, true",
})
public void test_hyperlinkUnderline(String paramValue, boolean expected) {
final SkinParam skinParam = createSkinParam("hyperlinkUnderline", paramValue);
assertThat(skinParam.useUnderlineForHyperlink()).isEqualTo(expected);
}
@Test @Test
public void testMaxAsciiMessageLength() { public void test_maxAsciiMessageLength() {
final SkinParam skinParam = createSkinParam("maxAsciiMessageLength", "123"); final SkinParam skinParam = createSkinParam("maxAsciiMessageLength", "123");
assertThat(skinParam.maxAsciiMessageLength()).isEqualTo(123); assertThat(skinParam.maxAsciiMessageLength()).isEqualTo(123);
} }
@Test @Test
public void testMinClassWidth() { public void test_minClassWidth() {
final SkinParam skinParam = createSkinParam("minClassWidth", "123"); final SkinParam skinParam = createSkinParam("minClassWidth", "123");
assertThat(skinParam.minClassWidth()).isEqualTo(123); assertThat(skinParam.minClassWidth()).isEqualTo(123);
} }
@Test @Test
public void testNodeSep() { public void test_nodeSep() {
final SkinParam skinParam = createSkinParam("nodeSep", "123"); final SkinParam skinParam = createSkinParam("nodeSep", "123");
assertThat(skinParam.getNodesep()).isEqualTo(123); assertThat(skinParam.getNodesep()).isEqualTo(123);
} }
@Test @Test
public void testRankSep() { public void test_preserveAspectRatio() {
final SkinParam skinParam = createSkinParam("preserveAspectRatio", "foo");
assertThat(skinParam.getPreserveAspectRatio()).isEqualTo("foo");
}
@Test
public void test_rankSep() {
final SkinParam skinParam = createSkinParam("rankSep", "123"); final SkinParam skinParam = createSkinParam("rankSep", "123");
assertThat(skinParam.getRanksep()).isEqualTo(123); assertThat(skinParam.getRanksep()).isEqualTo(123);
} }
@ParameterizedTest
@CsvSource({
"true, true",
"tRUe, true",
"TRUE, true",
"other_value, false",
})
public void test_responseMessageBelowArrow(String paramValue, boolean expected) {
final SkinParam skinParam = createSkinParam("responseMessageBelowArrow", paramValue);
assertThat(skinParam.responseMessageBelowArrow()).isEqualTo(expected);
}
@ParameterizedTest
@CsvSource({
"true, true",
"tRUe, true",
"TRUE, true",
"other_value, false",
})
public void test_sameClassWidth(String paramValue, boolean expected) {
final SkinParam skinParam = createSkinParam("sameClassWidth", paramValue);
assertThat(skinParam.sameClassWidth()).isEqualTo(expected);
}
@ParameterizedTest
@CsvSource({
"underline, true",
"undERLine, true",
"UNDERLINE, true",
"other_value, false",
})
public void test_sequenceParticipant(String paramValue, boolean expected) {
final SkinParam skinParam = createSkinParam("sequenceParticipant", paramValue);
assertThat(skinParam.forceSequenceParticipantUnderlined()).isEqualTo(expected);
}
@Test @Test
public void testSplitParam() { public void testSplitParam() {
final SkinParam skinParam = createSkinParam( final SkinParam skinParam = createSkinParam(
@ -332,8 +429,69 @@ class SkinParamTest {
assertThat(splitParam.getExternalMargin()).isEqualTo(123); assertThat(splitParam.getExternalMargin()).isEqualTo(123);
} }
@ParameterizedTest
@CsvSource({
"bottom, false",
"boTTom, false",
"BOTTOM, false",
"other_value, true",
})
public void test_stereotypePosition(String paramValue, boolean expected) {
final SkinParam skinParam = createSkinParam("stereotypePosition", paramValue);
assertThat(skinParam.stereotypePositionTop()).isEqualTo(expected);
}
@ParameterizedTest
@CsvSource({
"strictuml, true",
"strICTuml, true",
"STRICTUML, true",
"other_value, false",
})
public void test_style(String paramValue, boolean expected) {
final SkinParam skinParam = createSkinParam("style", paramValue);
assertThat(skinParam.strictUmlStyle()).isEqualTo(expected);
}
@ParameterizedTest
@CsvSource({
"false, false",
"fALSe, false",
"FALSE, false",
"other_value, true",
})
public void test_svgDimensionStyle(String paramValue, boolean expected) {
final SkinParam skinParam = createSkinParam("svgDimensionStyle", paramValue);
assertThat(skinParam.svgDimensionStyle()).isEqualTo(expected);
}
@Test @Test
public void testTabSize() { public void test_svgLinkTarget() {
final SkinParam skinParam = createSkinParam("svgLinkTarget", "foo");
assertThat(skinParam.getSvgLinkTarget()).isEqualTo("foo");
}
@ParameterizedTest
@CsvSource({
// swimlane swimlanes expected
" true, any_value, true",
" tRUe, any_value, true",
" TRUE, any_value, true",
" other_value, true, true",
" other_value, tRUe, true",
" other_value, TRUE, true",
" other_value, other_value, false",
})
public void test_swimlanes(String swimlane, String swimlanes, boolean expected) {
final SkinParam skinParam = createSkinParam(
"swimlane", swimlane,
"swimlanes", swimlanes
);
assertThat(skinParam.swimlanes()).isEqualTo(expected);
}
@Test
public void test_tabSize() {
final SkinParam skinParam = createSkinParam("tabSize", "123"); final SkinParam skinParam = createSkinParam("tabSize", "123");
assertThat(skinParam.getTabSize()).isEqualTo(123); assertThat(skinParam.getTabSize()).isEqualTo(123);
} }