Ticket #1762: tgtest.patch

turbogears/identity/tests/test_identity.py

@@ -155 +155 @@
-
-
-
-Web
+
-
-    def setUp(self):
-        # identity requires visit and a failure_url
@@ -169 +169 @@
-        self._original_config = original_config
-        config.configure_loggers(test_config)
-        config.update(test_config['global'])
-testutil.mount(IdentityRoot())
-Web
+self.root = IdentityRoot
+
-        self.init_model()
-
-    def tearDown(self):
-Web
+
-        config.update(self._original_config)
-
-    def init_model(self):

turbogears/tests/test_controllers.py

@@ -242 +242 @@
-        return "redirected OK"
-
-
-Web
+
-
-    def setUp(self):
-        testutil.mount(MyRoot(), '/')
-        testutil.mount(SubApp(), '/subthing')
+        self.app = testutil.make_app()
-        super(TestRoot, self).setUp()
-
-
@@ -565 +566 @@
-        assert 'handling_key' in response
-
-
-Web
+
-
-    def setUp(self):
-        testutil.mount(MyRoot(), '/')
-        testutil.mount(SubApp(), '/subthing')
-        testutil.mount(SubApp(), '/subthing/subsubthing')
+        self.app = testutil.make_app()
-        super(TestURLs, self).setUp()
-
-    def tearDown(self):

turbogears/tests/test_view.py

@@ -3 +3 @@
-import cherrypy
-import unittest
-
-testutil.TGWebTest
+unittest.TestCase
-
+    def setUp(self):
+        # The server needs to be started so that the template engines get loaded.
+        testutil.start_server()
+
-    def test_cycle(self):
-        oe = view.base.cycle(('odd','even'))
-        assert str(oe) == str(None)

turbogears/tests/test_paginate.py

@@ -186 +186 @@
-    return result
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    """Never trust a spy"""
-
-    class MyRoot(RootController):
@@ -219 +234 @@
-            spy = Spy(foobar=10)
-            return dict(data=data, spy=spy)
-
-
-    def setUp(self):
-        super(TestSpy, self).setUp(self.MyRoot)
-
-
-    def test_spy(self):
-        response = self.app.get('/spy')
-        Spy.assert_ok(response.body, 'current_page', 1)
@@ -251 +261 @@
-        Spy.assert_ok(response.body, 'var_name', "'data'", raw=True)
-
-
-class TestPagination(testutil.TGWebTest):
-    """Base class for all Paginate TestCases"""
-
-    def setUp(self):
-        super(TestPagination, self).setUp(self.MyRoot)
-
-    def request(self, url, status=200):
-        response = self.app.get(url, status=status)
-        self.body = response.body
-        if "fail: " in self.body:
-            print self.body
-            assert False, "Spy alert! Check body output for details..."
-
-
-class TestBasicPagination(TestPagination):
-
-    class MyRoot(RootController):

turbogears/qstemplates/quickstart/+package+/tests/test_model.py_tmpl

@@ -17 +17 @@
-    from ${package}.model import YourModelClass, User, ...
-"""
-
- import testutil, database
+.testutil import DBTest
-
-# from ${package}.model import YourModelClass, User
-
-
-
-
+
+
-#
-#     def test_creation(self):
-#         """Object creation should set the name."""

turbogears/qstemplates/quickstart/+package+/tests/test_controllers.py_tmpl

@@ -4 +4 @@
-from ${package}.controllers import Root
-import cherrypy
-
-
+
-
-
+
-
-    def setUp(self):
-        testutil.start_server()
-
-    def tearDown(self):
-        """Tests for apps using identity need to stop CP/TG after each test to
-        stop the VisitManager thread.
-        See http://trac.turbogears.org/turbogears/ticket/1217 for details.
-        """
-        testutil.stop_server()
-
-    def test_method(self):
-        "the index method should return a string called now"
-        import types
-testutil.go
+self.app.get
-        assert type(response.raw["now"]) == types.StringType
-
-    def test_indextitle(self):
-        "The indexpage should have the right title"
-testutil.go
+self.app.get
-        assert "<title>welcome to turbogears</title>" in response.body.lower()
-
-#if $identity != "none"
-    def test_logintitle(self):
-        "login page should have the right title"
-testutil.go
-login</title>" in response.body.lower()
+self.app.get
+Login</title>" in response, response
-#end if

turbogears/qstemplates/quickstart/setup.py_tmpl

@@ -27 +27 @@
-
-    install_requires=[
-        "TurboGears >= ${turbogearsversion}",
+        "WebTest",
-#if $sqlobject == 'True'
-        "$sqlobjectversion"
-#elif $sqlalchemy == 'True'

turbogears/testutil.py

@@ -157 +157 @@
-    return TestApp(wsgiapp)
-
-
-Web
+
-    """A WebTest enabled unit testing class.
-
-
+
+
-
+    In your tests, use self.app to make WebTest calls.
-    """
-
-def setUp(self, controller=None):
-    """Set up the WebTest by starting the server."
+root = None
+app = None
-
+    def setUp(self):
+        """Set up the WebTest by starting the server.
+
-        You should override this and make sure you have properly
-        mounted a root for your server before calling super,
-        or simply pass a root controller to super.
-        Otherwise the Cherrypy filters for TurboGears will not be used.
-
-        """
-
+
+
+
-        start_server()
-
-    def tearDown(self):
-        """Tear down the WebTest by stopping the server."""
-        stop_server(tg_only = True)
-        del self.app
-
-    def login_user(self, user):
-        """Log a specified user object into the system."""
@@ -281 +286 @@
-    return output, response
-
-
-
+
+
-
+    Creates and destroys your database before and after each unit test.  You must set the 
+    model attribute in order for this class to function correctly.
+    """
-    model = None
-
+    def setUp(self):
+        raise NotImplementedError()
+
+    def tearDown(self):
+        raise NotImplementedError()
+
+class DBTestSO(AbstractDBTest):
-    def _get_soClasses(self):
-        try:
-            return [self.model.__dict__[x] for x in self.model.soClasses]
@@ -295 +311 @@
-        if not self.model:
-            self.model = get_model()
-            if not self.model:
-
-
+
-        for item in self._get_soClasses():
-            if isinstance(item, types.TypeType) and issubclass(item,
-                sqlobject.SQLObject) and item != sqlobject.SQLObject \
@@ -311 +326 @@
-                and item != InheritableSQLObject:
-                item.dropTable(ifExists=True, cascade=True)
-
+class DBTestSA(AbstractDBTest):
+    def setUp(self):
+        database.get_engine()
+        database.metadata.create_all()
+
+    def tearDown(self):
+        database.metadata.drop_all()
+
+
+#Determine which class to use for "DBTest".  Setup & teardown should behave 
+#simularly regardless of which ORM you choose.
+if config.get("sqlobject.dburi"):
+    DBTest = DBTestSO
+elif config.get("sqlalchemy.dburi"):
+    DBTest = DBTestSA
+else:
+    raise Exception("Unable to find sqlalchemy or sqlobject dburi")
+
+
-def unmount():
-    """Remove an application from the object traversal tree."""
-    # There's no clean way to remove a subtree under CP2, so the only use case

turbogears/command/quickstart.py

@@ -240 +240 @@
-            sqlalchemyversion = str(get_requirement('sqlalchemy'))
-            cmd_args.append("sqlalchemyversion=%s" % sqlalchemyversion)
-        if self.elixir:
-future', 'elixir
+sqlalchemy
-            cmd_args.append("elixirversion=%s" % elixirversion)
-
-        command.run(cmd_args)