Changeset d22da51 in sasview for DataLoader/test

Timestamp:

Jul 9, 2008 3:53:01 PM (16 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:

3dd7cce

Parents:

f8de7de

Message:

clean and more testing added

Location:

DataLoader/test

Files:

• _THETA_weights.txt (added)
• angles_flat.txt (added)
• testLoad.py (modified) (6 diffs)
• testplugings.py (modified) (2 diffs)

DataLoader/test/testLoad.py

@@ -1 +1 @@
 """
     Unit tests for DataLoader module 
+    log file "test_log.txt" contains all errors when running loader
+    It is create in the folder where test is runned
 """
+import logging
+logging.basicConfig(level=logging.DEBUG,
+                    format='%(asctime)s %(levelname)s %(message)s',
+                    filename='test_log.txt',
+                    filemode='w')
+
+
+#logger.info('oops I did it again')
 
 import unittest
@@ -38 +48 @@
     L.__setitem__('.bmp',read5)
        
+    def testLoad0(self):
+        """test reading empty file"""
+        self.assertEqual(self.L.load('empty.txt'),None)
+        
     def testLoad1(self):
-        """test reading empty file, no file can read it"""
-        self.assertEqual(self.L.load('empty.txt'),None)
-        self.assertEqual( self.L.getAcTReader('empty.txt'),None)
-         
+        """test reading 2 columns"""
+        
         #Testing loading a txt file of 2 columns, the only reader should be read1 
         xload,yload,dyload=self.L.load('test_2_columns.txt') 
@@ -55 +67 @@
             self.assertEqual(xload[i],x[i])
             self.assertEqual(yload[i],y[i])
-        self.assertEqual( self.L.getAcTReader('test_2_columns.txt'),self.read1.__class__)
+       
     
     def testLoad2(self):
-        """Testing loading a txt file of 3 columns, the only reader should be read2"""
+        """Testing loading a txt file of 3 columns"""
         xload,yload,dyload= self.L.load('test_3_columns.txt') 
         x=[0,0.204082,0.408163,0.612245,0.816327,1.02041,1.22449]    
@@ -71 +83 @@
             self.assertEqual(yload[i],y[i])
             self.assertEqual(dyload[i],dy[i])
-        self.assertEqual(self.L.getAcTReader('test_3_columns.txt'),self.read2.__class__)
+       
     
     def testload3(self):
@@ -81 +93 @@
         self.assertEqual(ymin,-0.01684257151702391)
         self.assertEqual(ymax,0.017950440578015116)
-        self.assertEqual(self.L.getAcTReader('MAR07232_rest.ASC'),self.read3.__class__)
+       
         #tested corrupted file.asc
-        self.assertEqual(self.L.load('AR07232_rest.ASC') ,None)
-    
+        try:self.L.load('AR07232_rest.ASC')
+        except ValueError,msg:
+           #logging.log(10,str(msg))
+           logging.error(str(msg))
     def testload4(self):
         """ Testing loading danse file"""
@@ -91 +105 @@
         
         self.assertEqual(data.__class__,danse_reader.ReaderInfo)
-        self.assertEqual(self.L.getAcTReader('MP_New.sans'),self.read4.__class__)
+        
         #tested corrupted file.sans
-        self.assertEqual(self.L.load('P_New.sans'),None)
-    
+        try: self.L.load('P_New.sans')
+        except ValueError,msg:
+           #logging.log(40,str(msg))
+           logging.error(str(msg))
+        #else: raise ValueError,"No error raised for missing extension"
     def testload5(self):
         """ Testing loading image file"""
         data=self.L.load('angles_flat.png')
         self.assertEqual(data.__class__,tiff_reader.ReaderInfo)
-        self.assertEqual(self.L.getAcTReader('angles_flat.png'),self.read5.__class__)
+        
+    def testload6(self):
+        """test file with unknown extension"""
+        try:self.L.load('hello.missing')
+        except ValueError,msg:
+           self.assertEqual( str(msg),"Unknown file type '.missing'")
+        else: raise ValueError,"No error raised for missing extension"
+        
+        #self.L.lookup('hello.missing')
+        try: self.L.lookup('hello.missing')
+        except ValueError,msg:
+           self.assertEqual( str(msg),"Unknown file type '.missing'")
+        else: raise ValueError,"No error raised for missing extension"
+        
+    def testload7(self):
+        """ test file containing an image but as extension .txt"""
+        self.assertEqual(self.L.load('angles_flat.txt'),None)
    
-   

DataLoader/test/testplugings.py

@@ -6 +6 @@
 import math
 import DataLoader
-from DataLoader.loader import  SingleLoader
+from DataLoader.loader import  Loader
 from DataLoader.readers import TXT3_Reader,TXT2_Reader
 from DataLoader.readers import IgorReader,danse_reader,tiff_reader
@@ -15 +15 @@
     def testplugin(self):
         """ test loading with plugging"""
-        l=SingleLoader()
+        l=Loader()
         self.assertEqual(l.__contains__('.tiff'),True)
         self.assertEqual(l.__contains__('.png'),True)
         self.assertEqual(l.__contains__('.txt'),True)
-        #self.assertEqual(l.getAcTReader('angles_flat.png'),tiff_reader.Reader)
-        #self.assertEqual(l.load('angles_flat.png').__class__,tiff_reader.ReaderInfo)
-        #print l.load('_THETA_weights.txt') 
+