Index: test/sasdataloader/test/testLoad.py
===================================================================
--- test/sasdataloader/test/testLoad.py	(revision 959eb0181ad06828a748f04512f953aad5b31659)
+++ 	(revision )
@@ -1,167 +1,0 @@
-"""
-    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 unittest
-import math
-import sas.sascalc.dataloader
-from sas.sascalc.dataloader.loader import  Loader
-
-import logging
-logger = logging.getLogger(__name__)
-
-# Check whether we should test image loading on this system 
-HAS_IMAGE = False
-try:
-    import Image
-    HAS_IMAGE = True
-except:
-    logger.info("IMAGE TESTS WILL NOT BE PERFORMED: MISSING PIL MODULE")
-    
-import os.path
-
-class designtest(unittest.TestCase):
-    
-    def setUp(self):
-        self.loader = Loader()
-        
-    def test_singleton(self):
-        """
-            Testing whether Loader is truly a singleton
-        """
-        # Create a 'new' Loader
-        b = Loader()
-        self.assertEqual(self.loader._get_registry_creation_time(),
-                         b._get_registry_creation_time())
-
-class testLoader(unittest.TestCase):
-    logger.debug("Inside testLoad module")
-    
-    """ test fitting """
-    def setUp(self):
-        """
-            Set up the initial conditions before _each_ test
-            so that they all start from the same well-defined state. 
-        """
-        #Creating a loader
-        self.L=Loader()
-        
-     
-    def testLoad0(self):
-        """test reading empty file"""
-        self.assertRaises(RuntimeError, self.L.load, 'empty.txt')
-        
-    def testLoad1(self):
-        """test reading 2 columns"""
-        
-        #Testing loading a txt file of 2 columns, the only reader should be read1 
-        output=self.L.load('test_2_columns.txt') 
-        x=[2.83954,0.204082,0.408163,0.612245,0.816327,1.02041,1.22449,1.42857,1.63265]
-        y=[0.6,3.44938, 5.82026,5.27591,5.2781,5.22531,7.47487,7.85852,10.2278]
-        dx=[]
-        dy=[]
-        self.assertEqual(len(output.x),len(x))
-        self.assertEqual(len(output.y),len(y))
-        
-        for i in range(len(x)):
-            self.assertEqual(output.x[i],x[i])
-            self.assertEqual(output.y[i],y[i])
-       
-    
-    def testLoad2(self):
-        """Testing loading a txt file of 3 columns"""
-        output= self.L.load('test_3_columns.txt') 
-        x=[0,0.204082,0.408163,0.612245,0.816327,1.02041,1.22449]    
-        y=[2.83954,3.44938,5.82026,5.27591,5.2781,5.22531,7.47487]
-        dx=[]
-        dy=[0.6,0.676531,0.753061,0.829592,0.906122,0.982653,1.05918]
-        self.assertEqual(len(output.x),len(x))
-        self.assertEqual(len(output.y),len(y))
-        self.assertEqual(len(output.dy),len(dy))
-        for i in range(len(x)):
-            self.assertEqual(output.x[i],x[i])
-            self.assertEqual(output.y[i],y[i])
-            self.assertEqual(output.dy[i],dy[i])
-       
-    def testLoad2_uppercase(self):
-        """Testing loading a txt file of 3 columns"""
-        output= self.L.load('test_3_columns.TXT') 
-        x=[0,0.204082,0.408163,0.612245,0.816327,1.02041,1.22449]    
-        y=[2.83954,3.44938,5.82026,5.27591,5.2781,5.22531,7.47487]
-        dx=[]
-        dy=[0.6,0.676531,0.753061,0.829592,0.906122,0.982653,1.05918]
-        self.assertEqual(len(output.x),len(x))
-        self.assertEqual(len(output.y),len(y))
-        self.assertEqual(len(output.dy),len(dy))
-        for i in range(len(x)):
-            self.assertEqual(output.x[i],x[i])
-            self.assertEqual(output.y[i],y[i])
-            self.assertEqual(output.dy[i],dy[i])
-       
-    
-    def testload3(self):
-        """ Testing loading Igor data"""
-        #tested good file.asc
-        output= self.L.load('MAR07232_rest.ASC') 
-        self.assertEqual(output.xmin,-0.018558945804750416)
-        self.assertEqual(output.xmax, 0.016234058202440633,)
-        self.assertEqual(output.ymin,-0.01684257151702391)
-        self.assertEqual(output.ymax,0.017950440578015116)
-       
-        #tested corrupted file.asc
-        try:self.L.load('AR07232_rest.ASC')
-        except ValueError,msg:
-           #logger.log(10,str(msg))
-           logger.error(str(msg))
-
-    def testload3_lowercase(self):
-        """ Testing loading Igor data"""
-        #tested good file.asc
-        output= self.L.load('MAR07232_rest.asc') 
-        self.assertEqual(output.xmin,-0.018558945804750416)
-        self.assertEqual(output.xmax, 0.016234058202440633,)
-        self.assertEqual(output.ymin,-0.01684257151702391)
-        self.assertEqual(output.ymax,0.017950440578015116)
-       
-        #tested corrupted file.asc
-        try:self.L.load('AR07232_rest.ASC')
-        except ValueError,msg:
-           #logger.log(10,str(msg))
-           logger.error(str(msg))
-    def testload4(self):
-        """ Testing loading danse file"""
-        #tested good file.sans
-        output=self.L.load('MP_New.sans')
-        
-        self.assertEqual(output.source.wavelength,7.5)
-        
-        #tested corrupted file.sans
-        try: self.L.load('P_New.sans')
-        except ValueError,msg:
-           #logger.log(40,str(msg))
-           logger.error(str(msg))
-        #else: raise ValueError,"No error raised for missing extension"
-        
-    def testload5(self):
-        """ Testing loading image file"""
-        if HAS_IMAGE:
-            output=self.L.load('angles_flat.png')
-            self.assertEqual(output.xbins ,200)
-        
-    def testload6(self):
-        """test file with unknown extension"""
-        self.assertRaises(RuntimeError, self.L.load, 'hello.missing')
-        
-        # Lookup is not supported as a public method
-        #self.assertRaises(ValueError, self.L.lookup, 'hello.missing')
-        
-        
-    def testload7(self):
-        """ test file containing an image but as extension .txt"""
-        self.assertRaises(RuntimeError, self.L.load, 'angles_flat.txt')
-
-if __name__ == '__main__':
-    unittest.main()
-   
Index: test/sasdataloader/test/testplugings.py
===================================================================
--- test/sasdataloader/test/testplugings.py	(revision 17c943656cb7c598b2d5cf9530ed6227d88ae6f9)
+++ 	(revision )
@@ -1,71 +1,0 @@
-"""
-    Unit tests for DataLoader module 
-"""
-
-import os
-import unittest
-from sas.sascalc.dataloader.loader import  Loader, Registry
-class testLoader(unittest.TestCase):
-    
-    def setUp(self):
-        self.L=Loader()
-        self.L.find_plugins('../plugins')
-            
-    def testplugin(self):
-        """ 
-            test loading with a test reader only 
-            found in the plugins directory
-        """
-        output = self.L.load('test_data.test')
-        self.assertEqual(output.x[0], 1234.)
-        
-class testRegistry(unittest.TestCase):
-    
-    def setUp(self):
-        self.L=Registry()
-        self.L.find_plugins('../plugins')
-            
-    def testplugin(self):
-        """ 
-            test loading with a test reader only 
-            found in the plugins directory
-        """
-        output = self.L.load('test_data.test')
-        self.assertEqual(output.x[0], 1234.)
-        self.assertTrue('.test' in self.L.loaders)
-        
-class testZip(unittest.TestCase):
-    
-    def setUp(self):
-        self.L=Registry()
-        
-        # Create module
-        import zipfile
-        f_name = "plugins.zip"
-        z = zipfile.PyZipFile(f_name, 'w')
-        z.writepy("../plugins", "")
-        z.close()
-        if os.path.isfile(f_name):
-            os.remove(f_name)
-        
-    def testplugin_checksetup(self):
-        """ 
-            Check that the test is valid by confirming
-            that the file can't be loaded without the
-            plugins
-        """
-        self.assertRaises(ValueError, self.L.load, 'test_data.test')
-        
-    def testplugin(self):
-        """ 
-            test loading with a test reader only 
-            found in the plugins directory
-        """
-        self.L.find_plugins('.')
-        output = self.L.load('test_data.test')
-        self.assertEqual(output.x[0], 1234.)
-        self.assertTrue('.test' in self.L.loaders)
-        
-        
-if __name__ == '__main__':
-    unittest.main()
