Changeset 8c9ffde in sasview for test/sasmodels/test/utest_models.py

Timestamp:

Feb 13, 2015 4:01:33 AM (9 years ago)

Author:

krzywon

Branches:

master, 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, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

35ec279

Parents:

3a39c2e

Message:

Found more folders with the name sans and about 50% done converting
all test files.

File:

• test/sasmodels/test/utest_models.py (moved) (moved from test/sansmodels/test/utest_models.py) (9 diffs)

test/sasmodels/test/utest_models.py

@@ -17 +17 @@
     
     def setUp(self):
-        from sans.models.CoreFourShellModel import CoreFourShellModel
-        from sans.models.CoreMultiShellModel import CoreMultiShellModel
+        from sas.models.CoreFourShellModel import CoreFourShellModel
+        from sas.models.CoreMultiShellModel import CoreMultiShellModel
         self.comp = CoreMultiShellModel(4)
         
@@ -29 +29 @@
     
     def setUp(self):
-        from sans.models.SphereModel import SphereModel
+        from sas.models.SphereModel import SphereModel
         self.comp = SphereModel()
         
@@ -45 +45 @@
     def setUp(self):
 
-        from sans.models.CylinderModel import CylinderModel
+        from sas.models.CylinderModel import CylinderModel
         self.comp = CylinderModel()
         
@@ -69 +69 @@
     
     def setUp(self):
-        from sans.models.Gaussian import Gaussian
+        from sas.models.Gaussian import Gaussian
         self.gauss= Gaussian()
         
@@ -100 +100 @@
     
     def setUp(self):
-        from sans.models.Lorentzian import Lorentzian
+        from sas.models.Lorentzian import Lorentzian
         self.lor= Lorentzian()
         
@@ -132 +132 @@
     
     def setUp(self):
-        from sans.models.Sin import Sin
+        from sas.models.Sin import Sin
         self.sin = Sin()
 
@@ -146 +146 @@
     
     def setUp(self):
-        from sans.models.Cos import Cos
+        from sas.models.Cos import Cos
         self.cos = Cos()
 
@@ -160 +160 @@
     
     def setUp(self):
-        from sans.models.Constant import Constant
+        from sas.models.Constant import Constant
         self.const = Constant()
         self.const.setParam('value',56.1)
@@ -174 +174 @@
         # version 0.5.0: No longer supported
         return
-        from sans.models.Sin import Sin
+        from sas.models.Sin import Sin
         s = Sin()
         A = self.const