Changeset 3617aa2 in sasview

Timestamp:

Apr 10, 2009 6:46:45 PM (16 years ago)

Author:

Mathieu Doucet <doucetm@…>

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:

c9795f6

Parents:

8adea21

Message:

DataLoader?: Added a new unit test

Location:

DataLoader

Files:

• readers/ascii_reader.py (modified) (1 diff)
• test/ascii_test_5.txt (added)
• test/utest_ascii.py (modified) (2 diffs)

DataLoader/readers/ascii_reader.py

@@ -312 +312 @@
                 else:
                     output.yaxis("\\rm{Intensity}","cm^{-1}")
-                print "output",output
                 return output
             

DataLoader/test/utest_ascii.py

@@ -46 +46 @@
         # Test .ABS file loaded as ascii
         f = self.loader.load("ascii_test_3.txt")
-        # The length of the data is 10
+        # The length of the data is 5
         self.assertEqual(len(f.x), 5)
         
@@ -58 +58 @@
         # Test .ABS file loaded as ascii
         f = self.loader.load("ascii_test_4.abs")
-        # The length of the data is 10
+        # The length of the data is 5
         self.assertEqual(len(f.x), 5)
+        
+    def test_truncated_4(self):
+        """
+            Test mix of 6-col and 2-col.
+            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)