Changeset b09095a in sasview for test/sasdataloader

Timestamp:

Apr 17, 2017 2:39:50 PM (8 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.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

8ffafd1

Parents:

beba407

git-author:

Jeff Krzywon <krzywon@…> (04/17/17 14:39:50)

git-committer:

krzywon <krzywon@…> (04/17/17 14:39:50)

Message:

Refactor ASCII reader to use FileReader? class.

Location:

test/sasdataloader/test

Files:

• utest_ascii.py (modified) (6 diffs)
• utest_averaging.py (modified) (2 diffs)

test/sasdataloader/test/utest_ascii.py

@@ -6 +6 @@
 
 import unittest
-from sas.sascalc.dataloader.loader import  Loader
- 
-import os.path
+from sas.sascalc.dataloader.loader import Loader
 
-class abs_reader(unittest.TestCase):
+
+class ABSReaderTests(unittest.TestCase):
     
     def setUp(self):
         self.loader = Loader()
+        self.f1_list = self.loader.load("ascii_test_1.txt")
+        self.f1 = self.f1_list[0]
+        self.f2_list = self.loader.load("ascii_test_2.txt")
+        self.f2 = self.f2_list[0]
+        self.f3_list = self.loader.load("ascii_test_3.txt")
+        self.f3 = self.f3_list[0]
+        self.f4_list = self.loader.load("ascii_test_4.abs")
+        self.f4 = self.f4_list[0]
+        self.f5_list = self.loader.load("ascii_test_5.txt")
+        self.f5 = self.f5_list[0]
         
     def test_checkdata(self):
@@ -19 +28 @@
             Test .ABS file loaded as ascii
         """
-        f = self.loader.load("ascii_test_1.txt")
         # The length of the data is 10
-        self.assertEqual(len(f.x), 10)
-        self.assertEqual(f.x[0],0.002618)
-        self.assertEqual(f.x[9],0.0497)
-        self.assertEqual(f.x_unit, '1/A')
-        self.assertEqual(f.y_unit, '1/cm')
+        self.assertEqual(len(self.f1.x), 10)
+        self.assertEqual(self.f1.x[0],0.002618)
+        self.assertEqual(self.f1.x[9],0.0497)
+        self.assertEqual(self.f1.x_unit, '1/A')
+        self.assertEqual(self.f1.y_unit, '1/cm')
         
-        self.assertEqual(f.meta_data['loader'],"ASCII")
+        self.assertEqual(self.f1.meta_data['loader'],"ASCII")
         
     def test_truncated_1(self):
@@ -38 +46 @@
             as though it were the start of a footer).
         """
-        # Test .ABS file loaded as ascii
-        f = self.loader.load("ascii_test_2.txt")
-        # The length of the data is 10
-        self.assertEqual(len(f.x), 5)
-        self.assertEqual(f.x[0],0.002618)
-        self.assertEqual(f.x[4],0.02356)
+        # The length of the data is 5
+        self.assertEqual(len(self.f2.x), 5)
+        self.assertEqual(self.f2.x[0],0.002618)
+        self.assertEqual(self.f2.x[4],0.02356)
         
     def test_truncated_2(self):
@@ -52 +58 @@
             reading at the first inconsitent line.
         """
-        # Test .ABS file loaded as ascii
-        f = self.loader.load("ascii_test_3.txt")
         # The length of the data is 5
-        self.assertEqual(len(f.x), 5)
-        self.assertEqual(f.x[0],0.002618)
-        self.assertEqual(f.x[4],0.02356)
+        self.assertEqual(len(self.f3.x), 5)
+        self.assertEqual(self.f3.x[0],0.002618)
+        self.assertEqual(self.f3.x[4],0.02356)
         
     def test_truncated_3(self):
@@ -66 +70 @@
             reading at the last line of header.
         """
-        # Test .ABS file loaded as ascii
-        f = self.loader.load("ascii_test_4.abs")
         # The length of the data is 5
-        self.assertEqual(len(f.x), 5)
-        self.assertEqual(f.x[0],0.012654)
-        self.assertEqual(f.x[4],0.02654)
+        self.assertEqual(len(self.f4.x), 5)
+        self.assertEqual(self.f4.x[0],0.012654)
+        self.assertEqual(self.f4.x[4],0.02654)
         
     def test_truncated_4(self):
@@ -78 +80 @@
             Only the last 5 2-col lines should be read.
         """
-        # Test .ABS file loaded as ascii
-        f = self.loader.load("ascii_test_5.txt")
         # The length of the data is 5
-        self.assertEqual(len(f.x), 5)
-        self.assertEqual(f.x[0],0.02879)
-        self.assertEqual(f.x[4],0.0497)
+        self.assertEqual(len(self.f5.x), 5)
+        self.assertEqual(self.f5.x[0],0.02879)
+        self.assertEqual(self.f5.x[4],0.0497)
         
     def test_truncated_5(self):
         """
-            Test a 6-col ascii file with complex header where one of them has a letter and 
-            many lines with 2 or 2 columns in the middle of the data section.
-            Only last four lines should be read.
+            Test a 6-col ascii file with complex header where one of them has a
+            letter and many lines with 2 or 2 columns in the middle of the data
+            section. Will be rejected because fewer than 5 lines.
         """
         # Test .ABS file loaded as ascii

test/sasdataloader/test/utest_averaging.py

@@ -3 +3 @@
 import math
 
-from sas.sascalc.dataloader.loader import  Loader
+from sas.sascalc.dataloader.loader import Loader
 from sas.sascalc.dataloader.manipulations import Ring, CircularAverage, SectorPhi, get_q,reader2D_converter
 
@@ -110 +110 @@
         
         o = r(self.data)
-        answer = Loader().load('ring_testdata.txt')
+        data_list = Loader().load('ring_testdata.txt')
+        answer = data_list[0]
         
         for i in range(r.nbins_phi - 1):