Changeset ae60f86 in sasview for sansmodels/src/sans/models/test/utest_models.py

Timestamp:

Oct 14, 2008 6:13:28 AM (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:

8809e48

Parents:

4fe4394

Message:

changing base model

File:

• sansmodels/src/sans/models/test/utest_models.py (modified) (4 diffs)

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

@@ -66 +66 @@
         
     def testIO_add(self):
+        # version 0.5.0: No longer supported
+        return
         from sans.models.ModelFactory import ModelFactory
         from sans.models.ModelIO import ModelIO
@@ -79 +81 @@
         
     def testIO_add2(self):
+        # version 0.5.0: No longer supported
+        return
         from sans.models.ModelFactory import ModelFactory
         #from sans.models.ModelIO import ModelIO
@@ -109 +113 @@
         self.assertAlmostEqual(self.comp.run(0.2), 0.041761386790780453, 4)
         
-class TestAddition(unittest.TestCase):
-    """Unit tests for Model Factory"""
-    
-    def setUp(self):
-        from sans.models.ModelFactory import ModelFactory
-        self.comp1 = ModelFactory().getModel('CylinderModel')
-        self.comp2 = ModelFactory().getModel('CylinderModel')
-        self.comp3 = self.comp1+self.comp2
-        
-    def test1D(self):
-        """ Test 1D model of a cylinder """
-        self.assertAlmostEqual(self.comp3.run(0.2), 2*0.041761386790780453, 4)
-        
  
 class TestGaussian(unittest.TestCase):
@@ -230 +221 @@
         
     def testFunction(self):
+        # version 0.5.0: No longer supported
+        return
         from sans.models.Sin import Sin
         s = Sin()