Changeset 3648cbf in sasview

Timestamp:

Oct 25, 2017 10:58:11 AM (6 years ago)

Author:

krzywon

Branches:

master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

1576693

Parents:

fe15198

Message:

FIx failing unit tests on file reader base class.

File:

• test/sasdataloader/test/utest_generic_file_reader_class.py (modified) (2 diffs)

test/sasdataloader/test/utest_generic_file_reader_class.py

@@ -17 +17 @@
 
     def setUp(self):
-        self.reader = FileReader()
+        self.reader = TestFileReader()
         self.bad_file = "ACB123.txt"
         self.good_file = "123ABC.txt"
-        self.msg = "Unable to find file at: {}\n".format(self.bad_file)
-        self.msg += "Please check your file path and try again."
-        x = np.zeros(0)
-        y = np.zeros(0)
-        self.reader.current_dataset = plottable_1D(x, y)
-        self.reader.current_datainfo = DataInfo()
-        self.reader.send_to_output()
 
     def test_bad_file_path(self):
         output = self.reader.read(self.bad_file)
-        self.assertEqual(len(output[0].errors), 1)
-        self.assertEqual(output[0].errors[0], self.msg)
+        self.assertEqual(output, [])
 
     def test_good_file_path(self):
-        f_open = open(self.good_file, 'w')
-        f_open.close()
+        f = open(self.good_file, 'w')
+        f.write('123ABC exists!')
+        f.close()
         output = self.reader.read(self.good_file)
-        self.assertEqual(len(output[0].errors), 1)
-        self.assertEqual(output[0].errors[0], self.msg)
+        self.assertEqual(len(output), 1)
+        self.assertEqual(output[0].meta_data["blah"], '123ABC exists!')
 
     def tearDown(self):
@@ -45 +38 @@
         if os.path.isfile(self.good_file):
             os.remove(self.good_file)
+
+class TestFileReader(FileReader):
+    def get_file_contents(self):
+        """
+        Reader specific class to access the contents of the file
+        All reader classes that inherit from FileReader must implement
+        """
+        x = np.zeros(0)
+        y = np.zeros(0)
+        self.current_dataset = plottable_1D(x,y)
+        self.current_datainfo = DataInfo()
+        self.current_datainfo.meta_data["blah"] = self.nextline()
+        self.send_to_output()