Changeset 2e3b055 in sasview for test/sansdataloader/test

Timestamp:

Apr 16, 2014 1:50:31 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:

b8de7fb

Parents:

d4117ccb

Message:

Transitioned from minidom to lxml for writing xml for neater output. XMLreader now has helper methods used to read and write xml data. Methods were taken from cansasReader to separate generic XML functions from cansas specific ones.

File:

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

test/sansdataloader/test/utest_cansas.py

@@ -90 +90 @@
         self.assertTrue(data.detector[1].distance == 4145.02)
         self.assertTrue(data.process[0].name == "Mantid generated CanSAS1D XML")
-        self.assertTrue(data.meta_data["xmlpreprocess"]["xml-stylesheet"] != None)
+        self.assertTrue(data.meta_data["xmlpreprocess"] != None)
         
     
@@ -102 +102 @@
         xmlreader = XMLreader(self.isis_1_1, self.schema_1_1)
         valid = xmlreader.validateXML()
+        xmlreader.setProcessingInstructions()
         self.assertTrue(valid)
+        fo = open(self.isis_1_1)
+        str = fo.read()
         reader_generic = Loader()
         dataloader = reader_generic.load(self.isis_1_1)
@@ -113 +116 @@
             self._check_data_1_1(cansasreader[i])
             reader_generic.save(filename, dataloader[i], None)
-            reader2 = Reader()
-            return_data = reader2.read(filename)
-            data_new = return_data
+            fo = open(filename)
+            str = fo.read()
+            reader2 = Loader()
+            return_data = reader2.load(filename)
             written_data = return_data[0]
             self._check_data(written_data)
-            
+    
     
     def test_double_trans_spectra(self):
@@ -169 +173 @@
         self.assertTrue(reader4.validateXML())
         
+    
     def test_save_cansas_v1_0(self):
         filename = "isis_1_0_write_test.xml"
@@ -184 +189 @@
             reader2 = Reader()
             return_data = reader2.read(filename)
-            data_new = return_data
             written_data = return_data[0]
+            xmlwrite = XMLreader(filename, self.schema_1_0)
+            valid = xmlreader.validateXML()
+            self.assertTrue(valid)
             self._check_data(written_data)
         
@@ -230 +237 @@
         return dict
         
+
 if __name__ == '__main__':
     unittest.main()