|
29 | 29 |
|
30 | 30 | package processing.app.macosx;
|
31 | 31 |
|
| 32 | +import org.junit.Before; |
32 | 33 | import org.junit.Test;
|
33 | 34 | import processing.app.TestHelper;
|
34 | 35 |
|
35 |
| -import static org.junit.Assert.assertEquals; |
36 |
| -import static processing.app.macosx.SystemProfilerParser.extractVIDAndPID; |
37 |
| - |
38 | 36 | import java.io.IOException;
|
39 | 37 | import java.io.InputStream;
|
40 | 38 |
|
| 39 | +import static org.junit.Assert.assertEquals; |
| 40 | + |
41 | 41 | public class SystemProfilerParserTest {
|
42 | 42 |
|
| 43 | + private SystemProfilerParser parser; |
| 44 | + |
| 45 | + @Before |
| 46 | + public void setUp() throws Exception { |
| 47 | + parser = new SystemProfilerParser(); |
| 48 | + } |
| 49 | + |
43 | 50 | @Test
|
44 | 51 | public void shouldCorrectlyParse() throws Exception {
|
45 | 52 | String output = getFileContent("system_profiler_output.txt");
|
46 |
| - assertEquals("0X2341_0X0044", extractVIDAndPID(output, "/dev/cu.usbmodemfa121")); |
47 |
| - assertEquals("0X2341_0X0044", extractVIDAndPID(output, "/dev/tty.usbmodemfa121")); |
| 53 | + assertEquals("0X2341_0X0044", parser.extractVIDAndPID(output, "/dev/cu.usbmodemfa121")); |
| 54 | + assertEquals("0X2341_0X0044", parser.extractVIDAndPID(output, "/dev/tty.usbmodemfa121")); |
48 | 55 |
|
49 | 56 | output = getFileContent("system_profiler_output2.txt");
|
50 |
| - assertEquals("0X2341_0X8036", extractVIDAndPID(output, "/dev/cu.usbmodemfd131")); |
51 |
| - assertEquals("0X2341_0X8036", extractVIDAndPID(output, "/dev/tty.usbmodemfd131")); |
| 57 | + assertEquals("0X2341_0X8036", parser.extractVIDAndPID(output, "/dev/cu.usbmodemfd131")); |
| 58 | + assertEquals("0X2341_0X8036", parser.extractVIDAndPID(output, "/dev/tty.usbmodemfd131")); |
52 | 59 |
|
53 | 60 | output = getFileContent("system_profiler_output3.txt");
|
54 |
| - assertEquals("0X2341_0X8041", extractVIDAndPID(output, "/dev/cu.usbmodemfd121")); |
55 |
| - assertEquals("0X2341_0X8041", extractVIDAndPID(output, "/dev/tty.usbmodemfd121")); |
| 61 | + assertEquals("0X2341_0X8041", parser.extractVIDAndPID(output, "/dev/cu.usbmodemfd121")); |
| 62 | + assertEquals("0X2341_0X8041", parser.extractVIDAndPID(output, "/dev/tty.usbmodemfd121")); |
56 | 63 |
|
57 | 64 | output = getFileContent("system_profiler_output4.txt");
|
58 |
| - assertEquals("0X2341_0X0041", extractVIDAndPID(output, "/dev/cu.usbmodem411")); |
59 |
| - assertEquals("0X2341_0X0041", extractVIDAndPID(output, "/dev/tty.usbmodem411")); |
| 65 | + assertEquals("0X2341_0X0041", parser.extractVIDAndPID(output, "/dev/cu.usbmodem411")); |
| 66 | + assertEquals("0X2341_0X0041", parser.extractVIDAndPID(output, "/dev/tty.usbmodem411")); |
60 | 67 |
|
61 | 68 | output = getFileContent("system_profiler_output5.txt");
|
62 |
| - assertEquals("0X2341_0X8041", extractVIDAndPID(output, "/dev/cu.usbmodem621")); |
63 |
| - assertEquals("0X2341_0X8041", extractVIDAndPID(output, "/dev/tty.usbmodem621")); |
| 69 | + assertEquals("0X2341_0X8041", parser.extractVIDAndPID(output, "/dev/cu.usbmodem621")); |
| 70 | + assertEquals("0X2341_0X8041", parser.extractVIDAndPID(output, "/dev/tty.usbmodem621")); |
64 | 71 |
|
65 | 72 | output = getFileContent("system_profiler_output6.txt");
|
66 |
| - assertEquals("0X2341_0X8041", extractVIDAndPID(output, "/dev/cu.usbmodem1421")); |
67 |
| - assertEquals("0X2341_0X8041", extractVIDAndPID(output, "/dev/tty.usbmodem1421")); |
| 73 | + assertEquals("0X2341_0X8041", parser.extractVIDAndPID(output, "/dev/cu.usbmodem1421")); |
| 74 | + assertEquals("0X2341_0X8041", parser.extractVIDAndPID(output, "/dev/tty.usbmodem1421")); |
68 | 75 |
|
69 | 76 | output = getFileContent("system_profiler_output7.txt");
|
70 |
| - assertEquals("0X2341_0X8036", extractVIDAndPID(output, "/dev/cu.usbmodem24131")); |
71 |
| - assertEquals("0X2341_0X8036", extractVIDAndPID(output, "/dev/tty.usbmodem24131")); |
72 |
| - assertEquals("0X0403_0X6015", extractVIDAndPID(output, "/dev/cu.usbserial-DN0031EV")); |
73 |
| - assertEquals("0X0403_0X6015", extractVIDAndPID(output, "/dev/tty.usbserial-DN0031EV")); |
| 77 | + assertEquals("0X2341_0X8036", parser.extractVIDAndPID(output, "/dev/cu.usbmodem24131")); |
| 78 | + assertEquals("0X2341_0X8036", parser.extractVIDAndPID(output, "/dev/tty.usbmodem24131")); |
| 79 | + assertEquals("0X0403_0X6015", parser.extractVIDAndPID(output, "/dev/cu.usbserial-DN0031EV")); |
| 80 | + assertEquals("0X0403_0X6015", parser.extractVIDAndPID(output, "/dev/tty.usbserial-DN0031EV")); |
74 | 81 |
|
75 | 82 | output = getFileContent("system_profiler_output8.txt");
|
76 |
| - assertEquals("0X03EB_0X2157", extractVIDAndPID(output, "/dev/tty.usbmodemfd132")); |
| 83 | + assertEquals("0X03EB_0X2157", parser.extractVIDAndPID(output, "/dev/tty.usbmodemfd132")); |
77 | 84 |
|
78 | 85 | // OSX El Capitan
|
79 | 86 | output = getFileContent("system_profiler_output9.txt");
|
80 |
| - assertEquals("0X2341_0X8036", extractVIDAndPID(output, "/dev/tty.usbmodemFA121")); |
| 87 | + assertEquals("0X2341_0X8036", parser.extractVIDAndPID(output, "/dev/tty.usbmodemFA121")); |
81 | 88 | }
|
82 | 89 |
|
83 | 90 | private String getFileContent(String filename) throws IOException {
|
|
0 commit comments