Mirrors
/
kicad
mirror of https://github.com/KiCad/kicad-source-mirror
3
0
Fork 0
Code Releases Activity
Browse Source

Update QA test schematics with valid and invalid variants

7.0
Seth Hillbrand 3 years ago
parent
63da407345
commit
ba11de6e66
5 changed files with 183 additions and 78 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 38
      qa/data/eeschema/NoConnectOnLineWithGlobalLabel.kicad_sch
  2. 37
      qa/data/eeschema/NoConnectOnLineWithHierarchicalLabel.kicad_sch
  3. 28
      qa/data/eeschema/NoConnectOnLineWithLabel.kicad_sch
  4. 156
      qa/data/eeschema/issue9367.kicad_sch
  5. 2
      qa/unittests/eeschema/erc/test_erc_global_labels.cpp

38
qa/data/eeschema/NoConnectOnLineWithGlobalLabel.kicad_sch
View File

@ -1,4 +1,4 @@
(kicad_sch (version 20210621) (generator eeschema)
(kicad_sch (version 20211123) (generator eeschema)
(uuid a42261a8-90bd-4a35-939b-632c3d8e595c)
@ -28,7 +28,10 @@
(effects (font (size 1.27 1.27)) hide)
)
(symbol "TestPoint_0_1"
(circle (center 0 3.302) (radius 0.762) (stroke (width 0)) (fill (type none)))
(circle (center 0 3.302) (radius 0.762)
(stroke (width 0) (type default) (color 0 0 0 0))
(fill (type none))
)
)
(symbol "TestPoint_1_1"
(pin passive line (at 0 0 90) (length 2.54)
@ -39,9 +42,12 @@
)
)
(junction (at 29.21 30.48) (diameter 0.9144) (color 0 0 0 0))
(junction (at 29.21 30.48) (diameter 0.9144) (color 0 0 0 0)
(uuid b80f780b-ddd7-486d-b8bc-c7ae3b0d378a)
)
(no_connect (at 29.21 36.83) (uuid 2dcc0ade-e5ab-4a90-8195-ec5478b70816))
(no_connect (at 60.96 30.48) (uuid d115e9ba-d4f0-4386-a27b-ff1d739d696d))
(wire (pts (xy 29.21 25.4) (xy 29.21 30.48))
(stroke (width 0) (type solid) (color 0 0 0 0))
@ -49,17 +55,37 @@
)
(wire (pts (xy 29.21 30.48) (xy 29.21 36.83))
(stroke (width 0) (type solid) (color 0 0 0 0))
(uuid 2660ab9a-04ca-42fa-8de1-6167aa524155)
(uuid 2660ab9a-04ca-42fa-8de1-6167aa524156)
)
(wire (pts (xy 60.96 30.48) (xy 63.5 30.48))
(stroke (width 0) (type solid) (color 0 0 0 0))
(uuid 2ece1ceb-2c6e-4363-a86f-fd0e243797e6)
)
(wire (pts (xy 29.21 30.48) (xy 31.75 30.48))
(stroke (width 0) (type solid) (color 0 0 0 0))
(uuid 59527371-8889-4eaf-b087-a3b8575f4ed2)
)
(global_label "test" (shape input) (at 31.75 30.48 0) (fields_autoplaced)
(text "1 error (no pin)" (at 74.93 35.56 180)
(effects (font (size 1.27 1.27)) (justify right bottom))
(uuid 1e94bc46-c2a0-4923-a475-d60aecf0a8c3)
)
(text "No error with pin" (at 26.67 39.37 90)
(effects (font (size 1.27 1.27)) (justify left bottom))
(uuid eb4d03e2-e08c-4736-982e-e674fd4662b3)
)
(global_label "test_OK" (shape input) (at 31.75 30.48 0) (fields_autoplaced)
(effects (font (size 1.27 1.27)) (justify left))
(uuid 4fd16d2c-2ba1-4d44-b54e-675a1f4522ca)
(property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 37.7312 30.4006 0)
(property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 41.2993 30.4006 0)
(effects (font (size 1.27 1.27)) (justify left) hide)
)
)
(global_label "test_err" (shape input) (at 63.5 30.48 0) (fields_autoplaced)
(effects (font (size 1.27 1.27)) (justify left))
(uuid 64c16521-77d5-4277-bc21-128bcc9264fb)
(property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at 73.1098 30.4006 0)
(effects (font (size 1.27 1.27)) (justify left) hide)
)
)

37
qa/data/eeschema/NoConnectOnLineWithHierarchicalLabel.kicad_sch
View File

@ -1,4 +1,4 @@
(kicad_sch (version 20210621) (generator eeschema)
(kicad_sch (version 20211123) (generator eeschema)
(uuid b5d9ebeb-f800-4288-8ce9-7033224d3b21)
@ -28,7 +28,10 @@
(effects (font (size 1.27 1.27)) hide)
)
(symbol "TestPoint_0_1"
(circle (center 0 3.302) (radius 0.762) (stroke (width 0)) (fill (type none)))
(circle (center 0 3.302) (radius 0.762)
(stroke (width 0) (type default) (color 0 0 0 0))
(fill (type none))
)
)
(symbol "TestPoint_1_1"
(pin passive line (at 0 0 90) (length 2.54)
@ -39,27 +42,47 @@
)
)
(junction (at 31.75 31.75) (diameter 0.9144) (color 0 0 0 0))
(junction (at 31.75 31.75) (diameter 0.9144) (color 0 0 0 0)
(uuid 737959f7-b51e-4ddd-971c-1c86ab0ee4a9)
)
(no_connect (at 31.75 38.1) (uuid 38e4d6ee-1caa-4107-afdf-9817c33f9c25))
(no_connect (at 71.12 31.75) (uuid f9998283-5d38-41d7-8c08-d81f053774ec))
(wire (pts (xy 31.75 31.75) (xy 34.29 31.75))
(stroke (width 0) (type solid) (color 0 0 0 0))
(uuid 4c68c6ce-7d5e-444c-b28d-6b1ab9830b10)
)
(wire (pts (xy 31.75 25.4) (xy 31.75 31.75))
(stroke (width 0) (type solid) (color 0 0 0 0))
(uuid c55e19e3-1b36-4112-9bca-54b9f9dee350)
)
(wire (pts (xy 31.75 31.75) (xy 31.75 38.1))
(stroke (width 0) (type solid) (color 0 0 0 0))
(uuid c55e19e3-1b36-4112-9bca-54b9f9dee350)
(uuid c55e19e3-1b36-4112-9bca-54b9f9dee351)
)
(wire (pts (xy 31.75 31.75) (xy 34.29 31.75))
(wire (pts (xy 71.12 31.75) (xy 73.66 31.75))
(stroke (width 0) (type solid) (color 0 0 0 0))
(uuid 4c68c6ce-7d5e-444c-b28d-6b1ab9830b10)
(uuid eb8568c2-b3b9-407b-8cd9-ebd8f225efaf)
)
(hierarchical_label "test" (shape input) (at 34.29 31.75 0)
(text "No errors with pin" (at 26.67 44.45 0)
(effects (font (size 1.27 1.27)) (justify left bottom))
(uuid 20a4c07b-2e3b-4ca8-81ba-5157f33c5e17)
)
(text "1 error (no pin)" (at 71.12 35.56 0)
(effects (font (size 1.27 1.27)) (justify left bottom))
(uuid 2e51c0a4-24b7-42fa-9bca-6358d096838f)
)
(hierarchical_label "test_ok" (shape input) (at 34.29 31.75 0)
(effects (font (size 1.27 1.27)) (justify left))
(uuid a11efb39-593e-4e55-9c2f-32db4d581aeb)
)
(hierarchical_label "test_err" (shape input) (at 73.66 31.75 0)
(effects (font (size 1.27 1.27)) (justify left))
(uuid b1a417d5-6a5d-4c29-91f2-2d4aa19b90db)
)
(symbol (lib_id "Connector:TestPoint") (at 31.75 25.4 0) (unit 1)
(in_bom yes) (on_board yes) (fields_autoplaced)

28
qa/data/eeschema/NoConnectOnLineWithLabel.kicad_sch
View File

@ -1,4 +1,4 @@
(kicad_sch (version 20210621) (generator eeschema)
(kicad_sch (version 20211123) (generator eeschema)
(uuid dbcbba47-5568-4743-853c-61930ab05049)
@ -28,7 +28,10 @@
(effects (font (size 1.27 1.27)) hide)
)
(symbol "TestPoint_0_1"
(circle (center 0 3.302) (radius 0.762) (stroke (width 0)) (fill (type none)))
(circle (center 0 3.302) (radius 0.762)
(stroke (width 0) (type default) (color 0 0 0 0))
(fill (type none))
)
)
(symbol "TestPoint_1_1"
(pin passive line (at 0 0 90) (length 2.54)
@ -40,17 +43,36 @@
)
(no_connect (at 43.18 35.56) (uuid 5390cdcb-0b60-4cf2-ac73-75bc3f3db96f))
(no_connect (at 43.18 25.4) (uuid dc8a70cf-6e4e-4231-b6be-1dcc1d97485c))
(no_connect (at 25.4 35.56) (uuid ecd200e1-9ed6-4c4a-9585-915c7b7ccdd8))
(wire (pts (xy 25.4 25.4) (xy 25.4 35.56))
(stroke (width 0) (type solid) (color 0 0 0 0))
(uuid 01236e64-2a69-4078-80f1-bc0398fb7c9f)
)
(wire (pts (xy 43.18 25.4) (xy 43.18 35.56))
(stroke (width 0) (type solid) (color 0 0 0 0))
(uuid 73f97079-eef5-4ec4-adbc-83ef78607567)
)
(text "1 error with unconnected label" (at 46.99 54.61 90)
(effects (font (size 1.27 1.27)) (justify left bottom))
(uuid 3e4e1fda-b57b-4929-8735-d7c559505ec0)
)
(text "No error with pin" (at 26.67 55.88 90)
(effects (font (size 1.27 1.27)) (justify left bottom))
(uuid 53efe433-3175-4976-ad3e-6c38960fd2d6)
)
(label "test" (at 25.4 31.75 90)
(label "test_OK" (at 25.4 31.75 90)
(effects (font (size 1.27 1.27)) (justify left bottom))
(uuid 03e214cc-bc77-4985-a9e8-8e508ac46a57)
)
(label "test_err" (at 43.18 34.29 90)
(effects (font (size 1.27 1.27)) (justify left bottom))
(uuid 611e8228-959f-4611-a3b6-e1c3cf8cd158)
)
(symbol (lib_id "Connector:TestPoint") (at 25.4 25.4 0) (unit 1)
(in_bom yes) (on_board yes) (fields_autoplaced)

156
qa/data/eeschema/issue9367.kicad_sch
View File

@ -1,4 +1,4 @@
(kicad_sch (version 20220904) (generator eeschema)
(kicad_sch (version 20221206) (generator eeschema)
(uuid 42cb452b-0025-41f3-ae52-70902384e6c1)
@ -6,27 +6,27 @@
(lib_symbols
(symbol "Device:R" (pin_numbers hide) (pin_names (offset 0)) (in_bom yes) (on_board yes)
(property "Reference" "R" (id 0) (at 2.032 0 90) (effects (font (size 1.27 1.27)))
)
(property "Value" "R" (id 1) (at 0 0 90) (effects (font (size 1.27 1.27)))
)
(property "Footprint" "" (id 2) (at -1.778 0 90) (effects (font (size 1.27 1.27)) hide)
)
(property "Datasheet" "~" (id 3) (at 0 0 0) (effects (font (size 1.27 1.27)) hide)
)
(property "ki_keywords" "R res resistor" (id 4) (at 0 0 0) (effects (font (size 1.27 1.27)) hide)
)
(property "ki_description" "Resistor" (id 5) (at 0 0 0) (effects (font (size 1.27 1.27)) hide)
)
(property "ki_fp_filters" "R_*" (id 6) (at 0 0 0) (effects (font (size 1.27 1.27)) hide)
)
(property "Reference" "R" (at 2.032 0 90)
(effects (font (size 1.27 1.27)))
)
(property "Value" "R" (at 0 0 90)
(effects (font (size 1.27 1.27)))
)
(property "Footprint" "" (at -1.778 0 90)
(effects (font (size 1.27 1.27)) hide)
)
(property "Datasheet" "~" (at 0 0 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "ki_keywords" "R res resistor" (at 0 0 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "ki_description" "Resistor" (at 0 0 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "ki_fp_filters" "R_*" (at 0 0 0)
(effects (font (size 1.27 1.27)) hide)
)
(symbol "R_0_1"
(rectangle (start -1.016 -2.54) (end 1.016 2.54)
(stroke (width 0.254) (type default))
@ -96,13 +96,20 @@
(uuid f8b5dc92-b396-4f6f-8c6d-0cef84d50e1f)
)
(text_box "We do not raise an unconnected error here because the net is explicitly designated 'no-connect'"
(at 86.36 73.66 0) (size 30.48 10.16)
(text_box "We do not raise an unconnected error on the NC because the error is most likely in the label naming not the NC placement"
(at 90.17 77.47 0) (size 30.48 11.43)
(stroke (width 0) (type default))
(fill (type none))
(effects (font (size 1.27 1.27)) (justify left top))
(uuid 4a3fcd23-1beb-412d-a70f-04fbd4523388)
)
(text_box "Each label on a net without a pin gets the unconnected label error"
(at 90.17 62.23 0) (size 30.48 10.16)
(stroke (width 0) (type default))
(fill (type none))
(effects (font (size 1.27 1.27)) (justify left top))
(uuid 73ae4426-1ed0-4556-b97a-24a32d70298a)
)
(text_box "Global labels connect to local labels, so this should be an error connecting RX1 to TX1"
(at 146.05 64.77 0) (size 30.48 10.16)
(stroke (width 0) (type default))
@ -181,49 +188,70 @@
(global_label "GL2" (shape input) (at 124.46 97.79 180) (fields_autoplaced)
(effects (font (size 1.27 1.27)) (justify right))
(uuid 33c2e437-c11c-4ea2-9005-694c58022174)
(property "Intersheetrefs" "${INTERSHEET_REFS}" (id 0) (at 118.2054 97.79 0)
(property "Intersheetrefs" "${INTERSHEET_REFS}" (at 0 0 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Intersheetrefs" "${INTERSHEET_REFS}" (at 118.2054 97.79 0)
(effects (font (size 1.27 1.27)) (justify right) hide)
)
)
(global_label "GL1" (shape input) (at 135.89 97.79 0) (fields_autoplaced)
(effects (font (size 1.27 1.27)) (justify left))
(uuid 36c8b1e4-3cc0-4715-ac55-64a74412c33f)
(property "Intersheetrefs" "${INTERSHEET_REFS}" (id 0) (at 142.1446 97.79 0)
(property "Intersheetrefs" "${INTERSHEET_REFS}" (at 0 0 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Intersheetrefs" "${INTERSHEET_REFS}" (at 142.1446 97.79 0)
(effects (font (size 1.27 1.27)) (justify left) hide)
)
)
(global_label "RX1" (shape input) (at 138.43 78.74 0) (fields_autoplaced)
(effects (font (size 1.27 1.27)) (justify left))
(uuid 4d379e56-88a8-4875-8bdc-4cc50cce81b3)
(property "Intersheetrefs" "${INTERSHEET_REFS}" (id 0) (at 144.866 78.74 0)
(property "Intersheetrefs" "${INTERSHEET_REFS}" (at 0 0 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Intersheetrefs" "${INTERSHEET_REFS}" (at 144.866 78.74 0)
(effects (font (size 1.27 1.27)) (justify left) hide)
)
)
(global_label "TX1" (shape input) (at 138.43 71.12 0) (fields_autoplaced)
(effects (font (size 1.27 1.27)) (justify left))
(uuid 595f58ee-7a9d-483b-900c-241205affa97)
(property "Intersheetrefs" "${INTERSHEET_REFS}" (id 0) (at 144.5636 71.12 0)
(property "Intersheetrefs" "${INTERSHEET_REFS}" (at 0 0 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Intersheetrefs" "${INTERSHEET_REFS}" (at 144.5636 71.12 0)
(effects (font (size 1.27 1.27)) (justify left) hide)
)
)
(global_label "GL4" (shape input) (at 240.03 119.38 0) (fields_autoplaced)
(effects (font (size 1.27 1.27)) (justify left))
(uuid 738faa5a-e36d-4864-9c8a-92149eb4280b)
(property "Intersheetrefs" "${INTERSHEET_REFS}" (id 0) (at 246.2846 119.38 0)
(property "Intersheetrefs" "${INTERSHEET_REFS}" (at 0 0 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Intersheetrefs" "${INTERSHEET_REFS}" (at 246.2846 119.38 0)
(effects (font (size 1.27 1.27)) (justify left) hide)
)
)
(global_label "GL4" (shape input) (at 240.03 109.22 0) (fields_autoplaced)
(effects (font (size 1.27 1.27)) (justify left))
(uuid b79dc78c-6af1-460f-9256-36c03a294717)
(property "Intersheetrefs" "${INTERSHEET_REFS}" (id 0) (at 246.2846 109.22 0)
(property "Intersheetrefs" "${INTERSHEET_REFS}" (at 0 0 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Intersheetrefs" "${INTERSHEET_REFS}" (at 246.2846 109.22 0)
(effects (font (size 1.27 1.27)) (justify left) hide)
)
)
(global_label "GL3" (shape input) (at 135.89 120.65 0) (fields_autoplaced)
(effects (font (size 1.27 1.27)) (justify left))
(uuid c7e7b732-ba94-430a-83a4-33f9d3de90b5)
(property "Intersheetrefs" "${INTERSHEET_REFS}" (id 0) (at 142.1446 120.65 0)
(property "Intersheetrefs" "${INTERSHEET_REFS}" (at 0 0 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Intersheetrefs" "${INTERSHEET_REFS}" (at 142.1446 120.65 0)
(effects (font (size 1.27 1.27)) (justify left) hide)
)
)
@ -234,78 +262,84 @@
)
(symbol (lib_id "Device:R") (at 91.44 114.3 0) (unit 1)
(in_bom yes) (on_board yes) (fields_autoplaced)
(in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
(uuid 19f41c33-5324-4ee4-ac8a-8893be6f0727)
(default_instance (reference "R1") (unit 1) (value "R") (footprint ""))
(property "Reference" "R1" (id 0) (at 93.98 113.665 0)
(property "Reference" "R1" (at 93.98 113.665 0)
(effects (font (size 1.27 1.27)) (justify left))
)
(property "Value" "R" (id 1) (at 93.98 116.205 0)
(property "Value" "R" (at 93.98 116.205 0)
(effects (font (size 1.27 1.27)) (justify left))
)
(property "Footprint" "" (id 2) (at 89.662 114.3 90)
(property "Footprint" "" (at 89.662 114.3 90)
(effects (font (size 1.27 1.27)) hide)
)
(property "Datasheet" "~" (id 3) (at 91.44 114.3 0)
(property "Datasheet" "~" (at 91.44 114.3 0)
(effects (font (size 1.27 1.27)) hide)
)
(pin "1" (uuid 864a3ebe-74a8-448a-b7a8-e239676322f3))
(pin "2" (uuid 73d09b4c-2071-4225-a679-dd1d266aa02f))
(instances
(project "issue9367"
(path "/42cb452b-0025-41f3-ae52-70902384e6c1"
(reference "R1") (unit 1)
)
)
)
)
(symbol (lib_id "Device:R") (at 238.76 114.3 0) (unit 1)
(in_bom yes) (on_board yes) (fields_autoplaced)
(in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
(uuid 28d3eb4f-83aa-4d39-b01b-9438757c72eb)
(default_instance (reference "R1") (unit 1) (value "R") (footprint ""))
(property "Reference" "R1" (id 0) (at 241.3 113.665 0)
(property "Reference" "R4" (at 241.3 113.665 0)
(effects (font (size 1.27 1.27)) (justify left))
)
(property "Value" "R" (id 1) (at 241.3 116.205 0)
(property "Value" "R" (at 241.3 116.205 0)
(effects (font (size 1.27 1.27)) (justify left))
)
(property "Footprint" "" (id 2) (at 236.982 114.3 90)
(property "Footprint" "" (at 236.982 114.3 90)
(effects (font (size 1.27 1.27)) hide)
)
(property "Datasheet" "~" (id 3) (at 238.76 114.3 0)
(property "Datasheet" "~" (at 238.76 114.3 0)
(effects (font (size 1.27 1.27)) hide)
)
(pin "1" (uuid 77273a01-861b-4502-a01f-04cf8e790056))
(pin "2" (uuid 8d04b7d3-2568-4921-ad13-52d09eef47cd))
(instances
(project "issue9367"
(path "/42cb452b-0025-41f3-ae52-70902384e6c1"
(reference "R4") (unit 1)
)
)
)
)
(symbol (lib_id "Device:R") (at 241.3 88.9 0) (unit 1)
(in_bom yes) (on_board yes) (fields_autoplaced)
(in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
(uuid a354c55f-796d-441f-bbf9-83f0447fcf25)
(default_instance (reference "R1") (unit 1) (value "R") (footprint ""))
(property "Reference" "R1" (id 0) (at 243.84 88.265 0)
(property "Reference" "R3" (at 243.84 88.265 0)
(effects (font (size 1.27 1.27)) (justify left))
)
(property "Value" "R" (id 1) (at 243.84 90.805 0)
(property "Value" "R" (at 243.84 90.805 0)
(effects (font (size 1.27 1.27)) (justify left))
)
(property "Footprint" "" (id 2) (at 239.522 88.9 90)
(property "Footprint" "" (at 239.522 88.9 90)
(effects (font (size 1.27 1.27)) hide)
)
(property "Datasheet" "~" (id 3) (at 241.3 88.9 0)
(property "Datasheet" "~" (at 241.3 88.9 0)
(effects (font (size 1.27 1.27)) hide)
)
(pin "1" (uuid 4a270a04-22d4-4051-8a5f-22bc82697dc4))
(pin "2" (uuid 165af397-576d-4c64-abeb-82e0ba697cda))
(instances
(project "issue9367"
(path "/42cb452b-0025-41f3-ae52-70902384e6c1"
(reference "R3") (unit 1)
)
)
)
)
(sheet_instances
(path "/" (page "1"))
)
(symbol_instances
(path "/19f41c33-5324-4ee4-ac8a-8893be6f0727"
(reference "R1") (unit 1) (value "R") (footprint "")
)
(path "/a354c55f-796d-441f-bbf9-83f0447fcf25"
(reference "R3") (unit 1) (value "R") (footprint "")
)
(path "/28d3eb4f-83aa-4d39-b01b-9438757c72eb"
(reference "R4") (unit 1) (value "R") (footprint "")
)
)
)

2
qa/unittests/eeschema/erc/test_erc_global_labels.cpp
View File

@ -46,7 +46,7 @@ BOOST_FIXTURE_TEST_CASE( ERCGlobalLabels, ERC_REGRESSION_TEST_FIXTURE )
// Check for Errors when using global labels
std::vector<std::pair<wxString, int>> tests =
{
{ "issue9367", 9 }
{ "issue9367", 12 }
};
for( const std::pair<wxString, int>& test : tests )

Write Preview
Loading…
Cancel
Save