Changeset 68a2c31 in sasview for Invariant

Timestamp:

Dec 17, 2009 5:18:40 PM (14 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

0957dbdb

Parents:

6311713

Message:

making some test pass

File:

• Invariant/test/utest_use_cases.py (modified) (2 diffs)

Invariant/test/utest_use_cases.py

@@ -363 +363 @@
         
         # Get the volume fraction and surface
-        #This calculation should have an error.
-        #v, dv = inv.get_volume_fraction_with_error(contrast=2.6e-6)
-        #s, ds = inv.get_surface_with_error(contrast=2.6e-6, porod_const=2)
-        
+        try:
+            self.assertRaises(RuntimeError,
+                              inv.get_volume_fraction_with_error(contrast=2.6e-6))
+        except RuntimeError, msg:
+            print "test pass : volume fraction is not defined for this data"+ str(msg)
+        else: raise ValueError, "fail to raise exception when expected"
+        
+        try:
+            self.assertRaises(RuntimeError,
+                 inv.get_surface_with_error(contrast=2.6e-6, porod_const=2))
+        except RuntimeError, msg:
+            print "test pass : surface is not defined for this data"+ str(msg)
+        else: raise ValueError, "fail to raise exception when expected"
         # Test results
         self.assertAlmostEquals(qstar, 0.0045773,2)
-        #self.assertAlmostEquals(v, 0.127225804)
-        #self.assertAlmostEquals(s+ _ERR_SURFACE, 9.42e+2, 1)
+        
        
     def test_use_case_5(self):
@@ -388 +396 @@
         
         # Get the volume fraction and surface
-        #This calculation should have an error.
-        #v, dv = inv.get_volume_fraction_with_error(contrast=2.6e-6)
-        #s, ds = inv.get_surface_with_error(contrast=2.6e-6, porod_const=2)
-        
+        try:
+            self.assertRaises(RuntimeError,
+                              inv.get_volume_fraction_with_error(contrast=2.6e-6))
+        except RuntimeError, msg:
+            print "test pass : volume fraction is not defined for this data"+ str(msg)
+        else: raise ValueError, "fail to raise exception when expected"
+        
+        try:
+            self.assertRaises(RuntimeError,
+                 inv.get_surface_with_error(contrast=2.6e-6, porod_const=2))
+        except RuntimeError, msg:
+            print "test pass : surface is not defined for this data"+ str(msg)
+        else: raise ValueError, "fail to raise exception when expected"
         # Test results
         self.assertAlmostEquals(qstar, 0.00460319,3)
-        #self.assertAlmostEquals(v, 0.202846825)
-        #self.assertAlmostEquals(s+ _ERR_SURFACE, 9.42e+2, 1)
+