# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1434530544 -7200
# Node ID 19eb87a4568578b83c3d4a748c79c1af45173096
# Parent  292a46fe374c03cbb1dbe4f753dd99f907e9ee61
test_images

diff -r 292a46fe374c -r 19eb87a45685 Database/Brainix/Flair/IM-0001-0001.dcm
Binary file Database/Brainix/Flair/IM-0001-0001.dcm has changed
diff -r 292a46fe374c -r 19eb87a45685 Database/Brainix/Flair/IM-0001-0002.dcm
Binary file Database/Brainix/Flair/IM-0001-0002.dcm has changed
diff -r 292a46fe374c -r 19eb87a45685 Database/Brainix/Flair/IM-0001-0003.dcm
Binary file Database/Brainix/Flair/IM-0001-0003.dcm has changed
diff -r 292a46fe374c -r 19eb87a45685 Database/Brainix/Flair/IM-0001-0004.dcm
Binary file Database/Brainix/Flair/IM-0001-0004.dcm has changed
diff -r 292a46fe374c -r 19eb87a45685 Database/Brainix/Flair/IM-0001-0005.dcm
Binary file Database/Brainix/Flair/IM-0001-0005.dcm has changed
diff -r 292a46fe374c -r 19eb87a45685 Database/Brainix/Flair/IM-0001-0006.dcm
Binary file Database/Brainix/Flair/IM-0001-0006.dcm has changed
diff -r 292a46fe374c -r 19eb87a45685 Database/Brainix/Flair/IM-0001-0007.dcm
Binary file Database/Brainix/Flair/IM-0001-0007.dcm has changed
diff -r 292a46fe374c -r 19eb87a45685 Database/Brainix/Flair/IM-0001-0008.dcm
Binary file Database/Brainix/Flair/IM-0001-0008.dcm has changed
diff -r 292a46fe374c -r 19eb87a45685 Database/Brainix/Flair/IM-0001-0009.dcm
Binary file Database/Brainix/Flair/IM-0001-0009.dcm has changed
diff -r 292a46fe374c -r 19eb87a45685 Database/Brainix/Flair/IM-0001-0010.dcm
Binary file Database/Brainix/Flair/IM-0001-0010.dcm has changed
diff -r 292a46fe374c -r 19eb87a45685 Database/Brainix/Flair/IM-0001-0011.dcm
Binary file Database/Brainix/Flair/IM-0001-0011.dcm has changed
diff -r 292a46fe374c -r 19eb87a45685 Database/Brainix/Flair/IM-0001-0012.dcm
Binary file Database/Brainix/Flair/IM-0001-0012.dcm has changed
diff -r 292a46fe374c -r 19eb87a45685 Database/Brainix/Flair/IM-0001-0013.dcm
Binary file Database/Brainix/Flair/IM-0001-0013.dcm has changed
diff -r 292a46fe374c -r 19eb87a45685 Database/Brainix/Flair/IM-0001-0014.dcm
Binary file Database/Brainix/Flair/IM-0001-0014.dcm has changed
diff -r 292a46fe374c -r 19eb87a45685 Database/Brainix/Flair/IM-0001-0015.dcm
Binary file Database/Brainix/Flair/IM-0001-0015.dcm has changed
diff -r 292a46fe374c -r 19eb87a45685 Database/Brainix/Flair/IM-0001-0016.dcm
Binary file Database/Brainix/Flair/IM-0001-0016.dcm has changed
diff -r 292a46fe374c -r 19eb87a45685 Database/Brainix/Flair/IM-0001-0017.dcm
Binary file Database/Brainix/Flair/IM-0001-0017.dcm has changed
diff -r 292a46fe374c -r 19eb87a45685 Database/Brainix/Flair/IM-0001-0018.dcm
Binary file Database/Brainix/Flair/IM-0001-0018.dcm has changed
diff -r 292a46fe374c -r 19eb87a45685 Database/Brainix/Flair/IM-0001-0019.dcm
Binary file Database/Brainix/Flair/IM-0001-0019.dcm has changed
diff -r 292a46fe374c -r 19eb87a45685 Database/Brainix/Flair/IM-0001-0020.dcm
Binary file Database/Brainix/Flair/IM-0001-0020.dcm has changed
diff -r 292a46fe374c -r 19eb87a45685 Database/Brainix/Flair/IM-0001-0021.dcm
Binary file Database/Brainix/Flair/IM-0001-0021.dcm has changed
diff -r 292a46fe374c -r 19eb87a45685 Database/Brainix/Flair/IM-0001-0022.dcm
Binary file Database/Brainix/Flair/IM-0001-0022.dcm has changed
diff -r 292a46fe374c -r 19eb87a45685 Database/Phenix/IM-0001-0001.dcm
Binary file Database/Phenix/IM-0001-0001.dcm has changed
diff -r 292a46fe374c -r 19eb87a45685 Database/README.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Database/README.txt	Wed Jun 17 10:42:24 2015 +0200
@@ -0,0 +1,14 @@
+=========================
+Source of the test images
+=========================
+
+Many of the images that are used by the integration tests of Orthanc
+come from the OsiriX samples available at:
+http://www.osirix-viewer.com/datasets/
+
+Other images were posted by external contributors or generated
+manually. Here is the source of each set of sample images:
+
+- Brainix/* : From OsiriX, "BRAINIX".
+- DummyCT.dcm : From Osirix, "KNEE" with PixelData removed.
+- Phenix/* : From OsiriX, "PHENIX"
diff -r 292a46fe374c -r 19eb87a45685 Tests/Run.py
--- a/Tests/Run.py	Wed Jun 17 10:05:27 2015 +0200
+++ b/Tests/Run.py	Wed Jun 17 10:42:24 2015 +0200
@@ -25,8 +25,8 @@
 import unittest
 import pprint
 
-from Toolbox import *
 from Tests import *
+from Toolbox import DoGet
 
 
 ##
@@ -123,7 +123,7 @@
 try:
     print('\nStarting the tests...')
     SetOrthancParameters(LOCAL, REMOTE)
-    unittest.main(argv = [ sys.argv[0] ]) #argv = args)
+    unittest.main(argv = [ sys.argv[0] ])
 
 finally:
     print('\nDone')
diff -r 292a46fe374c -r 19eb87a45685 Tests/Tests.py
--- a/Tests/Tests.py	Wed Jun 17 10:05:27 2015 +0200
+++ b/Tests/Tests.py	Wed Jun 17 10:42:24 2015 +0200
@@ -54,7 +54,7 @@
         self.assertEqual('20070101', i['StudyDate'])
 
 
-    def test_rest_grid(self):
+    def test_upload_2(self):
         i = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID']
         instance = DoGet(_REMOTE, '/instances/%s' % i)
         self.assertEqual(i, instance['ID'])
@@ -81,4 +81,35 @@
         self.assertEqual('TWINOW', DoGet(_REMOTE, '/instances/%s/tags' % i)['0008,1010']['Value'])
 
 
+    def test_images(self):
+        i = UploadInstance(_REMOTE, 'Phenix/IM-0001-0001.dcm')['ID']
+        self.assertEqual(1, len(DoGet(_REMOTE, '/instances/%s/frames' % i)))
 
+        im = GetImage(_REMOTE, '/instances/%s/preview' % i)
+        self.assertEqual("L", im.mode)
+        self.assertEqual(512, im.size[0])
+        self.assertEqual(358, im.size[1])
+
+        im = GetImage(_REMOTE, '/instances/%s/image-uint8' % i)
+        self.assertEqual("L", im.mode)
+        self.assertEqual(512, im.size[0])
+        self.assertEqual(358, im.size[1])
+
+        im = GetImage(_REMOTE, '/instances/%s/image-uint16' % i)
+        self.assertEqual(512, im.size[0])
+        self.assertEqual(358, im.size[1])
+
+        im = GetImage(_REMOTE, '/instances/%s/frames/0/preview' % i)
+        self.assertEqual("L", im.mode)
+        self.assertEqual(512, im.size[0])
+        self.assertEqual(358, im.size[1])
+
+        im = GetImage(_REMOTE, '/instances/%s/frames/0/image-uint8' % i)
+        self.assertEqual("L", im.mode)
+        self.assertEqual(512, im.size[0])
+        self.assertEqual(358, im.size[1])
+
+        im = GetImage(_REMOTE, '/instances/%s/frames/0/image-uint16' % i)
+        self.assertEqual(512, im.size[0])
+        self.assertEqual(358, im.size[1])
+