Skip to content

Commit

Permalink
Merge pull request #128 from GoogleCloudPlatform/integration_test_ref…
Browse files Browse the repository at this point in the history 
…actor

Merge Integration test refactor into master
  • Loading branch information
@danielbeaudreau
danielbeaudreau authored Feb 12, 2021
2 parents 032387a + 3335d20 commit c893c51
Show file tree
Hide file tree
Showing 23 changed files with 585 additions and 602 deletions.
616 changes: 33 additions & 583 deletions integration_test/cloudbuild-integration-test.yaml
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion integration_test/data/findscu-instance-expected.xml
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<?xml version="1.0" encoding="UTF-8"?><NativeDicomModel xml:space="preserve"><DicomAttribute keyword="SOPClassUID" tag="00080016" vr="UI"><Value number="1">1.2.840.10008.5.1.4.1.1.7</Value></DicomAttribute><DicomAttribute keyword="SOPInstanceUID" tag="00080018" vr="UI"><Value number="1">2.25.140302709094137852884202099990798014056</Value></DicomAttribute><DicomAttribute keyword="StudyDate" tag="00080020" vr="DA"/><DicomAttribute keyword="StudyTime" tag="00080030" vr="TM"/><DicomAttribute keyword="AccessionNumber" tag="00080050" vr="SH"/><DicomAttribute keyword="Modality" tag="00080060" vr="CS"><Value number="1">XC</Value></DicomAttribute><DicomAttribute keyword="ReferringPhysicianName" tag="00080090" vr="PN"/><DicomAttribute keyword="PatientName" tag="00100010" vr="PN"/><DicomAttribute keyword="PatientID" tag="00100020" vr="LO"/><DicomAttribute keyword="PatientBirthDate" tag="00100030" vr="DA"/><DicomAttribute keyword="PatientSex" tag="00100040" vr="CS"/><DicomAttribute keyword="StudyInstanceUID" tag="0020000D" vr="UI"><Value number="1">2.25.140302709094137852884202099990798014056</Value></DicomAttribute><DicomAttribute keyword="SeriesInstanceUID" tag="0020000E" vr="UI"><Value number="1">2.25.140302709094137852884202099990798014056</Value></DicomAttribute><DicomAttribute keyword="StudyID" tag="00200010" vr="SH"/><DicomAttribute keyword="InstanceNumber" tag="00200013" vr="IS"><Value number="1">1</Value></DicomAttribute><DicomAttribute keyword="Rows" tag="00280010" vr="US"><Value number="1">500</Value></DicomAttribute><DicomAttribute keyword="Columns" tag="00280011" vr="US"><Value number="1">500</Value></DicomAttribute><DicomAttribute keyword="BitsAllocated" tag="00280100" vr="US"><Value number="1">8</Value></DicomAttribute></NativeDicomModel><?xml version="1.0" encoding="UTF-8"?><NativeDicomModel xml:space="preserve"><DicomAttribute keyword="SOPClassUID" tag="00080016" vr="UI"><Value number="1">1.2.840.10008.5.1.4.1.1.7</Value></DicomAttribute><DicomAttribute keyword="SOPInstanceUID" tag="00080018" vr="UI"><Value number="1">2.25.140302709094137852884202099990798014222</Value></DicomAttribute><DicomAttribute keyword="StudyDate" tag="00080020" vr="DA"/><DicomAttribute keyword="StudyTime" tag="00080030" vr="TM"/><DicomAttribute keyword="AccessionNumber" tag="00080050" vr="SH"/><DicomAttribute keyword="Modality" tag="00080060" vr="CS"><Value number="1">XC</Value></DicomAttribute><DicomAttribute keyword="ReferringPhysicianName" tag="00080090" vr="PN"/><DicomAttribute keyword="PatientName" tag="00100010" vr="PN"/><DicomAttribute keyword="PatientID" tag="00100020" vr="LO"/><DicomAttribute keyword="PatientBirthDate" tag="00100030" vr="DA"/><DicomAttribute keyword="PatientSex" tag="00100040" vr="CS"/><DicomAttribute keyword="StudyInstanceUID" tag="0020000D" vr="UI"><Value number="1">2.25.140302709094137852884202099990798014222</Value></DicomAttribute><DicomAttribute keyword="SeriesInstanceUID" tag="0020000E" vr="UI"><Value number="1">2.25.140302709094137852884202099990798014222</Value></DicomAttribute><DicomAttribute keyword="StudyID" tag="00200010" vr="SH"/><DicomAttribute keyword="InstanceNumber" tag="00200013" vr="IS"><Value number="1">1</Value></DicomAttribute><DicomAttribute keyword="Rows" tag="00280010" vr="US"><Value number="1">500</Value></DicomAttribute><DicomAttribute keyword="Columns" tag="00280011" vr="US"><Value number="1">500</Value></DicomAttribute><DicomAttribute keyword="BitsAllocated" tag="00280100" vr="US"><Value number="1">8</Value></DicomAttribute></NativeDicomModel><?xml version="1.0" encoding="UTF-8"?><NativeDicomModel xml:space="preserve"><DicomAttribute keyword="SOPClassUID" tag="00080016" vr="UI"><Value number="1">1.2.840.10008.5.1.4.1.1.7</Value></DicomAttribute><DicomAttribute keyword="SOPInstanceUID" tag="00080018" vr="UI"><Value number="1">2.25.140302709094137852884202099990798014333</Value></DicomAttribute><DicomAttribute keyword="StudyDate" tag="00080020" vr="DA"/><DicomAttribute keyword="StudyTime" tag="00080030" vr="TM"/><DicomAttribute keyword="AccessionNumber" tag="00080050" vr="SH"/><DicomAttribute keyword="Modality" tag="00080060" vr="CS"><Value number="1">XC</Value></DicomAttribute><DicomAttribute keyword="ReferringPhysicianName" tag="00080090" vr="PN"/><DicomAttribute keyword="PatientName" tag="00100010" vr="PN"/><DicomAttribute keyword="PatientID" tag="00100020" vr="LO"/><DicomAttribute keyword="PatientBirthDate" tag="00100030" vr="DA"/><DicomAttribute keyword="PatientSex" tag="00100040" vr="CS"/><DicomAttribute keyword="StudyInstanceUID" tag="0020000D" vr="UI"><Value number="1">2.25.140302709094137852884202099990798014333</Value></DicomAttribute><DicomAttribute keyword="SeriesInstanceUID" tag="0020000E" vr="UI"><Value number="1">2.25.140302709094137852884202099990798014333</Value></DicomAttribute><DicomAttribute keyword="StudyID" tag="00200010" vr="SH"/><DicomAttribute keyword="InstanceNumber" tag="00200013" vr="IS"><Value number="1">1</Value></DicomAttribute><DicomAttribute keyword="Rows" tag="00280010" vr="US"><Value number="1">500</Value></DicomAttribute><DicomAttribute keyword="Columns" tag="00280011" vr="US"><Value number="1">500</Value></DicomAttribute><DicomAttribute keyword="BitsAllocated" tag="00280100" vr="US"><Value number="1">8</Value></DicomAttribute></NativeDicomModel><?xml version="1.0" encoding="UTF-8"?><NativeDicomModel xml:space="preserve"><DicomAttribute keyword="SOPClassUID" tag="00080016" vr="UI"><Value number="1">1.2.840.10008.5.1.4.1.1.7</Value></DicomAttribute><DicomAttribute keyword="SOPInstanceUID" tag="00080018" vr="UI"><Value number="1">111</Value></DicomAttribute><DicomAttribute keyword="StudyDate" tag="00080020" vr="DA"/><DicomAttribute keyword="StudyTime" tag="00080030" vr="TM"/><DicomAttribute keyword="AccessionNumber" tag="00080050" vr="SH"/><DicomAttribute keyword="Modality" tag="00080060" vr="CS"><Value number="1">XC</Value></DicomAttribute><DicomAttribute keyword="ReferringPhysicianName" tag="00080090" vr="PN"/><DicomAttribute keyword="PatientName" tag="00100010" vr="PN"/><DicomAttribute keyword="PatientID" tag="00100020" vr="LO"/><DicomAttribute keyword="PatientBirthDate" tag="00100030" vr="DA"/><DicomAttribute keyword="PatientSex" tag="00100040" vr="CS"/><DicomAttribute keyword="StudyInstanceUID" tag="0020000D" vr="UI"><Value number="1">111</Value></DicomAttribute><DicomAttribute keyword="SeriesInstanceUID" tag="0020000E" vr="UI"><Value number="1">111</Value></DicomAttribute><DicomAttribute keyword="StudyID" tag="00200010" vr="SH"/><DicomAttribute keyword="InstanceNumber" tag="00200013" vr="IS"><Value number="1">1</Value></DicomAttribute><DicomAttribute keyword="Rows" tag="00280010" vr="US"><Value number="1">500</Value></DicomAttribute><DicomAttribute keyword="Columns" tag="00280011" vr="US"><Value number="1">500</Value></DicomAttribute><DicomAttribute keyword="BitsAllocated" tag="00280100" vr="US"><Value number="1">8</Value></DicomAttribute></NativeDicomModel>
<?xml version="1.0" encoding="UTF-8"?><NativeDicomModel xml:space="preserve"><DicomAttribute keyword="SOPClassUID" tag="00080016" vr="UI"><Value number="1">1.2.840.10008.5.1.4.1.1.7</Value></DicomAttribute><DicomAttribute keyword="SOPInstanceUID" tag="00080018" vr="UI"><Value number="1">2.25.140302709094137852884202099990798014056</Value></DicomAttribute><DicomAttribute keyword="StudyDate" tag="00080020" vr="DA"/><DicomAttribute keyword="StudyTime" tag="00080030" vr="TM"/><DicomAttribute keyword="AccessionNumber" tag="00080050" vr="SH"/><DicomAttribute keyword="Modality" tag="00080060" vr="CS"><Value number="1">XC</Value></DicomAttribute><DicomAttribute keyword="ReferringPhysicianName" tag="00080090" vr="PN"/><DicomAttribute keyword="PatientName" tag="00100010" vr="PN"/><DicomAttribute keyword="PatientID" tag="00100020" vr="LO"/><DicomAttribute keyword="PatientBirthDate" tag="00100030" vr="DA"/><DicomAttribute keyword="PatientSex" tag="00100040" vr="CS"/><DicomAttribute keyword="StudyInstanceUID" tag="0020000D" vr="UI"><Value number="1">2.25.140302709094137852884202099990798014056</Value></DicomAttribute><DicomAttribute keyword="SeriesInstanceUID" tag="0020000E" vr="UI"><Value number="1">2.25.140302709094137852884202099990798014056</Value></DicomAttribute><DicomAttribute keyword="StudyID" tag="00200010" vr="SH"/><DicomAttribute keyword="InstanceNumber" tag="00200013" vr="IS"><Value number="1">1</Value></DicomAttribute><DicomAttribute keyword="Rows" tag="00280010" vr="US"><Value number="1">500</Value></DicomAttribute><DicomAttribute keyword="Columns" tag="00280011" vr="US"><Value number="1">500</Value></DicomAttribute><DicomAttribute keyword="BitsAllocated" tag="00280100" vr="US"><Value number="1">8</Value></DicomAttribute></NativeDicomModel>
2 changes: 1 addition & 1 deletion integration_test/data/findscu-series-expected.xml
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<?xml version="1.0" encoding="UTF-8"?><NativeDicomModel xml:space="preserve"><DicomAttribute keyword="StudyDate" tag="00080020" vr="DA"/><DicomAttribute keyword="StudyTime" tag="00080030" vr="TM"/><DicomAttribute keyword="AccessionNumber" tag="00080050" vr="SH"/><DicomAttribute keyword="Modality" tag="00080060" vr="CS"><Value number="1">XC</Value></DicomAttribute><DicomAttribute keyword="ReferringPhysicianName" tag="00080090" vr="PN"/><DicomAttribute keyword="PatientName" tag="00100010" vr="PN"/><DicomAttribute keyword="PatientID" tag="00100020" vr="LO"/><DicomAttribute keyword="PatientBirthDate" tag="00100030" vr="DA"/><DicomAttribute keyword="PatientSex" tag="00100040" vr="CS"/><DicomAttribute keyword="StudyInstanceUID" tag="0020000D" vr="UI"><Value number="1">2.25.140302709094137852884202099990798014333</Value></DicomAttribute><DicomAttribute keyword="SeriesInstanceUID" tag="0020000E" vr="UI"><Value number="1">2.25.140302709094137852884202099990798014333</Value></DicomAttribute><DicomAttribute keyword="StudyID" tag="00200010" vr="SH"/></NativeDicomModel><?xml version="1.0" encoding="UTF-8"?><NativeDicomModel xml:space="preserve"><DicomAttribute keyword="StudyDate" tag="00080020" vr="DA"/><DicomAttribute keyword="StudyTime" tag="00080030" vr="TM"/><DicomAttribute keyword="AccessionNumber" tag="00080050" vr="SH"/><DicomAttribute keyword="Modality" tag="00080060" vr="CS"><Value number="1">XC</Value></DicomAttribute><DicomAttribute keyword="ReferringPhysicianName" tag="00080090" vr="PN"/><DicomAttribute keyword="PatientName" tag="00100010" vr="PN"/><DicomAttribute keyword="PatientID" tag="00100020" vr="LO"/><DicomAttribute keyword="PatientBirthDate" tag="00100030" vr="DA"/><DicomAttribute keyword="PatientSex" tag="00100040" vr="CS"/><DicomAttribute keyword="StudyInstanceUID" tag="0020000D" vr="UI"><Value number="1">111</Value></DicomAttribute><DicomAttribute keyword="SeriesInstanceUID" tag="0020000E" vr="UI"><Value number="1">111</Value></DicomAttribute><DicomAttribute keyword="StudyID" tag="00200010" vr="SH"/></NativeDicomModel><?xml version="1.0" encoding="UTF-8"?><NativeDicomModel xml:space="preserve"><DicomAttribute keyword="StudyDate" tag="00080020" vr="DA"/><DicomAttribute keyword="StudyTime" tag="00080030" vr="TM"/><DicomAttribute keyword="AccessionNumber" tag="00080050" vr="SH"/><DicomAttribute keyword="Modality" tag="00080060" vr="CS"><Value number="1">XC</Value></DicomAttribute><DicomAttribute keyword="ReferringPhysicianName" tag="00080090" vr="PN"/><DicomAttribute keyword="PatientName" tag="00100010" vr="PN"/><DicomAttribute keyword="PatientID" tag="00100020" vr="LO"/><DicomAttribute keyword="PatientBirthDate" tag="00100030" vr="DA"/><DicomAttribute keyword="PatientSex" tag="00100040" vr="CS"/><DicomAttribute keyword="StudyInstanceUID" tag="0020000D" vr="UI"><Value number="1">2.25.140302709094137852884202099990798014056</Value></DicomAttribute><DicomAttribute keyword="SeriesInstanceUID" tag="0020000E" vr="UI"><Value number="1">2.25.140302709094137852884202099990798014056</Value></DicomAttribute><DicomAttribute keyword="StudyID" tag="00200010" vr="SH"/></NativeDicomModel><?xml version="1.0" encoding="UTF-8"?><NativeDicomModel xml:space="preserve"><DicomAttribute keyword="StudyDate" tag="00080020" vr="DA"/><DicomAttribute keyword="StudyTime" tag="00080030" vr="TM"/><DicomAttribute keyword="AccessionNumber" tag="00080050" vr="SH"/><DicomAttribute keyword="Modality" tag="00080060" vr="CS"><Value number="1">XC</Value></DicomAttribute><DicomAttribute keyword="ReferringPhysicianName" tag="00080090" vr="PN"/><DicomAttribute keyword="PatientName" tag="00100010" vr="PN"/><DicomAttribute keyword="PatientID" tag="00100020" vr="LO"/><DicomAttribute keyword="PatientBirthDate" tag="00100030" vr="DA"/><DicomAttribute keyword="PatientSex" tag="00100040" vr="CS"/><DicomAttribute keyword="StudyInstanceUID" tag="0020000D" vr="UI"><Value number="1">2.25.140302709094137852884202099990798014222</Value></DicomAttribute><DicomAttribute keyword="SeriesInstanceUID" tag="0020000E" vr="UI"><Value number="1">2.25.140302709094137852884202099990798014222</Value></DicomAttribute><DicomAttribute keyword="StudyID" tag="00200010" vr="SH"/></NativeDicomModel>
<?xml version="1.0" encoding="UTF-8"?><NativeDicomModel xml:space="preserve"><DicomAttribute keyword="StudyDate" tag="00080020" vr="DA"/><DicomAttribute keyword="StudyTime" tag="00080030" vr="TM"/><DicomAttribute keyword="AccessionNumber" tag="00080050" vr="SH"/><DicomAttribute keyword="Modality" tag="00080060" vr="CS"><Value number="1">XC</Value></DicomAttribute><DicomAttribute keyword="ReferringPhysicianName" tag="00080090" vr="PN"/><DicomAttribute keyword="PatientName" tag="00100010" vr="PN"/><DicomAttribute keyword="PatientID" tag="00100020" vr="LO"/><DicomAttribute keyword="PatientBirthDate" tag="00100030" vr="DA"/><DicomAttribute keyword="PatientSex" tag="00100040" vr="CS"/><DicomAttribute keyword="StudyInstanceUID" tag="0020000D" vr="UI"><Value number="1">2.25.140302709094137852884202099990798014056</Value></DicomAttribute><DicomAttribute keyword="SeriesInstanceUID" tag="0020000E" vr="UI"><Value number="1">2.25.140302709094137852884202099990798014056</Value></DicomAttribute><DicomAttribute keyword="StudyID" tag="00200010" vr="SH"/></NativeDicomModel>
2 changes: 1 addition & 1 deletion integration_test/data/findscu-study-expected.xml
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<?xml version="1.0" encoding="UTF-8"?><NativeDicomModel xml:space="preserve"><DicomAttribute keyword="StudyDate" tag="00080020" vr="DA"/><DicomAttribute keyword="StudyTime" tag="00080030" vr="TM"/><DicomAttribute keyword="AccessionNumber" tag="00080050" vr="SH"/><DicomAttribute keyword="ReferringPhysicianName" tag="00080090" vr="PN"/><DicomAttribute keyword="PatientName" tag="00100010" vr="PN"/><DicomAttribute keyword="PatientID" tag="00100020" vr="LO"/><DicomAttribute keyword="PatientBirthDate" tag="00100030" vr="DA"/><DicomAttribute keyword="PatientSex" tag="00100040" vr="CS"/><DicomAttribute keyword="StudyInstanceUID" tag="0020000D" vr="UI"><Value number="1">2.25.140302709094137852884202099990798014056</Value></DicomAttribute><DicomAttribute keyword="StudyID" tag="00200010" vr="SH"/></NativeDicomModel><?xml version="1.0" encoding="UTF-8"?><NativeDicomModel xml:space="preserve"><DicomAttribute keyword="StudyDate" tag="00080020" vr="DA"/><DicomAttribute keyword="StudyTime" tag="00080030" vr="TM"/><DicomAttribute keyword="AccessionNumber" tag="00080050" vr="SH"/><DicomAttribute keyword="ReferringPhysicianName" tag="00080090" vr="PN"/><DicomAttribute keyword="PatientName" tag="00100010" vr="PN"/><DicomAttribute keyword="PatientID" tag="00100020" vr="LO"/><DicomAttribute keyword="PatientBirthDate" tag="00100030" vr="DA"/><DicomAttribute keyword="PatientSex" tag="00100040" vr="CS"/><DicomAttribute keyword="StudyInstanceUID" tag="0020000D" vr="UI"><Value number="1">2.25.140302709094137852884202099990798014222</Value></DicomAttribute><DicomAttribute keyword="StudyID" tag="00200010" vr="SH"/></NativeDicomModel><?xml version="1.0" encoding="UTF-8"?><NativeDicomModel xml:space="preserve"><DicomAttribute keyword="StudyDate" tag="00080020" vr="DA"/><DicomAttribute keyword="StudyTime" tag="00080030" vr="TM"/><DicomAttribute keyword="AccessionNumber" tag="00080050" vr="SH"/><DicomAttribute keyword="ReferringPhysicianName" tag="00080090" vr="PN"/><DicomAttribute keyword="PatientName" tag="00100010" vr="PN"/><DicomAttribute keyword="PatientID" tag="00100020" vr="LO"/><DicomAttribute keyword="PatientBirthDate" tag="00100030" vr="DA"/><DicomAttribute keyword="PatientSex" tag="00100040" vr="CS"/><DicomAttribute keyword="StudyInstanceUID" tag="0020000D" vr="UI"><Value number="1">111</Value></DicomAttribute><DicomAttribute keyword="StudyID" tag="00200010" vr="SH"/></NativeDicomModel><?xml version="1.0" encoding="UTF-8"?><NativeDicomModel xml:space="preserve"><DicomAttribute keyword="StudyDate" tag="00080020" vr="DA"/><DicomAttribute keyword="StudyTime" tag="00080030" vr="TM"/><DicomAttribute keyword="AccessionNumber" tag="00080050" vr="SH"/><DicomAttribute keyword="ReferringPhysicianName" tag="00080090" vr="PN"/><DicomAttribute keyword="PatientName" tag="00100010" vr="PN"/><DicomAttribute keyword="PatientID" tag="00100020" vr="LO"/><DicomAttribute keyword="PatientBirthDate" tag="00100030" vr="DA"/><DicomAttribute keyword="PatientSex" tag="00100040" vr="CS"/><DicomAttribute keyword="StudyInstanceUID" tag="0020000D" vr="UI"><Value number="1">2.25.140302709094137852884202099990798014333</Value></DicomAttribute><DicomAttribute keyword="StudyID" tag="00200010" vr="SH"/></NativeDicomModel>
<?xml version="1.0" encoding="UTF-8"?><NativeDicomModel xml:space="preserve"><DicomAttribute keyword="StudyDate" tag="00080020" vr="DA"/><DicomAttribute keyword="StudyTime" tag="00080030" vr="TM"/><DicomAttribute keyword="AccessionNumber" tag="00080050" vr="SH"/><DicomAttribute keyword="ReferringPhysicianName" tag="00080090" vr="PN"/><DicomAttribute keyword="PatientName" tag="00100010" vr="PN"/><DicomAttribute keyword="PatientID" tag="00100020" vr="LO"/><DicomAttribute keyword="PatientBirthDate" tag="00100030" vr="DA"/><DicomAttribute keyword="PatientSex" tag="00100040" vr="CS"/><DicomAttribute keyword="StudyInstanceUID" tag="0020000D" vr="UI"><Value number="1">2.25.140302709094137852884202099990798014056</Value></DicomAttribute><DicomAttribute keyword="StudyID" tag="00200010" vr="SH"/></NativeDicomModel>
Loading

0 comments on commit c893c51

Please sign in to comment.