Tweak test deflate::test_read_data_deflated

- remove use of dicom_pixeldata
- inspect dicom object contents

transfer-syntax-registry/Cargo.toml

@@ -101,4 +101,3 @@ features = ["native"]
 [dev-dependencies]
 dicom-test-files = "0.3"
 dicom-object = { path = "../object" }
-dicom-pixeldata = { path = "../pixeldata" }

transfer-syntax-registry/tests/deflate.rs

@@ -1,31 +1,61 @@
+use std::{
+    fs::{metadata, File},
+    io::BufReader,
+};
 
-use std::{io::BufReader, fs::{metadata, File}};
-
-
+use dicom_core::Tag;
 use dicom_object::OpenFileOptions;
-use dicom_pixeldata::PixelDecoder;
 
 #[test]
 fn test_read_data_deflated() {
-    let path = dicom_test_files::path("pydicom/image_dfl.dcm").expect("test DICOM file should exist");
+    let path =
+        dicom_test_files::path("pydicom/image_dfl.dcm").expect("test DICOM file should exist");
     let source = BufReader::new(File::open(path).unwrap());
 
     // should read preamble even though it's from a reader
     let object = OpenFileOptions::new()
         .from_reader(source)
         .expect("Should read from source successfully");
 
-    let res = object.decode_pixel_data().unwrap();
-    assert_eq!((
-        res.rows() as usize * 
-        res.columns() as usize *
-        res.number_of_frames() as usize), res.data().len() as usize);
+    // inspect some attributes
+
+    // SOP Instance UID
+    assert_eq!(
+        object.get(Tag(0x0008, 0x0018)).unwrap().to_str().unwrap(),
+        "1.3.6.1.4.1.5962.1.1.0.0.0.977067309.6001.0",
+    );
+
+    // photometric interpretation
+    assert_eq!(
+        object.get(Tag(0x0028, 0x0004)).unwrap().to_str().unwrap(),
+        "MONOCHROME2",
+    );
+
+    let rows: u16 = object.get(Tag(0x0028, 0x0010)).unwrap().to_int().unwrap();
+    let cols: u16 = object.get(Tag(0x0028, 0x0011)).unwrap().to_int().unwrap();
+    let spp: u16 = object.get(Tag(0x0028, 0x0002)).unwrap().to_int().unwrap();
+    assert_eq!((rows, cols, spp), (512, 512, 1));
+
+    // pixel data
+
+    let pixel_data = object.get(Tag(0x7FE0, 0x0010)).unwrap().to_bytes().unwrap();
+
+    assert_eq!(
+        pixel_data.len(),
+        rows as usize * cols as usize * spp as usize,
+    );
+
+    // poke some of the pixel samples
+    assert_eq!(pixel_data[0], 0xd5);
+    assert_eq!(pixel_data[0x0080], 0x29);
+    assert_eq!(pixel_data[0x0804], 0xff);
 }
 
 #[test]
 #[ignore = "test is unsound"]
-fn write_deflated(){
-    let path = dicom_test_files::path("pydicom/image_dfl.dcm").expect("test DICOM file should exist");
+fn write_deflated() {
+    let path =
+        dicom_test_files::path("pydicom/image_dfl.dcm").expect("test DICOM file should exist");
     let source = BufReader::new(File::open(path.clone()).unwrap());
 
     // should read preamble even though it's from a reader
@@ -36,4 +66,4 @@ fn write_deflated(){
     let mut buf = Vec::<u8>::new();
     object.write_all(&mut buf).unwrap();
     assert_eq!(buf.len(), metadata(path).unwrap().len() as usize);
-}
+}