Skip to content

Commit

Permalink
some test syntax cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
Patrick Lauber committed Dec 13, 2009
1 parent c1c96cb commit f826ecf
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 27 deletions.
4 changes: 2 additions & 2 deletions cms/tests/base.py
View file
Expand Up @@ -28,7 +28,7 @@ def _post_teardown(self):

def login_user(self, user):
logged_in = self.client.login(username=user.username, password=user.username)
assert logged_in
self.assertEqual(logged_in, True)


def get_new_page_data(self, parent_id=''):
Expand Down Expand Up @@ -135,7 +135,7 @@ def move_page(self, page, target_page, position="first-child"):
'target': target_page.pk,
}
response = self.client.post(URL_CMS_PAGE + "%d/move-page/" % page.pk, data)
assert(response.status_code, 200)
self.assertEqual(response.status_code, 200)
return self.reload_page(page)


Expand Down
18 changes: 9 additions & 9 deletions cms/tests/page.py
View file
Expand Up @@ -21,7 +21,7 @@ def test_01_add_page(self):
Test that the add admin page could be displayed via the admin
"""
response = self.client.get(URL_CMS_PAGE_ADD)
assert(response.status_code == 200)
self.assertEqual(response.status_code, 200)

def test_02_create_page(self):
"""
Expand All @@ -32,12 +32,12 @@ def test_02_create_page(self):
response = self.client.post(URL_CMS_PAGE_ADD, page_data)
self.assertRedirects(response, URL_CMS_PAGE)
title = Title.objects.get(slug=page_data['slug'])
assert(title is not None)
self.assertEqual(title is not None, True)
page = title.page
page.published = True
page.save()
assert(page.get_title() == page_data['title'])
assert(page.get_slug() == page_data['slug'])
self.assertEqual(page.get_title(), page_data['title'])
self.assertEqual(page.get_slug(), page_data['slug'])

# were public instanes created?
title = Title.objects.drafts().get(slug=page_data['slug'])
Expand All @@ -60,10 +60,10 @@ def test_03_slug_collision(self):
if settings.i18n_installed:
self.assertEqual(response.status_code, 302)
# did we got right redirect?
assert(response['Location'].endswith(URL_CMS_PAGE))
self.assertEqual(response['Location'].endswith(URL_CMS_PAGE), True)
else:
self.assertEqual(response.status_code, 200)
assert(response['Location'].endswith(URL_CMS_PAGE_ADD))
self.assertEqual(response['Location'].endswith(URL_CMS_PAGE_ADD), True)
# TODO: check for slug collisions after move
# TODO: check for slug collisions with different settings

Expand Down Expand Up @@ -107,7 +107,7 @@ def test_05_edit_page(self):
response = self.client.post('/admin/cms/page/1/', page_data)
self.assertRedirects(response, URL_CMS_PAGE)
page = Page.objects.get(id=1)
assert(page.get_title() == 'changed title')
self.assertEqual(page.get_title(), 'changed title')

def test_06_meta_description_and_keywords_fields_from_admin(self):
"""
Expand All @@ -123,8 +123,8 @@ def test_06_meta_description_and_keywords_fields_from_admin(self):
response = self.client.post('/admin/cms/page/1/', page_data)
self.assertRedirects(response, URL_CMS_PAGE)
page = Page.objects.get(id=1)
assert(page.get_meta_description() == 'I am a duck')
assert(page.get_meta_keywords() == 'page,cms,stuff')
self.assertEqual(page.get_meta_description(), 'I am a duck')
self.assertEqual(page.get_meta_keywords(), 'page,cms,stuff')

def test_07_meta_description_and_keywords_from_template_tags(self):
from django import template
Expand Down
32 changes: 16 additions & 16 deletions cms/tests/permmod.py
View file
Expand Up @@ -277,8 +277,8 @@ def test_00_test_configuration(self):
TODO: settings must be changed to be configurable / overridable
"""
assert(settings.CMS_PERMISSION)
assert(settings.CMS_MODERATOR)
self.assertEqual(settings.CMS_PERMISSION, True)
self.assertEqual(settings.CMS_MODERATOR, True)


def test_01_super_can_add_page_to_root(self, status_code=200):
Expand Down Expand Up @@ -337,7 +337,7 @@ def test_05_slave_can_add_page_under_slave_home(self):
#assert(page.moderator_state == Page.MODERATOR_NEED_APPROVEMENT)

# must not have public object yet
assert(not page.publisher_public)
self.assertEqual(not page.publisher_public, True)

# publish / approve page by master
self.login_user(self.user_master)
Expand Down Expand Up @@ -408,31 +408,31 @@ def test_12_subtree_needs_approvement(self):
self.login_user(self.user_master)
# create page under slave_page
page = self.create_page(self.home_page)
assert(not page.publisher_public)
self.assertEqual(not page.publisher_public, True)

# create subpage uner page
subpage = self.create_page(page)
assert(not subpage.publisher_public)
self.assertEqual(not subpage.publisher_public, True)

# publish both of them in reverse order
subpage = self.publish_page(subpage, True, published_check=False)

# subpage should not be published, because parent is not published
# yet, should be marked as `publish when parent`
assert(not subpage.publisher_public)
self.assertEqual(not subpage.publisher_public, True)

# pagemoderator state must be set
self.assertEqual(subpage.moderator_state, Page.MODERATOR_APPROVED_WAITING_FOR_PARENTS)

# publish page (parent of subage), so subpage must be published also
page = self.publish_page(page, True)
assert(page.publisher_public)
self.assertEqual(page.publisher_public, True)

# reload subpage, it was probably changed
subpage = self.reload_page(subpage)

# parent was published, so subpage must be also published..
assert(subpage.publisher_public)
self.assertEqual(subpage.publisher_public, True)

#check attributes
self.check_published_page_attributes(page)
Expand All @@ -443,11 +443,11 @@ def test_13_subtree_with_super(self):
self.login_user(self.user_super)
# create page under root
page = self.create_page()
assert(not page.publisher_public)
self.assertEqual(not page.publisher_public, True)

# create subpage under page
subpage = self.create_page(page)
assert(not subpage.publisher_public)
self.assertEqual(not subpage.publisher_public, True)

# tree id must be the same
self.assertEqual(page.tree_id, subpage.tree_id)
Expand Down Expand Up @@ -479,7 +479,7 @@ def test_14_super_add_page_to_root(self):
page = self.create_page()

# public must not exist
assert(not page.publisher_public)
self.assertEqual(not page.publisher_public, True)

# moderator_state must be changed
self.assertEqual(page.moderator_state, Page.MODERATOR_CHANGED)
Expand Down Expand Up @@ -508,16 +508,16 @@ def test_15_moderator_flags(self):
page = self.approve_page(page)

# public page must not exist because of parent
assert(not page.publisher_public)
self.assertEqual(not page.publisher_public, True)

# waiting for parents
self.assertEqual(page.moderator_state, Page.MODERATOR_APPROVED_WAITING_FOR_PARENTS)

# publish slave page
slave_page = self.publish_page(self.slave_page)

assert(not page.publisher_public)
assert(not slave_page.publisher_public)
self.assertEqual(not page.publisher_public, True)
self.assertEqual(not slave_page.publisher_public, True)

# they must be approved first
slave_page = self.approve_page(slave_page)
Expand Down Expand Up @@ -580,7 +580,7 @@ def test_16_patricks_move(self):
ph = self.create_page(pf, position="right", title="ph")


assert(not pg.publisher_public)
self.assertEqual(not pg.publisher_public, True)

# login as master for approvement
self.login_user(self.user_master)
Expand All @@ -604,7 +604,7 @@ def test_16_patricks_move(self):
self.assertEqual(ph.parent, pe)

# not published yet, cant exist
assert(pg.publisher_public)
self.assertEqual(pg.publisher_public, True)

# check urls
self.assertEqual(pg.publisher_public.get_absolute_url(), u'/master/slave-home/pb/pe/pg/')
Expand Down

0 comments on commit f826ecf

Please sign in to comment.