From e548f3111cc9821670cf2d6f039c87feabf31f16 Mon Sep 17 00:00:00 2001 From: Federico Fissore Date: Sat, 12 Oct 2013 15:02:45 +0200 Subject: [PATCH] Added another macos system profiler test --- .../app/macosx/SystemProfilerParserTest.java | 5 + .../app/macosx/system_profiler_output5.txt | 94 +++++++++++++++++++ 2 files changed, 99 insertions(+) create mode 100644 app/test/processing/app/macosx/system_profiler_output5.txt diff --git a/app/test/processing/app/macosx/SystemProfilerParserTest.java b/app/test/processing/app/macosx/SystemProfilerParserTest.java index 63a2e1fac..4791cc058 100644 --- a/app/test/processing/app/macosx/SystemProfilerParserTest.java +++ b/app/test/processing/app/macosx/SystemProfilerParserTest.java @@ -28,5 +28,10 @@ public class SystemProfilerParserTest { assertEquals("0X2341_0X0041", new SystemProfilerParser().extractVIDAndPID(output, "/dev/cu.usbmodem04101")); assertEquals("0X2341_0X0041", new SystemProfilerParser().extractVIDAndPID(output, "/dev/tty.usbmodem04101")); + + output = TestHelper.inputStreamToString(SystemProfilerParserTest.class.getResourceAsStream("system_profiler_output5.txt")); + + assertEquals("0X2341_0X8041", new SystemProfilerParser().extractVIDAndPID(output, "/dev/cu.usbmodem06201")); + assertEquals("0X2341_0X8041", new SystemProfilerParser().extractVIDAndPID(output, "/dev/tty.usbmodem06201")); } } diff --git a/app/test/processing/app/macosx/system_profiler_output5.txt b/app/test/processing/app/macosx/system_profiler_output5.txt new file mode 100644 index 000000000..4f9226d4c --- /dev/null +++ b/app/test/processing/app/macosx/system_profiler_output5.txt @@ -0,0 +1,94 @@ +USB: + + USB Hi-Speed Bus: + + Host Controller Location: Built-in USB + Host Controller Driver: AppleUSBEHCI + PCI Device ID: 0x0d9d + PCI Revision ID: 0x00a2 + PCI Vendor ID: 0x10de + Bus Number: 0x24 + + FaceTime Camera (Built-in): + + Product ID: 0x850a + Vendor ID: 0x05ac (Apple Inc.) + Version: 6.26 + Serial Number: CCGB1KY362DF9KL0 + Speed: Up to 480 Mb/sec + Manufacturer: Apple Inc. + Location ID: 0x24600000 / 2 + Current Available (mA): 500 + Current Required (mA): 500 + + USB Hi-Speed Bus: + + Host Controller Location: Built-in USB + Host Controller Driver: AppleUSBEHCI + PCI Device ID: 0x0d9d + PCI Revision ID: 0x00a2 + PCI Vendor ID: 0x10de + Bus Number: 0x26 + + USB Bus: + + Host Controller Location: Built-in USB + Host Controller Driver: AppleUSBOHCI + PCI Device ID: 0x0d9c + PCI Revision ID: 0x00a1 + PCI Vendor ID: 0x10de + Bus Number: 0x04 + + BRCM2070 Hub: + + Product ID: 0x4500 + Vendor ID: 0x0a5c (Broadcom Corp.) + Version: 1.00 + Speed: Up to 12 Mb/sec + Manufacturer: Apple Inc. + Location ID: 0x04500000 / 3 + Current Available (mA): 500 + Current Required (mA): 94 + + Bluetooth USB Host Controller: + + Product ID: 0x821b + Vendor ID: 0x05ac (Apple Inc.) + Version: 0.41 + Speed: Up to 12 Mb/sec + Manufacturer: Apple Inc. + Location ID: 0x04530000 / 6 + Current Available (mA): 500 + Current Required (mA): 0 + + Apple Internal Keyboard / Trackpad: + + Product ID: 0x0242 + Vendor ID: 0x05ac (Apple Inc.) + Version: 1.07 + Speed: Up to 12 Mb/sec + Manufacturer: Apple Inc. + Location ID: 0x04300000 / 2 + Current Available (mA): 500 + Current Required (mA): 40 + + USB Bus: + + Host Controller Location: Built-in USB + Host Controller Driver: AppleUSBOHCI + PCI Device ID: 0x0d9c + PCI Revision ID: 0x00a1 + PCI Vendor ID: 0x10de + Bus Number: 0x06 + + Arduino Yun: + + Product ID: 0x8041 + Vendor ID: 0x2341 + Version: 1.00 + Speed: Up to 12 Mb/sec + Manufacturer: Arduino LLC + Location ID: 0x06200000 / 2 + Current Available (mA): 500 + Current Required (mA): 500 +