Changeset 35ec279 in sasview for test/sasdataloader

Timestamp:

Feb 13, 2015 4:08:43 AM (10 years ago)

Author:

krzywon

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:

b9a5f0e

Parents:

8c9ffde

Message:

Completed the SANS to SAS conversion on the tests. src.sas is left.

Location:

test/sasdataloader

Files:

• plugins/test_reader.py (modified) (1 diff)
• test/error_conditions.py (modified) (1 diff)
• test/testLoad.py (modified) (1 diff)
• test/testplugings.py (modified) (1 diff)
• test/utest_abs_reader.py (modified) (3 diffs)
• test/utest_ascii.py (modified) (1 diff)
• test/utest_averaging.py (modified) (7 diffs)
• test/utest_cansas.py (modified) (1 diff)
• test/utest_red2d_reader.py (modified) (1 diff)

test/sasdataloader/plugins/test_reader.py

@@ -9 +9 @@
 """
 import numpy, os
-from sans.dataloader.data_info import Data1D
+from sas.dataloader.data_info import Data1D
 
 

test/sasdataloader/test/error_conditions.py

@@ -1 @@
-from sans.dataloader.loader import Loader
+from sas.dataloader.loader import Loader
 import unittest
 

test/sasdataloader/test/testLoad.py

@@ -14 +14 @@
 import unittest
 import math
-import sans.dataloader
-from sans.dataloader.loader import  Loader
+import sas.dataloader
+from sas.dataloader.loader import  Loader
 
 # Check whether we should test image loading on this system 

test/sasdataloader/test/testplugings.py

@@ -4 +4 @@
 
 import unittest
-from sans.dataloader.loader import  Loader, Registry
+from sas.dataloader.loader import  Loader, Registry
 class testLoader(unittest.TestCase):
     

test/sasdataloader/test/utest_abs_reader.py

@@ -5 +5 @@
 import unittest
 import numpy, math
-from sans.dataloader.loader import  Loader
-from sans.dataloader.data_info import Data1D
+from sas.dataloader.loader import  Loader
+from sas.dataloader.data_info import Data1D
  
 import os.path
@@ -13 +13 @@
     
     def setUp(self):
-        from sans.dataloader.readers.abs_reader import Reader
+        from sas.dataloader.readers.abs_reader import Reader
         self.data = Reader().read("jan08002.ABS")
         
@@ -311 +311 @@
         
     def test_writer(self):
-        from sans.dataloader.readers.cansas_reader import Reader
+        from sas.dataloader.readers.cansas_reader import Reader
         r = Reader()
         x = numpy.ones(5)

test/sasdataloader/test/utest_ascii.py

@@ -6 +6 @@
 
 import unittest
-from sans.dataloader.loader import  Loader
+from sas.dataloader.loader import  Loader
  
 import os.path

test/sasdataloader/test/utest_averaging.py

@@ -2 +2 @@
 import unittest
 
-from sans.dataloader.loader import  Loader
-from sans.dataloader.manipulations import Ring, CircularAverage, SectorPhi, get_q,reader2D_converter
+from sas.dataloader.loader import  Loader
+from sas.dataloader.manipulations import Ring, CircularAverage, SectorPhi, get_q,reader2D_converter
  
 import os.path
 import numpy, math
-import sans.dataloader.data_info as data_info
+import sas.dataloader.data_info as data_info
 
 class Averaging(unittest.TestCase):
@@ -137 +137 @@
             The test data was not generated by IGOR.
         """
-        from sans.dataloader.manipulations import Boxsum, Boxavg
+        from sas.dataloader.manipulations import Boxsum, Boxavg
         
         r = Boxsum(x_min=.01, x_max=.015, y_min=0.01, y_max=0.015)
@@ -155 +155 @@
             The test data was not generated by IGOR.
         """
-        from sans.dataloader.manipulations import SlabX
+        from sas.dataloader.manipulations import SlabX
         
         r = SlabX(x_min=-.01, x_max=.01, y_min=-0.0002, y_max=0.0002, bin_width=0.0004)
@@ -172 +172 @@
             The test data was not generated by IGOR.
         """
-        from sans.dataloader.manipulations import SlabY
+        from sas.dataloader.manipulations import SlabY
         
         r = SlabY(x_min=.005, x_max=.01, y_min=-0.01, y_max=0.01, bin_width=0.0004)
@@ -191 +191 @@
             The test data was not generated by IGOR.
         """
-        from sans.dataloader.manipulations import SectorPhi
+        from sas.dataloader.manipulations import SectorPhi
         import math
         
@@ -209 +209 @@
             The test data was not generated by IGOR.
         """
-        from sans.dataloader.manipulations import SectorPhi
+        from sas.dataloader.manipulations import SectorPhi
         import math
         
@@ -227 +227 @@
             The test data was not generated by IGOR.
         """
-        from sans.dataloader.manipulations import SectorQ
+        from sas.dataloader.manipulations import SectorQ
         import math
         

test/sasdataloader/test/utest_cansas.py

@@ -6 +6 @@
 warnings.simplefilter("ignore")
 
-import sans.dataloader.readers.cansas_reader as cansas
-from sans.dataloader.loader import Loader
-from sans.dataloader.data_info import Data1D
-from sans.dataloader.readers.xml_reader import XMLreader
-from sans.dataloader.readers.cansas_reader import Reader
-from sans.dataloader.readers.cansas_constants import CansasConstants
+import sas.dataloader.readers.cansas_reader as cansas
+from sas.dataloader.loader import Loader
+from sas.dataloader.data_info import Data1D
+from sas.dataloader.readers.xml_reader import XMLreader
+from sas.dataloader.readers.cansas_reader import Reader
+from sas.dataloader.readers.cansas_constants import CansasConstants
 
 import os

test/sasdataloader/test/utest_red2d_reader.py

@@ -6 +6 @@
 
 import unittest
-from sans.dataloader.loader import  Loader
+from sas.dataloader.loader import  Loader
  
 import os.path