Changeset 8d3d20a in sasview for test

Timestamp:

Oct 6, 2016 12:35:24 PM (8 years ago)

Author:

GitHub <noreply@…>

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, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

4c3be25

Parents:

0639476 (diff), e32e35a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Andrew Jackson <andrew.jackson@…> (10/06/16 12:35:24)

git-committer:

GitHub <noreply@…> (10/06/16 12:35:24)

Message:

Merge pull request #11 from SasView?/corfunc

Implement Correlation Function Perspective

Location:

test

Files:

• corfunc/test/98929.txt (added)
• corfunc/test/utest_corfunc.py (added)
• fileconverter/test/cansas1d.xml (added)
• fileconverter/test/exp18_14_igor_2dqxqy.dat (added)
• fileconverter/test/export2d.h5 (added)
• fileconverter/test/utest_nxcansas_writer.py (added)
• sasdataloader/test/utest_ascii.py (modified) (1 diff)

test/sasdataloader/test/utest_ascii.py

@@ -94 +94 @@
         f = self.loader.load("ascii_test_6.txt")
         # The length of the data is 5
-        self.assertEqual(len(f.x), 4)
-        self.assertEqual(f.x[0],0.013534)
-        self.assertEqual(f.x[3],0.022254)
+        self.assertEqual(f, None)
         
 if __name__ == '__main__':