Merge pull request #46 from yeslogic/brendanzab/edid-fixtures

Add more fixtures for EDID files

Author: brendanzab

examples/formats/edid/Cargo.toml

@@ -9,6 +9,3 @@ ddl-util = { path = "../../../ddl-util" }
 
 [build-dependencies]
 ddl = { path = "../../.." }
-
-[dev-dependencies]
-hex = "0.3.1"

examples/formats/edid/tests/fixtures/README.md

@@ -0,0 +1,13 @@
+# EDID Fixtures
+
+These were obtained on macOS using:
+
+```bash
+ioreg -lr -w 0 -k IODisplayEDID | grep IODisplayEDID | sed 's/.*<\(.*\)>/\1/'
+```
+
+The hex-dumps can then be output to fixtures using:
+
+```bash
+echo 'HEXDUMP' | xxd -r -p > examples/formats/edid/tests/fixtures/FIXTURE_NAME.bin
+````

examples/formats/edid/tests/fixtures/mbp_2013_built_in_retina.bin

@@ -1,17 +1,13 @@
 extern crate ddl_edid;
-extern crate hex;
 
-use hex::FromHex;
 use std::io::Cursor;
 use ddl_edid::Edid;
 
 const MAGIC: [u8; 8] = [0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00];
 
 #[test]
-fn test_read_edid() {
-    // Obtained on macOS using `ioreg -l | grep IODisplayEDID | awk '{print $7}'`
-    let buf = Vec::from_hex("00FFFFFFFFFFFF00061019A00000000030160104A5211578026FB1A7554C9E250C505400000001010101010101010101010101010101EF8340A0B0083470302036004BCF1000001A000000FC00436F6C6F72204C43440A20202000000010000000000000000000000000000000000010000000000000000000000000000000BC").unwrap();
-
+fn test_read_edid_mbp_2013_built_in_retina() {
+    let buf = include_bytes!("fixtures/mbp_2013_built_in_retina.bin");
     let edid = Edid::read(&mut Cursor::new(&buf[..])).unwrap();
 
     assert_eq!(edid.header.magic, MAGIC);
@@ -27,3 +23,27 @@ fn test_read_edid() {
 
     // panic!("{:#?}", edid);
 }
+
+#[test]
+fn test_read_edid_mbp_2017_built_in_retina() {
+    let buf = include_bytes!("fixtures/mbp_2017_built_in_retina.bin");
+    let edid = Edid::read(&mut Cursor::new(&buf[..])).unwrap();
+
+    assert_eq!(edid.header.magic, MAGIC);
+
+    // TODO: ...
+
+    // panic!("{:#?}", edid);
+}
+
+#[test]
+fn test_read_edid_yamakasi_0270led() {
+    let buf = include_bytes!("fixtures/yamakasi_0270led.bin");
+    let edid = Edid::read(&mut Cursor::new(&buf[..])).unwrap();
+
+    assert_eq!(edid.header.magic, MAGIC);
+
+    // TODO: ...
+
+    // panic!("{:#?}", edid);
+}