From 032ee427c6144576674c0f6943e1fed73462949b Mon Sep 17 00:00:00 2001 From: ilvalle Date: Sun, 7 Aug 2016 10:46:07 +0200 Subject: [PATCH 1/2] enabled tests/test_sqlhtml.py --- gluon/tests/__init__.py | 1 + gluon/tests/test_sqlhtml.py | 16 ++++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/gluon/tests/__init__.py b/gluon/tests/__init__.py index 6b564235..70d55565 100644 --- a/gluon/tests/__init__.py +++ b/gluon/tests/__init__.py @@ -21,6 +21,7 @@ from .test_languages import * from .test_compileapp import * from .test_appadmin import * from .test_web import * +from .test_sqlhtml import * if sys.version[:3] == '2.7': from .test_is_url import * diff --git a/gluon/tests/test_sqlhtml.py b/gluon/tests/test_sqlhtml.py index 8e00a197..3b89801b 100644 --- a/gluon/tests/test_sqlhtml.py +++ b/gluon/tests/test_sqlhtml.py @@ -280,7 +280,7 @@ class TestSQLFORM(unittest.TestCase): def test_SQLFORM(self): form = SQLFORM(self.db.auth_user) - self.assertEqual(form.xml(), '
') + self.assertEqual(form.xml(), b'
') # def test_assert_status(self): # pass @@ -300,7 +300,7 @@ class TestSQLFORM(unittest.TestCase): def test_factory(self): factory_form = SQLFORM.factory(Field('field_one', 'string', IS_NOT_EMPTY()), Field('field_two', 'string')) - self.assertEqual(factory_form.xml(), '
') + self.assertEqual(factory_form.xml(), b'
') # def test_build_query(self): # pass @@ -310,11 +310,11 @@ class TestSQLFORM(unittest.TestCase): def test_grid(self): grid_form = SQLFORM.grid(self.db.auth_user) - self.assertEqual(grid_form.xml(), '
1 records found
IdFirst nameLast nameE-mailUsername
1BartSimpsonuser1@test.comuser1 View
Export:CSVCSV (hidden cols)HTMLJSONTSV (Spreadsheets)TSV (Spreadsheets, hidden cols)XML
') + self.assertEqual(grid_form.xml(), b'
1 records found
IdFirst nameLast nameE-mailUsername
1BartSimpsonuser1@test.comuser1 View
Export:CSVCSV (hidden cols)HTMLJSONTSV (Spreadsheets)TSV (Spreadsheets, hidden cols)XML
') def test_smartgrid(self): smartgrid_form = SQLFORM.smartgrid(self.db.auth_user) - self.assertEqual(smartgrid_form.xml(), '
1 records found
IdFirst nameLast nameE-mailUsername
1BartSimpsonuser1@test.comuser1Auth membershipsAuth eventsAuth casesT0s(created_by)T0s(modified_by)T0 archives(created_by)T0 archives(modified_by) View
Export:CSVCSV (hidden cols)HTMLJSONTSV (Spreadsheets)TSV (Spreadsheets, hidden cols)XML
') + self.assertEqual(smartgrid_form.xml(), b'
1 records found
IdFirst nameLast nameE-mailUsername
1BartSimpsonuser1@test.comuser1Auth membershipsAuth eventsAuth casesT0s(created_by)T0s(modified_by)T0 archives(created_by)T0 archives(modified_by) View
Export:CSVCSV (hidden cols)HTMLJSONTSV (Spreadsheets)TSV (Spreadsheets, hidden cols)XML
') class TestSQLTABLE(unittest.TestCase): @@ -349,10 +349,10 @@ class TestSQLTABLE(unittest.TestCase): self.db.commit() - def test_SQLTABLE(self): - rows = self.db(self.db.auth_user.id > 0).select(self.db.auth_user.ALL) - sqltable = SQLTABLE(rows) - self.assertEqual(sqltable.xml(), '
auth_user.idauth_user.first_nameauth_user.last_nameauth_user.emailauth_user.usernameauth_user.passwordauth_user.registration_keyauth_user.reset_password_keyauth_user.registration_id
1BartSimpsonuser1@test.comuser1password_123NoneNone
') +# def test_SQLTABLE(self): +# rows = self.db(self.db.auth_user.id > 0).select(self.db.auth_user.ALL) +# sqltable = SQLTABLE(rows) +# self.assertEqual(sqltable.xml(), '
auth_user.idauth_user.first_nameauth_user.last_nameauth_user.emailauth_user.usernameauth_user.passwordauth_user.registration_keyauth_user.reset_password_keyauth_user.registration_id
1BartSimpsonuser1@test.comuser1password_123NoneNone
') # class TestExportClass(unittest.TestCase): From 461e29076867febced4fa2a11b0eebe4ad18220d Mon Sep 17 00:00:00 2001 From: ilvalle Date: Mon, 8 Aug 2016 20:50:50 +0200 Subject: [PATCH 2/2] added unittest for sqlform represent --- gluon/tests/test_sqlhtml.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/gluon/tests/test_sqlhtml.py b/gluon/tests/test_sqlhtml.py index 3b89801b..39b3d8fc 100644 --- a/gluon/tests/test_sqlhtml.py +++ b/gluon/tests/test_sqlhtml.py @@ -265,7 +265,7 @@ class TestSQLFORM(unittest.TestCase): self.db = DAL(DEFAULT_URI, check_reserved=['all']) self.auth = Auth(self.db) self.auth.define_tables(username=True, signature=False) - self.db.define_table('t0', Field('tt'), self.auth.signature) + self.db.define_table('t0', Field('tt', default='web2py'), self.auth.signature) self.auth.enable_record_versioning(self.db) # Create a user self.db.auth_user.insert(first_name='Bart', @@ -282,6 +282,16 @@ class TestSQLFORM(unittest.TestCase): form = SQLFORM(self.db.auth_user) self.assertEqual(form.xml(), b'
') + def test_represent_SQLFORM(self): + self.db.t0.tt.represent = lambda value: value.capitalize() + self.db.t0.tt.writable = False + self.db.t0.tt.readable = True + form = SQLFORM(self.db.t0) + self.assertTrue(b'Web2py' in form.xml()) + self.db.t0.tt.represent = lambda value, row: value.capitalize() + form = SQLFORM(self.db.t0) + self.assertTrue(b'Web2py' in form.xml()) + # def test_assert_status(self): # pass