[Lxml-checkins] r49014 - lxml/trunk/src/lxml/tests

[scoder at codespeak.net]

Author: scoder
Date: Sat Nov 24 08:30:09 2007
New Revision: 49014

Modified:
   lxml/trunk/src/lxml/tests/test_elementtree.py
   lxml/trunk/src/lxml/tests/test_io.py
Log:
test cleanup

Modified: lxml/trunk/src/lxml/tests/test_elementtree.py
==============================================================================
--- lxml/trunk/src/lxml/tests/test_elementtree.py	(original)
+++ lxml/trunk/src/lxml/tests/test_elementtree.py	Sat Nov 24 08:30:09 2007
@@ -9,7 +9,7 @@
 """
 
 import unittest, doctest
-import os, re, shutil, tempfile, copy, operator, gc
+import os, re, tempfile, copy, operator, gc
 
 from common_imports import StringIO, etree, ElementTree, cElementTree
 from common_imports import fileInTestDir, canonicalize
@@ -21,54 +21,16 @@
 
 class ETreeTestCaseBase(unittest.TestCase):
     etree = None
-    
-    def setUp(self):
-        self._temp_dir = tempfile.mkdtemp()
-        
+
     def tearDown(self):
         gc.collect()
-        shutil.rmtree(self._temp_dir)
 
-    def getTestFilePath(self, name):
-        return os.path.join(self._temp_dir, name)
-    
     def test_element(self):
         for i in range(10):
             e = self.etree.Element('foo')
-
-    def test_tree(self):
-        Element = self.etree.Element
-        ElementTree = self.etree.ElementTree
-    
-        element = Element('top')
-        tree = ElementTree(element)
-        self.buildNodes(element, 10, 3)
-        f = open(self.getTestFilePath('testdump.xml'), 'w')
-        tree.write(f, encoding='UTF-8')
-        f.close()
-        f = open(self.getTestFilePath('testdump.xml'), 'r')
-        tree = ElementTree(file=f)
-        f.close()
-        f = open(self.getTestFilePath('testdump2.xml'), 'w')
-        tree.write(f, encoding='UTF-8')
-        f.close()
-        f = open(self.getTestFilePath('testdump.xml'), 'r')
-        data1 = f.read()
-        f.close()
-        f = open(self.getTestFilePath('testdump2.xml'), 'r')
-        data2 = f.read()
-        f.close()
-        self.assertEquals(data1, data2)
-        
-    def buildNodes(self, element, children, depth):
-        Element = self.etree.Element
-        
-        if depth == 0:
-            return
-        for i in range(children):
-            new_element = Element('element_%s_%s' % (depth, i))
-            self.buildNodes(new_element, children, depth - 1)
-            element.append(new_element)
+            self.assertEquals(e.tag, 'foo')
+            self.assertEquals(e.text, None)
+            self.assertEquals(e.tail, None)
 
     def test_simple(self):
         Element = self.etree.Element

Modified: lxml/trunk/src/lxml/tests/test_io.py
==============================================================================
--- lxml/trunk/src/lxml/tests/test_io.py	(original)
+++ lxml/trunk/src/lxml/tests/test_io.py	Sat Nov 24 08:30:09 2007
@@ -5,7 +5,7 @@
 """
 
 import unittest
-import tempfile, gzip, os, gc
+import tempfile, gzip, os, gc, shutil
 
 from common_imports import etree, ElementTree, fileInTestDir
 from common_imports import SillyFileLike, LargeFileLike
@@ -21,10 +21,49 @@
         self.root = self.etree.Element('a')
         self.root_str = self.etree.tostring(self.root)
         self.tree = self.etree.ElementTree(self.root)
-
+        self._temp_dir = tempfile.mkdtemp()
+        
     def tearDown(self):
         gc.collect()
+        shutil.rmtree(self._temp_dir)
+
+    def getTestFilePath(self, name):
+        return os.path.join(self._temp_dir, name)
 
+    def buildNodes(self, element, children, depth):
+        Element = self.etree.Element
+        
+        if depth == 0:
+            return
+        for i in range(children):
+            new_element = Element('element_%s_%s' % (depth, i))
+            self.buildNodes(new_element, children, depth - 1)
+            element.append(new_element)
+
+    def test_tree_io(self):
+        Element = self.etree.Element
+        ElementTree = self.etree.ElementTree
+    
+        element = Element('top')
+        tree = ElementTree(element)
+        self.buildNodes(element, 10, 3)
+        f = open(self.getTestFilePath('testdump.xml'), 'w')
+        tree.write(f, encoding='UTF-8')
+        f.close()
+        f = open(self.getTestFilePath('testdump.xml'), 'r')
+        tree = ElementTree(file=f)
+        f.close()
+        f = open(self.getTestFilePath('testdump2.xml'), 'w')
+        tree.write(f, encoding='UTF-8')
+        f.close()
+        f = open(self.getTestFilePath('testdump.xml'), 'r')
+        data1 = f.read()
+        f.close()
+        f = open(self.getTestFilePath('testdump2.xml'), 'r')
+        data2 = f.read()
+        f.close()
+        self.assertEquals(data1, data2)
+        
     def test_write_filename(self):
         # (c)ElementTree  supports filename strings as write argument