[CMF-checkins] CVS: Products/CMFDefault/tests -
test_DefaultWorkflow.py:1.6 test_DiscussionReply.py:1.7
test_DiscussionTool.py:1.7 test_Discussions.py:1.23
test_Document.py:1.43 test_DublinCore.py:1.11
test_Favorite.py:1.11 test_Image.py:1.13 test_Link.py:1.13
test_MembershipTool.py:1.14 test_MetadataTool.py:1.13
test_NewsItem.py:1.14 test_Portal.py:1.10
test_PropertiesTool.py:1.6 test_RegistrationTool.py:1.9
test_all.py:1.17 test_join.py:1.15 test_utils.py:1.14
Tres Seaver
tseaver at palladion.com
Wed Jun 15 10:18:09 EDT 2005
Update of /cvs-repository/Products/CMFDefault/tests
In directory cvs.zope.org:/tmp/cvs-serv19326/CMFDefault/tests
Modified Files:
test_DefaultWorkflow.py test_DiscussionReply.py
test_DiscussionTool.py test_Discussions.py test_Document.py
test_DublinCore.py test_Favorite.py test_Image.py test_Link.py
test_MembershipTool.py test_MetadataTool.py test_NewsItem.py
test_Portal.py test_PropertiesTool.py test_RegistrationTool.py
test_all.py test_join.py test_utils.py
Log Message:
- Merge tseaver-z28_only-branch, removing BBB for Zope 2.7 support.
=== Products/CMFDefault/tests/test_DefaultWorkflow.py 1.5 => 1.6 ===
--- Products/CMFDefault/tests/test_DefaultWorkflow.py:1.5 Mon Jun 13 13:32:05 2005
+++ Products/CMFDefault/tests/test_DefaultWorkflow.py Wed Jun 15 10:17:39 2005
@@ -17,8 +17,8 @@
from unittest import TestCase, TestSuite, makeSuite, main
import Testing
-import Zope
-Zope.startup()
+import Zope2
+Zope2.startup()
class DefaultWorkflowDefinitionTests(TestCase):
@@ -33,11 +33,7 @@
verifyClass(IWorkflowDefinition, DefaultWorkflowDefinition)
def test_z3interfaces(self):
- try:
- from zope.interface.verify import verifyClass
- except ImportError:
- # BBB: for Zope 2.7
- return
+ from zope.interface.verify import verifyClass
from Products.CMFCore.interfaces import IWorkflowDefinition
from Products.CMFDefault.DefaultWorkflow \
import DefaultWorkflowDefinition
=== Products/CMFDefault/tests/test_DiscussionReply.py 1.6 => 1.7 ===
--- Products/CMFDefault/tests/test_DiscussionReply.py:1.6 Sun Mar 27 13:16:14 2005
+++ Products/CMFDefault/tests/test_DiscussionReply.py Wed Jun 15 10:17:39 2005
@@ -1,12 +1,24 @@
+##############################################################################
#
-# Tests for http://zope.org/Collectors/CMF/318
+# Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+""" Unit tests for http://zope.org/Collectors/CMF/318
+$Id$
+"""
from unittest import TestSuite, makeSuite, main
import Testing
-import Zope
-Zope.startup()
+import Zope2
+Zope2.startup()
from AccessControl.SecurityManagement import newSecurityManager
from AccessControl.SecurityManagement import noSecurityManager
=== Products/CMFDefault/tests/test_DiscussionTool.py 1.6 => 1.7 ===
--- Products/CMFDefault/tests/test_DiscussionTool.py:1.6 Mon Jun 13 13:32:05 2005
+++ Products/CMFDefault/tests/test_DiscussionTool.py Wed Jun 15 10:17:39 2005
@@ -17,8 +17,8 @@
from unittest import TestCase, TestSuite, makeSuite, main
import Testing
-import Zope
-Zope.startup()
+import Zope2
+Zope2.startup()
from Products.CMFCore.tests.base.dummy import DummyFolder
from Products.CMFCore.tests.base.dummy import DummySite
@@ -49,11 +49,7 @@
verifyClass(IDiscussionTool, DiscussionTool)
def test_z3interfaces(self):
- try:
- from zope.interface.verify import verifyClass
- except ImportError:
- # BBB: for Zope 2.7
- return
+ from zope.interface.verify import verifyClass
from Products.CMFCore.interfaces import IActionProvider
from Products.CMFCore.interfaces import IDiscussionTool
from Products.CMFDefault.DiscussionTool import DiscussionTool
=== Products/CMFDefault/tests/test_Discussions.py 1.22 => 1.23 ===
--- Products/CMFDefault/tests/test_Discussions.py:1.22 Mon Jun 13 13:32:05 2005
+++ Products/CMFDefault/tests/test_Discussions.py Wed Jun 15 10:17:39 2005
@@ -17,8 +17,8 @@
from unittest import TestCase, TestSuite, makeSuite, main
import Testing
-import Zope
-Zope.startup()
+import Zope2
+Zope2.startup()
from Products.CMFCore.CatalogTool import CatalogTool
from Products.CMFCore.tests.base.dummy import DummyContent
@@ -60,11 +60,7 @@
verifyClass(IMutableDublinCore, DiscussionItem)
def test_z3interfaces(self):
- try:
- from zope.interface.verify import verifyClass
- except ImportError:
- # BBB: for Zope 2.7
- return
+ from zope.interface.verify import verifyClass
from Products.CMFCore.interfaces import ICatalogableDublinCore
from Products.CMFCore.interfaces import IContentish
from Products.CMFCore.interfaces import IDiscussionResponse
@@ -92,11 +88,7 @@
verifyClass(IDiscussable, DiscussionItemContainer)
def test_z3interfaces(self):
- try:
- from zope.interface.verify import verifyClass
- except ImportError:
- # BBB: for Zope 2.7
- return
+ from zope.interface.verify import verifyClass
from Products.CMFCore.interfaces import IDiscussable
from Products.CMFDefault.DiscussionItem import DiscussionItemContainer
=== Products/CMFDefault/tests/test_Document.py 1.42 => 1.43 ===
--- Products/CMFDefault/tests/test_Document.py:1.42 Mon Jun 13 13:32:05 2005
+++ Products/CMFDefault/tests/test_Document.py Wed Jun 15 10:17:39 2005
@@ -17,8 +17,8 @@
from unittest import TestSuite, makeSuite, main
import Testing
-import Zope
-Zope.startup()
+import Zope2
+Zope2.startup()
from os.path import abspath
from os.path import dirname
@@ -90,11 +90,7 @@
verifyClass(IMutableDublinCore, Document)
def test_z3interfaces(self):
- try:
- from zope.interface.verify import verifyClass
- except ImportError:
- # BBB: for Zope 2.7
- return
+ from zope.interface.verify import verifyClass
from Products.CMFCore.interfaces import ICatalogableDublinCore
from Products.CMFCore.interfaces import IContentish
from Products.CMFCore.interfaces import IDublinCore
=== Products/CMFDefault/tests/test_DublinCore.py 1.10 => 1.11 ===
--- Products/CMFDefault/tests/test_DublinCore.py:1.10 Mon Jun 13 13:32:05 2005
+++ Products/CMFDefault/tests/test_DublinCore.py Wed Jun 15 10:17:39 2005
@@ -17,8 +17,8 @@
from unittest import TestSuite, makeSuite, main
import Testing
-import Zope
-Zope.startup()
+import Zope2
+Zope2.startup()
from AccessControl.SecurityManagement import newSecurityManager
from Acquisition import Implicit
@@ -83,11 +83,7 @@
verifyClass(IMutableDublinCore, DefaultDublinCoreImpl)
def test_z3interfaces(self):
- try:
- from zope.interface.verify import verifyClass
- except ImportError:
- # BBB: for Zope 2.7
- return
+ from zope.interface.verify import verifyClass
from Products.CMFCore.interfaces import ICatalogableDublinCore
from Products.CMFCore.interfaces import IDublinCore
from Products.CMFCore.interfaces import IMutableDublinCore
=== Products/CMFDefault/tests/test_Favorite.py 1.10 => 1.11 ===
--- Products/CMFDefault/tests/test_Favorite.py:1.10 Thu Aug 12 11:07:41 2004
+++ Products/CMFDefault/tests/test_Favorite.py Wed Jun 15 10:17:39 2005
@@ -17,8 +17,8 @@
from unittest import TestCase, TestSuite, makeSuite, main
import Testing
-import Zope
-Zope.startup()
+import Zope2
+Zope2.startup()
from Products.CMFCore.tests.base.dummy import DummySite
from Products.CMFCore.tests.base.dummy import DummyTool
=== Products/CMFDefault/tests/test_Image.py 1.12 => 1.13 ===
--- Products/CMFDefault/tests/test_Image.py:1.12 Tue Apr 5 05:26:55 2005
+++ Products/CMFDefault/tests/test_Image.py Wed Jun 15 10:17:39 2005
@@ -17,11 +17,7 @@
from unittest import TestCase, TestSuite, makeSuite, main
import Testing
-try:
- import Zope2
-except ImportError:
- # BBB: for Zope 2.7
- import Zope as Zope2
+import Zope2
Zope2.startup()
from os.path import join as path_join
@@ -30,11 +26,7 @@
from AccessControl.SecurityManagement import newSecurityManager
from AccessControl.SecurityManagement import noSecurityManager
from AccessControl.User import UnrestrictedUser
-try:
- import transaction
-except ImportError:
- # BBB: for Zope 2.7
- from Products.CMFCore.utils import transaction
+import transaction
from Products.CMFCore.tests.base.dummy import DummySite
from Products.CMFCore.tests.base.dummy import DummyTool
=== Products/CMFDefault/tests/test_Link.py 1.12 => 1.13 ===
--- Products/CMFDefault/tests/test_Link.py:1.12 Sat Jul 31 10:06:33 2004
+++ Products/CMFDefault/tests/test_Link.py Wed Jun 15 10:17:39 2005
@@ -1,7 +1,23 @@
+##############################################################################
+#
+# Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+""" Unit tests for Link module.
+
+$Id$
+"""
from unittest import TestCase, TestSuite, makeSuite, main
import Testing
-import Zope
-Zope.startup()
+import Zope2
+Zope2.startup()
from re import compile
=== Products/CMFDefault/tests/test_MembershipTool.py 1.13 => 1.14 ===
--- Products/CMFDefault/tests/test_MembershipTool.py:1.13 Mon Jun 13 13:32:05 2005
+++ Products/CMFDefault/tests/test_MembershipTool.py Wed Jun 15 10:17:39 2005
@@ -17,8 +17,8 @@
from unittest import TestCase, TestSuite, makeSuite, main
import Testing
-import Zope
-Zope.startup()
+import Zope2
+Zope2.startup()
from AccessControl.SecurityManagement import newSecurityManager
@@ -53,11 +53,7 @@
verifyClass(IMembershipTool, MembershipTool)
def test_z3interfaces(self):
- try:
- from zope.interface.verify import verifyClass
- except ImportError:
- # BBB: for Zope 2.7
- return
+ from zope.interface.verify import verifyClass
from Products.CMFCore.interfaces import IActionProvider
from Products.CMFDefault.interfaces import IMembershipTool
from Products.CMFDefault.MembershipTool import MembershipTool
=== Products/CMFDefault/tests/test_MetadataTool.py 1.12 => 1.13 ===
--- Products/CMFDefault/tests/test_MetadataTool.py:1.12 Mon Jun 13 13:32:05 2005
+++ Products/CMFDefault/tests/test_MetadataTool.py Wed Jun 15 10:17:39 2005
@@ -17,8 +17,8 @@
from unittest import TestCase, TestSuite, makeSuite, main
import Testing
-import Zope
-Zope.startup()
+import Zope2
+Zope2.startup()
from Acquisition import aq_base
@@ -137,11 +137,7 @@
verifyClass(IMetadataTool, MetadataTool)
def test_z3interfaces(self):
- try:
- from zope.interface.verify import verifyClass
- except ImportError:
- # BBB: for Zope 2.7
- return
+ from zope.interface.verify import verifyClass
from Products.CMFCore.interfaces import IActionProvider
from Products.CMFCore.interfaces import IMetadataTool
=== Products/CMFDefault/tests/test_NewsItem.py 1.13 => 1.14 ===
--- Products/CMFDefault/tests/test_NewsItem.py:1.13 Mon Jun 13 13:32:05 2005
+++ Products/CMFDefault/tests/test_NewsItem.py Wed Jun 15 10:17:39 2005
@@ -17,8 +17,8 @@
from unittest import TestCase, TestSuite, makeSuite, main
import Testing
-import Zope
-Zope.startup()
+import Zope2
+Zope2.startup()
from Products.CMFCore.tests.base.content import BASIC_HTML
from Products.CMFCore.tests.base.content import BASIC_STRUCTUREDTEXT
@@ -56,11 +56,7 @@
verifyClass(IMutableDublinCore, NewsItem)
def test_z3interfaces(self):
- try:
- from zope.interface.verify import verifyClass
- except ImportError:
- # BBB: for Zope 2.7
- return
+ from zope.interface.verify import verifyClass
from Products.CMFCore.interfaces import ICatalogableDublinCore
from Products.CMFCore.interfaces import IContentish
from Products.CMFCore.interfaces import IDublinCore
=== Products/CMFDefault/tests/test_Portal.py 1.9 => 1.10 ===
--- Products/CMFDefault/tests/test_Portal.py:1.9 Sun Mar 20 16:19:47 2005
+++ Products/CMFDefault/tests/test_Portal.py Wed Jun 15 10:17:39 2005
@@ -17,8 +17,8 @@
from unittest import TestSuite, makeSuite, main
import Testing
-import Zope
-Zope.startup()
+import Zope2
+Zope2.startup()
from Acquisition import aq_base
=== Products/CMFDefault/tests/test_PropertiesTool.py 1.5 => 1.6 ===
--- Products/CMFDefault/tests/test_PropertiesTool.py:1.5 Mon Jun 13 13:32:05 2005
+++ Products/CMFDefault/tests/test_PropertiesTool.py Wed Jun 15 10:17:39 2005
@@ -17,8 +17,8 @@
from unittest import TestCase, TestSuite, makeSuite, main
import Testing
-import Zope
-Zope.startup()
+import Zope2
+Zope2.startup()
class PropertiesToolTests(TestCase):
@@ -35,11 +35,7 @@
verifyClass(IPropertiesTool, PropertiesTool)
def test_z3interfaces(self):
- try:
- from zope.interface.verify import verifyClass
- except ImportError:
- # BBB: for Zope 2.7
- return
+ from zope.interface.verify import verifyClass
from Products.CMFCore.interfaces import IActionProvider
from Products.CMFCore.interfaces import IPropertiesTool
from Products.CMFDefault.PropertiesTool import PropertiesTool
=== Products/CMFDefault/tests/test_RegistrationTool.py 1.8 => 1.9 ===
--- Products/CMFDefault/tests/test_RegistrationTool.py:1.8 Mon Jun 13 13:32:05 2005
+++ Products/CMFDefault/tests/test_RegistrationTool.py Wed Jun 15 10:17:39 2005
@@ -17,8 +17,8 @@
import unittest
import Testing
-import Zope
-Zope.startup()
+import Zope2
+Zope2.startup()
from Products.CMFCore.tests.base.testcase import RequestTest
@@ -50,11 +50,7 @@
verifyClass(IRegistrationTool, self._getTargetClass())
def test_z3interfaces(self):
- try:
- from zope.interface.verify import verifyClass
- except ImportError:
- # BBB: for Zope 2.7
- return
+ from zope.interface.verify import verifyClass
from Products.CMFCore.interfaces import IActionProvider
from Products.CMFCore.interfaces import IRegistrationTool
=== Products/CMFDefault/tests/test_all.py 1.16 => 1.17 ===
--- Products/CMFDefault/tests/test_all.py:1.16 Thu Aug 12 11:07:41 2004
+++ Products/CMFDefault/tests/test_all.py Wed Jun 15 10:17:39 2005
@@ -17,8 +17,8 @@
from unittest import main
import Testing
-import Zope
-Zope.startup()
+import Zope2
+Zope2.startup()
from Products.CMFCore.tests.base.utils import build_test_suite
=== Products/CMFDefault/tests/test_join.py 1.14 => 1.15 ===
--- Products/CMFDefault/tests/test_join.py:1.14 Sun Mar 20 16:19:47 2005
+++ Products/CMFDefault/tests/test_join.py Wed Jun 15 10:17:39 2005
@@ -17,8 +17,8 @@
from unittest import TestSuite, makeSuite, main
import Testing
-import Zope
-Zope.startup()
+import Zope2
+Zope2.startup()
from Products.CMFCore.tests.base.testcase import TransactionalTest
=== Products/CMFDefault/tests/test_utils.py 1.13 => 1.14 ===
--- Products/CMFDefault/tests/test_utils.py:1.13 Sun Oct 17 15:37:00 2004
+++ Products/CMFDefault/tests/test_utils.py Wed Jun 15 10:17:39 2005
@@ -1,7 +1,23 @@
+##############################################################################
+#
+# Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+""" Unit tests for utils module.
+
+$Id$
+"""
from unittest import TestCase, makeSuite, main
import Testing
-import Zope
-Zope.startup()
+import Zope2
+Zope2.startup()
from Products.CMFCore.tests.base.content import FAUX_HTML_LEADING_TEXT
from Products.CMFCore.tests.base.content import SIMPLE_HTML
More information about the CMF-checkins
mailing list