Changeset 8c9ffde in sasview for test/sasmodels/test/utest_extra_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_extra_models.py (moved) (moved from test/sansmodels/test/utest_extra_models.py) (18 diffs)

test/sasmodels/test/utest_extra_models.py

@@ -10 +10 @@
     """
     def setUp(self):
-        from sans.models.PolymerExclVolume import PolymerExclVolume
+        from sas.models.PolymerExclVolume import PolymerExclVolume
         self.model= PolymerExclVolume()
         
@@ -24 +24 @@
     """
     def setUp(self):
-        from sans.models.RPA10Model import RPA10Model
+        from sas.models.RPA10Model import RPA10Model
         self.model0= RPA10Model(0)
         self.model1= RPA10Model(1)
@@ -92 +92 @@
     """
     def setUp(self):
-        from sans.models.BarBellModel import BarBellModel
+        from sas.models.BarBellModel import BarBellModel
         self.model= BarBellModel()
         
@@ -106 +106 @@
     """
     def setUp(self):
-        from sans.models.CappedCylinderModel import CappedCylinderModel
+        from sas.models.CappedCylinderModel import CappedCylinderModel
         self.model= CappedCylinderModel()
         
@@ -121 +121 @@
     """
     def setUp(self):
-        from sans.models.LamellarPCrystalModel import LamellarPCrystalModel
+        from sas.models.LamellarPCrystalModel import LamellarPCrystalModel
         self.model= LamellarPCrystalModel()
         
@@ -138 +138 @@
     """
     def setUp(self):
-        from sans.models.SCCrystalModel import SCCrystalModel
+        from sas.models.SCCrystalModel import SCCrystalModel
         self.model= SCCrystalModel()
         
@@ -153 +153 @@
     """
     def setUp(self):
-        from sans.models.FCCrystalModel import FCCrystalModel
+        from sas.models.FCCrystalModel import FCCrystalModel
         self.model= FCCrystalModel()
         
@@ -169 +169 @@
     """
     def setUp(self):
-        from sans.models.BCCrystalModel import BCCrystalModel
+        from sas.models.BCCrystalModel import BCCrystalModel
         self.model= BCCrystalModel()
         
@@ -185 +185 @@
     """
     def setUp(self):
-        from sans.models.GuinierPorodModel import GuinierPorodModel 
+        from sas.models.GuinierPorodModel import GuinierPorodModel 
         self.model= GuinierPorodModel()
         
@@ -200 +200 @@
     """
     def setUp(self):
-        from sans.models.GaussLorentzGelModel import GaussLorentzGelModel
+        from sas.models.GaussLorentzGelModel import GaussLorentzGelModel
         self.model= GaussLorentzGelModel()
         
@@ -216 +216 @@
     """
     def setUp(self):
-        from sans.models.TwoPowerLawModel import TwoPowerLawModel
+        from sas.models.TwoPowerLawModel import TwoPowerLawModel
         self.model= TwoPowerLawModel()
         
@@ -231 +231 @@
     """
     def setUp(self):
-        from sans.models.TwoLorentzianModel import TwoLorentzianModel
+        from sas.models.TwoLorentzianModel import TwoLorentzianModel
         self.model= TwoLorentzianModel()
         
@@ -247 +247 @@
     """
     def setUp(self):
-        from sans.models.CorrLengthModel import CorrLengthModel
+        from sas.models.CorrLengthModel import CorrLengthModel
         self.model= CorrLengthModel()
         
@@ -263 +263 @@
     """
     def setUp(self):
-        from sans.models.BroadPeakModel import BroadPeakModel
+        from sas.models.BroadPeakModel import BroadPeakModel
         self.model= BroadPeakModel()
         
@@ -278 +278 @@
     """
     def setUp(self):
-        from sans.models.FractalCoreShellModel import FractalCoreShellModel
+        from sas.models.FractalCoreShellModel import FractalCoreShellModel
         self.model= FractalCoreShellModel()
         
@@ -291 +291 @@
     def test1DSchulzDispersion(self):      
         # Same test w/ test1D up there but w/ Schulzdispersion
-        from sans.models.dispersion_models import SchulzDispersion
+        from sas.models.dispersion_models import SchulzDispersion
         disp = SchulzDispersion()
         self.model.set_dispersion('radius', disp)
@@ -311 +311 @@
     """
     def setUp(self):
-        from sans.models.UnifiedPowerRgModel import UnifiedPowerRgModel
+        from sas.models.UnifiedPowerRgModel import UnifiedPowerRgModel
         self.model1= UnifiedPowerRgModel(1)
         self.model4= UnifiedPowerRgModel(4)
@@ -353 +353 @@
     """
     def setUp(self):
-        from sans.models.CSParallelepipedModel import CSParallelepipedModel
+        from sas.models.CSParallelepipedModel import CSParallelepipedModel
         self.model= CSParallelepipedModel()