rename 'storage' modules to 'serializer', and rename serializer child modules

This commit is contained in:
Samuel Abels
2017-03-16 09:38:41 +01:00
parent aadb75cc88
commit c1937ae740
37 changed files with 89 additions and 98 deletions

View File

@ -38,7 +38,7 @@ The process of using Spiff Workflow involves the following steps:
```python ```python
from SpiffWorkflow.specs import WorkflowSpec from SpiffWorkflow.specs import WorkflowSpec
from SpiffWorkflow.storage import XmlSerializer from SpiffWorkflow.serializer.oldxml import XmlSerializer
from SpiffWorkflow import Workflow from SpiffWorkflow import Workflow
# Load the workflow specification: # Load the workflow specification:

View File

@ -275,7 +275,7 @@ class Workflow(object):
""" """
Serializes a Workflow instance using the provided serializer. Serializes a Workflow instance using the provided serializer.
:type serializer: :class:`SpiffWorkflow.storage.Serializer` :type serializer: :class:`SpiffWorkflow.serializer.base.Serializer`
:param serializer: The serializer to use. :param serializer: The serializer to use.
:type kwargs: dict :type kwargs: dict
:param kwargs: Passed to the serializer. :param kwargs: Passed to the serializer.
@ -289,7 +289,7 @@ class Workflow(object):
""" """
Deserializes a Workflow instance using the provided serializer. Deserializes a Workflow instance using the provided serializer.
:type serializer: :class:`SpiffWorkflow.storage.Serializer` :type serializer: :class:`SpiffWorkflow.serializer.base.Serializer`
:param serializer: The serializer to use. :param serializer: The serializer to use.
:type s_state: object :type s_state: object
:param s_state: The serialized workflow. :param s_state: The serialized workflow.

View File

@ -22,13 +22,13 @@ import xml.etree.ElementTree as ET
import zipfile import zipfile
import os import os
from SpiffWorkflow.bpmn.parser.BpmnParser import BpmnParser from SpiffWorkflow.bpmn.parser.BpmnParser import BpmnParser
from SpiffWorkflow.bpmn.storage.Packager import Packager from SpiffWorkflow.bpmn.serializer.Packager import Packager
from SpiffWorkflow.storage.Serializer import Serializer from SpiffWorkflow.serializer.base import Serializer
class BpmnSerializer(Serializer): class BpmnSerializer(Serializer):
""" """
The BpmnSerializer class provides support for deserializing a Bpmn Workflow Spec from a BPMN package. The BpmnSerializer class provides support for deserializing a Bpmn Workflow Spec from a BPMN package.
The BPMN package must have been created using the Packager class (from SpiffWorkflow.bpmn.storage.Packager). The BPMN package must have been created using the :class:`SpiffWorkflow.bpmn.serializer.Packager`.
It will also use the appropriate subclass of BpmnParser, if one is included in the metadata.ini file. It will also use the appropriate subclass of BpmnParser, if one is included in the metadata.ini file.
""" """

View File

@ -22,7 +22,7 @@ import logging
from SpiffWorkflow.Task import Task from SpiffWorkflow.Task import Task
from SpiffWorkflow.bpmn.BpmnWorkflow import BpmnWorkflow from SpiffWorkflow.bpmn.BpmnWorkflow import BpmnWorkflow
from SpiffWorkflow.specs import SubWorkflow from SpiffWorkflow.specs import SubWorkflow
from SpiffWorkflow.storage.Serializer import Serializer from SpiffWorkflow.serializer.base import Serializer
try: try:
basestring basestring

View File

@ -43,7 +43,7 @@ class Attrib(Term):
""" """
Serializes the instance using the provided serializer. Serializes the instance using the provided serializer.
:type serializer: :class:`SpiffWorkflow.storage.Serializer` :type serializer: :class:`SpiffWorkflow.serializer.base.Serializer`
:param serializer: The serializer to use. :param serializer: The serializer to use.
:rtype: object :rtype: object
:returns: The serialized object. :returns: The serialized object.
@ -55,7 +55,7 @@ class Attrib(Term):
""" """
Serializes the instance using the provided serializer. Serializes the instance using the provided serializer.
:type serializer: :class:`SpiffWorkflow.storage.Serializer` :type serializer: :class:`SpiffWorkflow.serializer.base.Serializer`
:param serializer: The serializer to use. :param serializer: The serializer to use.
:rtype: object :rtype: object
:returns: The serialized object. :returns: The serialized object.
@ -75,7 +75,7 @@ class PathAttrib(Term):
""" """
Serializes the instance using the provided serializer. Serializes the instance using the provided serializer.
:type serializer: :class:`SpiffWorkflow.storage.Serializer` :type serializer: :class:`SpiffWorkflow.serializer.base.Serializer`
:param serializer: The serializer to use. :param serializer: The serializer to use.
:rtype: object :rtype: object
:returns: The serialized object. :returns: The serialized object.
@ -87,7 +87,7 @@ class PathAttrib(Term):
""" """
Serializes the instance using the provided serializer. Serializes the instance using the provided serializer.
:type serializer: :class:`SpiffWorkflow.storage.Serializer` :type serializer: :class:`SpiffWorkflow.serializer.base.Serializer`
:param serializer: The serializer to use. :param serializer: The serializer to use.
:rtype: object :rtype: object
:returns: The serialized object. :returns: The serialized object.
@ -137,6 +137,29 @@ class Assign(Term):
right = from_obj.get_data(self.right_attribute) right = from_obj.get_data(self.right_attribute)
to_obj.set_data(**{unicode(self.left_attribute): right}) to_obj.set_data(**{unicode(self.left_attribute): right})
def serialize(self, serializer):
"""
Serializes the instance using the provided serializer.
:type serializer: :class:`SpiffWorkflow.serializer.base.Serializer`
:param serializer: The serializer to use.
:rtype: object
:returns: The serialized object.
"""
return serializer.serialize_assign(self)
@classmethod
def deserialize(cls, serializer, s_state):
"""
Serializes the instance using the provided serializer.
:type serializer: :class:`SpiffWorkflow.serializer.base.Serializer`
:param serializer: The serializer to use.
:rtype: object
:returns: The serialized object.
"""
return serializer.deserialize_assign(s_state)
def valueof(scope, op, default=None): def valueof(scope, op, default=None):
if op is None: if op is None:
@ -189,7 +212,7 @@ class Operator(Term):
""" """
Serializes the instance using the provided serializer. Serializes the instance using the provided serializer.
:type serializer: :class:`SpiffWorkflow.storage.Serializer` :type serializer: :class:`SpiffWorkflow.serializer.base.Serializer`
:param serializer: The serializer to use. :param serializer: The serializer to use.
:rtype: object :rtype: object
:returns: The serialized object. :returns: The serialized object.
@ -201,7 +224,7 @@ class Operator(Term):
""" """
Serializes the instance using the provided serializer. Serializes the instance using the provided serializer.
:type serializer: :class:`SpiffWorkflow.storage.Serializer` :type serializer: :class:`SpiffWorkflow.serializer.base.Serializer`
:param serializer: The serializer to use. :param serializer: The serializer to use.
:rtype: object :rtype: object
:returns: The serialized object. :returns: The serialized object.

View File

@ -1,5 +1,5 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from __future__ import division from __future__ import division, absolute_import
# This library is free software; you can redistribute it and/or # This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public # modify it under the terms of the GNU Lesser General Public
# License as published by the Free Software Foundation; either # License as published by the Free Software Foundation; either
@ -14,7 +14,6 @@ from __future__ import division
# License along with this library; if not, write to the Free Software # License along with this library; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
class Serializer(object): class Serializer(object):
def serialize_workflow_spec(self, wf_spec, **kwargs): def serialize_workflow_spec(self, wf_spec, **kwargs):
raise NotImplementedError("You must implement the serialize_workflow_spec method.") raise NotImplementedError("You must implement the serialize_workflow_spec method.")

View File

@ -1,5 +1,5 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from __future__ import division from __future__ import division, absolute_import
# This library is free software; you can redistribute it and/or # This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public # modify it under the terms of the GNU Lesser General Public
# License as published by the Free Software Foundation; either # License as published by the Free Software Foundation; either
@ -15,14 +15,14 @@ from __future__ import division
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
import pickle import pickle
from base64 import b64encode, b64decode from base64 import b64encode, b64decode
from SpiffWorkflow import Workflow from .. import Workflow
from SpiffWorkflow.util.impl import get_class from ..util.impl import get_class
from SpiffWorkflow.Task import Task from ..Task import Task
from SpiffWorkflow.operators import * from ..operators import *
from SpiffWorkflow.specs.TaskSpec import TaskSpec from ..specs.TaskSpec import TaskSpec
from SpiffWorkflow.specs import * from ..specs import *
from SpiffWorkflow.storage.Serializer import Serializer from .base import Serializer
from SpiffWorkflow.storage.exceptions import TaskNotSupportedError from .exceptions import TaskNotSupportedError
import warnings import warnings
class DictionarySerializer(Serializer): class DictionarySerializer(Serializer):

View File

@ -1,5 +1,5 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from __future__ import division from __future__ import division, absolute_import
# This library is free software; you can redistribute it and/or # This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public # modify it under the terms of the GNU Lesser General Public
# License as published by the Free Software Foundation; either # License as published by the Free Software Foundation; either
@ -14,11 +14,9 @@ from __future__ import division
# License along with this library; if not, write to the Free Software # License along with this library; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
# requires: https://github.com/stricaud/gvgen # requires: https://github.com/stricaud/gvgen
import gvgen import gvgen
from .base import Serializer
from SpiffWorkflow.storage.Serializer import Serializer
class dotVisualizer(Serializer): class dotVisualizer(Serializer):
def serialize_workflow_spec(self, wf_spec): def serialize_workflow_spec(self, wf_spec):
@ -73,4 +71,4 @@ class dotVisualizer(Serializer):
recurisvelyAddNodes(wf_spec.start) recurisvelyAddNodes(wf_spec.start)
recursive_linking(wf_spec.start) recursive_linking(wf_spec.start)
return (graph.dot() if graph.dot() else '') return (graph.dot() if graph.dot() else '')

View File

@ -1,5 +1,5 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from __future__ import division from __future__ import division, absolute_import
# This library is free software; you can redistribute it and/or # This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public # modify it under the terms of the GNU Lesser General Public
# License as published by the Free Software Foundation; either # License as published by the Free Software Foundation; either
@ -15,8 +15,8 @@ from __future__ import division
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
import json import json
import uuid import uuid
from SpiffWorkflow.storage import DictionarySerializer from .dict import DictionarySerializer
from SpiffWorkflow.operators import Attrib from ..operators import Attrib
def object_hook(dct): def object_hook(dct):
if '__uuid__' in dct: if '__uuid__' in dct:

View File

@ -1,5 +1,5 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from __future__ import division from __future__ import division, absolute_import
# Copyright (C) 2007-2012 Samuel Abels # Copyright (C) 2007-2012 Samuel Abels
# #
# This library is free software; you can redistribute it and/or # This library is free software; you can redistribute it and/or
@ -18,9 +18,9 @@ from __future__ import division
import os import os
import re import re
import xml.dom.minidom as minidom import xml.dom.minidom as minidom
from SpiffWorkflow import operators, specs from .. import operators, specs
from SpiffWorkflow.exceptions import StorageException from ..exceptions import StorageException
from SpiffWorkflow.storage.Serializer import Serializer from .base import Serializer
# Create a list of tag names out of the spec names. # Create a list of tag names out of the spec names.
_spec_map = dict() _spec_map = dict()

View File

@ -81,7 +81,7 @@ class SubWorkflow(TaskSpec):
my_task._sync_children(outputs, my_task.state) my_task._sync_children(outputs, my_task.state)
def _create_subworkflow(self, my_task): def _create_subworkflow(self, my_task):
from SpiffWorkflow.storage import XmlSerializer from SpiffWorkflow.serializer.prettyxml import XmlSerializer
from SpiffWorkflow.specs import WorkflowSpec from SpiffWorkflow.specs import WorkflowSpec
file = valueof(my_task, self.file) file = valueof(my_task, self.file)
serializer = XmlSerializer() serializer = XmlSerializer()

View File

@ -422,7 +422,7 @@ class TaskSpec(object):
use them, make sure to re-connect them once the spec is use them, make sure to re-connect them once the spec is
deserialized. deserialized.
:type serializer: :class:`SpiffWorkflow.storage.Serializer` :type serializer: :class:`SpiffWorkflow.serializer.base.Serializer`
:param serializer: The serializer to use. :param serializer: The serializer to use.
:type kwargs: dict :type kwargs: dict
:param kwargs: Passed to the serializer. :param kwargs: Passed to the serializer.
@ -442,7 +442,7 @@ class TaskSpec(object):
use them, make sure to re-connect them once the spec is use them, make sure to re-connect them once the spec is
deserialized. deserialized.
:type serializer: :class:`SpiffWorkflow.storage.Serializer` :type serializer: :class:`SpiffWorkflow.serializer.base.Serializer`
:param serializer: The serializer to use. :param serializer: The serializer to use.
:type wf_spec: :class:`SpiffWorkflow.spec.WorkflowSpec` :type wf_spec: :class:`SpiffWorkflow.spec.WorkflowSpec`
:param wf_spec: An instance of the WorkflowSpec. :param wf_spec: An instance of the WorkflowSpec.

View File

@ -22,14 +22,14 @@ from SpiffWorkflow.specs.TaskSpec import TaskSpec
class ThreadStart(TaskSpec): class ThreadStart(TaskSpec):
""" """
This class implements the task the is placed at the beginning This class implements the task the is placed at the beginning
of each thread. It is NOT supposed to be used by in the API, it is of each thread. It is NOT supposed to be used! It is purely internal,
used internally only (by the ThreadSplit task). and used only by the ThreadSplit task.
The task has no inputs and at least one output. The task has no inputs and at least one output.
If more than one output is connected, the task does an implicit If more than one output is connected, the task does an implicit
parallel split. parallel split.
""" """
def __init__(self, parent, **kwargs): def __init__(self, parent, name='ThreadStart', **kwargs):
""" """
Constructor. The name of this task is *always* 'ThreadStart'. Constructor. The name of this task is *always* 'ThreadStart'.
@ -38,7 +38,7 @@ class ThreadStart(TaskSpec):
:type kwargs: dict :type kwargs: dict
:param kwargs: See :class:`SpiffWorkflow.specs.TaskSpec`. :param kwargs: See :class:`SpiffWorkflow.specs.TaskSpec`.
""" """
TaskSpec.__init__(self, parent, 'ThreadStart', **kwargs) TaskSpec.__init__(self, parent, name, **kwargs)
self.internal = True self.internal = True
def _on_complete_hook(self, my_task): def _on_complete_hook(self, my_task):

View File

@ -105,7 +105,7 @@ class WorkflowSpec(object):
""" """
Serializes the instance using the provided serializer. Serializes the instance using the provided serializer.
:type serializer: :class:`SpiffWorkflow.storage.Serializer` :type serializer: :class:`SpiffWorkflow.serializer.serialzer.Serializer`
:param serializer: The serializer to use. :param serializer: The serializer to use.
:type kwargs: dict :type kwargs: dict
:param kwargs: Passed to the serializer. :param kwargs: Passed to the serializer.
@ -119,7 +119,7 @@ class WorkflowSpec(object):
""" """
Deserializes a WorkflowSpec instance using the provided serializer. Deserializes a WorkflowSpec instance using the provided serializer.
:type serializer: :class:`SpiffWorkflow.storage.Serializer` :type serializer: :class:`SpiffWorkflow.serializer.serialzer.Serializer`
:param serializer: The serializer to use. :param serializer: The serializer to use.
:type s_state: object :type s_state: object
:param s_state: The serialized workflow specification object. :param s_state: The serialized workflow specification object.

View File

@ -1,9 +0,0 @@
# -*- coding: utf-8 -*-
from __future__ import division
from .XmlSerializer import XmlSerializer
from .DictionarySerializer import DictionarySerializer
from .JSONSerializer import JSONSerializer
import inspect
__all__ = [name for name, obj in list(locals().items())
if not (name.startswith('_') or inspect.ismodule(obj))]

View File

@ -55,7 +55,7 @@ The WorkflowSpec and TaskSpec classes are used to define a workflow. SpiffWorkfl
A WorkflowSpec is built by chaining TaskSpecs together in a tree. You can either assemble workflow using Python objects (see the example linked above), or by loading it from XML such as follows:: A WorkflowSpec is built by chaining TaskSpecs together in a tree. You can either assemble workflow using Python objects (see the example linked above), or by loading it from XML such as follows::
from SpiffWorkflow.storage import XmlSerializer from SpiffWorkflow.serializer.oldxml import XmlSerializer
serializer = XmlSerializer() serializer = XmlSerializer()
xml_file = 'my_workflow.xml' xml_file = 'my_workflow.xml'

View File

@ -1,4 +1,4 @@
from SpiffWorkflow.storage import JSONSerializer from SpiffWorkflow.serializer.prettyxml import JSONSerializer
from strike import NuclearStrike from strike import NuclearStrike
class NuclearSerializer(JSONSerializer): class NuclearSerializer(JSONSerializer):

View File

@ -21,7 +21,7 @@ included with the package.
license = 'lGPLv2', license = 'lGPLv2',
packages = find_packages(exclude=['tests', 'tests.*']), packages = find_packages(exclude=['tests', 'tests.*']),
requires = [], requires = [],
keywords = 'spiff guard acl acls security authentication object storage', keywords = 'spiff workflow bpmn engine',
url = 'https://github.com/knipknap/SpiffWorkflow', url = 'https://github.com/knipknap/SpiffWorkflow',
classifiers = [ classifiers = [
'Development Status :: 3 - Alpha', 'Development Status :: 3 - Alpha',

View File

@ -5,7 +5,7 @@ sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..', '..'))
from SpiffWorkflow.specs import * from SpiffWorkflow.specs import *
from SpiffWorkflow import Task from SpiffWorkflow import Task
from SpiffWorkflow.storage import XmlSerializer from SpiffWorkflow.serializer.prettyxml import XmlSerializer
from util import run_workflow from util import run_workflow
class WorkflowTestData: class WorkflowTestData:

View File

@ -1,7 +1,5 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from __future__ import print_function, absolute_import, division from __future__ import print_function, absolute_import, division
from __future__ import division
import sys, unittest, os.path import sys, unittest, os.path
sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..', '..')) sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..', '..'))
@ -10,8 +8,7 @@ from SpiffWorkflow.specs import *
from SpiffWorkflow.operators import * from SpiffWorkflow.operators import *
from SpiffWorkflow.Task import * from SpiffWorkflow.Task import *
from SpiffWorkflow.specs.Simple import Simple from SpiffWorkflow.specs.Simple import Simple
from SpiffWorkflow.storage import DictionarySerializer from SpiffWorkflow.serializer.dict import DictionarySerializer
class ASmallWorkflow(WorkflowSpec): class ASmallWorkflow(WorkflowSpec):
def __init__(self): def __init__(self):

View File

@ -10,7 +10,7 @@ from SpiffWorkflow import Workflow
from SpiffWorkflow.specs import * from SpiffWorkflow.specs import *
from SpiffWorkflow.operators import * from SpiffWorkflow.operators import *
from SpiffWorkflow.Task import * from SpiffWorkflow.Task import *
from SpiffWorkflow.storage import XmlSerializer from SpiffWorkflow.serializer.prettyxml import XmlSerializer
class WorkflowTest(unittest.TestCase): class WorkflowTest(unittest.TestCase):
def testConstructor(self): def testConstructor(self):

View File

@ -1,13 +1,11 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from __future__ import print_function, absolute_import, division from __future__ import print_function, absolute_import, division
from __future__ import division
import logging import logging
import os import os
import unittest import unittest
from SpiffWorkflow.Task import Task from SpiffWorkflow.Task import Task
from SpiffWorkflow.bpmn.storage.BpmnSerializer import BpmnSerializer from SpiffWorkflow.bpmn.serializer.BpmnSerializer import BpmnSerializer
from SpiffWorkflow.bpmn.storage.CompactWorkflowSerializer import CompactWorkflowSerializer from SpiffWorkflow.bpmn.serializer.CompactWorkflowSerializer import CompactWorkflowSerializer
from tests.SpiffWorkflow.bpmn.PackagerForTests import PackagerForTests from tests.SpiffWorkflow.bpmn.PackagerForTests import PackagerForTests
__author__ = 'matth' __author__ = 'matth'

View File

@ -1,11 +1,7 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from __future__ import print_function, absolute_import, division from __future__ import print_function, absolute_import, division
from __future__ import division
from io import BytesIO from io import BytesIO
from SpiffWorkflow.bpmn.serializer.Packager import Packager, main
from SpiffWorkflow.bpmn.storage.Packager import Packager, main
from tests.SpiffWorkflow.bpmn.BpmnLoaderForTests import TestBpmnParser from tests.SpiffWorkflow.bpmn.BpmnLoaderForTests import TestBpmnParser
__author__ = 'matth' __author__ = 'matth'

View File

@ -3,7 +3,7 @@ from __future__ import print_function, absolute_import, division
from __future__ import division from __future__ import division
import sys import sys
from SpiffWorkflow.bpmn.storage.BpmnSerializer import BpmnSerializer from SpiffWorkflow.bpmn.serializer.BpmnSerializer import BpmnSerializer
from tests.SpiffWorkflow.bpmn.PackagerForTests import PackagerForTests from tests.SpiffWorkflow.bpmn.PackagerForTests import PackagerForTests
__author__ = 'matth' __author__ = 'matth'
@ -23,4 +23,4 @@ def main():
f.close() f.close()
if __name__ == '__main__': if __name__ == '__main__':
main() main()

View File

@ -7,10 +7,10 @@ sys.path.insert(0, os.path.join(dirname, '..'))
from uuid import UUID from uuid import UUID
from PatternTest import run_workflow, PatternTest from PatternTest import run_workflow, PatternTest
from SpiffWorkflow.storage.Serializer import Serializer from SpiffWorkflow.serializer.base import Serializer
from SpiffWorkflow.specs import WorkflowSpec from SpiffWorkflow.specs import WorkflowSpec
from SpiffWorkflow import Workflow from SpiffWorkflow import Workflow
from SpiffWorkflow.storage.exceptions import TaskSpecNotSupportedError, \ from SpiffWorkflow.serializer.exceptions import TaskSpecNotSupportedError, \
TaskNotSupportedError TaskNotSupportedError
from data.spiff.workflow1 import TestWorkflowSpec from data.spiff.workflow1 import TestWorkflowSpec

View File

@ -5,8 +5,8 @@ dirname = os.path.dirname(__file__)
sys.path.insert(0, os.path.join(dirname, '..', '..', '..')) sys.path.insert(0, os.path.join(dirname, '..', '..', '..'))
import uuid import uuid
from SpiffWorkflow.storage import DictionarySerializer from SpiffWorkflow.serializer.dict import DictionarySerializer
from .SerializerTest import SerializerTest from .baseTest import SerializerTest
from SpiffWorkflow import Workflow from SpiffWorkflow import Workflow
class DictionarySerializerTest(SerializerTest): class DictionarySerializerTest(SerializerTest):

View File

@ -5,9 +5,9 @@ dirname = os.path.dirname(__file__)
sys.path.insert(0, os.path.join(dirname, '..', '..', '..')) sys.path.insert(0, os.path.join(dirname, '..', '..', '..'))
import json import json
from SpiffWorkflow.storage import JSONSerializer from SpiffWorkflow.serializer.json import JSONSerializer
from .SerializerTest import SerializerTest from .baseTest import SerializerTest
from .DictionarySerializerTest import DictionarySerializerTest from .dictTest import DictionarySerializerTest
class JSONSerializerTest(DictionarySerializerTest): class JSONSerializerTest(DictionarySerializerTest):
def setUp(self): def setUp(self):

View File

@ -5,10 +5,8 @@ dirname = os.path.dirname(__file__)
data_dir = os.path.join(dirname, '..', 'data') data_dir = os.path.join(dirname, '..', 'data')
sys.path.insert(0, os.path.join(dirname, '..', '..', '..')) sys.path.insert(0, os.path.join(dirname, '..', '..', '..'))
from SpiffWorkflow.storage import XmlSerializer from SpiffWorkflow.serializer.prettyxml import XmlSerializer
from .SerializerTest import SerializerTest from .baseTest import SerializerTest
from PatternTest import run_workflow
from SpiffWorkflow.specs import WorkflowSpec
class XmlSerializerTest(SerializerTest): class XmlSerializerTest(SerializerTest):
def setUp(self): def setUp(self):

View File

@ -1,7 +1,5 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from __future__ import print_function, absolute_import, division from __future__ import print_function, absolute_import, division
from __future__ import division
import os import os
import sys import sys
import unittest import unittest
@ -10,7 +8,7 @@ sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..', '..', '..'))
from .TaskSpecTest import TaskSpecTest from .TaskSpecTest import TaskSpecTest
from SpiffWorkflow.specs import Celery, WorkflowSpec from SpiffWorkflow.specs import Celery, WorkflowSpec
from SpiffWorkflow.operators import Attrib from SpiffWorkflow.operators import Attrib
from SpiffWorkflow.storage import DictionarySerializer from SpiffWorkflow.serializer.dict import DictionarySerializer
from base64 import b64encode from base64 import b64encode
class CeleryTest(TaskSpecTest): class CeleryTest(TaskSpecTest):

View File

@ -1,7 +1,5 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from __future__ import print_function, absolute_import, division from __future__ import print_function, absolute_import, division
from __future__ import division
import sys import sys
import unittest import unittest
import re import re
@ -11,7 +9,7 @@ sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..', '..', '..'))
from SpiffWorkflow.specs import WorkflowSpec, Simple, Join from SpiffWorkflow.specs import WorkflowSpec, Simple, Join
from SpiffWorkflow.specs.SubWorkflow import SubWorkflow from SpiffWorkflow.specs.SubWorkflow import SubWorkflow
from SpiffWorkflow.storage import XmlSerializer from SpiffWorkflow.serializer.prettyxml import XmlSerializer
from SpiffWorkflow.Task import Task from SpiffWorkflow.Task import Task
from SpiffWorkflow.Workflow import Workflow from SpiffWorkflow.Workflow import Workflow

View File

@ -1,7 +1,5 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from __future__ import print_function, absolute_import, division from __future__ import print_function, absolute_import, division
from __future__ import division
import sys import sys
import unittest import unittest
import re import re
@ -11,8 +9,7 @@ sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..', '..', '..'))
from SpiffWorkflow.specs import WorkflowSpec, Simple, Join from SpiffWorkflow.specs import WorkflowSpec, Simple, Join
from SpiffWorkflow.exceptions import WorkflowException from SpiffWorkflow.exceptions import WorkflowException
from SpiffWorkflow.specs.TaskSpec import TaskSpec from SpiffWorkflow.specs.TaskSpec import TaskSpec
from SpiffWorkflow.storage import DictionarySerializer from SpiffWorkflow.serializer.dict import DictionarySerializer
class TaskSpecTest(unittest.TestCase): class TaskSpecTest(unittest.TestCase):
CORRELATE = TaskSpec CORRELATE = TaskSpec

View File

@ -1,7 +1,5 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from __future__ import print_function, absolute_import, division from __future__ import print_function, absolute_import, division
from __future__ import division
import os import os
import sys import sys
import unittest import unittest
@ -16,7 +14,7 @@ except ImportError as e:
from tests.SpiffWorkflow.util import track_workflow from tests.SpiffWorkflow.util import track_workflow
from SpiffWorkflow import Workflow from SpiffWorkflow import Workflow
from SpiffWorkflow.specs import Join, WorkflowSpec from SpiffWorkflow.specs import Join, WorkflowSpec
from SpiffWorkflow.storage import XmlSerializer from SpiffWorkflow.serializer.prettyxml import XmlSerializer
serializer = XmlSerializer() serializer = XmlSerializer()
data_file = 'data.pkl' data_file = 'data.pkl'