Changeset ac5b69d in sasview for test

Timestamp:

May 5, 2014 3:41:43 PM (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:

c81aa18

Parents:

0089be3

Message:

Ticket #249 fix: Saving and loading projects and analysis is now working.

File:

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

test/sansdataloader/test/utest_cansas.py

@@ -5 +5 @@
 warnings.simplefilter("ignore")
 
-import unittest
-import numpy
 import sans.dataloader.readers.cansas_reader as cansas
 from sans.dataloader.loader import Loader
@@ -12 +10 @@
 from sans.dataloader.readers.xml_reader import XMLreader
 from sans.dataloader.readers.cansas_reader import Reader
-from sans.dataloader.readers.cansas_constants import cansasConstants
+from sans.dataloader.readers.cansas_constants import CansasConstants
 
 import os
@@ -18 +16 @@
 import urllib2
 import StringIO
+import pylint as pylint
+import unittest
+import numpy
 
 from lxml import etree
 from xml.dom import minidom
  
-CANSAS_FORMAT = cansasConstants.CANSAS_FORMAT
-CANSAS_NS = cansasConstants.CANSAS_NS
+CANSAS_FORMAT = CansasConstants.CANSAS_FORMAT
+CANSAS_NS = CansasConstants.CANSAS_NS
     
 class cansas_reader(unittest.TestCase):
@@ -72 +73 @@
     def test_real_xml(self):
         reader = XMLreader(self.xml_valid, self.schema_1_0)
-        valid = reader.validateXML()
+        valid = reader.validate_xml()
         if valid:
             self.assertTrue(valid)
@@ -101 +102 @@
         filename = "isis_1_1_write_test.xml"
         xmlreader = XMLreader(self.isis_1_1, self.schema_1_1)
-        valid = xmlreader.validateXML()
-        xmlreader.setProcessingInstructions()
+        valid = xmlreader.validate_xml()
+        xmlreader.set_processing_instructions()
         self.assertTrue(valid)
         fo = open(self.isis_1_1)
@@ -126 +127 @@
     def test_double_trans_spectra(self):
         xmlreader = XMLreader(self.isis_1_1_doubletrans, self.schema_1_1)
-        self.assertTrue(xmlreader.validateXML())
+        self.assertTrue(xmlreader.validate_xml())
         reader = Loader()
         data = reader.load(self.isis_1_1_doubletrans)
@@ -146 +147 @@
         valid = []
         reader1 = XMLreader(self.xml_valid, self.schema_1_0)
-        self.assertTrue(reader1.validateXML())
+        self.assertTrue(reader1.validate_xml())
         reader2 = XMLreader(self.xml_invalid, self.schema_1_0)
-        self.assertFalse(reader2.validateXML())
+        self.assertFalse(reader2.validate_xml())
         reader3 = XMLreader(self.xml_valid, self.schema_1_1)
-        self.assertFalse(reader3.validateXML())
+        self.assertFalse(reader3.validate_xml())
         reader4 = XMLreader(self.xml_invalid, self.schema_1_1)
-        self.assertFalse(reader4.validateXML())
+        self.assertFalse(reader4.validate_xml())
         reader5 = XMLreader(self.isis_1_0, self.schema_1_0)
-        self.assertTrue(reader5.validateXML())
+        self.assertTrue(reader5.validate_xml())
         reader6 = XMLreader(self.isis_1_1, self.schema_1_1)
-        self.assertTrue(reader6.validateXML())
+        self.assertTrue(reader6.validate_xml())
         reader7 = XMLreader(self.isis_1_1, self.schema_1_0)
-        self.assertFalse(reader7.validateXML())
+        self.assertFalse(reader7.validate_xml())
         
        
     def test_old_cansas_files(self):
         reader1 = XMLreader(self.cansas1d, self.schema_1_0)
-        self.assertTrue(reader1.validateXML())
+        self.assertTrue(reader1.validate_xml())
         file_loader = Loader()
         file1 = file_loader.load(self.cansas1d)
         reader2 = XMLreader(self.cansas1d_units, self.schema_1_0)
-        self.assertTrue(reader2.validateXML())
+        self.assertTrue(reader2.validate_xml())
         reader3 = XMLreader(self.cansas1d_badunits, self.schema_1_0)
-        self.assertTrue(reader3.validateXML())
+        self.assertTrue(reader3.validate_xml())
         reader4 = XMLreader(self.cansas1d_slit, self.schema_1_0)
-        self.assertTrue(reader4.validateXML())
+        self.assertTrue(reader4.validate_xml())
         
     
@@ -177 +178 @@
         filename = "isis_1_0_write_test.xml"
         xmlreader = XMLreader(self.isis_1_0, self.schema_1_0)
-        valid = xmlreader.validateXML()
+        valid = xmlreader.validate_xml()
         self.assertTrue(valid)
         reader_generic = Loader()
@@ -191 +192 @@
             written_data = return_data[0]
             xmlwrite = XMLreader(filename, self.schema_1_0)
-            valid = xmlreader.validateXML()
+            valid = xmlreader.validate_xml()
             self.assertTrue(valid)
             self._check_data(written_data)
@@ -198 +199 @@
     def test_processing_instructions(self):
         reader = XMLreader(self.isis_1_1, self.schema_1_1)
-        valid = reader.validateXML()
+        valid = reader.validate_xml()
         if valid:
             ## find the processing instructions and make into a dictionary
-            dic = self.getProcessingInstructions(reader)
+            dic = self.get_processing_instructions(reader)
             self.assertTrue(dic == {'xml-stylesheet': 'type="text/xsl" href="cansas1d.xsl" '})
             
@@ -208 +209 @@
             
             ## take the processing instructions and put them back in
-            xmldoc = self.setProcessingInstructions(xmldoc, dic)
+            xmldoc = self.set_processing_instructions(xmldoc, dic)
             xml_output = xmldoc.toprettyxml()
             
     
-    def setProcessingInstructions(self, minidomObject, dic):
-        xmlroot = minidomObject.firstChild
+    def set_processing_instructions(self, minidom_object, dic):
+        xmlroot = minidom_object.firstChild
         for item in dic:
-            pi = minidomObject.createProcessingInstruction(item, dic[item])
-            minidomObject.insertBefore(pi, xmlroot)
-        return minidomObject
-    
-    
-    def getProcessingInstructions(self, XMLreaderObject):
+            pi = minidom_object.createProcessingInstruction(item, dic[item])
+            minidom_object.insertBefore(pi, xmlroot)
+        return minidom_object
+    
+    
+    def get_processing_instructions(self, xml_reader_object):
         dict = {}
-        pi = XMLreaderObject.xmlroot.getprevious()
+        pi = xml_reader_object.xmlroot.getprevious()
         i = 0
         while pi is not None: