Remove using namespace, + clean up the CMakeLists

[gdcm.git] / gdcmPython / testSuite.py

diff --git a/gdcmPython/testSuite.py b/gdcmPython/testSuite.py
index f43c216dd2422c42a14212d3ca15f175f86c3e9e..cbde0e9bd9b08632ec2b48613e08fbf4b3cdf8fd 100644 (file)
--- a/gdcmPython/testSuite.py
+++ b/gdcmPython/testSuite.py
@@ -536,8 +536,11 @@ class gdcmTestCase(unittest.TestCase):
    def _BaseTest(self, FileSet):
       for entry in FileSet:
          fileName = os.path.join(GDCM_TEST_DATA_PATH, entry[0])
-         toRead = gdcmHeader(fileName)
-         valDict = toRead.GetPubElVal()
+         reader = gdcmHeader(fileName)
+         assert reader.IsReadable(),\
+                "File '%s' is not readable by gdcmHeader" % fileName
+
+         valDict = reader.GetEntry()
          for subEntry in entry[1]:
             element = subEntry[0]
             value   = subEntry[1]
@@ -545,7 +548,6 @@ class gdcmTestCase(unittest.TestCase):
                              ("Wrong %s for file %s (got %s, shoud be %s)"
                              % (element,fileName, valDict[element], value)) )
 
-
    def testBarre(self):
       gdcmTestCase._BaseTest(self, gdcmTestCase.BarreFiles)
 
@@ -566,8 +568,8 @@ class gdcmTestCase(unittest.TestCase):
       Source.GetImageData()
       TargetFileName = "junk"
       Target = Source.WriteDcmImplVR(TargetFileName)
-      # Sign = 'c3d27238647b7eaa773bff6ea0692b54' # old signature in the file
-      Sign = 'a1e2abdc2f6abedd86b93c8b88db5203' # new signature (found on Win)
+#       Sign = 'a1e2abdc2f6abedd86b93c8b88db5203' # new signature (found on Win)
+      Sign = '849e722e004d3bb37b87ab6006509b8f' # new signature without field strip
       ComputeSign = md5.new(open(TargetFileName).read()).hexdigest()
       self.assertEqual(ComputeSign, Sign,
           ("Wrong signature for file %s (got %s, shoud be %s)"