updated tests

Author: chrisgorgo

nipype/interfaces/fsl/tests/test_auto_BEDPOSTX5.py

@@ -8,21 +8,18 @@ def test_BEDPOSTX5_inputs():
     ),
     args=dict(argstr='%s',
     ),
-    burn_in=dict(argstr='--burnin=%d',
+    burn_in=dict(argstr='-b %d',
     ),
     burn_in_no_ard=dict(argstr='--burninnoard=%d',
     ),
-    bvals=dict(argstr='--bvals=%s',
-    mandatory=True,
+    bvals=dict(mandatory=True,
     ),
-    bvecs=dict(argstr='--bvecs=%s',
-    mandatory=True,
+    bvecs=dict(mandatory=True,
     ),
     cnlinear=dict(argstr='--cnonlinear',
     xor=('no_spat', 'non_linear', 'cnlinear'),
     ),
-    dwi=dict(argstr='--data=%s',
-    mandatory=True,
+    dwi=dict(mandatory=True,
     ),
     environ=dict(nohash=True,
     usedefault=True,
@@ -36,25 +33,24 @@ def test_BEDPOSTX5_inputs():
     force_dir=dict(argstr='--forcedir',
     usedefault=True,
     ),
-    fudge=dict(argstr='--fudge=%d',
+    fudge=dict(argstr='-w %d',
     ),
     gradnonlin=dict(argstr='-g',
     ),
     ignore_exception=dict(nohash=True,
     usedefault=True,
     ),
     logdir=dict(argstr='--logdir=%s',
-    usedefault=True,
     ),
-    mask=dict(argstr='--mask=%s',
-    mandatory=True,
+    mask=dict(mandatory=True,
     ),
-    model=dict(argstr='--model=%d',
+    model=dict(argstr='-model %d',
     ),
-    n_fibres=dict(argstr='--nfibres=%d',
+    n_fibres=dict(argstr='-n %d',
+    mandatory=True,
     usedefault=True,
     ),
-    n_jumps=dict(argstr='--njumps=%d',
+    n_jumps=dict(argstr='-j %d',
     ),
     no_ard=dict(argstr='--noard',
     xor=('no_ard', 'all_ard'),
@@ -73,7 +69,7 @@ def test_BEDPOSTX5_inputs():
     output_type=dict(),
     rician=dict(argstr='--rician',
     ),
-    sample_every=dict(argstr='--sampleevery=%d',
+    sample_every=dict(argstr='-s %d',
     ),
     seed=dict(argstr='--seed=%d',
     ),
@@ -90,23 +86,16 @@ def test_BEDPOSTX5_inputs():
             yield assert_equal, getattr(inputs.traits()[key], metakey), value
 
 def test_BEDPOSTX5_outputs():
-    output_map = dict(d_stdsamples=dict(),
-    dsamples=dict(),
-    dyads=dict(),
-    dyads_disp=dict(),
-    fsamples=dict(),
+    output_map = dict(dyads=dict(),
+    dyads_dispersion=dict(),
     mean_S0samples=dict(),
-    mean_d_stdsamples=dict(),
     mean_dsamples=dict(),
     mean_fsamples=dict(),
     mean_phsamples=dict(),
-    mean_tausamples=dict(),
     mean_thsamples=dict(),
     merged_fsamples=dict(),
     merged_phsamples=dict(),
     merged_thsamples=dict(),
-    phsamples=dict(),
-    thsamples=dict(),
     )
     outputs = BEDPOSTX5.output_spec()
 

nipype/interfaces/fsl/tests/test_auto_FSLXCommand.py

@@ -50,6 +50,7 @@ def test_FSLXCommand_inputs():
     model=dict(argstr='--model=%d',
     ),
     n_fibres=dict(argstr='--nfibres=%d',
+    mandatory=True,
     usedefault=True,
     ),
     n_jumps=dict(argstr='--njumps=%d',
@@ -82,12 +83,9 @@ def test_FSLXCommand_inputs():
             yield assert_equal, getattr(inputs.traits()[key], metakey), value
 
 def test_FSLXCommand_outputs():
-    output_map = dict(d_stdsamples=dict(),
-    dsamples=dict(),
-    dyads=dict(),
+    output_map = dict(dyads=dict(),
     fsamples=dict(),
     mean_S0samples=dict(),
-    mean_d_stdsamples=dict(),
     mean_dsamples=dict(),
     mean_fsamples=dict(),
     mean_tausamples=dict(),

nipype/interfaces/fsl/tests/test_auto_XFibres5.py

@@ -52,6 +52,7 @@ def test_XFibres5_inputs():
     model=dict(argstr='--model=%d',
     ),
     n_fibres=dict(argstr='--nfibres=%d',
+    mandatory=True,
     usedefault=True,
     ),
     n_jumps=dict(argstr='--njumps=%d',
@@ -84,12 +85,9 @@ def test_XFibres5_inputs():
             yield assert_equal, getattr(inputs.traits()[key], metakey), value
 
 def test_XFibres5_outputs():
-    output_map = dict(d_stdsamples=dict(),
-    dsamples=dict(),
-    dyads=dict(),
+    output_map = dict(dyads=dict(),
     fsamples=dict(),
     mean_S0samples=dict(),
-    mean_d_stdsamples=dict(),
     mean_dsamples=dict(),
     mean_fsamples=dict(),
     mean_tausamples=dict(),