From 151b8ba38a33184ecc6e20dd8ffac1971e4a5b1e Mon Sep 17 00:00:00 2001 From: Jason Gerard DeRose Date: Tue, 7 Oct 2008 21:06:01 -0600 Subject: Moved ipa_webui/tests/ to tests/test_ipa_webui/ --- ipa_webui/tests/__init__.py | 21 ---------- ipa_webui/tests/test_controllers.py | 70 -------------------------------- tests/test_ipa_webui/__init__.py | 21 ++++++++++ tests/test_ipa_webui/test_controllers.py | 70 ++++++++++++++++++++++++++++++++ 4 files changed, 91 insertions(+), 91 deletions(-) delete mode 100644 ipa_webui/tests/__init__.py delete mode 100644 ipa_webui/tests/test_controllers.py create mode 100644 tests/test_ipa_webui/__init__.py create mode 100644 tests/test_ipa_webui/test_controllers.py diff --git a/ipa_webui/tests/__init__.py b/ipa_webui/tests/__init__.py deleted file mode 100644 index c0647132..00000000 --- a/ipa_webui/tests/__init__.py +++ /dev/null @@ -1,21 +0,0 @@ -# Authors: Jason Gerard DeRose -# -# Copyright (C) 2008 Red Hat -# see file 'COPYING' for use and warranty information -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; version 2 only -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -""" -Test the `ipa_webui` package. -""" diff --git a/ipa_webui/tests/test_controllers.py b/ipa_webui/tests/test_controllers.py deleted file mode 100644 index f5944dd9..00000000 --- a/ipa_webui/tests/test_controllers.py +++ /dev/null @@ -1,70 +0,0 @@ -# Authors: Jason Gerard DeRose -# -# Copyright (C) 2008 Red Hat -# see file 'COPYING' for use and warranty information -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; version 2 only -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -""" -Test the `ipa_webui.controller` module. -""" - -from ipa_webui import controller - - - -class test_Controller(object): - """ - Test the `controller.Controller` class. - """ - - def test_init(self): - """ - Test the `ipa_webui.controller.Controller.__init__()` method. - """ - o = controller.Controller() - assert o.template is None - template = 'The template.' - o = controller.Controller(template) - assert o.template is template - - def test_output_xhtml(self): - """ - Test the `ipa_webui.controller.Controller.output_xhtml` method. - """ - class Template(object): - def __init__(self): - self.calls = 0 - self.kw = {} - - def serialize(self, **kw): - self.calls += 1 - self.kw = kw - return dict(kw) - - d = dict(output='xhtml-strict', format='pretty') - t = Template() - o = controller.Controller(t) - assert o.output_xhtml() == d - assert t.calls == 1 - - def test_output_json(self): - """ - Test the `ipa_webui.controller.Controller.output_json` method. - """ - o = controller.Controller() - assert o.output_json() == '{}' - e = '{\n "age": 27, \n "first": "John", \n "last": "Doe"\n}' - j = o.output_json(last='Doe', first='John', age=27) - assert j == e diff --git a/tests/test_ipa_webui/__init__.py b/tests/test_ipa_webui/__init__.py new file mode 100644 index 00000000..c0647132 --- /dev/null +++ b/tests/test_ipa_webui/__init__.py @@ -0,0 +1,21 @@ +# Authors: Jason Gerard DeRose +# +# Copyright (C) 2008 Red Hat +# see file 'COPYING' for use and warranty information +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; version 2 only +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +""" +Test the `ipa_webui` package. +""" diff --git a/tests/test_ipa_webui/test_controllers.py b/tests/test_ipa_webui/test_controllers.py new file mode 100644 index 00000000..f5944dd9 --- /dev/null +++ b/tests/test_ipa_webui/test_controllers.py @@ -0,0 +1,70 @@ +# Authors: Jason Gerard DeRose +# +# Copyright (C) 2008 Red Hat +# see file 'COPYING' for use and warranty information +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; version 2 only +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +""" +Test the `ipa_webui.controller` module. +""" + +from ipa_webui import controller + + + +class test_Controller(object): + """ + Test the `controller.Controller` class. + """ + + def test_init(self): + """ + Test the `ipa_webui.controller.Controller.__init__()` method. + """ + o = controller.Controller() + assert o.template is None + template = 'The template.' + o = controller.Controller(template) + assert o.template is template + + def test_output_xhtml(self): + """ + Test the `ipa_webui.controller.Controller.output_xhtml` method. + """ + class Template(object): + def __init__(self): + self.calls = 0 + self.kw = {} + + def serialize(self, **kw): + self.calls += 1 + self.kw = kw + return dict(kw) + + d = dict(output='xhtml-strict', format='pretty') + t = Template() + o = controller.Controller(t) + assert o.output_xhtml() == d + assert t.calls == 1 + + def test_output_json(self): + """ + Test the `ipa_webui.controller.Controller.output_json` method. + """ + o = controller.Controller() + assert o.output_json() == '{}' + e = '{\n "age": 27, \n "first": "John", \n "last": "Doe"\n}' + j = o.output_json(last='Doe', first='John', age=27) + assert j == e -- cgit