diff --git a/coverage.txt b/coverage.txt new file mode 100644 index 0000000..c0f8e15 --- /dev/null +++ b/coverage.txt @@ -0,0 +1,314 @@ +mode: atomic +github.com/jfeliu007/goplantuml/parser/function.go:18.63,23.12 5 62 +github.com/jfeliu007/goplantuml/parser/function.go:30.2,30.15 1 61 +github.com/jfeliu007/goplantuml/parser/function.go:23.12,24.34 1 13 +github.com/jfeliu007/goplantuml/parser/function.go:24.34,25.53 1 10 +github.com/jfeliu007/goplantuml/parser/function.go:25.53,27.5 1 1 +github.com/jfeliu007/goplantuml/parser/function.go:35.105,44.19 3 55 +github.com/jfeliu007/goplantuml/parser/function.go:67.2,68.20 2 55 +github.com/jfeliu007/goplantuml/parser/function.go:75.2,75.17 1 55 +github.com/jfeliu007/goplantuml/parser/function.go:44.19,45.34 1 55 +github.com/jfeliu007/goplantuml/parser/function.go:45.34,47.23 2 31 +github.com/jfeliu007/goplantuml/parser/function.go:47.23,48.24 1 13 +github.com/jfeliu007/goplantuml/parser/function.go:48.24,49.41 1 13 +github.com/jfeliu007/goplantuml/parser/function.go:49.41,55.7 1 14 +github.com/jfeliu007/goplantuml/parser/function.go:57.10,63.5 1 18 +github.com/jfeliu007/goplantuml/parser/function.go:68.20,69.35 1 29 +github.com/jfeliu007/goplantuml/parser/function.go:69.35,73.4 3 30 +github.com/jfeliu007/goplantuml/parser/struct.go:22.59,23.31 1 73 +github.com/jfeliu007/goplantuml/parser/struct.go:26.2,26.37 1 61 +github.com/jfeliu007/goplantuml/parser/struct.go:38.2,38.13 1 11 +github.com/jfeliu007/goplantuml/parser/struct.go:23.31,25.3 1 12 +github.com/jfeliu007/goplantuml/parser/struct.go:26.37,28.35 2 61 +github.com/jfeliu007/goplantuml/parser/struct.go:34.3,34.18 1 61 +github.com/jfeliu007/goplantuml/parser/struct.go:28.35,29.32 1 61 +github.com/jfeliu007/goplantuml/parser/struct.go:29.32,31.10 2 11 +github.com/jfeliu007/goplantuml/parser/struct.go:34.18,36.4 1 50 +github.com/jfeliu007/goplantuml/parser/struct.go:44.50,45.21 1 12 +github.com/jfeliu007/goplantuml/parser/struct.go:48.2,48.24 1 11 +github.com/jfeliu007/goplantuml/parser/struct.go:51.2,51.36 1 11 +github.com/jfeliu007/goplantuml/parser/struct.go:45.21,47.3 1 1 +github.com/jfeliu007/goplantuml/parser/struct.go:48.24,50.3 1 1 +github.com/jfeliu007/goplantuml/parser/struct.go:57.46,58.21 1 13 +github.com/jfeliu007/goplantuml/parser/struct.go:61.2,61.24 1 12 +github.com/jfeliu007/goplantuml/parser/struct.go:64.2,64.32 1 12 +github.com/jfeliu007/goplantuml/parser/struct.go:58.21,60.3 1 1 +github.com/jfeliu007/goplantuml/parser/struct.go:61.24,63.3 1 1 +github.com/jfeliu007/goplantuml/parser/struct.go:68.50,70.2 1 5 +github.com/jfeliu007/goplantuml/parser/struct.go:73.57,75.2 1 5 +github.com/jfeliu007/goplantuml/parser/struct.go:79.73,82.24 3 28 +github.com/jfeliu007/goplantuml/parser/struct.go:82.24,89.46 4 23 +github.com/jfeliu007/goplantuml/parser/struct.go:89.46,90.39 1 5 +github.com/jfeliu007/goplantuml/parser/struct.go:90.39,92.5 1 5 +github.com/jfeliu007/goplantuml/parser/struct.go:93.9,94.39 1 18 +github.com/jfeliu007/goplantuml/parser/struct.go:94.39,96.5 1 5 +github.com/jfeliu007/goplantuml/parser/struct.go:98.8,98.30 1 5 +github.com/jfeliu007/goplantuml/parser/struct.go:98.30,99.27 1 5 +github.com/jfeliu007/goplantuml/parser/struct.go:102.3,102.31 1 5 +github.com/jfeliu007/goplantuml/parser/struct.go:99.27,101.4 1 1 +github.com/jfeliu007/goplantuml/parser/struct.go:107.75,109.9 2 41 +github.com/jfeliu007/goplantuml/parser/struct.go:112.2,113.47 2 40 +github.com/jfeliu007/goplantuml/parser/struct.go:109.9,111.3 1 1 +github.com/jfeliu007/goplantuml/parser/alias.go:12.60,13.29 1 16 +github.com/jfeliu007/goplantuml/parser/alias.go:16.2,20.3 1 16 +github.com/jfeliu007/goplantuml/parser/alias.go:13.29,15.3 1 1 +github.com/jfeliu007/goplantuml/parser/alias.go:27.32,29.2 1 9 +github.com/jfeliu007/goplantuml/parser/alias.go:33.42,35.2 1 2 +github.com/jfeliu007/goplantuml/parser/alias.go:38.37,40.2 1 1 +github.com/jfeliu007/goplantuml/parser/class_parser.go:46.73,50.2 3 209 +github.com/jfeliu007/goplantuml/parser/class_parser.go:126.85,147.49 3 16 +github.com/jfeliu007/goplantuml/parser/class_parser.go:150.2,150.52 1 16 +github.com/jfeliu007/goplantuml/parser/class_parser.go:178.2,178.40 1 14 +github.com/jfeliu007/goplantuml/parser/class_parser.go:189.2,190.25 2 14 +github.com/jfeliu007/goplantuml/parser/class_parser.go:147.49,149.3 1 1 +github.com/jfeliu007/goplantuml/parser/class_parser.go:150.52,151.24 1 16 +github.com/jfeliu007/goplantuml/parser/class_parser.go:151.24,152.110 1 4 +github.com/jfeliu007/goplantuml/parser/class_parser.go:167.4,167.18 1 4 +github.com/jfeliu007/goplantuml/parser/class_parser.go:152.110,153.19 1 54 +github.com/jfeliu007/goplantuml/parser/class_parser.go:156.5,156.21 1 53 +github.com/jfeliu007/goplantuml/parser/class_parser.go:165.5,165.15 1 49 +github.com/jfeliu007/goplantuml/parser/class_parser.go:153.19,155.6 1 1 +github.com/jfeliu007/goplantuml/parser/class_parser.go:156.21,157.72 1 24 +github.com/jfeliu007/goplantuml/parser/class_parser.go:160.6,160.47 1 21 +github.com/jfeliu007/goplantuml/parser/class_parser.go:163.6,163.38 1 20 +github.com/jfeliu007/goplantuml/parser/class_parser.go:157.72,159.7 1 3 +github.com/jfeliu007/goplantuml/parser/class_parser.go:160.47,162.7 1 1 +github.com/jfeliu007/goplantuml/parser/class_parser.go:167.18,169.5 1 1 +github.com/jfeliu007/goplantuml/parser/class_parser.go:170.9,172.18 2 12 +github.com/jfeliu007/goplantuml/parser/class_parser.go:172.18,174.5 1 1 +github.com/jfeliu007/goplantuml/parser/class_parser.go:178.40,180.16 2 19 +github.com/jfeliu007/goplantuml/parser/class_parser.go:180.16,181.45 1 19 +github.com/jfeliu007/goplantuml/parser/class_parser.go:181.45,183.38 2 68 +github.com/jfeliu007/goplantuml/parser/class_parser.go:183.38,185.6 1 10 +github.com/jfeliu007/goplantuml/parser/class_parser.go:195.113,204.2 2 15 +github.com/jfeliu007/goplantuml/parser/class_parser.go:207.51,211.9 4 31 +github.com/jfeliu007/goplantuml/parser/class_parser.go:214.2,215.35 2 31 +github.com/jfeliu007/goplantuml/parser/class_parser.go:218.2,219.39 2 31 +github.com/jfeliu007/goplantuml/parser/class_parser.go:211.9,213.3 1 31 +github.com/jfeliu007/goplantuml/parser/class_parser.go:215.35,217.3 1 31 +github.com/jfeliu007/goplantuml/parser/class_parser.go:219.39,221.47 1 31 +github.com/jfeliu007/goplantuml/parser/class_parser.go:221.47,223.32 2 31 +github.com/jfeliu007/goplantuml/parser/class_parser.go:226.4,226.30 1 31 +github.com/jfeliu007/goplantuml/parser/class_parser.go:223.32,225.5 1 10 +github.com/jfeliu007/goplantuml/parser/class_parser.go:226.30,228.5 1 82 +github.com/jfeliu007/goplantuml/parser/class_parser.go:233.58,234.22 1 10 +github.com/jfeliu007/goplantuml/parser/class_parser.go:234.22,238.3 3 5 +github.com/jfeliu007/goplantuml/parser/class_parser.go:241.66,244.16 3 32 +github.com/jfeliu007/goplantuml/parser/class_parser.go:247.2,247.27 1 31 +github.com/jfeliu007/goplantuml/parser/class_parser.go:250.2,250.12 1 31 +github.com/jfeliu007/goplantuml/parser/class_parser.go:244.16,246.3 1 1 +github.com/jfeliu007/goplantuml/parser/class_parser.go:247.27,249.3 1 31 +github.com/jfeliu007/goplantuml/parser/class_parser.go:254.60,255.29 1 82 +github.com/jfeliu007/goplantuml/parser/class_parser.go:256.20,257.24 1 63 +github.com/jfeliu007/goplantuml/parser/class_parser.go:258.21,259.25 1 19 +github.com/jfeliu007/goplantuml/parser/class_parser.go:263.58,265.22 1 20 +github.com/jfeliu007/goplantuml/parser/class_parser.go:265.22,266.28 1 20 +github.com/jfeliu007/goplantuml/parser/class_parser.go:271.3,273.27 3 19 +github.com/jfeliu007/goplantuml/parser/class_parser.go:276.3,277.27 2 19 +github.com/jfeliu007/goplantuml/parser/class_parser.go:281.3,289.19 3 19 +github.com/jfeliu007/goplantuml/parser/class_parser.go:266.28,268.4 1 1 +github.com/jfeliu007/goplantuml/parser/class_parser.go:273.27,275.4 1 19 +github.com/jfeliu007/goplantuml/parser/class_parser.go:277.27,279.4 1 5 +github.com/jfeliu007/goplantuml/parser/class_parser.go:293.81,294.34 1 19 +github.com/jfeliu007/goplantuml/parser/class_parser.go:294.34,296.3 1 25 +github.com/jfeliu007/goplantuml/parser/class_parser.go:299.87,300.35 1 24 +github.com/jfeliu007/goplantuml/parser/class_parser.go:300.35,301.29 1 24 +github.com/jfeliu007/goplantuml/parser/class_parser.go:302.22,304.9 2 20 +github.com/jfeliu007/goplantuml/parser/class_parser.go:305.19,310.9 5 4 +github.com/jfeliu007/goplantuml/parser/class_parser.go:315.56,316.46 1 65 +github.com/jfeliu007/goplantuml/parser/class_parser.go:320.2,320.34 1 63 +github.com/jfeliu007/goplantuml/parser/class_parser.go:316.46,319.3 1 2 +github.com/jfeliu007/goplantuml/parser/class_parser.go:320.34,322.3 1 72 +github.com/jfeliu007/goplantuml/parser/class_parser.go:325.50,329.26 4 72 +github.com/jfeliu007/goplantuml/parser/class_parser.go:358.2,360.25 3 57 +github.com/jfeliu007/goplantuml/parser/class_parser.go:376.2,376.8 1 57 +github.com/jfeliu007/goplantuml/parser/class_parser.go:330.21,332.29 2 57 +github.com/jfeliu007/goplantuml/parser/class_parser.go:354.10,356.9 1 15 +github.com/jfeliu007/goplantuml/parser/class_parser.go:333.24,335.42 2 19 +github.com/jfeliu007/goplantuml/parser/class_parser.go:336.27,338.45 2 24 +github.com/jfeliu007/goplantuml/parser/class_parser.go:339.11,344.36 4 14 +github.com/jfeliu007/goplantuml/parser/class_parser.go:347.4,348.36 2 14 +github.com/jfeliu007/goplantuml/parser/class_parser.go:351.4,351.101 1 14 +github.com/jfeliu007/goplantuml/parser/class_parser.go:344.36,346.5 1 14 +github.com/jfeliu007/goplantuml/parser/class_parser.go:348.36,350.5 1 9 +github.com/jfeliu007/goplantuml/parser/class_parser.go:361.19,362.41 1 24 +github.com/jfeliu007/goplantuml/parser/class_parser.go:363.15,364.38 1 19 +github.com/jfeliu007/goplantuml/parser/class_parser.go:365.15,367.41 2 14 +github.com/jfeliu007/goplantuml/parser/class_parser.go:367.41,369.50 2 5 +github.com/jfeliu007/goplantuml/parser/class_parser.go:372.4,373.56 2 5 +github.com/jfeliu007/goplantuml/parser/class_parser.go:369.50,371.5 1 5 +github.com/jfeliu007/goplantuml/parser/class_parser.go:381.46,382.29 1 26 +github.com/jfeliu007/goplantuml/parser/class_parser.go:394.2,394.16 1 21 +github.com/jfeliu007/goplantuml/parser/class_parser.go:383.22,384.29 1 1 +github.com/jfeliu007/goplantuml/parser/class_parser.go:385.21,386.27 1 1 +github.com/jfeliu007/goplantuml/parser/class_parser.go:387.20,388.31 1 1 +github.com/jfeliu007/goplantuml/parser/class_parser.go:389.21,390.31 1 1 +github.com/jfeliu007/goplantuml/parser/class_parser.go:391.21,392.29 1 1 +github.com/jfeliu007/goplantuml/parser/class_parser.go:398.39,401.36 3 8 +github.com/jfeliu007/goplantuml/parser/class_parser.go:404.2,404.69 1 8 +github.com/jfeliu007/goplantuml/parser/class_parser.go:410.2,411.32 2 8 +github.com/jfeliu007/goplantuml/parser/class_parser.go:414.2,415.32 2 8 +github.com/jfeliu007/goplantuml/parser/class_parser.go:420.2,420.32 1 8 +github.com/jfeliu007/goplantuml/parser/class_parser.go:423.2,423.32 1 8 +github.com/jfeliu007/goplantuml/parser/class_parser.go:426.2,426.33 1 8 +github.com/jfeliu007/goplantuml/parser/class_parser.go:429.2,430.21 2 8 +github.com/jfeliu007/goplantuml/parser/class_parser.go:401.36,403.3 1 1 +github.com/jfeliu007/goplantuml/parser/class_parser.go:404.69,408.3 3 1 +github.com/jfeliu007/goplantuml/parser/class_parser.go:411.32,413.3 1 9 +github.com/jfeliu007/goplantuml/parser/class_parser.go:415.32,419.3 2 9 +github.com/jfeliu007/goplantuml/parser/class_parser.go:420.32,422.3 1 8 +github.com/jfeliu007/goplantuml/parser/class_parser.go:423.32,425.3 1 1 +github.com/jfeliu007/goplantuml/parser/class_parser.go:426.33,428.3 1 1 +github.com/jfeliu007/goplantuml/parser/class_parser.go:433.108,434.25 1 12 +github.com/jfeliu007/goplantuml/parser/class_parser.go:434.25,441.32 6 12 +github.com/jfeliu007/goplantuml/parser/class_parser.go:445.3,447.30 2 12 +github.com/jfeliu007/goplantuml/parser/class_parser.go:451.3,452.51 2 12 +github.com/jfeliu007/goplantuml/parser/class_parser.go:455.3,456.50 2 12 +github.com/jfeliu007/goplantuml/parser/class_parser.go:462.3,463.38 2 12 +github.com/jfeliu007/goplantuml/parser/class_parser.go:466.3,466.41 1 12 +github.com/jfeliu007/goplantuml/parser/class_parser.go:469.3,469.38 1 12 +github.com/jfeliu007/goplantuml/parser/class_parser.go:441.32,443.4 1 17 +github.com/jfeliu007/goplantuml/parser/class_parser.go:447.30,450.4 2 17 +github.com/jfeliu007/goplantuml/parser/class_parser.go:452.51,454.4 1 1 +github.com/jfeliu007/goplantuml/parser/class_parser.go:456.50,461.4 4 1 +github.com/jfeliu007/goplantuml/parser/class_parser.go:463.38,465.4 1 12 +github.com/jfeliu007/goplantuml/parser/class_parser.go:466.41,468.4 1 12 +github.com/jfeliu007/goplantuml/parser/class_parser.go:469.38,471.4 1 3 +github.com/jfeliu007/goplantuml/parser/class_parser.go:475.61,478.41 2 8 +github.com/jfeliu007/goplantuml/parser/class_parser.go:481.2,482.37 2 8 +github.com/jfeliu007/goplantuml/parser/class_parser.go:485.2,486.39 2 8 +github.com/jfeliu007/goplantuml/parser/class_parser.go:478.41,480.3 1 1 +github.com/jfeliu007/goplantuml/parser/class_parser.go:482.37,484.3 1 3 +github.com/jfeliu007/goplantuml/parser/class_parser.go:486.39,488.41 2 3 +github.com/jfeliu007/goplantuml/parser/class_parser.go:497.3,497.99 1 3 +github.com/jfeliu007/goplantuml/parser/class_parser.go:488.41,490.60 2 1 +github.com/jfeliu007/goplantuml/parser/class_parser.go:490.60,492.42 2 1 +github.com/jfeliu007/goplantuml/parser/class_parser.go:492.42,494.6 1 1 +github.com/jfeliu007/goplantuml/parser/class_parser.go:501.201,509.24 7 18 +github.com/jfeliu007/goplantuml/parser/class_parser.go:517.2,523.29 7 18 +github.com/jfeliu007/goplantuml/parser/class_parser.go:526.2,526.28 1 18 +github.com/jfeliu007/goplantuml/parser/class_parser.go:529.2,529.30 1 18 +github.com/jfeliu007/goplantuml/parser/class_parser.go:532.2,532.29 1 18 +github.com/jfeliu007/goplantuml/parser/class_parser.go:535.2,535.45 1 18 +github.com/jfeliu007/goplantuml/parser/class_parser.go:510.15,511.33 1 11 +github.com/jfeliu007/goplantuml/parser/class_parser.go:512.15,514.32 2 3 +github.com/jfeliu007/goplantuml/parser/class_parser.go:523.29,525.3 1 9 +github.com/jfeliu007/goplantuml/parser/class_parser.go:526.28,528.3 1 5 +github.com/jfeliu007/goplantuml/parser/class_parser.go:529.30,531.3 1 11 +github.com/jfeliu007/goplantuml/parser/class_parser.go:532.29,534.3 1 8 +github.com/jfeliu007/goplantuml/parser/class_parser.go:538.106,541.39 2 21 +github.com/jfeliu007/goplantuml/parser/class_parser.go:552.2,553.40 2 21 +github.com/jfeliu007/goplantuml/parser/class_parser.go:541.39,542.32 1 8 +github.com/jfeliu007/goplantuml/parser/class_parser.go:545.3,546.42 2 8 +github.com/jfeliu007/goplantuml/parser/class_parser.go:549.3,550.55 2 8 +github.com/jfeliu007/goplantuml/parser/class_parser.go:542.32,544.4 1 3 +github.com/jfeliu007/goplantuml/parser/class_parser.go:546.42,548.4 1 1 +github.com/jfeliu007/goplantuml/parser/class_parser.go:553.40,555.3 1 8 +github.com/jfeliu007/goplantuml/parser/class_parser.go:558.107,561.48 2 20 +github.com/jfeliu007/goplantuml/parser/class_parser.go:564.2,564.71 1 20 +github.com/jfeliu007/goplantuml/parser/class_parser.go:561.48,563.3 1 1 +github.com/jfeliu007/goplantuml/parser/class_parser.go:567.105,569.49 1 1 +github.com/jfeliu007/goplantuml/parser/class_parser.go:569.49,571.3 1 1 +github.com/jfeliu007/goplantuml/parser/class_parser.go:574.145,576.32 2 20 +github.com/jfeliu007/goplantuml/parser/class_parser.go:580.2,582.40 2 20 +github.com/jfeliu007/goplantuml/parser/class_parser.go:576.32,578.3 1 5 +github.com/jfeliu007/goplantuml/parser/class_parser.go:582.40,583.32 1 5 +github.com/jfeliu007/goplantuml/parser/class_parser.go:586.3,587.42 2 5 +github.com/jfeliu007/goplantuml/parser/class_parser.go:590.3,590.59 1 5 +github.com/jfeliu007/goplantuml/parser/class_parser.go:583.32,585.4 1 4 +github.com/jfeliu007/goplantuml/parser/class_parser.go:587.42,589.4 1 1 +github.com/jfeliu007/goplantuml/parser/class_parser.go:590.59,592.4 1 5 +github.com/jfeliu007/goplantuml/parser/class_parser.go:596.67,599.26 2 13 +github.com/jfeliu007/goplantuml/parser/class_parser.go:602.2,602.20 1 13 +github.com/jfeliu007/goplantuml/parser/class_parser.go:599.26,601.3 1 2 +github.com/jfeliu007/goplantuml/parser/class_parser.go:604.97,607.35 2 20 +github.com/jfeliu007/goplantuml/parser/class_parser.go:618.2,619.35 2 20 +github.com/jfeliu007/goplantuml/parser/class_parser.go:607.35,608.32 1 8 +github.com/jfeliu007/goplantuml/parser/class_parser.go:611.3,612.42 2 8 +github.com/jfeliu007/goplantuml/parser/class_parser.go:615.3,616.45 2 8 +github.com/jfeliu007/goplantuml/parser/class_parser.go:608.32,610.4 1 5 +github.com/jfeliu007/goplantuml/parser/class_parser.go:612.42,614.4 1 1 +github.com/jfeliu007/goplantuml/parser/class_parser.go:619.35,621.3 1 8 +github.com/jfeliu007/goplantuml/parser/class_parser.go:624.131,626.45 1 19 +github.com/jfeliu007/goplantuml/parser/class_parser.go:626.45,628.44 2 21 +github.com/jfeliu007/goplantuml/parser/class_parser.go:631.3,632.39 2 21 +github.com/jfeliu007/goplantuml/parser/class_parser.go:635.3,636.35 2 21 +github.com/jfeliu007/goplantuml/parser/class_parser.go:643.3,643.28 1 21 +github.com/jfeliu007/goplantuml/parser/class_parser.go:628.44,630.4 1 12 +github.com/jfeliu007/goplantuml/parser/class_parser.go:632.39,634.4 1 24 +github.com/jfeliu007/goplantuml/parser/class_parser.go:636.35,637.37 1 14 +github.com/jfeliu007/goplantuml/parser/class_parser.go:637.37,639.5 1 9 +github.com/jfeliu007/goplantuml/parser/class_parser.go:639.10,641.5 1 5 +github.com/jfeliu007/goplantuml/parser/class_parser.go:643.28,645.4 1 12 +github.com/jfeliu007/goplantuml/parser/class_parser.go:645.9,647.4 1 9 +github.com/jfeliu007/goplantuml/parser/class_parser.go:651.128,652.41 1 19 +github.com/jfeliu007/goplantuml/parser/class_parser.go:652.41,654.43 2 17 +github.com/jfeliu007/goplantuml/parser/class_parser.go:657.3,657.28 1 17 +github.com/jfeliu007/goplantuml/parser/class_parser.go:654.43,656.4 1 11 +github.com/jfeliu007/goplantuml/parser/class_parser.go:657.28,659.4 1 11 +github.com/jfeliu007/goplantuml/parser/class_parser.go:659.9,661.4 1 6 +github.com/jfeliu007/goplantuml/parser/class_parser.go:666.62,668.9 2 127 +github.com/jfeliu007/goplantuml/parser/class_parser.go:681.2,681.15 1 127 +github.com/jfeliu007/goplantuml/parser/class_parser.go:668.9,680.3 2 58 +github.com/jfeliu007/goplantuml/parser/class_parser.go:685.60,688.9 3 97 +github.com/jfeliu007/goplantuml/parser/class_parser.go:691.2,691.23 1 94 +github.com/jfeliu007/goplantuml/parser/class_parser.go:688.9,690.3 1 3 +github.com/jfeliu007/goplantuml/parser/class_parser.go:695.85,696.30 1 25 +github.com/jfeliu007/goplantuml/parser/class_parser.go:723.2,723.12 1 24 +github.com/jfeliu007/goplantuml/parser/class_parser.go:696.30,697.17 1 18 +github.com/jfeliu007/goplantuml/parser/class_parser.go:698.27,699.48 1 5 +github.com/jfeliu007/goplantuml/parser/class_parser.go:700.22,701.43 1 1 +github.com/jfeliu007/goplantuml/parser/class_parser.go:702.27,703.48 1 1 +github.com/jfeliu007/goplantuml/parser/class_parser.go:704.21,705.42 1 2 +github.com/jfeliu007/goplantuml/parser/class_parser.go:706.30,707.51 1 1 +github.com/jfeliu007/goplantuml/parser/class_parser.go:708.22,709.43 1 2 +github.com/jfeliu007/goplantuml/parser/class_parser.go:710.31,711.52 1 2 +github.com/jfeliu007/goplantuml/parser/class_parser.go:712.20,713.43 1 1 +github.com/jfeliu007/goplantuml/parser/class_parser.go:714.20,715.43 1 1 +github.com/jfeliu007/goplantuml/parser/class_parser.go:716.32,717.59 1 1 +github.com/jfeliu007/goplantuml/parser/class_parser.go:718.11,719.60 1 1 +github.com/jfeliu007/goplantuml/parser/class_parser.go:725.59,728.2 2 7 +github.com/jfeliu007/goplantuml/parser/field.go:21.79,22.25 1 201 +github.com/jfeliu007/goplantuml/parser/field.go:44.2,44.23 1 1 +github.com/jfeliu007/goplantuml/parser/field.go:23.18,24.30 1 137 +github.com/jfeliu007/goplantuml/parser/field.go:25.22,26.34 1 1 +github.com/jfeliu007/goplantuml/parser/field.go:27.25,28.36 1 12 +github.com/jfeliu007/goplantuml/parser/field.go:29.20,30.32 1 1 +github.com/jfeliu007/goplantuml/parser/field.go:31.21,32.32 1 31 +github.com/jfeliu007/goplantuml/parser/field.go:33.21,34.33 1 1 +github.com/jfeliu007/goplantuml/parser/field.go:35.23,36.35 1 2 +github.com/jfeliu007/goplantuml/parser/field.go:37.26,38.38 1 1 +github.com/jfeliu007/goplantuml/parser/field.go:39.21,40.33 1 13 +github.com/jfeliu007/goplantuml/parser/field.go:41.21,42.33 1 1 +github.com/jfeliu007/goplantuml/parser/field.go:47.75,49.20 1 137 +github.com/jfeliu007/goplantuml/parser/field.go:52.2,53.23 2 47 +github.com/jfeliu007/goplantuml/parser/field.go:49.20,51.3 1 90 +github.com/jfeliu007/goplantuml/parser/field.go:56.83,59.2 2 1 +github.com/jfeliu007/goplantuml/parser/field.go:61.88,64.53 2 12 +github.com/jfeliu007/goplantuml/parser/field.go:67.2,68.23 2 12 +github.com/jfeliu007/goplantuml/parser/field.go:64.53,66.3 1 1 +github.com/jfeliu007/goplantuml/parser/field.go:71.79,76.2 3 1 +github.com/jfeliu007/goplantuml/parser/field.go:78.80,82.2 2 31 +github.com/jfeliu007/goplantuml/parser/field.go:84.81,88.2 2 1 +github.com/jfeliu007/goplantuml/parser/field.go:90.85,93.38 2 2 +github.com/jfeliu007/goplantuml/parser/field.go:97.2,97.101 1 2 +github.com/jfeliu007/goplantuml/parser/field.go:93.38,96.3 2 4 +github.com/jfeliu007/goplantuml/parser/field.go:100.91,103.39 2 1 +github.com/jfeliu007/goplantuml/parser/field.go:111.2,111.102 1 1 +github.com/jfeliu007/goplantuml/parser/field.go:103.39,105.25 2 1 +github.com/jfeliu007/goplantuml/parser/field.go:108.3,109.46 2 1 +github.com/jfeliu007/goplantuml/parser/field.go:105.25,107.4 1 1 +github.com/jfeliu007/goplantuml/parser/field.go:114.81,118.41 3 13 +github.com/jfeliu007/goplantuml/parser/field.go:121.2,123.43 3 13 +github.com/jfeliu007/goplantuml/parser/field.go:126.2,126.25 1 13 +github.com/jfeliu007/goplantuml/parser/field.go:131.2,131.108 1 13 +github.com/jfeliu007/goplantuml/parser/field.go:118.41,120.3 1 13 +github.com/jfeliu007/goplantuml/parser/field.go:123.43,125.3 1 14 +github.com/jfeliu007/goplantuml/parser/field.go:126.25,128.3 1 1 +github.com/jfeliu007/goplantuml/parser/field.go:128.8,130.3 1 12 +github.com/jfeliu007/goplantuml/parser/field.go:134.81,137.2 2 1 +github.com/jfeliu007/goplantuml/parser/field.go:182.38,184.2 1 137 +github.com/jfeliu007/goplantuml/parser/field.go:186.39,189.2 2 195 +github.com/jfeliu007/goplantuml/parser/field.go:191.63,192.23 1 222 +github.com/jfeliu007/goplantuml/parser/field.go:195.2,195.64 1 222 +github.com/jfeliu007/goplantuml/parser/field.go:192.23,194.3 1 49 diff --git a/go.sum b/go.sum index 72ad2eb..95666ab 100644 --- a/go.sum +++ b/go.sum @@ -1,3 +1,4 @@ + cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= @@ -432,3 +433,4 @@ honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= + diff --git a/parser/class_parser.go b/parser/class_parser.go index 7526b00..a375083 100644 --- a/parser/class_parser.go +++ b/parser/class_parser.go @@ -552,7 +552,7 @@ func (p *ClassParser) renderCompositions(structure *Struct, name string, composi if p.renderingOptions.ConnectionLabels { composedString = extends } - c = fmt.Sprintf(`"%s" *-- %s"%s.%s"`, c, composedString, structure.PackageName, name) + c = fmt.Sprintf(`"%s" <|-- %s"%s.%s"`, c, composedString, structure.PackageName, name) orderedCompositions = append(orderedCompositions, c) } sort.Strings(orderedCompositions) @@ -618,7 +618,7 @@ func (p *ClassParser) renderExtends(structure *Struct, name string, extends *Lin if p.renderingOptions.ConnectionLabels { implementString = implements } - c = fmt.Sprintf(`"%s" <|-- %s"%s.%s"`, c, implementString, structure.PackageName, name) + c = fmt.Sprintf(`"%s" <|.. %s"%s.%s"`, c, implementString, structure.PackageName, name) orderedExtends = append(orderedExtends, c) } sort.Strings(orderedExtends) diff --git a/parser/class_parser_test.go b/parser/class_parser_test.go index 8ca95bc..d363c84 100644 --- a/parser/class_parser_test.go +++ b/parser/class_parser_test.go @@ -188,7 +188,7 @@ func TestRenderStructures(t *testing.T) { lineB := &LineStringBuilder{} parser := getEmptyParser("main") parser.renderStructures("main", structMap, lineB) - expectedResult := "namespace main {\n class MainClass << (S,Aquamarine) >> {\n - privateField int\n\n + PublicField error\n\n - foo( int, string) (error, int)\n\n + Boo( string, int) int\n\n }\n}\n\"foopack.AnotherClass\" *-- \"main.MainClass\"\n\n\"main.NewClass\" <|-- \"main.MainClass\"\n\n" + expectedResult := "namespace main {\n class MainClass << (S,Aquamarine) >> {\n - privateField int\n\n + PublicField error\n\n - foo( int, string) (error, int)\n\n + Boo( string, int) int\n\n }\n}\n\"foopack.AnotherClass\" <|-- \"main.MainClass\"\n\n\"main.NewClass\" <|.. \"main.MainClass\"\n\n" if lineB.String() != expectedResult { t.Errorf("TestRenderStructures: expected %s, got %s", expectedResult, lineB.String()) } @@ -205,7 +205,7 @@ func TestRenderStructures(t *testing.T) { RenderAggregations: true, }) parser.renderStructures("main", structMap, lineB) - expectedResult = "namespace main {\n class MainClass << (S,Aquamarine) >> {\n - privateField int\n\n + PublicField error\n\n - foo( int, string) (error, int)\n\n + Boo( string, int) int\n\n }\n}\n\"foopack.AnotherClass\" *-- \"main.MainClass\"\n\n\"main.NewClass\" <|-- \"main.MainClass\"\n\n\"main.MainClass\" o-- \"main.File\"\n\n" + expectedResult = "namespace main {\n class MainClass << (S,Aquamarine) >> {\n - privateField int\n\n + PublicField error\n\n - foo( int, string) (error, int)\n\n + Boo( string, int) int\n\n }\n}\n\"foopack.AnotherClass\" <|-- \"main.MainClass\"\n\n\"main.NewClass\" <|.. \"main.MainClass\"\n\n\"main.MainClass\" o-- \"main.File\"\n\n" if lineB.String() != expectedResult { t.Errorf("TestRenderStructures: expected %s, got %s", expectedResult, lineB.String()) } @@ -217,7 +217,7 @@ func TestRenderStructures(t *testing.T) { AggregatePrivateMembers: true, }) parser.renderStructures("main", structMap, lineB) - expectedResult = "namespace main {\n class MainClass << (S,Aquamarine) >> {\n - privateField int\n\n + PublicField error\n\n - foo( int, string) (error, int)\n\n + Boo( string, int) int\n\n }\n}\n\"foopack.AnotherClass\" *-- \"main.MainClass\"\n\n\"main.NewClass\" <|-- \"main.MainClass\"\n\n\"main.MainClass\" o-- \"main.File\"\n\"main.MainClass\" o-- \"main.File2\"\n\n" + expectedResult = "namespace main {\n class MainClass << (S,Aquamarine) >> {\n - privateField int\n\n + PublicField error\n\n - foo( int, string) (error, int)\n\n + Boo( string, int) int\n\n }\n}\n\"foopack.AnotherClass\" <|-- \"main.MainClass\"\n\n\"main.NewClass\" <|.. \"main.MainClass\"\n\n\"main.MainClass\" o-- \"main.File\"\n\"main.MainClass\" o-- \"main.File2\"\n\n" if lineB.String() != expectedResult { t.Errorf("TestRenderStructures: expected %s, got %s", expectedResult, lineB.String()) } @@ -235,11 +235,11 @@ func TestRenderStructure(t *testing.T) { if lineBuilder.String() != expectedLineBuilder { t.Errorf("TestRenderStructure: Expected lineBuilder [%s] got [%s]", expectedLineBuilder, lineBuilder.String()) } - expectedComposition := "\"foopack.AnotherClass\" *-- \"main.TestClass\"\n" + expectedComposition := "\"foopack.AnotherClass\" <|-- \"main.TestClass\"\n" if compositionBuilder.String() != expectedComposition { t.Errorf("TestRenderStructure: Expected compositionBuilder %s got %s", expectedComposition, compositionBuilder.String()) } - expectedExtends := "\"main.NewClass\" <|-- \"main.TestClass\"\n" + expectedExtends := "\"main.NewClass\" <|.. \"main.TestClass\"\n" if extendBuilder.String() != expectedExtends { t.Errorf("TestRenderStructure: Expected extendBuilder %s got %s", expectedExtends, extendBuilder.String()) } @@ -312,7 +312,7 @@ func TestRenderCompositions(t *testing.T) { } extendsBuilder := &LineStringBuilder{} parser.renderCompositions(st, "TestClass", extendsBuilder) - expectedResult := "\"foopack.AnotherClass\" *-- \"main.TestClass\"\n" + expectedResult := "\"foopack.AnotherClass\" <|-- \"main.TestClass\"\n" if extendsBuilder.String() != expectedResult { t.Errorf("TestRenderCompositions: Expected %s got %s", expectedResult, extendsBuilder.String()) } @@ -325,7 +325,7 @@ func TestRenderCompositions(t *testing.T) { } extendsBuilder = &LineStringBuilder{} parser.renderCompositions(st, "TestClass", extendsBuilder) - expectedResult = "\"main.AnotherClass\" *-- \"main.TestClass\"\n" + expectedResult = "\"main.AnotherClass\" <|-- \"main.TestClass\"\n" if extendsBuilder.String() != expectedResult { t.Errorf("TestRenderCompositions: Expected %s got %s", expectedResult, extendsBuilder.String()) } @@ -338,7 +338,7 @@ func TestRenderCompositions(t *testing.T) { } extendsBuilder = &LineStringBuilder{} parser.renderCompositions(st, "TestClass", extendsBuilder) - expectedResult = "\"" + builtinPackageName + ".int\" *-- \"main.TestClass\"\n" + expectedResult = "\"" + builtinPackageName + ".int\" <|-- \"main.TestClass\"\n" if extendsBuilder.String() != expectedResult { t.Errorf("TestRenderCompositions: Expected %s got %s", expectedResult, extendsBuilder.String()) } @@ -353,7 +353,7 @@ func TestRenderExtends(t *testing.T) { } extendsBuilder := &LineStringBuilder{} parser.renderExtends(st, "TestClass", extendsBuilder) - expectedResult := "\"foopack.AnotherClass\" <|-- \"main.TestClass\"\n" + expectedResult := "\"foopack.AnotherClass\" <|.. \"main.TestClass\"\n" if extendsBuilder.String() != expectedResult { t.Errorf("TestRenderExtends: Expected %s got %s", expectedResult, extendsBuilder.String()) } @@ -366,7 +366,7 @@ func TestRenderExtends(t *testing.T) { } extendsBuilder = &LineStringBuilder{} parser.renderExtends(st, "TestClass", extendsBuilder) - expectedResult = "\"main.AnotherClass\" <|-- \"main.TestClass\"\n" + expectedResult = "\"main.AnotherClass\" <|.. \"main.TestClass\"\n" if extendsBuilder.String() != expectedResult { t.Errorf("TestRenderExtends: Expected %s got %s", expectedResult, extendsBuilder.String()) } @@ -977,9 +977,9 @@ namespace connectionlabels { class connectionlabels.AliasOfInt << (T, #FF7700) >> { } } -"connectionlabels.AliasOfInt" *-- "extends""connectionlabels.ImplementsAbstractInterface" +"connectionlabels.AliasOfInt" <|-- "extends""connectionlabels.ImplementsAbstractInterface" -"connectionlabels.AbstractInterface" <|-- "implements""connectionlabels.ImplementsAbstractInterface" +"connectionlabels.AbstractInterface" <|.. "implements""connectionlabels.ImplementsAbstractInterface" "connectionlabels.ImplementsAbstractInterface""uses" o-- "connectionlabels.AbstractInterface" diff --git a/testingsupport/subfolder1-2.puml b/testingsupport/subfolder1-2.puml index f9b373e..0f867da 100644 --- a/testingsupport/subfolder1-2.puml +++ b/testingsupport/subfolder1-2.puml @@ -7,7 +7,7 @@ namespace subfolder2 { } } -"subfolder3.SubfolderInterface" <|-- "subfolder2.Subfolder2" +"subfolder3.SubfolderInterface" <|.. "subfolder2.Subfolder2" namespace subfolder3 { interface SubfolderInterface {