Changes in / [717e456:e5cbbce] in sasview

Location:

test

Files:

• fileconverter/test/utest_nxcansas_writer.py (modified) (1 diff)
• pr_inversion/test/utest_invertor.py (modified) (2 diffs)
• sasdataloader/test/isis_1_0_write_test.xml (added)
• sasdataloader/test/isis_1_1_write_test.xml (added)
• sasdataloader/test/testplugings.py (modified) (2 diffs)
• sasdataloader/test/utest_abs_reader.py (modified) (1 diff)
• sasdataloader/test/utest_cansas.py (modified) (17 diffs)
• sasdataloader/test/write_test.xml (added)

test/fileconverter/test/utest_nxcansas_writer.py

@@ -66 +66 @@
         if os.path.isfile(self.write_file_1d):
             os.remove(self.write_file_1d)
-        if os.path.isfile(self.write_file_2d):
-            os.remove(self.write_file_2d)

test/pr_inversion/test/utest_invertor.py

@@ -8 +8 @@
 
 
-
-import os
-import unittest
-import math
-import numpy
+import unittest, math, numpy
 from sas.sascalc.pr.invertor import Invertor
-
-
+        
 class TestFiguresOfMerit(unittest.TestCase):
             
@@ -421 +416 @@
         
         # Save
-        f_name = "test_output.txt"
-        self.invertor.to_file(f_name)
+        self.invertor.to_file("test_output.txt")
     
         # Load
-        self.invertor.from_file(f_name)
+        self.invertor.from_file("test_output.txt")
         self.assertEqual(self.invertor.d_max, 160.0)
         self.assertEqual(self.invertor.alpha, 0.0007)
         self.assertEqual(self.invertor.chi2, 836.797)
         self.assertAlmostEqual(self.invertor.pr(self.invertor.out, 10.0), 903.31577041, 4)
-        if os.path.isfile(f_name):
-            os.remove(f_name)
         
     def test_qmin(self):

test/sasdataloader/test/testplugings.py

@@ -3 +3 @@
 """
 
-import os
 import unittest
 from sas.sascalc.dataloader.loader import  Loader, Registry
@@ -42 +41 @@
         # Create module
         import zipfile
-        f_name = "plugins.zip"
-        z = zipfile.PyZipFile(f_name, 'w')
+        z = zipfile.PyZipFile("plugins.zip", 'w')
         z.writepy("../plugins", "")
         z.close()
-        if os.path.isfile(f_name):
-            os.remove(f_name)
         
     def testplugin_checksetup(self):

test/sasdataloader/test/utest_abs_reader.py

@@ -339 +339 @@
         self.assertEqual(self.data.filename, filename)
         self._checkdata()
-        if os.path.isfile(filename):
-            os.remove(filename)
         
     def test_units(self):

test/sasdataloader/test/utest_cansas.py

@@ -46 +46 @@
         self.schema_1_0 = "cansas1d_v1_0.xsd"
         self.schema_1_1 = "cansas1d_v1_1.xsd"
-        self.write_1_0_filename = "isis_1_0_write_test.xml"
-        self.write_1_1_filename = "isis_1_1_write_test.xml"
+
 
     def get_number_of_entries(self, dictionary, name, i):
@@ -57 +56 @@
         return name
 
+
     def test_invalid_xml(self):
         """
@@ -62 +62 @@
         """
         invalid = StringIO.StringIO('<a><c></b></a>')
-        XMLreader(invalid)
+        reader = XMLreader(invalid)
+
 
     def test_xml_validate(self):
@@ -81 +82 @@
         self.assertFalse(xmlschema.validate(invalid))
 
+
     def test_real_xml(self):
         reader = XMLreader(self.xml_valid, self.schema_1_0)
@@ -88 +90 @@
         else:
             self.assertFalse(valid)
+
 
     def _check_data(self, data):
@@ -102 +105 @@
         self.assertTrue(data.meta_data["xmlpreprocess"] is not None)
 
+
     def _check_data_1_1(self, data):
         spectrum = data.trans_spectrum[0]
         self.assertTrue(len(spectrum.wavelength) == 138)
 
+
     def test_cansas_xml(self):
+        filename = "isis_1_1_write_test.xml"
         xmlreader = XMLreader(self.isis_1_1, self.schema_1_1)
         valid = xmlreader.validate_xml()
@@ -112 +118 @@
         self.assertTrue(valid)
         fo = open(self.isis_1_1)
-        fo.read()
-        fo.close()
+        str = fo.read()
         reader_generic = Loader()
         dataloader = reader_generic.load(self.isis_1_1)
@@ -123 +128 @@
             self._check_data(cansasreader[i])
             self._check_data_1_1(cansasreader[i])
-            reader_generic.save(self.write_1_1_filename, dataloader[i], None)
-            fo = open(self.write_1_1_filename)
-            fo.read()
-            fo.close()
+            reader_generic.save(filename, dataloader[i], None)
+            fo = open(filename)
+            str = fo.read()
             reader2 = Loader()
-            return_data = reader2.load(self.write_1_1_filename)
+            return_data = reader2.load(filename)
             written_data = return_data[0]
             self._check_data(written_data)
-        if os.path.isfile(self.write_1_1_filename):
-            os.remove(self.write_1_1_filename)
+
 
     def test_double_trans_spectra(self):
@@ -141 +144 @@
         for item in data:
             self._check_data(item)
+
 
     def test_entry_name_recurse(self):
@@ -151 +155 @@
         self.assertTrue(len(d) == 6)
 
+
     def test_load_cansas_file(self):
+        valid = []
         reader1 = XMLreader(self.xml_valid, self.schema_1_0)
         self.assertTrue(reader1.validate_xml())
@@ -167 +173 @@
         self.assertFalse(reader7.validate_xml())
 
+
     def test_invalid_cansas(self):
         list = self.loader.load(self.cansas1d_notitle)
@@ -177 +184 @@
         self.assertTrue(data.detector[0].distance == 4150)
 
+
     def test_old_cansas_files(self):
         reader1 = XMLreader(self.cansas1d, self.schema_1_0)
         self.assertTrue(reader1.validate_xml())
         file_loader = Loader()
-        file_loader.load(self.cansas1d)
+        file1 = file_loader.load(self.cansas1d)
         reader2 = XMLreader(self.cansas1d_units, self.schema_1_0)
         self.assertTrue(reader2.validate_xml())
@@ -189 +197 @@
         self.assertTrue(reader4.validate_xml())
 
+
     def test_save_cansas_v1_0(self):
+        filename = "isis_1_0_write_test.xml"
         xmlreader = XMLreader(self.isis_1_0, self.schema_1_0)
         valid = xmlreader.validate_xml()
@@ -200 +210 @@
             self._check_data(dataloader[i])
             self._check_data(cansasreader[i])
-            reader_generic.save(self.write_1_0_filename, dataloader[i], None)
+            reader_generic.save(filename, dataloader[i], None)
             reader2 = Reader()
-            return_data = reader2.read(self.write_1_0_filename)
+            return_data = reader2.read(filename)
             written_data = return_data[0]
-            XMLreader(self.write_1_0_filename, self.schema_1_0)
+            xmlwrite = XMLreader(filename, self.schema_1_0)
             valid = xmlreader.validate_xml()
             self.assertTrue(valid)
             self._check_data(written_data)
-        if os.path.isfile(self.write_1_0_filename):
-            os.remove(self.write_1_0_filename)
+
 
     def test_processing_instructions(self):
@@ -215 +224 @@
         valid = reader.validate_xml()
         if valid:
-            # find the processing instructions and make into a dictionary
+            ## find the processing instructions and make into a dictionary
             dic = self.get_processing_instructions(reader)
             self.assertTrue(dic == {'xml-stylesheet': \
@@ -223 +232 @@
             xmldoc = minidom.parseString(xml)
 
-            # take the processing instructions and put them back in
+            ## take the processing instructions and put them back in
             xmldoc = self.set_processing_instructions(xmldoc, dic)
-            xmldoc.toprettyxml()
+            xml_output = xmldoc.toprettyxml()
+
 
     def set_processing_instructions(self, minidom_object, dic):
@@ -233 +243 @@
             minidom_object.insertBefore(pi, xmlroot)
         return minidom_object
+
 
     def get_processing_instructions(self, xml_reader_object):