add tests for printResults and formatResults

Author: cadenmyers13

tests/conftest.py

@@ -155,12 +155,12 @@ def build_recipe_one_contribution():
     profile.set_observed_profile(x, y)
     contribution = FitContribution("c1")
     contribution.set_profile(profile)
-    contribution.set_equation("A*sin(k*x + c)")
+    contribution.set_equation("amplitude*sin(wave_number*x + phase_shift)")
     recipe = FitRecipe()
     recipe.add_contribution(contribution)
-    recipe.add_variable(contribution.A, 1)
-    recipe.add_variable(contribution.k, 1)
-    recipe.add_variable(contribution.c, 1)
+    recipe.add_variable(contribution.amplitude, 1)
+    recipe.add_variable(contribution.wave_number, 1)
+    recipe.add_variable(contribution.phase_shift, 1)
     return recipe
 
 

tests/test_fitresults.py

@@ -22,6 +22,23 @@
 from diffpy.srfit.fitbase.fitrecipe import FitRecipe
 from diffpy.srfit.fitbase.fitresults import FitResults, initializeRecipe
 
+# The fit results from the recipe fixture in conftest.py
+expected_fitresults = """\
+Some quantities invalid due to missing profile uncertainty
+Overall (Chi2 and Reduced Chi2 invalid)
+------------------------------------------------------------------------------
+Residual       0.00000000
+Contributions  0.00000000
+Restraints     0.00000000
+Chi2           0.00000000
+Reduced Chi2   0.00000000
+Rw             0.00000000
+
+Variables (Uncertainties invalid)
+------------------------------------------------------------------------------
+"""
+expected_refined_variables = ["amplitude", "wave_number", "phase_shift"]
+
 
 def optimize_recipe(recipe):
     recipe.fithooks[0].verbose = 0
@@ -30,13 +47,58 @@ def optimize_recipe(recipe):
     leastsq(residuals, values)
 
 
-def test_compare_old_formatResults_with_new(build_recipe_one_contribution):
+def test_formatResults(build_recipe_one_contribution):
+    recipe = build_recipe_one_contribution
+    optimize_recipe(recipe)
+    results = FitResults(recipe)
+    actual_results_string = results.formatResults()
+    # Because slight variations in refinement, just check
+    # that the header of the results are the same.
+    assert expected_fitresults.strip() in actual_results_string.strip()
+    # check if the refined variables are in the results
+    for expected_var in expected_refined_variables:
+        assert expected_var in actual_results_string.strip()
+
+
+def test_get_results_string(build_recipe_one_contribution):
+    recipe = build_recipe_one_contribution
+    optimize_recipe(recipe)
+    results = FitResults(recipe)
+    actual_results_string = results.get_results_string()
+    # Because slight variations in refinement, just check
+    # that the header of the results are the same.
+    assert expected_fitresults.strip() in actual_results_string.strip()
+    # check if the refined variables are in the results
+    for expected_var in expected_refined_variables:
+        assert expected_var in actual_results_string.strip()
+
+
+def test_printResults(build_recipe_one_contribution, capsys):
+    recipe = build_recipe_one_contribution
+    optimize_recipe(recipe)
+    results = FitResults(recipe)
+    results.printResults()
+    actual_results = capsys.readouterr().out
+    # Because slight variations in refinement, just check
+    # that the header of the results are the same.
+    assert expected_fitresults.strip() in actual_results.strip()
+    # check if the refined variables are in the results
+    for expected_var in expected_refined_variables:
+        assert expected_var in actual_results.strip()
+
+
+def test_print_results(build_recipe_one_contribution, capsys):
     recipe = build_recipe_one_contribution
     optimize_recipe(recipe)
     results = FitResults(recipe)
-    results_dep = results.formatResults()
-    results_new = results.get_results_string()
-    assert results_dep == results_new
+    results.print_results()
+    actual_results = capsys.readouterr().out
+    # Because slight variations in refinement, just check
+    # that the header of the results are the same.
+    assert expected_fitresults.strip() in actual_results.strip()
+    # check if the refined variables are in the results
+    for expected_var in expected_refined_variables:
+        assert expected_var in actual_results.strip()
 
 
 def testInitializeFromFileName(datafile):