Changeset ea67541 in sasview for test

Timestamp:

Apr 3, 2014 5:22:58 AM (11 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:

caf273b

Parents:

307fa4f

Message:

Fix for ticket #204 - processing instructions were not being set properly when saving as cansas data file.

Location:

test/sansdataloader/test

Files:

• isis_1_0_write_test.xml (modified) (1 diff)
• isis_1_1_write_test.xml (modified) (1 diff)
• utest_cansas.py (modified) (7 diffs)
• write_test.xml (modified) (1 diff)

test/sansdataloader/test/isis_1_0_write_test.xml

@@ -1 +1 @@
 <?xml version="1.0" ?>
+<?xml-stylesheet type="text/xsl" href="cansasxml-html.xsl" ?>
 <SASroot version="1.0" xmlns="cansas1d/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="cansas1d/1.0 http://svn.smallangles.net/svn/canSAS/1dwg/trunk/cansas1d.xsd">
         <SASentry>

test/sansdataloader/test/isis_1_1_write_test.xml

@@ -1 +1 @@
 <?xml version="1.0" ?>
-<?xml-stylesheet type="text/xsl" href="cansasxml-html.xsl"?>
+<?xml-stylesheet type="text/xsl" href="cansas1d.xsl" ?>
 <SASroot version="1.1" xmlns="urn:cansas1d:1.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:cansas1d:1.1 http://www.cansas.org/formats/1.1/cansas1d.xsd">
         <SASentry>

test/sansdataloader/test/utest_cansas.py

@@ -20 +20 @@
 
 from lxml import etree
-import xml.dom.minidom
+from xml.dom import minidom
  
 CANSAS_FORMAT = cansasConstants.CANSAS_FORMAT
@@ -50 +50 @@
             name = self.get_number_of_entries(dictionary, name, i)
         return name
-    
+       
 
     def test_xml_validate(self):
@@ -82 +82 @@
         self.assertTrue(data.title == "TK49 c10_SANS")
         self.assertTrue(data.x.size == 138)
-        self.assertTrue(len(data.meta_data) == 2)
+        self.assertTrue(len(data.meta_data) == 3)
         self.assertTrue(data.detector[0].distance_unit == "mm")
         self.assertTrue(data.detector[1].distance_unit == "mm")
@@ -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)
         
     
@@ -155 +156 @@
         self.assertFalse(reader7.validateXML())
         
-    
+       
     def test_old_cansas_files(self):
         reader1 = XMLreader(self.cansas1d, self.schema_1_0)
         self.assertTrue(reader1.validateXML())
+        file_loader = Loader()
+        file1 = file_loader.load(self.cansas1d)
         reader2 = XMLreader(self.cansas1d_units, self.schema_1_0)
         self.assertTrue(reader2.validateXML())
@@ -166 +169 @@
         self.assertTrue(reader4.validateXML())
         
-    
     def test_save_cansas_v1_0(self):
         filename = "isis_1_0_write_test.xml"
@@ -186 +188 @@
             self._check_data(written_data)
         
-
+        
+    def test_processing_instructions(self):
+        reader = XMLreader(self.isis_1_1, self.schema_1_1)
+        valid = reader.validateXML()
+        if valid:
+            ## find the processing instructions and make into a dictionary
+            dic = self.getProcessingInstructions(reader)
+            self.assertTrue(dic == {'xml-stylesheet': 'type="text/xsl" href="cansas1d.xsl" '})
+            
+            xml = "<test><a><b><c></c></b></a></test>"
+            xmldoc = minidom.parseString(xml)
+            
+            ## take the processing instructions and put them back in
+            xmldoc = self.setProcessingInstructions(xmldoc, dic)
+            xml_output = xmldoc.toprettyxml()
+            
+    
+    def setProcessingInstructions(self, minidomObject, dic):
+        xmlroot = minidomObject.firstChild
+        for item in dic:
+            pi = minidomObject.createProcessingInstruction(item, dic[item])
+            minidomObject.insertBefore(pi, xmlroot)
+        return minidomObject
+    
+    
+    def getProcessingInstructions(self, XMLreaderObject):
+        dict = {}
+        pi = XMLreaderObject.xmlroot.getprevious()
+        i = 0
+        while pi is not None:
+            attr = {}
+            pi_name = ""
+            pi_string = etree.tostring(pi)
+            if isinstance(pi_string, str):
+                pi_string = pi_string.replace("<?", "").replace("?>", "")
+                split = pi_string.split(" ", 1)
+                pi_name = split[0]
+                attr = split[1]
+            dict[pi_name] = attr
+            pi = pi.getprevious()
+        return dict
+        
 if __name__ == '__main__':
     unittest.main()    

test/sansdataloader/test/write_test.xml

@@ -1 +1 @@
 <?xml version="1.0" ?>
+<?xml-stylesheet type="text/xsl" href="example.xsl" ?>
 <SASroot version="1.0" xmlns="cansas1d/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="cansas1d/1.0 http://svn.smallangles.net/svn/canSAS/1dwg/trunk/cansas1d.xsd">
         <SASentry>