reference run can now be given as string ('first', 'last', 'middle). Also added rudimentary tests

Author: oliver-contier

nipype/workflows/fmri/fsl/preprocess.py

@@ -19,7 +19,7 @@ def getthreshop(thresh):
 def pickrun(files, whichrun):
     """pick file from list of files"""
 
-    filemap = {'first': 0, 'last': -1, 'middle' :len(files) // 2}
+    filemap = {'first': 0, 'last': -1, 'middle': len(files) // 2}
 
     if isinstance(whichrun, str):
         if whichrun not in filemap.keys():

nipype/workflows/fmri/fsl/tests/test_preprocess.py

@@ -4,13 +4,22 @@
 
 
 def test_pickrun():
-    files = ['1', '2', '3']
+    files = ['1', '2', '3', '4']
     assert pickrun(files, 0) == '1'
-    assert pickrun(files, -1) == '3'
+    assert pickrun(files, 'first') == '1'
+    assert pickrun(files, -1) == '4'
+    assert pickrun(files, 'last') == '4'
+    assert pickrun(files, 'middle') == '3'
 
 
 def test_create_featreg_preproc():
-    # smoke test
+    """smoke test"""
     wf = create_featreg_preproc(whichrun=0)
-    wf.get_node('extractref')
-    assert wf._get_dot()
+
+    # test type
+    import nipype
+    assert type(wf) == nipype.pipeline.engine.Workflow
+
+    # test methods
+    assert wf.get_node('extractref')
+    assert wf._get_dot()