# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1434697012 -7200
# Node ID 7c8500991a127370780b66c0b37a46735a2ff819
# Parent  04fa104ab63b890d01cebbec29f9dd691fb75efa
karsten

diff -r 04fa104ab63b -r 7c8500991a12 Database/KarstenHilbertRF.dcm
Binary file Database/KarstenHilbertRF.dcm has changed
diff -r 04fa104ab63b -r 7c8500991a12 Database/README.txt
--- a/Database/README.txt	Fri Jun 19 08:34:24 2015 +0200
+++ b/Database/README.txt	Fri Jun 19 08:56:52 2015 +0200
@@ -48,6 +48,7 @@
 - Issue19.dcm : From Chris Hafey on Google Code (YBR_FULL are not decoded incorrectly)
 - Issue22.dcm : From Emsy Chan on Google Code (Error decoding multi-frame instances)
 - Issue32.dcm : From aceberg93 on Google Code (Cyrillic symbols)
+- KarstenHilbertRF.dcm : From Karsten Hilbert
 - Knee/* : From OsiriX, "KNEE".
 - Multiframe.dcm : From GDCM, "images_of_interest/PHILIPS_Integris_H-8-MONO2-Multiframe.dcm"
 - Phenix/* : From OsiriX, "PHENIX".
diff -r 04fa104ab63b -r 7c8500991a12 Tests/Tests.py
--- a/Tests/Tests.py	Fri Jun 19 08:34:24 2015 +0200
+++ b/Tests/Tests.py	Fri Jun 19 08:56:52 2015 +0200
@@ -988,20 +988,19 @@
         self.assertEqual(1, len(series))
         
 
-    @unittest.skip("This test fails, to fix")
     def test_incoming_movescu(self):
         def CallMoveScu(args):
             subprocess.check_call([ 'movescu', 
-                                    '--move', _LOCAL['DicomAet'],     # Target AET (i.e. storescp)
-                                    '--call', _REMOTE['DicomAet'],    # Called AET (i.e. Orthanc)
-                                    '--aetitle', _LOCAL['DicomAet'],  # Calling AET (i.e. storescp)
+                                    '--move', _LOCAL['DicomAet'],      # Target AET (i.e. storescp)
+                                    '--call', _REMOTE['DicomAet'],     # Called AET (i.e. Orthanc)
+                                    '--aetitle', _LOCAL['DicomAet'],   # Calling AET (i.e. storescp)
                                     _REMOTE['Server'], str(_REMOTE['DicomPort'])  ] + args,
                                   stderr=subprocess.PIPE)
 
         UploadInstance(_REMOTE, 'Multiframe.dcm')
         
         self.assertEqual(0, len(DoGet(_LOCAL, '/patients')))
-        #CallMoveScu([ '--patient', '-k', '0008,0052=PATIENT', '-k', 'PatientID=none' ])
+        CallMoveScu([ '--patient', '-k', '0008,0052=PATIENT', '-k', 'PatientID=none' ])
         self.assertEqual(0, len(DoGet(_LOCAL, '/patients')))
         CallMoveScu([ '--patient', '-k', '0008,0052=PATIENT', '-k', 'PatientID=12345678' ])
         self.assertEqual(1, len(DoGet(_LOCAL, '/patients')))
@@ -1715,3 +1714,10 @@
             self.assertEqual('My Medical Device', re.search('"StationName">(.*?)<', routed).group(1).strip())
             self.assertEqual(None, re.search('"MilitaryRank"', routed))
             self.assertEqual(None, re.search('"0051,0010"', routed))  # A private tag
+
+
+    def test_storescu_rf(self):
+        i = UploadInstance(_REMOTE, 'KarstenHilbertRF.dcm')['ID']
+        self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
+        j = DoPost(_REMOTE, '/modalities/orthanctest/store', str(i), 'text/plain')
+        self.assertEqual(1, len(DoGet(_LOCAL, '/instances')))