update autotests and make naming consistent

Author: rciric

nipype/algorithms/confounds.py

@@ -1278,7 +1278,7 @@ def compute_noise_components(imgseries, mask_images, components_criterion=0.5,
             components = u[:, :num_components]
             metadata = {
                 'mask': np.array([i] * num_components),
-                'singular_values': s[:num_components],
+                'singular_value': s[:num_components],
                 'variance_explained': variance_explained[:num_components],
                 'cumulative_variance_explained':
                     cumulative_variance_explained[:num_components]
@@ -1287,8 +1287,8 @@ def compute_noise_components(imgseries, mask_images, components_criterion=0.5,
             components = np.hstack((components, u[:, :num_components]))
             metadata['mask'] = np.hstack((metadata['mask'],
                                           [i] * num_components))
-            metadata['singular_values'] = (
-                np.hstack((metadata['singular_values'], s[:num_components])))
+            metadata['singular_value'] = (
+                np.hstack((metadata['singular_value'], s[:num_components])))
             metadata['variance_explained'] = (
                 np.hstack((metadata['variance_explained'],
                            variance_explained[:num_components])))

nipype/algorithms/tests/test_auto_ACompCor.py

@@ -15,6 +15,7 @@ def test_ACompCor_inputs():
             requires=['mask_files'],
             xor=['merge_method'],
         ),
+        mask_names=dict(),
         merge_method=dict(
             requires=['mask_files'],
             xor=['mask_index'],
@@ -24,6 +25,7 @@ def test_ACompCor_inputs():
         realigned_file=dict(mandatory=True, ),
         regress_poly_degree=dict(usedefault=True, ),
         repetition_time=dict(),
+        save_metadata=dict(),
         save_pre_filter=dict(),
         use_regress_poly=dict(
             deprecated='0.15.0',
@@ -38,6 +40,7 @@ def test_ACompCor_inputs():
 def test_ACompCor_outputs():
     output_map = dict(
         components_file=dict(),
+        metadata_file=dict(),
         pre_filter_file=dict(),
     )
     outputs = ACompCor.output_spec()

nipype/algorithms/tests/test_auto_TCompCor.py

@@ -15,6 +15,7 @@ def test_TCompCor_inputs():
             requires=['mask_files'],
             xor=['merge_method'],
         ),
+        mask_names=dict(),
         merge_method=dict(
             requires=['mask_files'],
             xor=['mask_index'],
@@ -25,6 +26,7 @@ def test_TCompCor_inputs():
         realigned_file=dict(mandatory=True, ),
         regress_poly_degree=dict(usedefault=True, ),
         repetition_time=dict(),
+        save_metadata=dict(),
         save_pre_filter=dict(),
         use_regress_poly=dict(
             deprecated='0.15.0',
@@ -40,6 +42,7 @@ def test_TCompCor_outputs():
     output_map = dict(
         components_file=dict(),
         high_variance_masks=dict(),
+        metadata_file=dict(),
         pre_filter_file=dict(),
     )
     outputs = TCompCor.output_spec()