Skip to content

Commit 4a3354e

Browse files
committed
add tests
Signed-off-by: Stefan Niederhauser <[email protected]>
1 parent 145d207 commit 4a3354e

File tree

6 files changed

+98
-3
lines changed

6 files changed

+98
-3
lines changed

graphviz-java/src/main/java/guru/nidi/graphviz/engine/Options.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,8 +219,6 @@ static Image create(String path, String completePath) {
219219
out.write(readAsBytes(in));
220220
}
221221
final BufferedImage image = ImageIO.read(file);
222-
System.out.println("******************" + file + " " + uriPathOf(file)
223-
+ " " + file.exists() + " " + image.getWidth());
224222
return new Image(path, uriPathOf(file), image.getWidth(), image.getHeight());
225223
}
226224
final BufferedImage image = ImageIO.read(new File(completePath));
461 Bytes
Loading

graphviz-rough/src/main/java/guru/nidi/graphviz/rough/FillStyle.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ public static FillStyle solid() {
185185
return new FillStyle("solid");
186186
}
187187

188-
public static FillStyle zigzag() {
188+
public static Zigzag zigzag() {
189189
return new Zigzag();
190190
}
191191

graphviz-rough/src/test/java/guru/nidi/graphviz/CodeAnalysisTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import guru.nidi.codeassert.model.Model;
2626
import guru.nidi.codeassert.pmd.*;
2727
import guru.nidi.graphviz.rough.FillStyle;
28+
import guru.nidi.graphviz.rough.FillStyleTest;
2829
import net.sourceforge.pmd.RulePriority;
2930
import org.junit.jupiter.api.Test;
3031

@@ -69,6 +70,7 @@ protected FindBugsResult analyzeFindBugs() {
6970
protected PmdResult analyzePmd() {
7071
final PmdViolationCollector collector = new PmdViolationCollector().minPriority(RulePriority.MEDIUM)
7172
.apply(PmdConfigs.minimalPmdIgnore())
73+
.because("It's a ok", In.clazz(FillStyleTest.class).ignore("JUnitTestContainsTooManyAsserts"))
7274
.because("It's a bug?", In.clazz(FillStyle.class).ignore("AccessorMethodGeneration"));
7375
return new PmdAnalyzer(AnalyzerConfig.maven().mainAndTest(), collector)
7476
.withRulesets(PmdConfigs.defaultPmdRulesets())
Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
/*
2+
* Copyright © 2015 Stefan Niederhauser ([email protected])
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
package guru.nidi.graphviz.rough;
17+
18+
import org.junit.jupiter.api.Test;
19+
20+
import java.util.HashMap;
21+
import java.util.Map;
22+
23+
import static org.junit.jupiter.api.Assertions.assertEquals;
24+
25+
public class FillStyleTest {
26+
@Test
27+
void hachure() {
28+
assertEquals(map("fillStyle", "hachure"), FillStyle.hachure().values);
29+
assertEquals(map("fillStyle", "hachure", "hachureAngle", 45.0), FillStyle.hachure().angle(45).values);
30+
assertEquals(map("fillStyle", "hachure", "hachureGap", 5.0), FillStyle.hachure().gap(5).values);
31+
assertEquals(map("fillStyle", "hachure", "fillWeight", 10.0), FillStyle.hachure().width(10).values);
32+
}
33+
34+
@Test
35+
void crosshatch() {
36+
assertEquals(map("fillStyle", "cross-hatch"), FillStyle.crossHatch().values);
37+
assertEquals(map("fillStyle", "cross-hatch", "hachureAngle", 45.0), FillStyle.crossHatch().angle(45).values);
38+
assertEquals(map("fillStyle", "cross-hatch", "hachureGap", 5.0), FillStyle.crossHatch().gap(5).values);
39+
assertEquals(map("fillStyle", "cross-hatch", "fillWeight", 10.0), FillStyle.crossHatch().width(10).values);
40+
}
41+
42+
@Test
43+
void solid() {
44+
assertEquals(map("fillStyle", "solid"), FillStyle.solid().values);
45+
}
46+
47+
@Test
48+
void zigzag() {
49+
assertEquals(map("fillStyle", "zigzag"), FillStyle.zigzag().values);
50+
assertEquals(map("fillStyle", "zigzag", "hachureAngle", 45.0), FillStyle.zigzag().angle(45).values);
51+
assertEquals(map("fillStyle", "zigzag", "hachureGap", 5.0), FillStyle.zigzag().gap(5).values);
52+
assertEquals(map("fillStyle", "zigzag", "fillWeight", 10.0), FillStyle.zigzag().width(10).values);
53+
}
54+
55+
@Test
56+
void zigzagLine() {
57+
assertEquals(map("fillStyle", "zigzag-line"), FillStyle.zigzagLine().values);
58+
assertEquals(map("fillStyle", "zigzag-line", "hachureAngle", 45.0), FillStyle.zigzagLine().angle(45).values);
59+
assertEquals(map("fillStyle", "zigzag-line", "hachureGap", 5.0), FillStyle.zigzagLine().gap(5).values);
60+
assertEquals(map("fillStyle", "zigzag-line", "fillWeight", 10.0), FillStyle.zigzagLine().width(10).values);
61+
assertEquals(map("fillStyle", "zigzag-line", "zigzagOffset", 22.0), FillStyle.zigzagLine().size(22).values);
62+
}
63+
64+
@Test
65+
void dots() {
66+
assertEquals(map("fillStyle", "dots"), FillStyle.dots().values);
67+
assertEquals(map("fillStyle", "dots", "fillWeight", 22.0), FillStyle.dots().size(22).values);
68+
}
69+
70+
@Test
71+
void starburst() {
72+
assertEquals(map("fillStyle", "starburst"), FillStyle.starburst().values);
73+
assertEquals(map("fillStyle", "starburst", "hachureGap", 5.0), FillStyle.starburst().gap(5).values);
74+
assertEquals(map("fillStyle", "starburst", "fillWeight", 10.0), FillStyle.starburst().width(10).values);
75+
}
76+
77+
@Test
78+
void dashed() {
79+
assertEquals(map("fillStyle", "dashed"), FillStyle.dashed().values);
80+
assertEquals(map("fillStyle", "dashed", "hachureAngle", 45.0), FillStyle.dashed().angle(45).values);
81+
assertEquals(map("fillStyle", "dashed", "hachureGap", 5.0), FillStyle.dashed().gap(5).values);
82+
assertEquals(map("fillStyle", "dashed", "fillWeight", 10.0), FillStyle.dashed().width(10).values);
83+
assertEquals(map("fillStyle", "dashed", "dashOffset", 22.0), FillStyle.dashed().length(22).values);
84+
}
85+
86+
private Map<String, Object> map(Object... vs) {
87+
final Map<String, Object> res = new HashMap<>();
88+
for (int i = 0; i < vs.length; i += 2) {
89+
res.put((String) vs[i], vs[i + 1]);
90+
}
91+
return res;
92+
}
93+
94+
}

graphviz-rough/src/test/java/guru/nidi/graphviz/rough/ReadmeTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ void simple() throws IOException {
5757
Graphviz.fromGraph(g)
5858
.filter(new RoughFilter()
5959
.bowing(2)
60+
.curveStepCount(6)
6061
.roughness(1)
6162
.fillStyle(FillStyle.hachure().width(2).gap(5).angle(0))
6263
.font("*serif", "Comic Sans MS"))

0 commit comments

Comments
 (0)