making test smaller

This commit is contained in:
rusefillc 2021-01-09 19:11:03 -05:00
parent aa0725cf3a
commit 3aabd4aab9
1 changed files with 4 additions and 23 deletions

View File

@ -26,7 +26,7 @@ public class PcbMergeTest {
}
@Test
public void testMergeNets() throws IOException {
public void testMergeNets() {
String pcb1 = "(kicad_pcb (version 4) (host pcbnew \"(2014-07-21 BZR 5016)-product\")\n" +
"\n" +
" (general\n" +
@ -39,11 +39,6 @@ public class PcbMergeTest {
" (net 1 \"Net1\")\n" +
" (net 2 \"CAN_VIO\")\n" +
" (net 3 \"CAN_RX\")\n" +
" (net 4 \"CAN_TX\")\n" +
" (net 5 \"GND\")\n" +
" (net 6 \"V5\")\n" +
" (net 7 \"CANH\")\n" +
" (net 8 \"CANL\")\n" +
" (pad \"S1\" smd oval\n" +
" (at 1.1 1.1)\n" +
"\n" +
@ -55,27 +50,13 @@ public class PcbMergeTest {
")\n" +
")\n";
PcbNode node = PcbNode.parse(pcb1);
assertEquals(9, node.iterate(TOKEN_NET).size());
assertEquals(4, node.iterate(TOKEN_NET).size());
String pcb2 = "(kicad_pcb (version 4) (host pcbnew \"(2014-07-21 BZR 5016)-product\")\n" +
"\n" +
" (net 0 \"\")\n" +
" (net 1 \"Net1\")\n" +
" (net 2 \"EXT_SPI_SCK\")\n" +
" (net 3 \"EXT_SPI_MOSI\")\n" +
" (net 4 \"EXT_SPI_MISO\")\n" +
" (net 5 \"EXT_SPI_CS2\")\n" +
" (net 6 \"EXT_SPI_CS1\")\n" +
" (net 7 \"EXT_IO4\")\n" +
" (net 8 \"EXT_IO3\")\n" +
" (net 9 \"EXT_IO2\")\n" +
" (net 10 \"EXT_IO1\")\n" +
" (net 11 \"VSS_PULLUP\")\n" +
" (net 12 \"NetD28_1\")\n" +
" (net 13 \"NetD27_1\")\n" +
" (net 14 \"NetD26_1\")\n" +
" (net 139 \"AC_PRESS\")\n" +
" (net 140 \"OUT_INJ8\")\n" +
" (pad \"S2\" smd oval\n" +
" (at 2.2 2.2)\n" +
"\n" +
@ -87,7 +68,7 @@ public class PcbMergeTest {
")\n" +
")";
PcbNode node2 = PcbNode.parse(pcb2);
assertEquals(17, node2.iterate(TOKEN_NET).size());
assertEquals(3, node2.iterate(TOKEN_NET).size());
PcbMergeTool.mergePcb(node, node2, new Networks());
@ -100,7 +81,7 @@ public class PcbMergeTest {
assertEquals("2", net1.id);
assertEquals("2", net2.id);
assertEquals(9, node.iterate(TOKEN_NET).size());
assertEquals(4, node.iterate(TOKEN_NET).size());
}
@Test