Changeset 8809e48 in sasview for sansmodels/src/sans/models/test/utest_newstylemodels.py

Timestamp:

Oct 15, 2008 1:01:06 PM (16 years ago)

Author:

Mathieu Doucet <doucetm@…>

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:

00353b4

Parents:

ae60f86

Message:

Updated cloning

File:

• sansmodels/src/sans/models/test/utest_newstylemodels.py (modified) (3 diffs)

sansmodels/src/sans/models/test/utest_newstylemodels.py

@@ -22 +22 @@
         return self.params['scale']*x
 
-from sans.models.BaseModel import BaseModel,ParameterProperty
+from sans.models.BaseModel import BaseModel, Parameter, ParameterProperty
 class NewTestModel(BaseModel):
     scale = ParameterProperty('scale')
@@ -31 +31 @@
         self.parameters['scale'] = Parameter('scale', 4.0) 
         
-    def run(self, x):
+        
+    def runXY(self, x):
         return self.scale*x
         
-
+class TestBogusModel(unittest.TestCase):
+    def setUp(self):
+        self.model = NewTestModel()
+        
+    def test_call(self):
+        self.assertEqual(self.model(1), 4.0)
+        self.model.scale = 1.0
+        self.assertEqual(self.model(1), 1.0)
+        self.model.setParam('scale',2.0)
+        self.assertEqual(self.model(1), 2.0)
+        self.assertEqual(self.model.getParam('scale'), 2.0)
+        
 class TestBaseModel(unittest.TestCase):
     """
@@ -66 +78 @@
         
         
-        print self.model.parameters
         
         print self.model(0.001)
+        print self.model.parameters['length']
         self.model.setParam("length", 250.0)
+        self.assertEquals(self.model.getParam("length"), 250.0)
+        
+        print self.model.parameters['length']
         print self.model(0.001)