Changeset eda8972 in sasview for test/sansdataloader/test/utest_abs_reader.py

Timestamp:

Dec 13, 2013 2:48:36 PM (10 years ago)

Author:

Jeff Krzywon <jeffery.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:

a25d242

Parents:

f28fd9cf

Message:

I will finalize this on Monday.

File:

• test/sansdataloader/test/utest_abs_reader.py (modified) (9 diffs)

test/sansdataloader/test/utest_abs_reader.py

@@ -160 +160 @@
     def setUp(self):
         self.data = Loader().load("cansas1d.xml")
+        if isinstance(self.data, list):
+            self.data = self.data[0]
  
     def test_cansas_checkdata(self):
+        print "\rtest_cansas_checkdata"
         self.assertEqual(self.data.filename, "cansas1d.xml")
         self._checkdata()
@@ -247 +250 @@
             self.assertEqual(item.size_unit,'mm')
             self.assertEqual(item.distance_unit,'mm')
+            print "size.x = {0}".format(item.size.x)
+            print "distance = {0}".format(item.distance)
+            print "name = {0}".format(item.name)
+            print "type = {0}".format(item.type)
             
             if item.size.x==50 \
@@ -311 +318 @@
         
     def test_writer(self):
+        print "\rtest_writer"
         from sans.dataloader.readers.cansas_reader import Reader
         r = Reader()
@@ -319 +327 @@
         filename = "write_test.xml"
         r.write(filename, self.data)
-        self.data = Loader().load(filename)
+        self.data = Loader().load(filename)[0]
         self.assertEqual(self.data.filename, filename)
         self._checkdata()
@@ -328 +336 @@
             Note that not all units are available.
         """
+        print "\rtest_units"
         filename = "cansas1d_units.xml"
         self.data = Loader().load(filename)
+        if isinstance(self.data, list):
+            self.data = self.data[0]
         self.assertEqual(self.data.filename, filename)
         self._checkdata()
@@ -338 +349 @@
             Note that not all units are available.
         """
+        print "\rtest_badunits"
         filename = "cansas1d_badunits.xml"
         self.data = Loader().load(filename)
+        if isinstance(self.data, list):
+            self.data = self.data[0]
         self.assertEqual(self.data.filename, filename)
         # The followed should not have been loaded
@@ -354 +368 @@
             Check slit data
         """
+        print "\rtest_slits"
         filename = "cansas1d_slit.xml"
         self.data = Loader().load(filename)
+        if isinstance(self.data, list):
+            self.data = self.data[0]
         self.assertEqual(self.data.filename, filename)
         self.assertEqual(self.data.run[0], "1234")
@@ -361 +378 @@
         # Data
         self.assertEqual(len(self.data.x), 2)
+        print self.data.x
         self.assertEqual(self.data.x_unit, '1/A')
         self.assertEqual(self.data.y_unit, '1/cm')
@@ -370 +388 @@
         self.assertEqual(self.data.x[1], 0.03)
         self.assertAlmostEquals(self.data.y[1], 1001.0)
-        self.assertEqual(self.data.dx[1], 0.0)
+        self.assertEqual(self.data.dx, None)
         self.assertEqual(self.data.dxl[1], 0.005)
         self.assertEqual(self.data.dxw[1], 0.001)
         self.assertEqual(self.data.dy[1], 4)
-        self.assertEqual(self.data.run_name['1234'], 'run name')
+        # self.assertEqual(self.data.run_name['1234'], 'run name')
         self.assertEqual(self.data.title, "Test title")