[FIX] forgot an if stmt, improved readablility of WLoaderManager_test.h

src/dataHandler/WLoaderManager.cpp

@@ -44,11 +44,13 @@ void WLoaderManager::load( std::string fileName, boost::shared_ptr< WDataHandler
 
     if( suffix == ".nii" || suffix == ".gz" )
     {
-        // enforce that a gzipped file is has also a "nii" sub suffix
-        boost::filesystem::path p( fileName );
-        p.replace_extension( "" );
-        suffix = getSuffix( p.string() );
-        assert( suffix == ".nii" && "currently only nii files may be gzipped" );
+        if( suffix == ".gz" )  // it may be a NIfTI file too
+        {
+            boost::filesystem::path p( fileName );
+            p.replace_extension( "" );
+            suffix = getSuffix( p.string() );
+            assert( suffix == ".nii" && "currently only nii files may be gzipped" );
+        }
         WLoaderNIfTI niiLoader( fileName, dataHandler );
         boost::thread loaderThread( niiLoader );
     }

src/dataHandler/test/WLoaderManager_test.h

@@ -50,12 +50,13 @@ public:
         std::cout << "Test loading of " << fileName << "." << std::endl;
         boost::shared_ptr< WDataHandler > dataHandler =
             boost::shared_ptr< WDataHandler >( new WDataHandler() );
+        TS_ASSERT_EQUALS( dataHandler->getNumberOfSubjects(), 0 );
         WLoaderManager testLoaderManager;
         testLoaderManager.load( fileName, dataHandler );
         sleep( 4 );  // we need this to allow the thread to terminate
         // TODO(wiebel): we need to change this because loading, in the end,
         // should not always increase the number of subjects.
-        TS_ASSERT( dataHandler->getNumberOfSubjects() );
+        TS_ASSERT_EQUALS( dataHandler->getNumberOfSubjects(), 1 );
     }
 };