Explorar o código

ENH: better testing of qCTKDCMTK

    /// make sure it is empty and properly initialized
Marco Nolden %!s(int64=15) %!d(string=hai) anos
pai
achega
744b7d29f5

+ 5 - 0
Libs/DICOM/Core/Resources/dicom-sample.sql

@@ -3,6 +3,11 @@
 -- For the corresponding DICOM files and more information see
 -- http://www.slicer.org/slicerWiki/index.php/DICOM:Database
 -- 
+-- Note: the semicolon at the end is necessary for the simple parser to separate
+--       the statements since the SQlite driver does not handle multiple
+--       commands per QSqlQuery::exec call!
+-- ;
+ 
 BEGIN TRANSACTION;
 CREATE TABLE 'Images' (   'Filename' VARCHAR(1024) NOT NULL ,   'SeriesInstanceUID' VARCHAR(255) NOT NULL ,   PRIMARY KEY ('Filename') );
 INSERT INTO "Images" VALUES('CTHeadAxialDicom/CTHead24.dcm','1.2.826.0.1.3680043.2.1125.1.65375240934815452318141136507497058');

+ 1 - 1
Libs/DICOM/Core/Testing/CMakeLists.txt

@@ -19,4 +19,4 @@ IF(WIN32)
 ENDIF(WIN32)
 
 ADD_TEST( qCTKDCMTKModelTest1 ${CTKDICOMCore_TESTS} qCTKDCMTKModelTest1 ../../Resources/dicom-sample.sql)
-ADD_TEST( qCTKDCMTKTest1 ${CTKDICOMCore_TESTS} qCTKDCMTKTest1 ${CMAKE_CURRENT_BINARY_DIR}/dicom.db)
+ADD_TEST( qCTKDCMTKTest1 ${CTKDICOMCore_TESTS} qCTKDCMTKTest1 ${CMAKE_CURRENT_BINARY_DIR}/dicom.db ${CMAKE_CURRENT_SOURCE_DIR}/../Resources/dicom-sample.sql)

+ 4 - 1
Libs/DICOM/Core/Testing/qCTKDCMTKTest1.cxx

@@ -14,8 +14,11 @@ int qCTKDCMTKTest1(int argc, char** argv) {
   if ( myCTK.openDatabase( argv[1]) )
     {
     out << "open db success\n";
+    /// make sure it is empty and properly initialized
     myCTK.initializeDatabase();
-    myCTK.database().close();
+    /// insert some sample data
+    myCTK.initializeDatabase(argv[2]);
+    myCTK.closeDatabase();
     }
   else
     { 

+ 0 - 1
Libs/DICOM/Core/qCTKDCMTK.cxx

@@ -82,7 +82,6 @@ bool qCTKDCMTKPrivate::executeScript(const QString& script) {
 
   for (QStringList::iterator it = sqlCommandsLines.begin(); it != sqlCommandsLines.end()-1; ++it)
   {
-    qDebug() << "Statement: " << *it ; 
     if (! (*it).startsWith("--") )
       {
       query.exec(*it);