Changeset 06b0138 in sasview for src/sas/qtgui/Perspectives/Fitting/UnitTesting/FittingUtilitiesTest.py

Timestamp:

Jun 8, 2017 3:12:46 AM (7 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

70080a0

Parents:

aca8418

Message:

Polydispersity support: cleanup and unit tests SASVIEW-575

File:

• src/sas/qtgui/Perspectives/Fitting/UnitTesting/FittingUtilitiesTest.py (modified) (4 diffs)

src/sas/qtgui/Perspectives/Fitting/UnitTesting/FittingUtilitiesTest.py

@@ -10 +10 @@
 from sasmodels import generate
 from sasmodels import modelinfo
+from sasmodels.sasview_model import load_standard_models
 
 # Tested module
@@ -94 +95 @@
         # Use a single-shell parameter
         model_name = "barbell"
-        kernel_module = generate.load_kernel_module(model_name)
+        models = load_standard_models()
+
+        kernel_module = generate.load_kernel_module(model_name)
+        kernel_module_o = None
+        for model in models:
+            if model.name == model_name:
+                kernel_module_o = model()
+        self.assertIsNotNone(kernel_module_o)
         barbell_parameters = modelinfo.make_parameter_table(getattr(kernel_module, 'parameters', []))
 
-        params = FittingUtilities.addParametersToModel(barbell_parameters, True)
+        params = FittingUtilities.addParametersToModel(barbell_parameters, kernel_module_o, True)
 
         # Test the resulting model
@@ -109 +117 @@
         model_name = "core_multi_shell"
         kernel_module = generate.load_kernel_module(model_name)
+        kernel_module_o = None
+        for model in models:
+            if model.name == model_name:
+                kernel_module_o = model()
+        self.assertIsNotNone(kernel_module_o)
         multi_parameters = modelinfo.make_parameter_table(getattr(kernel_module, 'parameters', []))
 
-        params = FittingUtilities.addParametersToModel(multi_parameters, False)
+        params = FittingUtilities.addParametersToModel(multi_parameters, kernel_module_o, False)
 
         # Test the resulting model
@@ -127 +140 @@
         model_name = "core_multi_shell"
         kernel_module = generate.load_kernel_module(model_name)
+        models = load_standard_models()
+        kernel_module_o = None
+        for model in models:
+            if model.name == model_name:
+                kernel_module_o = model()
+        self.assertIsNotNone(kernel_module_o)
         multi_parameters = modelinfo.make_parameter_table(getattr(kernel_module, 'parameters', []))
 
-        params = FittingUtilities.addParametersToModel(multi_parameters, True)
+        params = FittingUtilities.addParametersToModel(multi_parameters, kernel_module_o, True)
 
         # Test the resulting model