Changeset 75eeb425 in sasview for test/sansdataloader/test/utest_cansas.py

Timestamp:

Dec 24, 2013 1:32:14 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:

81b524f

Parents:

a25d242

Message:

Pushing this here before I merge with trunk to be sure I don't lose anything.

File:

• test/sansdataloader/test/utest_cansas.py (modified) (8 diffs)

test/sansdataloader/test/utest_cansas.py

@@ -21 +21 @@
 from lxml import etree
 import xml.dom.minidom
-_ZERO = 1e-16
-HAS_CONVERTER = True
-try:
-    from data_util.nxsunit import Converter
-except:
-    HAS_CONVERTER = False
  
 CANSAS_FORMAT = cansasConstants.CANSAS_FORMAT
 CANSAS_NS = cansasConstants.CANSAS_NS
-ALLOW_ALL = True
     
 class cansas_reader(unittest.TestCase):
@@ -48 +41 @@
         self.schema_1_0 = "cansas1d_v1_0.xsd"
         self.schema_1_1 = "cansas1d_v1_1.xsd"
+        
     
     def get_number_of_entries(self, dictionary, name, i):
@@ -56 +50 @@
             name = self.get_number_of_entries(dictionary, name, i)
         return name
+    
 
     def test_xml_validate(self):
@@ -74 +69 @@
         self.assertFalse(xmlschema.validate(invalid))
         
+        
     def test_real_xml(self):
         reader = XMLreader(self.xml_valid, self.schema_1_0)
@@ -81 +77 @@
         else:
             self.assertFalse(valid)
+            
         
     def test_cansas_xml(self):
+        filename = "isis_1_1_write_test.xml"
         xmlreader = XMLreader(self.isis_1_1, self.schema_1_1)
         valid = xmlreader.validateXML()
@@ -91 +89 @@
             self.assertTrue(data.title == "TK49 c10_SANS")
             self.assertTrue(data.x.size == 138)
-            self.assertTrue(len(data.meta_data) == 417)
+            self.assertTrue(len(data.meta_data) == 2)
             self.assertTrue(data.detector[0].distance_unit == "mm")
+            reader.write(filename, data)
+            reader2 = Reader()
+            return_data = reader2.read(filename)
+            data_new = return_data
+            self.data = return_data[0]
+            self.assertTrue(self.data.x.size == 138)
+            self.assertTrue(len(self.data.meta_data) == 2)
+            self.assertTrue(self.data.detector[0].distance_unit == "mm")
+            self.assertTrue(self.data.title == "TK49 c10_SANS")
                     
     def test_entry_name_recurse(self):
@@ -102 +109 @@
             d[new_key] = value
         self.assertTrue(len(d) == 6)
+        
     
     def test_load_cansas_file(self):
@@ -119 +127 @@
         reader7 = XMLreader(self.isis_1_1, self.schema_1_0)
         self.assertFalse(reader7.validateXML())
+        
     
     def test_old_cansas_files(self):