Web MIDI (Linux): Improve id quality, create opaque id, prep for hotplug

media/midi/midi_manager_alsa_unittest.cc

Index: media/midi/midi_manager_alsa_unittest.cc
diff --git a/media/midi/midi_manager_alsa_unittest.cc b/media/midi/midi_manager_alsa_unittest.cc
index 47789b6d60d471518fb34848ff2ceaf7e3090471..6ce46171ecd73ec92d4ae430fadc81aea42802d0 100644
--- a/media/midi/midi_manager_alsa_unittest.cc
+++ b/media/midi/midi_manager_alsa_unittest.cc
@@ -10,41 +10,82 @@ namespace media {
 
 TEST(MidiManagerAlsaTest, ExtractManufacturer) {
   ASSERT_EQ("My\\x20Vendor",
-            MidiManagerAlsa::MidiDevice::ExtractManufacturerString(
+            MidiManagerAlsa::AlsaRawmidi::ExtractManufacturerString(
                 "My\\x20Vendor", "1234", "My Vendor, Inc.", "Card",
                 "My Vendor Inc Card at bus"));
-  ASSERT_EQ("My Vendor", MidiManagerAlsa::MidiDevice::ExtractManufacturerString(
-                             "My Vendor", "1234", "My Vendor, Inc.", "Card",
-                             "My Vendor Inc Card at bus"));
+  ASSERT_EQ("My Vendor",
+            MidiManagerAlsa::AlsaRawmidi::ExtractManufacturerString(
+                "My Vendor", "1234", "My Vendor, Inc.", "Card",
+                "My Vendor Inc Card at bus"));
   ASSERT_EQ("My Vendor, Inc.",
-            MidiManagerAlsa::MidiDevice::ExtractManufacturerString(
+            MidiManagerAlsa::AlsaRawmidi::ExtractManufacturerString(
                 "1234", "1234", "My Vendor, Inc.", "Card",
                 "My Vendor Inc Card at bus"));
   ASSERT_EQ("My Vendor Inc",
-            MidiManagerAlsa::MidiDevice::ExtractManufacturerString(
+            MidiManagerAlsa::AlsaRawmidi::ExtractManufacturerString(
                 "1234", "1234", "", "Card", "My Vendor Inc Card at bus"));
   ASSERT_EQ("My Vendor Inc",
-            MidiManagerAlsa::MidiDevice::ExtractManufacturerString(
+            MidiManagerAlsa::AlsaRawmidi::ExtractManufacturerString(
                 "", "", "", "Card", "My Vendor Inc Card at bus"));
-  ASSERT_EQ("", MidiManagerAlsa::MidiDevice::ExtractManufacturerString(
+  ASSERT_EQ("", MidiManagerAlsa::AlsaRawmidi::ExtractManufacturerString(
                     "1234", "1234", "", "Card", "Longname"));
   ASSERT_EQ("Keystation\\x20Mini\\x2032",
-            MidiManagerAlsa::MidiDevice::ExtractManufacturerString(
+            MidiManagerAlsa::AlsaRawmidi::ExtractManufacturerString(
                 "Keystation\\x20Mini\\x2032", "129d",
                 "Evolution Electronics, Ltd", "Keystation Mini 32",
                 "Keystation Mini 32 Keystation Mini 32 at"
                 " usb-0000:00:14.0-2.4.4, full speed"));
   ASSERT_EQ("Keystation Mini 32",
-            MidiManagerAlsa::MidiDevice::ExtractManufacturerString(
+            MidiManagerAlsa::AlsaRawmidi::ExtractManufacturerString(
                 "Keystation Mini 32", "129d", "Evolution Electronics, Ltd",
                 "Keystation Mini 32",
                 "Keystation Mini 32 Keystation Mini 32 at"
                 " usb-0000:00:14.0-2.4.4, full speed"));
   ASSERT_EQ("Keystation Mini 32",
-            MidiManagerAlsa::MidiDevice::ExtractManufacturerString(
+            MidiManagerAlsa::AlsaRawmidi::ExtractManufacturerString(
                 "", "", "", "Keystation Mini 32",
                 "Keystation Mini 32 Keystation Mini 32 at"
                 " usb-0000:00:14.0-2.4.4, full speed"));
+  ASSERT_EQ("", MidiManagerAlsa::AlsaRawmidi::ExtractManufacturerString(
+                    "", "", "", "Serial MIDI (UART16550A)",
+                    "Serial MIDI (UART16550A) [Soundcanvas] at 0x3f8, irq 4"));
+  ASSERT_EQ("", MidiManagerAlsa::AlsaRawmidi::ExtractManufacturerString(
+                    "", "", "", "VirMIDI", "Virtual MIDI Card 1"));
+}
+
+TEST(MidiManagerAlsaTest, JSONPortMetadata) {
+  snd_seq_addr_t address;
+  address.client = 1;
+  address.port = 2;
+
+  MidiManagerAlsa::AlsaPortMetadata input(
+      "path", "bus", "id", &address, "client_name", "port_name", "card_name",
+      "card_longname", MidiManagerAlsa::AlsaPortMetadata::Type::kInput);
+
+  MidiManagerAlsa::AlsaPortMetadata output(
+      "path", "bus", "id", &address, "client_name", "port_name", "card_name",
+      "card_longname", MidiManagerAlsa::AlsaPortMetadata::Type::kOutput);
+
+  ASSERT_EQ(
+      "{\"bus\":\"bus\",\"cardLongname\":\"card_longname\",\"cardName\":\"card_"
+      "name\","
+      "\"clientAddr\":1,\"clientName\":\"client_name\",\"id\":\"id\",\"path\":"
+      "\"path\","
+      "\"portAddr\":2,\"portName\":\"port_name\",\"type\":\"input\"}",
+      input.JSONValue());
+
+  ASSERT_EQ("6D6186ACF60BB2FD26B5D2E21881CF0541FDB80FAC5BDFFA95CD55739E3BC526",
+            input.OpaqueKey());
+
+  ASSERT_EQ(
+      "{\"bus\":\"bus\",\"cardLongname\":\"card_longname\",\"cardName\":\"card_"
+      "name\","
+      "\"clientAddr\":1,\"clientName\":\"client_name\",\"id\":\"id\",\"path\":"
+      "\"path\","
+      "\"portAddr\":2,\"portName\":\"port_name\",\"type\":\"output\"}",
+      output.JSONValue());
+  ASSERT_EQ("747E553D40F8388A0C1C51261B82869D5EFA8A54860AAFB2F4F7437744982495",
+            output.OpaqueKey());
 }
 
 }  // namespace media