From 71891b3040605103397ffa7fb349215eced3a2c3 Mon Sep 17 00:00:00 2001 From: Edan Binshtok Date: Sun, 19 Nov 2017 11:50:50 +0200 Subject: Pep8 another fixes Add more fixes to pep8 Issue-ID: VVP-25 Change-Id: Icc3bd3977ced2b537c858a9801e04a6bf6d1db05 Signed-off-by: Edan Binshtok --- .../uiTests/test_cms_news_and_announcementsion.py | 78 +++++++++++++++------- 1 file changed, 54 insertions(+), 24 deletions(-) (limited to 'tests/uiTests/test_cms_news_and_announcementsion.py') diff --git a/tests/uiTests/test_cms_news_and_announcementsion.py b/tests/uiTests/test_cms_news_and_announcementsion.py index b639338..ad918d8 100644 --- a/tests/uiTests/test_cms_news_and_announcementsion.py +++ b/tests/uiTests/test_cms_news_and_announcementsion.py @@ -1,5 +1,4 @@ - -# ============LICENSE_START========================================== +# ============LICENSE_START========================================== # org.onap.vvp/test-engine # =================================================================== # Copyright © 2017 AT&T Intellectual Property. All rights reserved. @@ -40,11 +39,9 @@ from wheel.signatures import assertTrue from iceci.decorator.exception_decor import exception from services.constants import Constants -from services.frontend.base_actions.click import Click from services.logging_service import LoggingServiceFactory -from services.session import session -from services.types import * from tests.uiTests.test_ui_base import TestUiBase +from services.types import API, Frontend, DB logger = LoggingServiceFactory.get_logger() @@ -55,12 +52,15 @@ class TestCMSNewsAndAnnoucements(TestUiBase): def setUpClass(cls): super(TestCMSNewsAndAnnoucements, cls).setUpClass() - cls.user_content = API.VirtualFunction.create_engagement(wait_for_gitlab=False) - logger.debug("user_conntent = "+str(cls.user_content)) + cls.user_content = API.VirtualFunction.create_engagement( + wait_for_gitlab=False) + logger.debug("user_conntent = " + str(cls.user_content)) def setUp(self): super(TestCMSNewsAndAnnoucements, self).setUp() - Frontend.User.login(self.user_content['email'], Constants.Default.Password.TEXT) + Frontend.User.login( + self.user_content['email'], + Constants.Default.Password.TEXT) @exception() def test_announcements(self): @@ -70,19 +70,25 @@ class TestCMSNewsAndAnnoucements(TestUiBase): @exception() def test_insert_post_Announcement(self): title, description = DB.Cms.create_announcement() - Frontend.General.refresh() + Frontend.User.logout() + Frontend.User.login( + self.user_content['email'], Constants.Default.Password.TEXT) Frontend.Cms.validae_announcement(title, description) @exception() def test_insert_post_News(self): title, description = DB.Cms.create_news() - Frontend.General.refresh() + Frontend.User.logout() + Frontend.User.login( + self.user_content['email'], Constants.Default.Password.TEXT) Frontend.Cms.validate_news(title, description) @exception() def test_insert_post_FAQ(self): title, description = DB.Cms.create_faq() - Frontend.General.refresh() + Frontend.User.logout() + Frontend.User.login( + self.user_content['email'], Constants.Default.Password.TEXT) Frontend.Cms.validate_FAQ(description) @exception() @@ -94,11 +100,18 @@ class TestCMSNewsAndAnnoucements(TestUiBase): def test_search_documentation_title(self): title, description = DB.Cms.create_page() logger.debug("About to login with EL and add VFC") - users = [self.user_content['el_email'], self.user_content['pr_email'], Constants.Users.AdminRO.EMAIL, - Constants.Users.Admin.EMAIL, self.user_content['email']] + users = [ + self.user_content['el_email'], + self.user_content['pr_email'], + Constants.Users.AdminRO.EMAIL, + Constants.Users.Admin.EMAIL, + self.user_content['email']] for user in users: logger.debug("Login with user " + user) - Frontend.User.relogin(user, Constants.Default.Password.TEXT, "documentation") + Frontend.User.relogin( + user, + Constants.Default.Password.TEXT, + "documentation") Frontend.Cms.search_documentation_title(title, self.user_content) @exception() @@ -112,8 +125,11 @@ class TestCMSNewsAndAnnoucements(TestUiBase): @exception() def test_validate_expired_post_Announcement(self): title, description = DB.Cms.create_announcement() - Frontend.General.refresh() - Frontend.Cms.validate_expired_post_Announcement(title, description) + Frontend.User.logout() + Frontend.User.login( + self.user_content['email'], Constants.Default.Password.TEXT) + Frontend.Cms.validate_expired_post_Announcement( + self.user_content['email'], title, description) ''' Announcement toast should stay was published if the user closes the message @@ -121,18 +137,27 @@ class TestCMSNewsAndAnnoucements(TestUiBase): @exception() def test_Announcement_validate_toast(self): title, description = DB.Cms.create_announcement() - Frontend.User.relogin(self.user_content['email'], Constants.Default.Password.TEXT, Constants.Toast.CMS_ID) - Frontend.Cms.announcement_validate_toast(title, description, self.user_content) + Frontend.User.relogin( + self.user_content['email'], + Constants.Default.Password.TEXT, + Constants.Toast.CMS_ID) + Frontend.Cms.announcement_validate_toast( + title, description, self.user_content) ''' - Announcement toast is shown for users even after the entry has disappeared from the widget on the Dashboard + Announcement toast is shown for users even after the entry has disappeared + from the widget on the Dashboard ''' @exception() def test_validate_5_last_Announcement_displayed(self): listOfTitleAnDescriptions = DB.Cms.create_announcements(6) - Frontend.User.relogin(self.user_content['email'], Constants.Default.Password.TEXT) - last_title = listOfTitleAnDescriptions[len(listOfTitleAnDescriptions) - 1][0] - Frontend.Cms.validate_5_last_announcement_displayed(listOfTitleAnDescriptions, self.user_content, last_title) + Frontend.User.relogin( + self.user_content['email'], + Constants.Default.Password.TEXT) + last_title = listOfTitleAnDescriptions[len( + listOfTitleAnDescriptions) - 1][0] + Frontend.Cms.validate_5_last_announcement_displayed( + listOfTitleAnDescriptions, self.user_content, last_title) @exception() def test_insert_grandchild_page(self): @@ -140,5 +165,10 @@ class TestCMSNewsAndAnnoucements(TestUiBase): parent_id = DB.Cms.get_last_inserted_page_id() child_title, child_description = DB.Cms.create_page(parent_id) child_id = DB.Cms.get_last_inserted_page_id() - grand_child_title, grand_child_description = DB.Cms.create_page(child_id) - Frontend.Cms.validate_grandchild_page(parent_title, child_title, grand_child_title, grand_child_description) + grand_child_title, grand_child_description = DB.Cms.create_page( + child_id) + Frontend.Cms.validate_grandchild_page( + parent_title, + child_title, + grand_child_title, + grand_child_description) -- cgit 1.2.3-korg