Added MANIFEST.in and unittests

mitsuhiko · mitsuhiko · commit d6e6e3156daa · 2010-07-25T17:58:10.000+02:00
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -0,0 +1,6 @@
+include LICENSE *.py
+recursive-include docs *
+recursive-exclude docs *.pyc
+recursive-exclude docs *.pyo
+prune docs/_build
+prune docs/_themes/.git
diff --git a/setup.py b/setup.py
@@ -17,7 +17,7 @@
 
 setup(
     name='Flask-SQLAlchemy',
-    version='0.8',
+    version='0.9',
     url='http://github.com/mitsuhiko/flask-sqlalchemy',
     license='BSD',
     author='Armin Ronacher',
@@ -33,6 +33,7 @@
         'Flask',
         'SQLAlchemy'
     ],
+    test_suite='test_sqlalchemy',
     classifiers=[
         'Development Status :: 4 - Beta',
         'Environment :: Web Environment',
diff --git a/test_sqlalchemy.py b/test_sqlalchemy.py
@@ -1,21 +1,101 @@
 import unittest
+from datetime import datetime
+import flask
 from flaskext import sqlalchemy
 
 
+class BasicAppTestCase(unittest.TestCase):
+
+    def setUp(self):
+        app = flask.Flask(__name__)
+        app.config['SQLALCHEMY_ENGINE'] = 'sqlite://'
+        app.config['TESTING'] = True
+        db = sqlalchemy.SQLAlchemy(app)
+
+        class Todo(db.Model):
+            __tablename__ = 'todos'
+            id = db.Column('todo_id', db.Integer, primary_key=True)
+            title = db.Column(db.String(60))
+            text = db.Column(db.String)
+            done = db.Column(db.Boolean)
+            pub_date = db.Column(db.DateTime)
+
+            def __init__(self, title, text):
+                self.title = title
+                self.text = text
+                self.done = False
+                self.pub_date = datetime.utcnow()
+
+        @app.route('/')
+        def index():
+            return '\n'.join(x.title for x in Todo.query.all())
+
+        @app.route('/add', methods=['POST'])
+        def add():
+            form = flask.request.form
+            todo = Todo(form['title'], form['text'])
+            db.session.add(todo)
+            db.session.commit()
+            return 'added'
+
+        db.create_all()
+
+        self.app = app
+        self.db = db
+        self.Todo = Todo
+
+    def tearDown(self):
+        self.db.drop_all()
+
+    def test_basic_insert(self):
+        c = self.app.test_client()
+        c.post('/add', data=dict(title='First Item', text='The text'))
+        c.post('/add', data=dict(title='2nd Item', text='The text'))
+        rv = c.get('/')
+        assert rv.data == 'First Item\n2nd Item'
+
+    def test_request_context(self):
+        self.assertEqual(self.Todo.query, None)
+        with self.app.test_request_context():
+            todo = self.Todo('Test', 'test')
+            self.db.session.add(todo)
+            self.db.session.commit()
+            self.assertEqual(len(self.Todo.query.all()), 1)
+
+    def test_query_recording(self):
+        with self.app.test_request_context():
+            todo = self.Todo('Test 1', 'test')
+            self.db.session.add(todo)
+            self.db.session.commit()
+
+            queries = sqlalchemy.get_debug_queries()
+            self.assertEqual(len(queries), 1)
+            query = queries[0]
+            self.assert_('insert into' in query.statement.lower())
+            self.assertEqual(query.parameters[0], 'Test 1')
+            self.assertEqual(query.parameters[1], 'test')
+            self.assert_('test_sqlalchemy.py' in query.context)
+            self.assert_('test_query_recording' in query.context)
+
+    def test_helper_api(self):
+        self.assertEqual(self.db.metadata, self.db.Model.metadata)
+
+
 class PaginationTestCase(unittest.TestCase):
 
     def test_basic_pagination(self):
         p = sqlalchemy.Pagination(None, 1, 20, 500, [])
-        assert p.page == 1
-        assert not p.has_prev
-        assert p.has_next
-        assert p.total == 500
-        assert p.pages == 25
-        assert p.next_num == 2
-        assert list(p.iter_pages()) == [1, 2, 3, 4, 5, None, 24, 25]
+        self.assertEqual(p.page, 1)
+        self.assertFalse(p.has_prev)
+        self.assert_(p.has_next)
+        self.assertEqual(p.total, 500)
+        self.assertEqual(p.pages, 25)
+        self.assertEqual(p.next_num, 2)
+        self.assertEqual(list(p.iter_pages()),
+                         [1, 2, 3, 4, 5, None, 24, 25])
         p.page = 10
-        assert list(p.iter_pages()) == [1, 2, None, 8, 9, 10, 11,
-                                        12, 13, 14, None, 24, 25]
+        self.assertEqual(list(p.iter_pages()),
+                         [1, 2, None, 8, 9, 10, 11, 12, 13, 14, None, 24, 25])
 
 
 if __name__ == '__main__':
