Changeset b345c45 in sasview for Invariant/test

Timestamp:

Jan 9, 2010 12:35:38 PM (15 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:

46d50ca

Parents:

277aab4e

Message:

invariant: minor improvements to unit tests.

File:

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

Invariant/test/utest_use_cases.py

@@ -9 +9 @@
 
 class Data1D:
-    print "I am not of type Dataloader.Data1D"
+    pass
     
 class TestLineFit(unittest.TestCase):
@@ -96 +96 @@
     def test_wrong_data(self):
         """ test receiving Data1D not of type loader"""
+        # That just doesn;t make sense
         
         wrong_data= Data1D()
+        invariant.InvariantCalculator(wrong_data)
+        
         try:
             self.assertRaises(ValueError,invariant.InvariantCalculator(wrong_data))
@@ -104 +107 @@
         else: raise ValueError, "fail to raise exception when expected"
     
+        print "test"
+        self.assertRaises(ValueError,invariant.InvariantCalculator, wrong_data )
         
     def test_use_case_1(self):
@@ -439 +444 @@
         
         # Get the volume fraction and surface
-        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"
+        self.assertRaises(RuntimeError, inv.get_volume_fraction_with_error, 2.6e-6)
+        
+        # Check that an exception is raised when the 'surface' is not defined
+        self.assertRaises(RuntimeError, inv.get_surface_with_error, 2.6e-6, 2)
+
         # Test results
         self.assertAlmostEquals(qstar, 0.0045773,2)
+        
         
        
@@ -472 +470 @@
         
         # Get the volume fraction and surface
-        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"
+        self.assertRaises(RuntimeError, inv.get_volume_fraction_with_error, 2.6e-6)
+        self.assertRaises(RuntimeError, inv.get_surface_with_error, 2.6e-6, 2)
+        
         # Test results
         self.assertAlmostEquals(qstar, 0.00460319,3)