diff --git a/Products/CMFPlone/controlpanel/bbb/__init__.py b/Products/CMFPlone/controlpanel/bbb/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/Products/CMFPlone/controlpanel/bbb/configure.zcml b/Products/CMFPlone/controlpanel/bbb/configure.zcml
deleted file mode 100644
index 9d7ff3bc01..0000000000
--- a/Products/CMFPlone/controlpanel/bbb/configure.zcml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Products/CMFPlone/controlpanel/bbb/editing.py b/Products/CMFPlone/controlpanel/bbb/editing.py
deleted file mode 100644
index f5614a8cd9..0000000000
--- a/Products/CMFPlone/controlpanel/bbb/editing.py
+++ /dev/null
@@ -1,55 +0,0 @@
-from plone.base.interfaces import IEditingSchema
-from plone.base.interfaces import IPloneSiteRoot
-from plone.registry.interfaces import IRegistry
-from zope.component import adapts
-from zope.component import getUtility
-from zope.interface import implementer
-
-
-@implementer(IEditingSchema)
-class EditingControlPanelAdapter:
-
- adapts(IPloneSiteRoot)
-
- def __init__(self, context):
- registry = getUtility(IRegistry)
- self.settings = registry.forInterface(IEditingSchema, prefix='plone')
-
- def get_visible_ids(self):
- return self.settings.visible_ids
-
- def set_visible_ids(self, value):
- self.settings.visible_ids = value
-
- def get_enable_link_integrity_checks(self):
- return self.settings.enable_link_integrity_checks
-
- def set_enable_link_integrity_checks(self, value):
- self.settings.enable_link_integrity_checks = value
-
- def get_ext_editor(self):
- return self.settings.ext_editor
-
- def set_ext_editor(self, value):
- self.settings.ext_editor = value
-
- def get_default_editor(self):
- return self.settings.default_editor
-
- def set_default_editor(self, value):
- self.settings.default_editor = value
-
- def get_lock_on_ttw_edit(self):
- return self.settings.lock_on_ttw_edit
-
- def set_lock_on_ttw_edit(self, value):
- self.settings.lock_on_ttw_edit = value
-
- visible_ids = property(get_visible_ids, set_visible_ids)
- enable_link_integrity_checks = property(
- get_enable_link_integrity_checks,
- set_enable_link_integrity_checks
- )
- ext_editor = property(get_ext_editor, set_ext_editor)
- default_editor = property(get_default_editor, set_default_editor)
- lock_on_ttw_edit = property(get_lock_on_ttw_edit, set_lock_on_ttw_edit)
diff --git a/Products/CMFPlone/controlpanel/bbb/filter.py b/Products/CMFPlone/controlpanel/bbb/filter.py
deleted file mode 100644
index 2da1d3dcb5..0000000000
--- a/Products/CMFPlone/controlpanel/bbb/filter.py
+++ /dev/null
@@ -1,46 +0,0 @@
-from plone.base.interfaces import IFilterSchema
-from plone.base.interfaces import IPloneSiteRoot
-from plone.registry.interfaces import IRegistry
-from zope.component import adapts
-from zope.component import getUtility
-from zope.interface import implementer
-
-
-@implementer(IFilterSchema)
-class FilterControlPanelAdapter:
-
- adapts(IPloneSiteRoot)
-
- def __init__(self, context):
- registry = getUtility(IRegistry)
- self.settings = registry.forInterface(IFilterSchema, prefix='plone')
-
- def get_disable_filtering(self):
- return self.settings.disable_filtering
-
- def set_disable_filtering(self, value):
- self.settings.disable_filtering = value
-
- def get_nasty_tags(self):
- return self.settings.nasty_tags
-
- def set_nasty_tags(self, value):
- self.settings.nasty_tags = value
-
- def get_valid_tags(self):
- return self.settings.valid_tags
-
- def set_valid_tags(self, value):
- self.settings.valid_tags = value
-
- def get_custom_attributes(self):
- return self.settings.custom_attributes
-
- def set_custom_attributes(self, value):
- self.settings.custom_attributes = value
-
- custom_attributes = property(
- get_custom_attributes, set_custom_attributes)
- valid_tags = property(get_valid_tags, set_valid_tags)
- nasty_tags = property(get_nasty_tags, set_nasty_tags)
- disable_filtering = property(get_disable_filtering, set_disable_filtering)
diff --git a/Products/CMFPlone/controlpanel/bbb/language.py b/Products/CMFPlone/controlpanel/bbb/language.py
deleted file mode 100644
index 8085b28cfb..0000000000
--- a/Products/CMFPlone/controlpanel/bbb/language.py
+++ /dev/null
@@ -1,135 +0,0 @@
-from plone.base.interfaces import IPloneSiteRoot
-from plone.i18n.interfaces import ILanguageSchema
-from plone.registry.interfaces import IRegistry
-from zope.component import adapts
-from zope.component import getUtility
-from zope.interface import implementer
-
-
-@implementer(ILanguageSchema)
-class LanguageControlPanelAdapter:
-
- adapts(IPloneSiteRoot)
-
- def __init__(self, context):
- self.context = context
- registry = getUtility(IRegistry)
- self.settings = registry.forInterface(
- ILanguageSchema, prefix="plone")
-
- def get_default_language(self):
- return self.settings.default_language
-
- def set_default_language(self, value):
- self.settings.default_language = value
-
- default_language = property(get_default_language,
- set_default_language)
-
- def get_available_languages(self):
- return self.settings.available_languages
-
- def set_available_languages(self, value):
- self.settings.available_languages = value
-
- available_languages = property(get_available_languages,
- set_available_languages)
-
- def get_use_combined_language_codes(self):
- return self.settings.use_combined_language_codes
-
- def set_use_combined_language_codes(self, value):
- self.settings.use_combined_language_codes = value
-
- use_combined_language_codes = property(get_use_combined_language_codes,
- set_use_combined_language_codes)
-
- def get_display_flags(self):
- return self.settings.display_flags
-
- def set_display_flags(self, value):
- self.settings.display_flags = value
-
- display_flags = property(get_display_flags,
- set_display_flags)
-
- def get_always_show_selector(self):
- return self.settings.always_show_selector
-
- def set_always_show_selector(self, value):
- self.settings.always_show_selector = value
-
- always_show_selector = property(get_always_show_selector,
- set_always_show_selector)
-
- def get_use_content_negotiation(self):
- return self.settings.use_content_negotiation
-
- def set_use_content_negotiation(self, value):
- self.settings.use_content_negotiation = value
-
- use_content_negotiation = property(get_use_content_negotiation,
- set_use_content_negotiation)
-
- def get_use_path_negotiation(self):
- return self.settings.use_path_negotiation
-
- def set_use_path_negotiation(self, value):
- self.settings.use_path_negotiation = value
-
- use_path_negotiation = property(get_use_path_negotiation,
- set_use_path_negotiation)
-
- def get_use_cookie_negotiation(self):
- return self.settings.use_cookie_negotiation
-
- def set_use_cookie_negotiation(self, value):
- self.settings.use_cookie_negotiation = value
-
- use_cookie_negotiation = property(get_use_cookie_negotiation,
- set_use_cookie_negotiation)
-
- def get_authenticated_users_only(self):
- return self.settings.authenticated_users_only
-
- def set_authenticated_users_only(self, value):
- self.settings.authenticated_users_only = value
-
- authenticated_users_only = property(get_authenticated_users_only,
- set_authenticated_users_only)
-
- def get_set_cookie_always(self):
- return self.settings.set_cookie_always
-
- def set_set_cookie_always(self, value):
- self.settings.set_cookie_always = value
-
- set_cookie_always = property(get_set_cookie_always,
- set_set_cookie_always)
-
- def get_use_subdomain_negotiation(self):
- return self.settings.use_subdomain_negotiation
-
- def set_use_subdomain_negotiation(self, value):
- self.settings.use_subdomain_negotiation = value
-
- use_subdomain_negotiation = property(get_use_subdomain_negotiation,
- set_use_subdomain_negotiation)
-
- def get_use_cctld_negotiation(self):
- return self.settings.use_cctld_negotiation
-
- def set_use_cctld_negotiation(self, value):
- self.settings.use_cctld_negotiation = value
-
- use_cctld_negotiation = property(get_use_cctld_negotiation,
- set_use_cctld_negotiation)
-
- def get_use_request_negotiation(self):
- return self.settings.use_request_negotiation
-
- def set_use_request_negotiation(self, value):
- self.settings.use_request_negotiation = value
-
- use_request_negotiation = property(get_use_request_negotiation,
- set_use_request_negotiation)
diff --git a/Products/CMFPlone/controlpanel/bbb/mail.py b/Products/CMFPlone/controlpanel/bbb/mail.py
deleted file mode 100644
index cdddaa2e8d..0000000000
--- a/Products/CMFPlone/controlpanel/bbb/mail.py
+++ /dev/null
@@ -1,89 +0,0 @@
-from plone.base.interfaces import IPloneSiteRoot
-from plone.base.interfaces.controlpanel import IMailSchema
-from plone.registry.interfaces import IRegistry
-from Products.CMFPlone.utils import safe_hasattr
-from zope.component import adapts
-from zope.component import getUtility
-from zope.component.hooks import getSite
-from zope.interface import implementer
-
-
-@implementer(IMailSchema)
-class MailControlPanelAdapter:
-
- adapts(IPloneSiteRoot)
-
- def __init__(self, context):
- self.context = context
- self.portal = getSite()
- registry = getUtility(IRegistry)
- self.encoding = 'utf-8'
- self.mail_settings = registry.forInterface(
- IMailSchema, prefix="plone")
-
- def get_smtp_host(self):
- return self.mail_settings.smtp_host
-
- def set_smtp_host(self, value):
- if safe_hasattr(self.mail_settings, 'smtp_host'):
- self.mail_settings.smtp_host = value
-
- smtp_host = property(get_smtp_host, set_smtp_host)
-
- def get_smtp_port(self):
- return getattr(self.mail_settings, 'smtp_port', None)
-
- def set_smtp_port(self, value):
- if safe_hasattr(self.mail_settings, 'smtp_port'):
- self.mail_settings.smtp_port = value
-
- smtp_port = property(get_smtp_port, set_smtp_port)
-
- def get_smtp_userid(self):
- return getattr(self.mail_settings, 'smtp_userid',
- getattr(self.mail_settings, 'smtp_userid', None))
-
- def set_smtp_userid(self, value):
- if safe_hasattr(self.mail_settings, 'smtp_userid'):
- self.mail_settings.smtp_userid = value
- # SecureMailhost 1.x also uses this:
- if safe_hasattr(self.mail_settings, '_smtp_userid'):
- self.mail_settings._smtp_userid = value
- elif safe_hasattr(self.mail_settings, 'smtp_userid'):
- self.mail_settings.smtp_uid = value
-
- smtp_userid = property(get_smtp_userid, set_smtp_userid)
-
- def get_smtp_pass(self):
- return getattr(self.mail_settings, 'smtp_pass',
- getattr(self.mail_settings, 'smtp_pwd', None))
-
- def set_smtp_pass(self, value):
- # Don't update the value, if we don't get a new one
- if value is not None:
- if safe_hasattr(self.mail_settings, 'smtp_pass'):
- self.mail_settings.smtp_pass = value
- # SecureMailhost 1.x also uses this:
- if safe_hasattr(self.mail_settings, '_smtp_pass'):
- self.mail_settings._smtp_pass = value
- elif safe_hasattr(self.mail_settings, 'smtp_pwd'):
- self.mail_settings.smtp_pwd = value
-
- smtp_pass = property(get_smtp_pass, set_smtp_pass)
-
- def get_email_from_name(self):
- return self.mail_settings.email_from_name
-
- def set_email_from_name(self, value):
- self.mail_settings.email_from_name = value
-
- email_from_name = property(get_email_from_name, set_email_from_name)
-
- def get_email_from_address(self):
- return self.mail_settings.email_from_address
-
- def set_email_from_address(self, value):
- self.mail_settings.email_from_address = value
-
- email_from_address = property(get_email_from_address,
- set_email_from_address)
diff --git a/Products/CMFPlone/controlpanel/bbb/maintenance.py b/Products/CMFPlone/controlpanel/bbb/maintenance.py
deleted file mode 100644
index 941fea458b..0000000000
--- a/Products/CMFPlone/controlpanel/bbb/maintenance.py
+++ /dev/null
@@ -1,26 +0,0 @@
-from plone.base.interfaces import IMaintenanceSchema
-from plone.base.interfaces import IPloneSiteRoot
-from plone.registry.interfaces import IRegistry
-from zope.component import adapts
-from zope.component import getUtility
-from zope.interface import implementer
-
-
-@implementer(IMaintenanceSchema)
-class MaintenanceControlPanelAdapter:
-
- adapts(IPloneSiteRoot)
-
- def __init__(self, context):
- self.context = context
- registry = getUtility(IRegistry)
- self.maintenance_settings = registry.forInterface(
- IMaintenanceSchema, prefix="plone")
-
- def get_days(self):
- return self.maintenance_settings.days
-
- def set_days(self, value):
- self.maintenance_settings.days = value
-
- days = property(get_days, set_days)
diff --git a/Products/CMFPlone/controlpanel/bbb/markup.py b/Products/CMFPlone/controlpanel/bbb/markup.py
deleted file mode 100644
index 2434f6b84b..0000000000
--- a/Products/CMFPlone/controlpanel/bbb/markup.py
+++ /dev/null
@@ -1,32 +0,0 @@
-from plone.base.interfaces import IMarkupSchema
-from plone.base.interfaces.siteroot import IPloneSiteRoot
-from plone.registry.interfaces import IRegistry
-from zope.component import adapts
-from zope.component import getUtility
-from zope.interface import implementer
-
-
-@implementer(IMarkupSchema)
-class MarkupControlPanelAdapter:
-
- adapts(IPloneSiteRoot)
-
- def __init__(self, context):
- registry = getUtility(IRegistry)
- self.settings = registry.forInterface(IMarkupSchema, prefix="plone")
-
- @property
- def default_type(self):
- return self.settings.default_type
-
- @default_type.setter
- def default_type(self, value):
- self.settings.default_type = value
-
- @property
- def allowed_types(self):
- return self.settings.allowed_types
-
- @allowed_types.setter
- def allowed_types(self, value):
- self.settings.allowed_types = value
diff --git a/Products/CMFPlone/controlpanel/bbb/navigation.py b/Products/CMFPlone/controlpanel/bbb/navigation.py
deleted file mode 100644
index 05705ccb77..0000000000
--- a/Products/CMFPlone/controlpanel/bbb/navigation.py
+++ /dev/null
@@ -1,83 +0,0 @@
-from plone.base.interfaces import INavigationSchema
-from plone.base.interfaces import IPloneSiteRoot
-from plone.registry.interfaces import IRegistry
-from zope.component import adapter
-from zope.component import getUtility
-from zope.interface import implementer
-
-
-@adapter(IPloneSiteRoot)
-@implementer(INavigationSchema)
-class NavigationControlPanelAdapter:
-
- def __init__(self, context):
- self.context = context
- registry = getUtility(IRegistry)
- self.navigation_settings = registry.forInterface(
- INavigationSchema,
- prefix="plone"
- )
-
- def get_generate_tabs(self):
- return self.navigation_settings.generate_tabs
-
- def set_generate_tabs(self, value):
- self.navigation_settings.generate_tabs = value
-
- generate_tabs = property(get_generate_tabs, set_generate_tabs)
-
- def get_nonfolderish_tabs(self):
- return self.navigation_settings.nonfolderish_tabs
-
- def set_nonfolderish_tabs(self, value):
- self.navigation_settings.nonfolderish_tabs = value
-
- nonfolderish_tabs = property(get_nonfolderish_tabs, set_nonfolderish_tabs)
-
- def get_show_excluded_items(self):
- return self.navigation_settings.show_excluded_items
-
- def set_show_excluded_items(self, value):
- self.navigation_settings.show_excluded_items = value
-
- show_excluded_items = property(
- get_show_excluded_items,
- set_show_excluded_items
- )
-
- def get_displayed_types(self):
- return self.navigation_settings.displayed_types
-
- def set_displayed_types(self, value):
- self.navigation_settings.displayed_types = value
-
- displayed_types = property(get_displayed_types, set_displayed_types)
-
- def get_filter_on_workflow(self):
- return self.navigation_settings.filter_on_workflow
-
- def set_filter_on_workflow(self, value):
- self.navigation_settings.filter_on_workflow = value
-
- filter_on_workflow = property(
- get_filter_on_workflow,
- set_filter_on_workflow
- )
-
- def get_workflow_states_to_show(self):
- return self.navigation_settings.workflow_states_to_show
-
- def set_workflow_states_to_show(self, value):
- self.navigation_settings.workflow_states_to_show = value
-
- workflow_states_to_show = property(
- get_workflow_states_to_show,
- set_workflow_states_to_show)
-
- @property
- def root(self):
- return self.navigation_settings.root
-
- @root.setter
- def root(self, value):
- self.navigation_settings.root = value
diff --git a/Products/CMFPlone/controlpanel/bbb/search.py b/Products/CMFPlone/controlpanel/bbb/search.py
deleted file mode 100644
index 784a30d448..0000000000
--- a/Products/CMFPlone/controlpanel/bbb/search.py
+++ /dev/null
@@ -1,49 +0,0 @@
-from plone.base.interfaces import ISearchSchema
-from plone.base.interfaces.siteroot import IPloneSiteRoot
-from plone.registry.interfaces import IRegistry
-from zope.component import adapts
-from zope.component import getUtility
-from zope.component.hooks import getSite
-from zope.interface import implementer
-
-
-@implementer(ISearchSchema)
-class SearchControlPanelAdapter:
-
- adapts(IPloneSiteRoot)
-
- def __init__(self, context):
- self.portal = getSite()
- registry = getUtility(IRegistry)
- self.search_settings = registry.forInterface(
- ISearchSchema, prefix="plone")
-
- def get_enable_livesearch(self):
- return self.search_settings.enable_livesearch
-
- def set_enable_livesearch(self, value):
- if value:
- self.search_settings.enable_livesearch = True
- else:
- self.search_settings.enable_livesearch = False
-
- enable_livesearch = property(get_enable_livesearch, set_enable_livesearch)
-
- def get_types_not_searched(self):
- return self.search_settings.types_not_searched
-
- def set_types_not_searched(self, value):
- self.search_settings.types_not_searched = value
-
- types_not_searched = property(
- get_types_not_searched,
- set_types_not_searched
- )
-
- @property
- def sort_on(self):
- return self.search_settings.sort_on
-
- @sort_on.setter
- def sort_on(self, value):
- self.search_settings.sort_on = value
diff --git a/Products/CMFPlone/controlpanel/bbb/security.py b/Products/CMFPlone/controlpanel/bbb/security.py
deleted file mode 100644
index b1b48f16ae..0000000000
--- a/Products/CMFPlone/controlpanel/bbb/security.py
+++ /dev/null
@@ -1,77 +0,0 @@
-from plone.base.interfaces import ISecuritySchema
-from plone.base.interfaces.siteroot import IPloneSiteRoot
-from plone.registry.interfaces import IRegistry
-from Products.CMFCore.utils import getToolByName
-from zope.component import adapts
-from zope.component import getUtility
-from zope.component.hooks import getSite
-from zope.interface import implementer
-
-
-@implementer(ISecuritySchema)
-class SecurityControlPanelAdapter:
-
- adapts(IPloneSiteRoot)
-
- def __init__(self, context):
- self.portal = getSite()
- self.pmembership = getToolByName(context, 'portal_membership')
- registry = getUtility(IRegistry)
- self.settings = registry.forInterface(
- ISecuritySchema, prefix="plone")
-
- def get_enable_self_reg(self):
- return self.settings.enable_self_reg
-
- def set_enable_self_reg(self, value):
- # additional processing in the event handler
- self.settings.enable_self_reg = value
-
- enable_self_reg = property(get_enable_self_reg, set_enable_self_reg)
-
- def get_enable_user_pwd_choice(self):
- return self.settings.enable_user_pwd_choice
-
- def set_enable_user_pwd_choice(self, value):
- self.settings.enable_user_pwd_choice = value
-
- enable_user_pwd_choice = property(get_enable_user_pwd_choice,
- set_enable_user_pwd_choice)
-
- def get_enable_user_folders(self):
- return self.settings.enable_user_folders
-
- def set_enable_user_folders(self, value):
- # additional processing in the event handler
- self.settings.enable_user_folders = value
-
- enable_user_folders = property(get_enable_user_folders,
- set_enable_user_folders)
-
- def get_allow_anon_views_about(self):
- return self.settings.allow_anon_views_about
-
- def set_allow_anon_views_about(self, value):
- self.settings.allow_anon_views_about = value
-
- allow_anon_views_about = property(get_allow_anon_views_about,
- set_allow_anon_views_about)
-
- def get_use_email_as_login(self):
- return self.settings.use_email_as_login
-
- def set_use_email_as_login(self, value):
- # additional processing in the event handler
- self.settings.use_email_as_login = value
-
- use_email_as_login = property(get_use_email_as_login,
- set_use_email_as_login)
-
- def get_use_uuid_as_userid(self):
- return self.settings.use_uuid_as_userid
-
- def set_use_uuid_as_userid(self, value):
- self.settings.use_uuid_as_userid = value
-
- use_uuid_as_userid = property(get_use_uuid_as_userid,
- set_use_uuid_as_userid)
diff --git a/Products/CMFPlone/controlpanel/bbb/site.py b/Products/CMFPlone/controlpanel/bbb/site.py
deleted file mode 100644
index 73402b154d..0000000000
--- a/Products/CMFPlone/controlpanel/bbb/site.py
+++ /dev/null
@@ -1,36 +0,0 @@
-from plone.base.interfaces import IPloneSiteRoot
-from plone.base.interfaces import ISiteSchema
-from plone.registry.interfaces import IRegistry
-from zope.component import adapts
-from zope.component import getUtility
-from zope.interface import implementer
-from zope.schema.fieldproperty import FieldProperty
-
-
-@implementer(ISiteSchema)
-class SiteControlPanelAdapter:
-
- adapts(IPloneSiteRoot)
-
- def __init__(self, context):
- registry = getUtility(IRegistry)
- self.settings = registry.forInterface(ISiteSchema, prefix="plone")
-
- def get_site_title(self):
- return self.settings.site_title
-
- def set_site_title(self, value):
- self.settings.site_title = value
-
- def get_webstats_js(self):
- return self.settings.webstats_js
-
- def set_webstats_js(self, value):
- self.settings.webstats_js = value
-
- site_title = property(get_site_title, set_site_title)
- webstats_js = property(get_webstats_js, set_webstats_js)
-
- site_logo = FieldProperty(ISiteSchema['site_logo'])
- enable_sitemap = FieldProperty(ISiteSchema['enable_sitemap'])
- exposeDCMetaTags = FieldProperty(ISiteSchema['exposeDCMetaTags'])
diff --git a/Products/CMFPlone/controlpanel/bbb/usergroups.py b/Products/CMFPlone/controlpanel/bbb/usergroups.py
deleted file mode 100644
index 0c819c7136..0000000000
--- a/Products/CMFPlone/controlpanel/bbb/usergroups.py
+++ /dev/null
@@ -1,42 +0,0 @@
-from plone.base.interfaces import IPloneSiteRoot
-from plone.base.interfaces import IUserGroupsSettingsSchema
-from plone.registry.interfaces import IRegistry
-from zope.component import adapts
-from zope.component import getUtility
-from zope.component.hooks import getSite
-from zope.interface import implementer
-
-
-@implementer(IUserGroupsSettingsSchema)
-class UserGroupsSettingsControlPanelAdapter:
-
- adapts(IPloneSiteRoot)
-
- def __init__(self, context):
- self.context = context
- self.portal = getSite()
- registry = getUtility(IRegistry)
- self.usergroups_settings = registry.forInterface(
- IUserGroupsSettingsSchema, prefix="plone")
-
- def get_many_groups(self):
- return self.usergroups_settings.many_groups
-
- def set_many_groups(self, value):
- if value:
- self.usergroups_settings.many_groups = True
- else:
- self.usergroups_settings.many_groups = False
-
- many_groups = property(get_many_groups, set_many_groups)
-
- def get_many_users(self):
- return self.usergroups_settings.many_users
-
- def set_many_users(self, value):
- if value:
- self.usergroups_settings.many_users = True
- else:
- self.usergroups_settings.many_users = False
-
- many_users = property(get_many_users, set_many_users)
diff --git a/Products/CMFPlone/controlpanel/configure.zcml b/Products/CMFPlone/controlpanel/configure.zcml
index c25bb55caa..0896392c39 100644
--- a/Products/CMFPlone/controlpanel/configure.zcml
+++ b/Products/CMFPlone/controlpanel/configure.zcml
@@ -4,7 +4,6 @@
-
diff --git a/Products/CMFPlone/controlpanel/tests/test_controlpanel_bbb_editing_adapter.py b/Products/CMFPlone/controlpanel/tests/test_controlpanel_bbb_editing_adapter.py
deleted file mode 100644
index 4cb4c82690..0000000000
--- a/Products/CMFPlone/controlpanel/tests/test_controlpanel_bbb_editing_adapter.py
+++ /dev/null
@@ -1,112 +0,0 @@
-from plone.app.testing import setRoles
-from plone.app.testing import TEST_USER_ID
-from plone.base.interfaces import IEditingSchema
-from plone.registry.interfaces import IRegistry
-from Products.CMFPlone.testing import PRODUCTS_CMFPLONE_INTEGRATION_TESTING
-from zope.component import getAdapter
-from zope.component import getUtility
-
-import unittest
-
-
-class EditingControlPanelAdapterTest(unittest.TestCase):
-
- layer = PRODUCTS_CMFPLONE_INTEGRATION_TESTING
-
- def setUp(self):
- self.portal = self.layer['portal']
- self.request = self.layer['request']
- setRoles(self.portal, TEST_USER_ID, ['Manager'])
- registry = getUtility(IRegistry)
- self.settings = registry.forInterface(IEditingSchema, prefix='plone')
-
- def test_adapter_lookup(self):
- self.assertTrue(getAdapter(self.portal, IEditingSchema))
-
- def test_get_enable_link_integrity_checks_setting(self):
- self.assertEqual(
- getAdapter(self.portal, IEditingSchema).enable_link_integrity_checks, # noqa
- True
- )
- self.settings.enable_link_integrity_checks = False
- self.assertEqual(
- getAdapter(self.portal, IEditingSchema).enable_link_integrity_checks, # noqa
- False
- )
-
- def test_set_enable_link_integrity_checks_setting(self):
- self.assertEqual(
- self.settings.enable_link_integrity_checks,
- True
- )
- getAdapter(self.portal, IEditingSchema).enable_link_integrity_checks = False # noqa
- self.assertEqual(
- self.settings.enable_link_integrity_checks,
- False
- )
-
- def test_get_ext_editor_setting(self):
- self.assertEqual(
- getAdapter(self.portal, IEditingSchema).ext_editor,
- False
- )
- self.settings.ext_editor = True
- self.assertEqual(
- getAdapter(self.portal, IEditingSchema).ext_editor,
- True
- )
-
- def test_set_ext_editor_setting(self):
- self.assertEqual(
- self.settings.ext_editor,
- False
- )
- getAdapter(self.portal, IEditingSchema).ext_editor = True
- self.assertEqual(
- self.settings.ext_editor,
- True
- )
-
- def test_get_default_editor_setting(self):
- self.assertEqual(
- getAdapter(self.portal, IEditingSchema).default_editor,
- 'TinyMCE'
- )
- self.settings.default_editor = 'None'
- self.assertEqual(
- getAdapter(self.portal, IEditingSchema).default_editor,
- 'None'
- )
-
- def test_set_default_editor_setting(self):
- self.assertEqual(
- self.settings.default_editor,
- 'TinyMCE'
- )
- getAdapter(self.portal, IEditingSchema).default_editor = 'None'
- self.assertEqual(
- self.settings.default_editor,
- 'None'
- )
-
- def test_get_lock_on_ttw_edit_setting(self):
- self.assertEqual(
- getAdapter(self.portal, IEditingSchema).lock_on_ttw_edit,
- True
- )
- self.settings.lock_on_ttw_edit = False
- self.assertEqual(
- getAdapter(self.portal, IEditingSchema).lock_on_ttw_edit,
- False
- )
-
- def test_set_lock_on_ttw_edit_setting(self):
- self.assertEqual(
- self.settings.lock_on_ttw_edit,
- True
- )
- getAdapter(self.portal, IEditingSchema).lock_on_ttw_edit = False
- self.assertEqual(
- self.settings.lock_on_ttw_edit,
- False
- )
diff --git a/Products/CMFPlone/controlpanel/tests/test_controlpanel_bbb_filter_adapter.py b/Products/CMFPlone/controlpanel/tests/test_controlpanel_bbb_filter_adapter.py
deleted file mode 100644
index 1558e1d814..0000000000
--- a/Products/CMFPlone/controlpanel/tests/test_controlpanel_bbb_filter_adapter.py
+++ /dev/null
@@ -1,68 +0,0 @@
-from plone.app.testing import setRoles
-from plone.app.testing import TEST_USER_ID
-from plone.base.interfaces import IFilterSchema
-from plone.registry.interfaces import IRegistry
-from Products.CMFPlone.testing import PRODUCTS_CMFPLONE_INTEGRATION_TESTING
-from zope.component import getAdapter
-from zope.component import getUtility
-
-import unittest
-
-
-class FilterControlPanelAdapterTest(unittest.TestCase):
-
- layer = PRODUCTS_CMFPLONE_INTEGRATION_TESTING
-
- def setUp(self):
- self.portal = self.layer['portal']
- self.request = self.layer['request']
- setRoles(self.portal, TEST_USER_ID, ['Manager'])
- registry = getUtility(IRegistry)
- self.settings = registry.forInterface(IFilterSchema, prefix="plone")
-
- def test_adapter_lookup(self):
- self.assertTrue(getAdapter(self.portal, IFilterSchema))
-
- def test_get_nasty_tags(self):
- self.settings.nasty_tags = ['foo', 'bar']
- self.assertEqual(
- getAdapter(self.portal, IFilterSchema).nasty_tags,
- ['foo', 'bar']
- )
-
- def test_set_nasty_tags(self):
- getAdapter(self.portal, IFilterSchema).nasty_tags = ['foo', 'bar']
- self.assertEqual(
- self.settings.nasty_tags,
- ['foo', 'bar']
- )
-
- def test_get_valid_tags(self):
- self.settings.valid_tags = ['foo', 'bar']
- self.assertEqual(
- getAdapter(self.portal, IFilterSchema).valid_tags,
- ['foo', 'bar']
- )
-
- def test_set_valid_tags(self):
- getAdapter(self.portal, IFilterSchema).valid_tags = ['foo', 'bar']
- self.assertEqual(
- self.settings.valid_tags,
- ['foo', 'bar']
- )
-
- def test_get_custom_attributes(self):
- self.settings.custom_attributes = ['foo', 'bar']
- self.assertEqual(
- getAdapter(self.portal, IFilterSchema).custom_attributes,
- ['foo', 'bar']
- )
-
- def test_set_custom_attributes(self):
- getAdapter(self.portal, IFilterSchema).custom_attributes = [
- 'foo', 'bar'
- ]
- self.assertEqual(
- self.settings.custom_attributes,
- ['foo', 'bar']
- )
diff --git a/Products/CMFPlone/controlpanel/tests/test_controlpanel_bbb_language_adapter.py b/Products/CMFPlone/controlpanel/tests/test_controlpanel_bbb_language_adapter.py
deleted file mode 100644
index 724b1f20f4..0000000000
--- a/Products/CMFPlone/controlpanel/tests/test_controlpanel_bbb_language_adapter.py
+++ /dev/null
@@ -1,311 +0,0 @@
-from plone.app.testing import setRoles
-from plone.app.testing import TEST_USER_ID
-from plone.i18n.interfaces import ILanguageSchema
-from plone.registry.interfaces import IRegistry
-from Products.CMFPlone.testing import PRODUCTS_CMFPLONE_INTEGRATION_TESTING
-from zope.component import getAdapter
-from zope.component import getUtility
-
-import unittest
-
-
-class LanguageControlPanelAdapterTest(unittest.TestCase):
-
- layer = PRODUCTS_CMFPLONE_INTEGRATION_TESTING
-
- def setUp(self):
- self.portal = self.layer['portal']
- self.request = self.layer['request']
- setRoles(self.portal, TEST_USER_ID, ['Manager'])
- registry = getUtility(IRegistry)
- self.settings = registry.forInterface(
- ILanguageSchema, prefix="plone")
-
- def test_adapter_lookup(self):
- self.assertTrue(getAdapter(self.portal, ILanguageSchema))
-
- def test_get_default_language(self):
- self.assertEqual(
- getAdapter(self.portal, ILanguageSchema).default_language,
- 'en'
- )
- self.settings.default_language = 'de'
- self.assertEqual(
- getAdapter(self.portal, ILanguageSchema).default_language,
- 'de'
- )
-
- def test_set_default_language(self):
- self.assertEqual(
- self.settings.default_language,
- 'en'
- )
- getAdapter(self.portal, ILanguageSchema).default_language = 'de'
- self.assertEqual(
- self.settings.default_language,
- 'de'
- )
-
- def test_get_available_languages(self):
- self.assertEqual(
- getAdapter(self.portal, ILanguageSchema).available_languages,
- ['en']
- )
- self.settings.available_languages = ['en', 'de']
- self.assertEqual(
- getAdapter(self.portal, ILanguageSchema).available_languages,
- ['en', 'de']
- )
-
- def test_set_available_languages(self):
- self.assertEqual(
- self.settings.available_languages,
- ['en']
- )
- getAdapter(self.portal, ILanguageSchema).available_languages = [
- 'de', 'en']
- self.assertEqual(
- self.settings.available_languages,
- ['de', 'en']
- )
-
- def test_get_use_combined_language_codes(self):
- self.assertEqual(
- getAdapter(
- self.portal, ILanguageSchema).use_combined_language_codes,
- True
- )
- self.settings.use_combined_language_codes = False
- self.assertEqual(
- getAdapter(
- self.portal, ILanguageSchema).use_combined_language_codes,
- False
- )
-
- def test_set_use_combined_language_codes(self):
- self.assertEqual(
- self.settings.use_combined_language_codes,
- True
- )
- getAdapter(
- self.portal, ILanguageSchema).use_combined_language_codes = False
- self.assertEqual(
- self.settings.use_combined_language_codes,
- False
- )
-
- def test_get_display_flags(self):
- self.assertEqual(
- getAdapter(
- self.portal, ILanguageSchema).display_flags,
- False
- )
- self.settings.display_flags = True
- self.assertEqual(
- getAdapter(self.portal, ILanguageSchema).display_flags,
- True
- )
-
- def test_set_display_flags(self):
- self.assertEqual(
- self.settings.display_flags,
- False
- )
- getAdapter(
- self.portal, ILanguageSchema).display_flags = True
- self.assertEqual(
- self.settings.display_flags,
- True
- )
-
- def test_get_use_content_negotiation(self):
- self.assertEqual(
- getAdapter(
- self.portal, ILanguageSchema).use_content_negotiation,
- False
- )
- self.settings.use_content_negotiation = True
- self.assertEqual(
- getAdapter(self.portal, ILanguageSchema).use_content_negotiation,
- True
- )
-
- def test_set_use_content_negotiation(self):
- self.assertEqual(
- self.settings.use_content_negotiation,
- False
- )
- getAdapter(
- self.portal, ILanguageSchema).use_content_negotiation = True
- self.assertEqual(
- self.settings.use_content_negotiation,
- True
- )
-
- def test_get_use_path_negotiation(self):
- self.assertEqual(
- getAdapter(
- self.portal, ILanguageSchema).use_path_negotiation,
- False
- )
- self.settings.use_path_negotiation = True
- self.assertEqual(
- getAdapter(self.portal, ILanguageSchema).use_path_negotiation,
- True
- )
-
- def test_set_use_path_negotiation(self):
- self.assertEqual(
- self.settings.use_path_negotiation,
- False
- )
- getAdapter(
- self.portal, ILanguageSchema).use_path_negotiation = True
- self.assertEqual(
- self.settings.use_path_negotiation,
- True
- )
-
- def test_get_use_cookie_negotiation(self):
- self.assertEqual(
- getAdapter(
- self.portal, ILanguageSchema).use_cookie_negotiation,
- False
- )
- self.settings.use_cookie_negotiation = True
- self.assertEqual(
- getAdapter(self.portal, ILanguageSchema).use_cookie_negotiation,
- True
- )
-
- def test_set_use_cookie_negotiation(self):
- self.assertEqual(
- self.settings.use_cookie_negotiation,
- False
- )
- getAdapter(
- self.portal, ILanguageSchema).use_cookie_negotiation = True
- self.assertEqual(
- self.settings.use_cookie_negotiation,
- True
- )
-
- def test_get_authenticated_users_only(self):
- self.assertEqual(
- getAdapter(
- self.portal, ILanguageSchema).authenticated_users_only,
- False
- )
- self.settings.authenticated_users_only = True
- self.assertEqual(
- getAdapter(self.portal, ILanguageSchema).authenticated_users_only,
- True
- )
-
- def test_set_authenticated_users_only(self):
- self.assertEqual(
- self.settings.authenticated_users_only,
- False
- )
- getAdapter(
- self.portal, ILanguageSchema).authenticated_users_only = True
- self.assertEqual(
- self.settings.authenticated_users_only,
- True
- )
-
- def test_get_set_cookie_always(self):
- self.assertEqual(
- getAdapter(
- self.portal, ILanguageSchema).set_cookie_always,
- False
- )
- self.settings.set_cookie_always = True
- self.assertEqual(
- getAdapter(self.portal, ILanguageSchema).set_cookie_always,
- True
- )
-
- def test_set_set_cookie_always(self):
- self.assertEqual(
- self.settings.set_cookie_always,
- False
- )
- getAdapter(
- self.portal, ILanguageSchema).set_cookie_always = True
- self.assertEqual(
- self.settings.set_cookie_always,
- True
- )
-
- def test_get_use_subdomain_negotiation(self):
- self.assertEqual(
- getAdapter(
- self.portal, ILanguageSchema).use_subdomain_negotiation,
- False
- )
- self.settings.use_subdomain_negotiation = True
- self.assertEqual(
- getAdapter(self.portal, ILanguageSchema).use_subdomain_negotiation,
- True
- )
-
- def test_set_use_subdomain_negotiation(self):
- self.assertEqual(
- self.settings.use_subdomain_negotiation,
- False
- )
- getAdapter(
- self.portal, ILanguageSchema).use_subdomain_negotiation = True
- self.assertEqual(
- self.settings.use_subdomain_negotiation,
- True
- )
-
- def test_get_use_cctld_negotiation(self):
- self.assertEqual(
- getAdapter(
- self.portal, ILanguageSchema).use_cctld_negotiation,
- False
- )
- self.settings.use_cctld_negotiation = True
- self.assertEqual(
- getAdapter(self.portal, ILanguageSchema).use_cctld_negotiation,
- True
- )
-
- def test_set_use_cctld_negotiation(self):
- self.assertEqual(
- self.settings.use_cctld_negotiation,
- False
- )
- getAdapter(
- self.portal, ILanguageSchema).use_cctld_negotiation = True
- self.assertEqual(
- self.settings.use_cctld_negotiation,
- True
- )
-
- def test_get_use_request_negotiation(self):
- self.assertEqual(
- getAdapter(
- self.portal, ILanguageSchema).use_request_negotiation,
- False
- )
- self.settings.use_request_negotiation = True
- self.assertEqual(
- getAdapter(self.portal, ILanguageSchema).use_request_negotiation,
- True
- )
-
- def test_set_use_request_negotiation(self):
- self.assertEqual(
- self.settings.use_request_negotiation,
- False
- )
- getAdapter(
- self.portal, ILanguageSchema).use_request_negotiation = True
- self.assertEqual(
- self.settings.use_request_negotiation,
- True
- )
diff --git a/Products/CMFPlone/controlpanel/tests/test_controlpanel_bbb_mail_adapter.py b/Products/CMFPlone/controlpanel/tests/test_controlpanel_bbb_mail_adapter.py
deleted file mode 100644
index ecf2feb855..0000000000
--- a/Products/CMFPlone/controlpanel/tests/test_controlpanel_bbb_mail_adapter.py
+++ /dev/null
@@ -1,158 +0,0 @@
-from plone.app.testing import setRoles
-from plone.app.testing import TEST_USER_ID
-from plone.base.interfaces import IMailSchema
-from plone.registry.interfaces import IRegistry
-from Products.CMFPlone.testing import PRODUCTS_CMFPLONE_INTEGRATION_TESTING
-from zope.component import getAdapter
-from zope.component import getUtility
-
-import unittest
-
-
-class MailControlPanelAdapterTest(unittest.TestCase):
-
- layer = PRODUCTS_CMFPLONE_INTEGRATION_TESTING
-
- def setUp(self):
- self.portal = self.layer['portal']
- self.request = self.layer['request']
- setRoles(self.portal, TEST_USER_ID, ['Manager'])
- registry = getUtility(IRegistry)
- self.mail_settings = registry.forInterface(
- IMailSchema, prefix="plone")
-
- def test_adapter_lookup(self):
- self.assertTrue(getAdapter(self.portal, IMailSchema))
-
- def test_get_smtp_host(self):
- self.assertEqual(
- getAdapter(self.portal, IMailSchema).smtp_host,
- 'localhost'
- )
- self.mail_settings.smtp_host = 'example.com'
- self.assertEqual(
- getAdapter(self.portal, IMailSchema).smtp_host,
- 'example.com'
- )
-
- def test_set_smtp_host(self):
- self.assertEqual(
- self.mail_settings.smtp_host,
- 'localhost'
- )
- getAdapter(self.portal, IMailSchema).smtp_host = 'example.com'
- self.assertEqual(
- self.mail_settings.smtp_host,
- 'example.com'
- )
-
- def test_get_smtp_port(self):
- self.assertEqual(
- getAdapter(self.portal, IMailSchema).smtp_port,
- 25
- )
- self.mail_settings.smtp_port = 88
- self.assertEqual(
- getAdapter(self.portal, IMailSchema).smtp_port,
- 88
- )
-
- def test_set_smtp_port(self):
- self.assertEqual(
- self.mail_settings.smtp_port,
- 25
- )
- getAdapter(self.portal, IMailSchema).smtp_port = 88
- self.assertEqual(
- self.mail_settings.smtp_port,
- 88
- )
-
- def test_get_smtp_userid(self):
- self.assertEqual(
- getAdapter(self.portal, IMailSchema).smtp_userid,
- None
- )
- self.mail_settings.smtp_userid = 'john@example.com'
- self.assertEqual(
- getAdapter(self.portal, IMailSchema).smtp_userid,
- 'john@example.com'
- )
-
- def test_set_smtp_userid(self):
- self.assertEqual(
- self.mail_settings.smtp_userid,
- None
- )
- getAdapter(self.portal, IMailSchema).smtp_userid = 'john@example.com'
- self.assertEqual(
- self.mail_settings.smtp_userid,
- 'john@example.com'
- )
-
- def test_get_smtp_pass(self):
- self.assertEqual(
- getAdapter(self.portal, IMailSchema).smtp_pass,
- None
- )
- self.mail_settings.smtp_pass = 'secret'
- self.assertEqual(
- getAdapter(self.portal, IMailSchema).smtp_pass,
- 'secret'
- )
-
- def test_set_smtp_pass(self):
- self.assertEqual(
- self.mail_settings.smtp_pass,
- None
- )
- getAdapter(self.portal, IMailSchema).smtp_pass = 'secret'
- self.assertEqual(
- self.mail_settings.smtp_pass,
- 'secret'
- )
-
- def test_get_email_from_name(self):
- self.assertEqual(
- getAdapter(self.portal, IMailSchema).email_from_name,
- None
- )
- self.mail_settings.email_from_name = 'John'
- self.assertEqual(
- getAdapter(self.portal, IMailSchema).email_from_name,
- 'John'
- )
-
- def test_set_email_from_name(self):
- self.assertEqual(
- self.mail_settings.email_from_name,
- None
- )
- getAdapter(self.portal, IMailSchema).email_from_name = 'John'
- self.assertEqual(
- self.mail_settings.email_from_name,
- 'John'
- )
-
- def test_get_email_from_address(self):
- self.assertEqual(
- getAdapter(self.portal, IMailSchema).email_from_address,
- None
- )
- self.mail_settings.email_from_address = 'john@example.com'
- self.assertEqual(
- getAdapter(self.portal, IMailSchema).email_from_address,
- 'john@example.com'
- )
-
- def test_set_email_from_address(self):
- self.assertEqual(
- self.mail_settings.email_from_address,
- None
- )
- getAdapter(self.portal, IMailSchema).email_from_address = \
- 'john@example.com'
- self.assertEqual(
- self.mail_settings.email_from_address,
- 'john@example.com'
- )
diff --git a/Products/CMFPlone/controlpanel/tests/test_controlpanel_bbb_maintenance_adapter.py b/Products/CMFPlone/controlpanel/tests/test_controlpanel_bbb_maintenance_adapter.py
deleted file mode 100644
index ab48904965..0000000000
--- a/Products/CMFPlone/controlpanel/tests/test_controlpanel_bbb_maintenance_adapter.py
+++ /dev/null
@@ -1,49 +0,0 @@
-from plone.app.testing import setRoles
-from plone.app.testing import TEST_USER_ID
-from plone.base.interfaces import IMaintenanceSchema
-from plone.registry.interfaces import IRegistry
-from Products.CMFPlone.testing import PRODUCTS_CMFPLONE_INTEGRATION_TESTING
-from zope.component import getAdapter
-from zope.component import getUtility
-
-import unittest
-
-
-class MaintenanceControlPanelAdapterTest(unittest.TestCase):
-
- layer = PRODUCTS_CMFPLONE_INTEGRATION_TESTING
-
- def setUp(self):
- self.portal = self.layer['portal']
- self.request = self.layer['request']
- setRoles(self.portal, TEST_USER_ID, ['Manager'])
- registry = getUtility(IRegistry)
- self.maintenance_settings = registry.forInterface(
- IMaintenanceSchema, prefix="plone")
-
- def test_adapter_lookup(self):
- self.assertTrue(
- getAdapter(self.portal, IMaintenanceSchema)
- )
-
- def test_get_days(self):
- self.assertEqual(
- getAdapter(self.portal, IMaintenanceSchema).days,
- 7
- )
- self.maintenance_settings.days = 4
- self.assertEqual(
- getAdapter(self.portal, IMaintenanceSchema).days,
- 4
- )
-
- def test_set_days(self):
- self.assertEqual(
- self.maintenance_settings.days,
- 7
- )
- getAdapter(self.portal, IMaintenanceSchema).days = 4
- self.assertEqual(
- self.maintenance_settings.days,
- 4
- )
diff --git a/Products/CMFPlone/controlpanel/tests/test_controlpanel_bbb_markup_adapter.py b/Products/CMFPlone/controlpanel/tests/test_controlpanel_bbb_markup_adapter.py
deleted file mode 100644
index 7ec8e09c4e..0000000000
--- a/Products/CMFPlone/controlpanel/tests/test_controlpanel_bbb_markup_adapter.py
+++ /dev/null
@@ -1,53 +0,0 @@
-from plone.app.testing import setRoles
-from plone.app.testing import TEST_USER_ID
-from plone.base.interfaces import IMarkupSchema
-from plone.registry.interfaces import IRegistry
-from Products.CMFPlone.testing import PRODUCTS_CMFPLONE_INTEGRATION_TESTING
-from zope.component import getAdapter
-from zope.component import getUtility
-
-import unittest
-
-
-class MarkupControlPanelAdapterTest(unittest.TestCase):
-
- layer = PRODUCTS_CMFPLONE_INTEGRATION_TESTING
-
- def setUp(self):
- self.app = self.layer['app']
- self.portal = self.layer['portal']
- setRoles(self.portal, TEST_USER_ID, ['Manager'])
- registry = getUtility(IRegistry)
- self.settings = registry.forInterface(IMarkupSchema, prefix="plone")
-
- def test_adapter_lookup(self):
- self.assertTrue(getAdapter(self.portal, IMarkupSchema))
-
- def test_get_default_type(self):
- self.settings.default_type = 'text/plain'
- self.assertEqual(
- getAdapter(self.portal, IMarkupSchema).default_type,
- 'text/plain'
- )
-
- def test_set_default_type(self):
- getAdapter(self.portal, IMarkupSchema).default_type = 'text/plain' # noqa
- self.assertEqual(
- self.settings.default_type,
- 'text/plain'
- )
-
- def test_get_allowed_types(self):
- self.settings.allowed_types = ('text/plain', 'text/x-web-textile')
- self.assertEqual(
- getAdapter(self.portal, IMarkupSchema).allowed_types,
- ('text/plain', 'text/x-web-textile')
- )
-
- def test_set_allowed_types(self):
- getAdapter(self.portal, IMarkupSchema).allowed_types =\
- ('text/plain', 'text/x-web-textile')
- self.assertEqual(
- self.settings.allowed_types,
- ('text/plain', 'text/x-web-textile')
- )
diff --git a/Products/CMFPlone/controlpanel/tests/test_controlpanel_bbb_navigation_adapter.py b/Products/CMFPlone/controlpanel/tests/test_controlpanel_bbb_navigation_adapter.py
deleted file mode 100644
index 819c4a8ebb..0000000000
--- a/Products/CMFPlone/controlpanel/tests/test_controlpanel_bbb_navigation_adapter.py
+++ /dev/null
@@ -1,156 +0,0 @@
-from plone.app.testing import setRoles
-from plone.app.testing import TEST_USER_ID
-from plone.base.interfaces import INavigationSchema
-from plone.registry.interfaces import IRegistry
-from Products.CMFPlone.testing import PRODUCTS_CMFPLONE_INTEGRATION_TESTING
-from zope.component import getAdapter
-from zope.component import getUtility
-
-import unittest
-
-
-class NavigationControlPanelAdapterTest(unittest.TestCase):
-
- layer = PRODUCTS_CMFPLONE_INTEGRATION_TESTING
-
- def setUp(self):
- self.portal = self.layer['portal']
- self.request = self.layer['request']
- setRoles(self.portal, TEST_USER_ID, ['Manager'])
- registry = getUtility(IRegistry)
- self.navigation_settings = registry.forInterface(
- INavigationSchema, prefix="plone")
-
- def test_adapter_lookup(self):
- self.assertTrue(getAdapter(self.portal, INavigationSchema))
-
- def test_get_generate_tabs(self):
- self.assertEqual(
- getAdapter(self.portal, INavigationSchema).generate_tabs,
- True
- )
- self.navigation_settings.generate_tabs = False
- self.assertEqual(
- getAdapter(self.portal, INavigationSchema).generate_tabs,
- False
- )
-
- def test_set_generate_tabs(self):
- self.assertEqual(
- self.navigation_settings.generate_tabs,
- True
- )
- getAdapter(self.portal, INavigationSchema).generate_tabs = False
- self.assertEqual(
- self.navigation_settings.generate_tabs,
- False
- )
-
- def test_get_nonfolderish_tabs(self):
- self.assertEqual(
- getAdapter(self.portal, INavigationSchema).nonfolderish_tabs,
- True
- )
- self.navigation_settings.nonfolderish_tabs = False
- self.assertEqual(
- getAdapter(self.portal, INavigationSchema).nonfolderish_tabs,
- False
- )
-
- def test_set_nonfolderish_tabs(self):
- self.assertEqual(
- self.navigation_settings.nonfolderish_tabs,
- True
- )
- getAdapter(self.portal, INavigationSchema).nonfolderish_tabs = False
- self.assertEqual(
- self.navigation_settings.nonfolderish_tabs,
- False
- )
-
- def test_get_displayed_types(self):
- self.navigation_settings.displayed_types = ('Folder',)
- self.assertEqual(
- getAdapter(self.portal, INavigationSchema).displayed_types,
- ('Folder',)
- )
-
- def test_set_displayed_types(self):
- getAdapter(
- self.portal,
- INavigationSchema
- ).displayed_types = ('Folder',)
- self.assertEqual(
- self.navigation_settings.displayed_types,
- ('Folder',)
- )
-
- def test_get_filter_on_workflow(self):
- self.assertEqual(
- getAdapter(self.portal, INavigationSchema).filter_on_workflow,
- False
- )
- self.navigation_settings.filter_on_workflow = True
- self.assertEqual(
- getAdapter(self.portal, INavigationSchema).filter_on_workflow,
- True
- )
-
- def test_set_filter_on_workflow(self):
- self.assertEqual(
- self.navigation_settings.filter_on_workflow,
- False
- )
- getAdapter(self.portal, INavigationSchema).filter_on_workflow = True
- self.assertEqual(
- self.navigation_settings.filter_on_workflow,
- True
- )
-
- def test_get_workflow_states_to_show(self):
- self.assertEqual(
- getAdapter(self.portal, INavigationSchema).workflow_states_to_show,
- ()
- )
-
- self.navigation_settings.workflow_states_to_show = ('private',)
- self.assertEqual(
- getAdapter(self.portal, INavigationSchema).workflow_states_to_show,
- ('private',)
- )
-
- def test_set_workflow_states_to_show(self):
- self.assertEqual(
- self.navigation_settings.workflow_states_to_show,
- ()
- )
- getAdapter(
- self.portal,
- INavigationSchema
- ).workflow_states_to_show = ('private',)
- self.assertEqual(
- self.navigation_settings.workflow_states_to_show,
- ('private',)
- )
-
- def test_get_show_excluded_items(self):
- self.assertEqual(
- getAdapter(self.portal, INavigationSchema).show_excluded_items,
- False
- )
- self.navigation_settings.show_excluded_items = True
- self.assertEqual(
- getAdapter(self.portal, INavigationSchema).show_excluded_items,
- True
- )
-
- def test_set_show_excluded_items(self):
- self.assertEqual(
- self.navigation_settings.show_excluded_items,
- False
- )
- getAdapter(self.portal, INavigationSchema).show_excluded_items = True
- self.assertEqual(
- self.navigation_settings.show_excluded_items,
- True
- )
diff --git a/Products/CMFPlone/controlpanel/tests/test_controlpanel_bbb_search_adapter.py b/Products/CMFPlone/controlpanel/tests/test_controlpanel_bbb_search_adapter.py
deleted file mode 100644
index 28905f2dec..0000000000
--- a/Products/CMFPlone/controlpanel/tests/test_controlpanel_bbb_search_adapter.py
+++ /dev/null
@@ -1,67 +0,0 @@
-from plone.app.testing import setRoles
-from plone.app.testing import TEST_USER_ID
-from plone.base.interfaces import ISearchSchema
-from plone.registry.interfaces import IRegistry
-from Products.CMFPlone.testing import PRODUCTS_CMFPLONE_INTEGRATION_TESTING
-from zope.component import getAdapter
-from zope.component import getUtility
-
-import unittest
-
-
-class SearchControlPanelAdapterTest(unittest.TestCase):
-
- layer = PRODUCTS_CMFPLONE_INTEGRATION_TESTING
-
- def setUp(self):
- self.portal = self.layer['portal']
- self.request = self.layer['request']
- setRoles(self.portal, TEST_USER_ID, ['Manager'])
- registry = getUtility(IRegistry)
- self.search_settings = registry.forInterface(
- ISearchSchema, prefix="plone")
-
- def test_adapter_lookup(self):
- self.assertTrue(getAdapter(self.portal, ISearchSchema))
-
- def test_get_enable_livesearch(self):
- self.assertEqual(
- getAdapter(self.portal, ISearchSchema).enable_livesearch,
- True
- )
- self.search_settings.enable_livesearch = False
- self.assertEqual(
- getAdapter(self.portal, ISearchSchema).enable_livesearch,
- False
- )
-
- def test_set_enable_livesearch(self):
- self.assertEqual(
- self.search_settings.enable_livesearch,
- True
- )
- getAdapter(self.portal, ISearchSchema).enable_livesearch = False
- self.assertEqual(
- self.search_settings.enable_livesearch,
- False
- )
-
- def test_get_types_not_searched(self):
- self.assertTrue(
- 'Folder' not in
- getAdapter(self.portal, ISearchSchema).types_not_searched
- )
- self.search_settings.types_not_searched = ('Folder',)
- self.assertTrue(
- 'Folder' in
- getAdapter(self.portal, ISearchSchema).types_not_searched
- )
-
- def test_set_types_not_searched(self):
- self.assertTrue(
- 'Folder' not in self.search_settings.types_not_searched
- )
- getAdapter(self.portal, ISearchSchema).types_not_searched = ('Folder',)
- self.assertTrue(
- 'Folder' in self.search_settings.types_not_searched
- )
diff --git a/Products/CMFPlone/controlpanel/tests/test_controlpanel_bbb_security_adapter.py b/Products/CMFPlone/controlpanel/tests/test_controlpanel_bbb_security_adapter.py
deleted file mode 100644
index 8be6d76154..0000000000
--- a/Products/CMFPlone/controlpanel/tests/test_controlpanel_bbb_security_adapter.py
+++ /dev/null
@@ -1,129 +0,0 @@
-from plone.app.testing import setRoles
-from plone.app.testing import TEST_USER_ID
-from plone.base.interfaces import ISecuritySchema
-from Products.CMFPlone.testing import PRODUCTS_CMFPLONE_INTEGRATION_TESTING
-from zope.component import getAdapter
-
-import unittest
-
-
-class SecurityControlPanelAdapterTest(unittest.TestCase):
-
- layer = PRODUCTS_CMFPLONE_INTEGRATION_TESTING
-
- def setUp(self):
- self.portal = self.layer['portal']
- self.request = self.layer['request']
- setRoles(self.portal, TEST_USER_ID, ['Manager'])
- self.security_settings = getAdapter(self.portal, ISecuritySchema)
-
- def test_adapter_lookup(self):
- self.assertTrue(getAdapter(self.portal, ISecuritySchema))
-
- def test_get_enable_self_reg_setting(self):
- self.assertEqual(
- self.security_settings.enable_self_reg,
- False
- )
-
- def test_set_enable_self_reg_setting(self):
- self.security_settings.enable_self_reg = False
- self.assertEqual(
- self.security_settings.enable_self_reg,
- False
- )
- self.security_settings.enable_self_reg = True
- self.assertEqual(
- self.security_settings.enable_self_reg,
- True
- )
-
- def test_get_enable_user_pwd_choice_setting(self):
- self.assertEqual(
- self.security_settings.enable_user_pwd_choice,
- False
- )
-
- def test_set_enable_user_pwd_choice_setting(self):
- self.security_settings.enable_user_pwd_choice = False
- self.assertEqual(
- self.security_settings.enable_user_pwd_choice,
- False
- )
- self.security_settings.enable_user_pwd_choice = True
- self.assertEqual(
- self.security_settings.enable_user_pwd_choice,
- True
- )
-
- def test_get_enable_user_folders_setting(self):
- self.assertEqual(
- self.security_settings.enable_user_folders,
- False
- )
-
- def test_set_enable_user_folders_setting(self):
- self.security_settings.enable_user_folders = False
- self.assertEqual(
- self.security_settings.enable_user_folders,
- False
- )
- self.security_settings.enable_user_folders = True
- self.assertEqual(
- self.security_settings.enable_user_folders,
- True
- )
-
- def test_get_allow_anon_views_about_setting(self):
- self.assertEqual(
- self.security_settings.allow_anon_views_about,
- False
- )
-
- def test_set_allow_anon_views_about_setting(self):
- self.security_settings.allow_anon_views_about = False
- self.assertEqual(
- self.security_settings.allow_anon_views_about,
- False
- )
- self.security_settings.allow_anon_views_about = True
- self.assertEqual(
- self.security_settings.allow_anon_views_about,
- True
- )
-
- def test_get_use_email_as_login_setting(self):
- self.assertEqual(
- self.security_settings.use_email_as_login,
- False
- )
-
- def test_set_use_email_as_login_setting(self):
- self.security_settings.use_email_as_login = False
- self.assertEqual(
- self.security_settings.use_email_as_login,
- False
- )
- self.security_settings.use_email_as_login = True
- self.assertEqual(
- self.security_settings.use_email_as_login,
- True
- )
-
- def test_get_use_uuid_as_userid_setting(self):
- self.assertEqual(
- self.security_settings.use_uuid_as_userid,
- False
- )
-
- def test_set_use_uuid_as_userid_setting(self):
- self.security_settings.use_uuid_as_userid = False
- self.assertEqual(
- self.security_settings.use_uuid_as_userid,
- False
- )
- self.security_settings.use_uuid_as_userid = True
- self.assertEqual(
- self.security_settings.use_uuid_as_userid,
- True
- )
diff --git a/Products/CMFPlone/controlpanel/tests/test_controlpanel_bbb_site_adapter.py b/Products/CMFPlone/controlpanel/tests/test_controlpanel_bbb_site_adapter.py
deleted file mode 100644
index 5901222888..0000000000
--- a/Products/CMFPlone/controlpanel/tests/test_controlpanel_bbb_site_adapter.py
+++ /dev/null
@@ -1,66 +0,0 @@
-from plone.app.testing import setRoles
-from plone.app.testing import TEST_USER_ID
-from plone.base.interfaces import ISiteSchema
-from plone.registry.interfaces import IRegistry
-from Products.CMFPlone.testing import PRODUCTS_CMFPLONE_INTEGRATION_TESTING
-from zope.component import getAdapter
-from zope.component import getUtility
-
-import unittest
-
-
-class SiteControlPanelAdapterTest(unittest.TestCase):
-
- layer = PRODUCTS_CMFPLONE_INTEGRATION_TESTING
-
- def setUp(self):
- self.portal = self.layer['portal']
- self.request = self.layer['request']
- setRoles(self.portal, TEST_USER_ID, ['Manager'])
- registry = getUtility(IRegistry)
- self.settings = registry.forInterface(ISiteSchema, prefix="plone")
-
- def test_adapter_lookup(self):
- self.assertTrue(getAdapter(self.portal, ISiteSchema))
-
- def test_get_site_title(self):
- self.settings.site_title = 'Great Site'
- self.assertEqual(
- getAdapter(self.portal, ISiteSchema).site_title,
- 'Great Site'
- )
-
- def test_set_site_title(self):
- getAdapter(self.portal, ISiteSchema).site_title = 'Good Site'
- self.assertEqual(
- self.settings.site_title,
- 'Good Site'
- )
-
- def test_set_site_title_string(self):
- getAdapter(self.portal, ISiteSchema).site_title = 'Good Site'
- self.assertEqual(
- self.settings.site_title,
- 'Good Site'
- )
-
- def test_get_webstats_js(self):
- self.settings.webstats_js = 'Script Tag'
- self.assertEqual(
- getAdapter(self.portal, ISiteSchema).webstats_js,
- 'Script Tag'
- )
-
- def test_set_webstats_js(self):
- getAdapter(self.portal, ISiteSchema).webstats_js = 'Script Tag'
- self.assertEqual(
- self.settings.webstats_js,
- 'Script Tag'
- )
-
- def test_set_webstats_js_string(self):
- getAdapter(self.portal, ISiteSchema).webstats_js = 'Script Tag'
- self.assertEqual(
- self.settings.webstats_js,
- 'Script Tag'
- )
diff --git a/Products/CMFPlone/controlpanel/tests/test_controlpanel_bbb_usergroups_adapter.py b/Products/CMFPlone/controlpanel/tests/test_controlpanel_bbb_usergroups_adapter.py
deleted file mode 100644
index 7140b64110..0000000000
--- a/Products/CMFPlone/controlpanel/tests/test_controlpanel_bbb_usergroups_adapter.py
+++ /dev/null
@@ -1,42 +0,0 @@
-from plone.app.testing import setRoles
-from plone.app.testing import TEST_USER_ID
-from plone.base.interfaces import IUserGroupsSettingsSchema
-from plone.registry.interfaces import IRegistry
-from Products.CMFPlone.testing import PRODUCTS_CMFPLONE_INTEGRATION_TESTING
-from zope.component import getAdapter
-from zope.component import getUtility
-
-import unittest
-
-
-class UserGroupsControlPanelAdapterTest(unittest.TestCase):
-
- layer = PRODUCTS_CMFPLONE_INTEGRATION_TESTING
-
- def setUp(self):
- self.portal = self.layer['portal']
- self.request = self.layer['request']
- setRoles(self.portal, TEST_USER_ID, ['Manager'])
- registry = getUtility(IRegistry)
- self.usergroups_settings = registry.forInterface(
- IUserGroupsSettingsSchema, prefix="plone")
-
- def test_adapter_lookup(self):
- self.assertTrue(
- getAdapter(self.portal, IUserGroupsSettingsSchema)
- )
-
- def test_many_groups(self):
- getAdapter(self.portal, IUserGroupsSettingsSchema).set_many_groups(True)
- self.assertEqual(
- getAdapter(
- self.portal, IUserGroupsSettingsSchema).get_many_groups(),
- True
- )
-
- def test_many_users(self):
- getAdapter(self.portal, IUserGroupsSettingsSchema).set_many_users(True)
- self.assertEqual(
- getAdapter(self.portal, IUserGroupsSettingsSchema).get_many_users(),
- True
- )