tests: fitrecipe

Author: sbillinge

tests/conftest.py

@@ -1,10 +1,12 @@
 import importlib.resources
 import json
 import logging
+import sys
 from functools import lru_cache
 from pathlib import Path
 
 import pytest
+import six
 
 import diffpy.srfit.equation.literals as literals
 from diffpy.srfit.sas.sasimport import sasimport
@@ -15,8 +17,8 @@
 @lru_cache()
 def has_sas():
     try:
-        __import__("sas.pr.invertor")
-        __import__("sas.models")
+        sasimport("sas.pr.invertor")
+        sasimport("sas.models")
         return True
     except ImportError:
         return False
@@ -25,7 +27,6 @@ def has_sas():
 # diffpy.structure
 @lru_cache()
 def has_diffpy_structure():
-    _msg_nostructure = "No module named 'diffpy.structure'"
     try:
         import diffpy.structure as m
 
@@ -40,7 +41,6 @@ def has_diffpy_structure():
 
 @lru_cache()
 def has_pyobjcryst():
-    _msg_nopyobjcryst = "No module named 'pyobjcryst'"
     try:
         import pyobjcryst as m
 
@@ -56,7 +56,6 @@ def has_pyobjcryst():
 
 @lru_cache()
 def has_diffpy_srreal():
-    _msg_nosrreal = "No module named 'diffpy.srreal'"
     try:
         import diffpy.srreal.pdfcalculator as m
 
@@ -87,7 +86,7 @@ def pyobjcryst_available():
     return has_pyobjcryst()
 
 
-@pytest.fixture
+@pytest.fixture(scope="session")
 def user_filesystem(tmp_path):
     base_dir = Path(tmp_path)
     home_dir = base_dir / "home_dir"
@@ -102,7 +101,7 @@ def user_filesystem(tmp_path):
     yield tmp_path
 
 
-@pytest.fixture
+@pytest.fixture(scope="session")
 def datafile():
     """Fixture to load a test data file from the testdata package directory."""
 
@@ -144,3 +143,19 @@ def _noObserversInGlobalBuilders():
         return rv
 
     return _noObserversInGlobalBuilders()
+
+
+@pytest.fixture(scope="session")
+def capturestdout():
+    def _capturestdout(f, *args, **kwargs):
+        """Capture the standard output from a call of function f."""
+        savestdout = sys.stdout
+        fp = six.StringIO()
+        try:
+            sys.stdout = fp
+            f(*args, **kwargs)
+        finally:
+            sys.stdout = savestdout
+        return fp.getvalue()
+
+    return _capturestdout

tests/test_fitrecipe.py

@@ -23,8 +23,6 @@
 from diffpy.srfit.fitbase.parameter import Parameter
 from diffpy.srfit.fitbase.profile import Profile
 
-from .utils import capturestdout
-
 
 class TestFitRecipe(unittest.TestCase):
 
@@ -239,32 +237,51 @@ def testResidual(self):
 
         return
 
-    def testPrintFitHook(self):
-        "check output from default PrintFitHook."
-        self.recipe.addVar(self.fitcontribution.c)
-        self.recipe.restrain("c", lb=5)
-        (pfh,) = self.recipe.getFitHooks()
-        out = capturestdout(self.recipe.scalarResidual)
-        self.assertEqual("", out)
-        pfh.verbose = 1
-        out = capturestdout(self.recipe.scalarResidual)
-        self.assertTrue(out.strip().isdigit())
-        self.assertFalse("\nRestraints:" in out)
-        pfh.verbose = 2
-        out = capturestdout(self.recipe.scalarResidual)
-        self.assertTrue("\nResidual:" in out)
-        self.assertTrue("\nRestraints:" in out)
-        self.assertFalse("\nVariables" in out)
-        pfh.verbose = 3
-        out = capturestdout(self.recipe.scalarResidual)
-        self.assertTrue("\nVariables" in out)
-        self.assertTrue("c = " in out)
-        return
-
 
 # End of class TestFitRecipe
 
+
 # ----------------------------------------------------------------------------
+def testPrintFitHook(capturestdout):
+    "check output from default PrintFitHook."
+    recipe = FitRecipe("recipe")
+    recipe.fithooks[0].verbose = 0
+
+    # Set up the Profile
+    profile = Profile()
+    x = linspace(0, pi, 10)
+    y = sin(x)
+    profile.setObservedProfile(x, y)
+
+    # Set up the FitContribution
+    fitcontribution = FitContribution("cont")
+    fitcontribution.setProfile(profile)
+    fitcontribution.setEquation("A*sin(k*x + c)")
+    fitcontribution.A.setValue(1)
+    fitcontribution.k.setValue(1)
+    fitcontribution.c.setValue(0)
+
+    recipe.addContribution(fitcontribution)
+
+    recipe.addVar(fitcontribution.c)
+    recipe.restrain("c", lb=5)
+    (pfh,) = recipe.getFitHooks()
+    out = capturestdout(recipe.scalarResidual)
+    assert "" == out
+    pfh.verbose = 1
+    out = capturestdout(recipe.scalarResidual)
+    assert out.strip().isdigit()
+    assert "\nRestraints:" not in out
+    pfh.verbose = 2
+    out = capturestdout(recipe.scalarResidual)
+    assert "\nResidual:" in out
+    assert "\nRestraints:" in out
+    assert "\nVariables" not in out
+    pfh.verbose = 3
+    out = capturestdout(recipe.scalarResidual)
+    assert "\nVariables" in out
+    assert "c = " in out
+    return
 
 
 if __name__ == "__main__":