Revision: b419a375445f
Author: Mikko Korpela <[email protected]>
Date: Thu Dec 1 04:42:12 2011
Log: Rename module jsdatamodel to jswriter
http://code.google.com/p/robotframework/source/detail?r=b419a375445f
Added:
/src/robot/reporting/jswriter.py
Deleted:
/src/robot/reporting/jsondatamodel.py
Modified:
/src/robot/reporting/builders.py
/utest/reporting/test_jsondatamodel.py
/utest/webcontent/spec/data/create_jsdata_for_specs.py
=======================================
--- /dev/null
+++ /src/robot/reporting/jswriter.py Thu Dec 1 04:42:12 2011
@@ -0,0 +1,126 @@
+# Copyright 2008-2011 Nokia Siemens Networks Oyj
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from robot.reporting.jsondump import JsonDumper
+
+
+class ScriptBlockWriter(object):
+ _OUTPUT = 'window.output'
+ _SETTINGS = 'window.settings'
+ _SUITE_KEY = 'suite'
+ _STRINGS_KEY = 'strings'
+
+ def __init__(self, separator, split_threshold=9500):
+ self._separator = separator
+ self._split_threshold = split_threshold
+
+ def write_to(self, output, model, config):
+ writer = SeparatingWriter(output, self._separator)
+ writer.write(self._OUTPUT+' = {};\n')
+ writer.separator()
+ self._write_suite(writer, model.suite)
+ writer.separator()
+ self._write_strings(model.strings, writer)
+ writer.separator()
+ for key, value in model.data.items():
+ writer.dump_json(self._output_var(key)+' = ', value)
+ writer.separator()
+ writer.dump_json(self._SETTINGS+' = ', config)
+
+ def _write_suite(self, writer, suite):
+ splitWriter = SplittingSuiteWriter(writer, self._split_threshold)
+ data, mapping = splitWriter.write(suite)
+ writer.dump_json(self._output_var(self._SUITE_KEY)+' = ', data,
mapping=mapping)
+
+ def _output_var(self, key):
+ return self._OUTPUT+'["%s"]' % key
+
+ def _write_strings(self, strings, writer):
+ writer.write(self._output_var(self._STRINGS_KEY)+' = [];\n')
+ while strings:
+ writer.separator()
+ writer.dump_json(self._output_var(self._STRINGS_KEY)
+ +' = '+self._output_var(self._STRINGS_KEY)
+ +'.concat(',
strings[:self._split_threshold], ');\n')
+ strings = strings[self._split_threshold:]
+
+
+class SeparatingWriter(object):
+
+ def __init__(self, output, separator=''):
+ self._dumper = JsonDumper(output)
+ self._separator = separator
+
+ def separator(self):
+ self._dumper.write(self._separator)
+
+ def dump_json(self, prefix, data, postfix=';\n', mapping=None):
+ if prefix:
+ self.write(prefix)
+ self._dumper.dump(data, mapping)
+ self.write(postfix)
+
+ def write(self, string):
+ self._dumper.write(string)
+
+
+class _SubResult(object):
+
+ def __init__(self, data_block, size, mapping):
+ self.data_block = data_block
+ self.size = size
+ self.mapping = mapping
+
+ def update(self, subresult):
+ self.data_block += [subresult.data_block]
+ self.size += subresult.size
+ if subresult.mapping:
+ self.mapping.update(subresult.mapping)
+
+ def link(self, name):
+ key = object()
+ return _SubResult(key, 1, {key: name})
+
+
+class SplittingSuiteWriter(object):
+
+ def __init__(self, writer, split_threshold):
+ self._index = 0
+ self._writer = writer
+ self._split_threshold = split_threshold
+
+ def write(self, data_block):
+ result = self._write(data_block)
+ return result.data_block, result.mapping
+
+ def _write(self, data_block):
+ if not isinstance(data_block, list):
+ return _SubResult(data_block, 1, None)
+ result = _SubResult([], 1, {})
+ for item in data_block:
+ result.update(self._write(item))
+ if result.size > self._split_threshold:
+ result = self._dump_suite_part(result)
+ return result
+
+ def _list_name(self):
+ return 'window.sPart%s' % self._index
+
+ def _dump_suite_part(self, result):
+ self._writer.dump_json(self._list_name()+' = ', result.data_block,
+ mapping=result.mapping)
+ self._writer.separator()
+ new_result = result.link(self._list_name())
+ self._index += 1
+ return new_result
=======================================
--- /src/robot/reporting/jsondatamodel.py Thu Dec 1 04:32:24 2011
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 2008-2011 Nokia Siemens Networks Oyj
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-from robot.reporting.jsondump import JsonDumper
-
-
-class ScriptBlockWriter(object):
- _OUTPUT = 'window.output'
- _SETTINGS = 'window.settings'
- _SUITE_KEY = 'suite'
- _STRINGS_KEY = 'strings'
-
- def __init__(self, separator, split_threshold=9500):
- self._separator = separator
- self._split_threshold = split_threshold
-
- def write_to(self, output, model, config):
- writer = SeparatingWriter(output, self._separator)
- writer.write(self._OUTPUT+' = {};\n')
- writer.separator()
- self._write_suite(writer, model.suite)
- writer.separator()
- self._write_strings(model.strings, writer)
- writer.separator()
- for key, value in model.data.items():
- writer.dump_json(self._output_var(key)+' = ', value)
- writer.separator()
- writer.dump_json(self._SETTINGS+' = ', config)
-
- def _write_suite(self, writer, suite):
- splitWriter = SplittingSuiteWriter(writer, self._split_threshold)
- data, mapping = splitWriter.write(suite)
- writer.dump_json(self._output_var(self._SUITE_KEY)+' = ', data,
mapping=mapping)
-
- def _output_var(self, key):
- return self._OUTPUT+'["%s"]' % key
-
- def _write_strings(self, strings, writer):
- writer.write(self._output_var(self._STRINGS_KEY)+' = [];\n')
- while strings:
- writer.separator()
- writer.dump_json(self._output_var(self._STRINGS_KEY)
- +' = '+self._output_var(self._STRINGS_KEY)
- +'.concat(',
strings[:self._split_threshold], ');\n')
- strings = strings[self._split_threshold:]
-
-
-class SeparatingWriter(object):
-
- def __init__(self, output, separator=''):
- self._dumper = JsonDumper(output)
- self._separator = separator
-
- def separator(self):
- self._dumper.write(self._separator)
-
- def dump_json(self, prefix, data, postfix=';\n', mapping=None):
- if prefix:
- self.write(prefix)
- self._dumper.dump(data, mapping)
- self.write(postfix)
-
- def write(self, string):
- self._dumper.write(string)
-
-
-class _SubResult(object):
-
- def __init__(self, data_block, size, mapping):
- self.data_block = data_block
- self.size = size
- self.mapping = mapping
-
- def update(self, subresult):
- self.data_block += [subresult.data_block]
- self.size += subresult.size
- if subresult.mapping:
- self.mapping.update(subresult.mapping)
-
- def link(self, name):
- key = object()
- return _SubResult(key, 1, {key: name})
-
-
-class SplittingSuiteWriter(object):
-
- def __init__(self, writer, split_threshold):
- self._index = 0
- self._writer = writer
- self._split_threshold = split_threshold
-
- def write(self, data_block):
- result = self._write(data_block)
- return result.data_block, result.mapping
-
- def _write(self, data_block):
- if not isinstance(data_block, list):
- return _SubResult(data_block, 1, None)
- result = _SubResult([], 1, {})
- for item in data_block:
- result.update(self._write(item))
- if result.size > self._split_threshold:
- result = self._dump_suite_part(result)
- return result
-
- def _list_name(self):
- return 'window.sPart%s' % self._index
-
- def _dump_suite_part(self, result):
- self._writer.dump_json(self._list_name()+' = ', result.data_block,
- mapping=result.mapping)
- self._writer.separator()
- new_result = result.link(self._list_name())
- self._index += 1
- return new_result
=======================================
--- /src/robot/reporting/builders.py Thu Dec 1 04:32:24 2011
+++ /src/robot/reporting/builders.py Thu Dec 1 04:42:12 2011
@@ -20,12 +20,11 @@
from robot.errors import DataError
from robot.output import LOGGER
-from robot.reporting.jsondatamodel import ScriptBlockWriter
from robot.result.serializer import RebotXMLWriter
from robot.version import get_full_version
from robot import utils
-from .jsondatamodel import SeparatingWriter
+from .jswriter import SeparatingWriter, ScriptBlockWriter
from .xunitwriter import XUnitWriter
try:
=======================================
--- /utest/reporting/test_jsondatamodel.py Thu Dec 1 04:32:24 2011
+++ /utest/reporting/test_jsondatamodel.py Thu Dec 1 04:42:12 2011
@@ -2,7 +2,7 @@
import unittest
from robot.result.jsondatamodelhandlers import JsExecutionResult
from robot.utils.asserts import assert_equals, assert_true
-from robot.reporting.jsondatamodel import ScriptBlockWriter
+from robot.reporting.jswriter import ScriptBlockWriter
class TestDataModelWrite(unittest.TestCase):
=======================================
--- /utest/webcontent/spec/data/create_jsdata_for_specs.py Wed Nov 30
01:40:18 2011
+++ /utest/webcontent/spec/data/create_jsdata_for_specs.py Thu Dec 1
04:42:12 2011
@@ -13,7 +13,7 @@
sys.path.insert(0, join(BASEDIR, '..', '..', '..', '..', 'src'))
import robot
-from robot.reporting.jsondatamodel import SeparatingWriter, DataModelWriter
+from robot.reporting.jswriter import SeparatingWriter, DataModelWriter
def run_robot(testdata, loglevel='INFO'):
