htmldata: rename HtmlFile -> HtmlTemplate

yanne · yanne · commit 5cf2f16bdc41 · 2012-03-06T13:29:58.000+02:00
diff --git a/src/robot/htmldata/htmlfilewriter.py b/src/robot/htmldata/htmlfilewriter.py
@@ -19,7 +19,7 @@
 from robot.utils import HtmlWriter
 from robot.version import get_full_version
 
-from .htmlfile import HtmlFile
+from .htmltemplate import HtmlTemplate
 
 
 class HtmlFileWriter(object):
@@ -30,7 +30,7 @@ def __init__(self, output, model_writer):
 
     def write(self, template):
         writers = self._get_writers(os.path.dirname(template))
-        for line in HtmlFile(template):
+        for line in HtmlTemplate(template):
             for writer in writers:
                 if writer.handles(line):
                     writer.write(line)
@@ -90,7 +90,7 @@ def __init__(self, html_writer, base_dir):
 
     def _inline_file(self, filename, tag, attrs):
         self._html_writer.start(tag, attrs)
-        for line in HtmlFile(os.path.join(self._base_dir, filename)):
+        for line in HtmlTemplate(os.path.join(self._base_dir, filename)):
             self._html_writer.content(line + os.linesep, escape=False)
         self._html_writer.end(tag)
 
diff --git a/src/robot/htmldata/htmltemplate.py b/src/robot/htmldata/htmltemplate.py
@@ -20,11 +20,12 @@
 
 
 try:
+    from java.io import BufferedReader, InputStreamReader
     from org.robotframework.RobotRunner import getResourceAsStream
 
 except ImportError:  # Occurs unless using standalone robotframework.jar
 
-    class HtmlFile(object):
+    class HtmlTemplate(object):
         _base_dir = join(dirname(abspath(__file__)), '..', 'htmldata')
 
         def __init__(self, filename):
@@ -37,10 +38,7 @@ def __iter__(self):
 
 else:
 
-    from java.io import BufferedReader, InputStreamReader
-
-
-    class HtmlFile(object):
+    class HtmlTemplate(object):
         _base_dir = '/Lib/robot/htmldata/'
 
         def __init__(self, filename):
diff --git a/utest/htmldata/test_htmltemplate.py b/utest/htmldata/test_htmltemplate.py
@@ -1,22 +1,23 @@
 import unittest
 
-from robot.htmldata.htmlfile import HtmlFile
+from robot.htmldata.htmltemplate import HtmlTemplate
+from robot.htmldata import LOG, REPORT
 from robot.utils.asserts import assert_true, assert_raises, assert_equals
 
 
-class TestWebContentFile(unittest.TestCase):
+class TestHtmlTemplate(unittest.TestCase):
 
-    def test_get_webcontent_file(self):
-        log = list(HtmlFile('log.html'))
+    def test_creating(self):
+        log = list(HtmlTemplate(LOG))
         assert_true(log[0].startswith('<!DOCTYPE'))
         assert_equals(log[-1], '</html>')
 
     def test_lines_do_not_have_line_breaks(self):
-        for line in HtmlFile('report.html'):
+        for line in HtmlTemplate(REPORT):
             assert_true(not line.endswith('\n'))
 
     def test_non_existing(self):
-        assert_raises(IOError, list, HtmlFile('nonex.html'))
+        assert_raises(IOError, list, HtmlTemplate('nonex.html'))
 
 
 if __name__ == "__main__":
