fixed tests

Author: chrisgorgo

nipype/interfaces/spm/preprocess.py

@@ -902,11 +902,11 @@ class NewSegment(SPMCommand):
     def __init__(self, **inputs):
         version = Info.version()
         if version and version['name'] == "SPM12":
-            self._jobtype = 'tools'
-            self._jobname = 'oldseg'
-        else:
             self._jobtype = 'spatial'
             self._jobname = 'preproc'
+        else:
+            self._jobtype = 'tools'
+            self._jobname = 'preproc8'
 
         SPMCommand.__init__(self, **inputs)
 

nipype/interfaces/spm/tests/test_preprocess.py

@@ -106,20 +106,20 @@ def test_normalize12_list_outputs():
 @skipif(no_spm)
 def test_segment():
     if spm.Info.version()['name'] == "SPM12":
-        yield assert_equal, spm.Segment._jobtype, 'tools'
-        yield assert_equal, spm.Segment._jobname, 'oldseg'
+        yield assert_equal, spm.Segment()._jobtype, 'tools'
+        yield assert_equal, spm.Segment()._jobname, 'oldseg'
     else:
-        yield assert_equal, spm.Segment._jobtype, 'spatial'
-        yield assert_equal, spm.Segment._jobname, 'preproc'
+        yield assert_equal, spm.Segment()._jobtype, 'spatial'
+        yield assert_equal, spm.Segment()._jobname, 'preproc'
 
 @skipif(no_spm)
 def test_newsegment():
     if spm.Info.version()['name'] == "SPM12":
-        yield assert_equal, spm.NewSegment._jobtype, 'spatial'
-        yield assert_equal, spm.NewSegment._jobname, 'preproc'
+        yield assert_equal, spm.NewSegment()._jobtype, 'spatial'
+        yield assert_equal, spm.NewSegment()._jobname, 'preproc'
     else:
-        yield assert_equal, spm.NewSegment._jobtype, 'tools'
-        yield assert_equal, spm.NewSegment._jobname, 'preproc8'
+        yield assert_equal, spm.NewSegment()._jobtype, 'tools'
+        yield assert_equal, spm.NewSegment()._jobname, 'preproc8'
 
 
 def test_smooth():