diff Plugins/Worklists/Run.py @ 93:fff2b4a24b5f

test of sequences in worklists
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 08 Dec 2016 19:58:28 +0100
parents ba5619c3941d
children 09afe3616660
line wrap: on
line diff
--- a/Plugins/Worklists/Run.py	Thu Dec 08 12:46:04 2016 +0100
+++ b/Plugins/Worklists/Run.py	Thu Dec 08 19:58:28 2016 +0100
@@ -70,13 +70,13 @@
             os.remove(os.path.join(WORKING, f))
 
 def AddToDatabase(source):
-    subprocess.check_call([ 'dump2dcm', '-g', '--write-xfer-little',
+    subprocess.check_call([ 'dump2dcm', '--write-xfer-little',
                             os.path.join(DATABASE, source),
                             os.path.join(WORKING, os.path.basename(source) + '.wl') ])
 
 def RunQuery(source, ignoreTags):
     with tempfile.NamedTemporaryFile() as f:
-        subprocess.check_call([ 'dump2dcm', '-g', '--write-xfer-little',
+        subprocess.check_call([ 'dump2dcm', '--write-xfer-little',
                                 os.path.join(DATABASE, source), f.name ])
 
         a = subprocess.check_output([ 'findscu', '-v', '--call', 'ORTHANC', '-aet', 'ORTHANCTEST',
@@ -175,6 +175,16 @@
                 self.assertTrue(CompareAnswers(expected, answers))
 
 
+    def test_vet(self):
+        AddToDatabase('Sequences/STATION_AET/orig.7705.dump')
+        AddToDatabase('Sequences/STATION_AET/orig.7814.dump')
+        AddToDatabase('Sequences/STATION_AET/orig.7814.without.seq.dump')
+        
+        self.assertEqual(2, len(RunQuery('Sequences/Queries/7814.without.length.dump', [])))
+        self.assertEqual(2, len(RunQuery('Sequences/Queries/7814.without.seq.dump', [])))
+        self.assertEqual(2, len(RunQuery('Sequences/Queries/orig.7814.dump', [])))
+
+
 
 try:
     print('\nStarting the tests...')