# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1445332884 -7200
# Node ID c5f8a6b0d85e10f2279c4eb2346d7a5260c3033e
# Parent  e0d1ee04119fcf0e98f3006593b1ab0cbb925af4
test_incoming_movescu_accession

diff -r e0d1ee04119f -r c5f8a6b0d85e Tests/Tests.py
--- a/Tests/Tests.py	Tue Oct 13 16:10:46 2015 +0200
+++ b/Tests/Tests.py	Tue Oct 20 11:21:24 2015 +0200
@@ -77,6 +77,15 @@
     return True
 
 
+def CallMoveScu(args):
+    subprocess.check_call([ FindExecutable('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)
+                            _REMOTE['Server'], str(_REMOTE['DicomPort'])  ] + args,
+                          stderr=subprocess.PIPE)
+
+
 
 def GenerateTestSequence():
     return [
@@ -1038,14 +1047,6 @@
         
 
     def test_incoming_movescu(self):
-        def CallMoveScu(args):
-            subprocess.check_call([ FindExecutable('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)
-                                    _REMOTE['Server'], str(_REMOTE['DicomPort'])  ] + args,
-                                  stderr=subprocess.PIPE)
-
         UploadInstance(_REMOTE, 'Multiframe.dcm')
         
         self.assertEqual(0, len(DoGet(_LOCAL, '/patients')))
@@ -2452,3 +2453,16 @@
         self.assertEqual('/instances/%s/file' % j, o['Dicom'][1])
         self.assertEqual('/instances/%s/frames/0' % i, o['Slices'][0])
         self.assertEqual('/instances/%s/frames/0' % j, o['Slices'][1])
+
+
+    def test_incoming_movescu_accession(self):
+        UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
+        
+        self.assertEqual(0, len(DoGet(_LOCAL, '/patients')))
+        CallMoveScu([ '--study', '-k', '0008,0052=STUDY', '-k', 'AccessionNumber=nope' ])
+        self.assertEqual(0, len(DoGet(_LOCAL, '/patients')))
+        CallMoveScu([ '--study', '-k', '0008,0052=PATIENT', '-k', 'AccessionNumber=A10003245599' ])
+        self.assertEqual(0, len(DoGet(_LOCAL, '/patients')))
+        CallMoveScu([ '--study', '-k', '0008,0052=STUDY', '-k', 'AccessionNumber=A10003245599' ])
+        self.assertEqual(1, len(DoGet(_LOCAL, '/patients')))
+