[Checkins] SVN: Products.CMFCore/trunk/Products/CMFCore/ - fixed tests that did use deprecated features
Yvo Schubbe
y.2009 at wcm-solutions.de
Tue Dec 8 16:34:37 EST 2009
Log message for revision 106312:
- fixed tests that did use deprecated features
- removed obsolete tests
Changed:
U Products.CMFCore/trunk/Products/CMFCore/exportimport/tests/test_skins.py
U Products.CMFCore/trunk/Products/CMFCore/tests/base/testcase.py
U Products.CMFCore/trunk/Products/CMFCore/tests/test_DirectoryView.py
-=-
Modified: Products.CMFCore/trunk/Products/CMFCore/exportimport/tests/test_skins.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/exportimport/tests/test_skins.py 2009-12-08 21:32:23 UTC (rev 106311)
+++ Products.CMFCore/trunk/Products/CMFCore/exportimport/tests/test_skins.py 2009-12-08 21:34:37 UTC (rev 106312)
@@ -37,7 +37,7 @@
_DIRECTORYVIEW_XML = """\
<object name="foo_directoryview" meta_type="Filesystem Directory View"
- directory="CMFCore/exportimport/tests/one"/>
+ directory="Products.CMFCore.exportimport.tests:one"/>
"""
_SKINSTOOL_BODY = """\
@@ -106,9 +106,9 @@
<?xml version="1.0"?>
<object name="portal_skins" meta_type="Dummy Skins Tool">
<object name="three" meta_type="Filesystem Directory View"
- directory="CMFCore/exportimport/tests/three"/>
+ directory="Products.CMFCore.exportimport.tests:three"/>
<object name="four" meta_type="Filesystem Directory View"
- directory="CMFCore/exportimport/tests/four"/>
+ directory="Products.CMFCore.exportimport.tests:four"/>
<skin-path name="*">
<layer name="three" insert-before="*"/>
<layer name="four" insert-after="*"/>
@@ -249,7 +249,7 @@
return DirectoryViewNodeAdapter
def _populate(self, obj):
- obj._dirpath = 'CMFCore/exportimport/tests/one'
+ obj._dirpath = 'Products.CMFCore.exportimport.tests:one'
def setUp(self):
from Products.CMFCore.DirectoryView import DirectoryView
@@ -279,14 +279,13 @@
obj._setObject('foo_directoryview',
DirectoryView('foo_directoryview',
- 'CMFCore/exportimport/tests/one'))
+ 'Products.CMFCore.exportimport.tests:one'))
obj.addSkinSelection('foo_path', 'one')
def _verifyImport(self, obj):
pass
def setUp(self):
- from Products.CMFCore import DirectoryView
from Products.CMFCore.SkinsTool import SkinsTool
_DVRegistrySetup.setUp(self)
@@ -303,8 +302,9 @@
from Products.CMFCore.DirectoryView import DirectoryView
site = DummySite()
- fsdvs = [ (id, DirectoryView(id, 'CMFCore/exportimport/tests/%s' %
- id)) for id in ids ]
+ fsdvs = [ (id, DirectoryView(id,
+ 'Products.CMFCore.exportimport.tests:%s' % id))
+ for id in ids ]
site._setObject('portal_skins', DummySkinsTool(selections, fsdvs))
site.REQUEST = 'exists'
Modified: Products.CMFCore/trunk/Products/CMFCore/tests/base/testcase.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/tests/base/testcase.py 2009-12-08 21:32:23 UTC (rev 106311)
+++ Products.CMFCore/trunk/Products/CMFCore/tests/base/testcase.py 2009-12-08 21:34:37 UTC (rev 106312)
@@ -6,7 +6,10 @@
import time
import logging
from os import chmod, curdir, mkdir, remove, stat, walk
-from os.path import join, abspath, dirname
+from os.path import abspath
+from os.path import basename
+from os.path import dirname
+from os.path import join
from shutil import copytree, rmtree
from stat import S_IREAD, S_IWRITE
from tempfile import mktemp
@@ -124,31 +127,36 @@
_prefix = abspath(join(_prefix,'..'))
-class FSDVTest(unittest.TestCase, WarningInterceptor):
+class FSDVTest(unittest.TestCase):
tempname = _sourceprefix = _prefix
_skinname = 'fake_skins'
_layername = 'fake_skin'
- def _registerDirectory(self, object=None, ignore=None):
- self._trap_warning_output()
- from Products.CMFCore.DirectoryView import registerDirectory
- from Products.CMFCore.DirectoryView import addDirectoryViews
+ def _registerDirectory(self, obj=None, ignore=None):
+ from Products.CMFCore.DirectoryView import _dirreg
+ from Products.CMFCore.DirectoryView import createDirectoryView
if ignore is None:
from Products.CMFCore.DirectoryView import ignore
- registerDirectory(self._skinname, self.tempname, ignore=ignore)
- if object is not None:
- ob = self.ob = DummyFolder()
- addDirectoryViews(ob, self._skinname, self.tempname)
+ filepath = join(self.tempname, self._skinname)
+ subpath = basename(self.tempname)
+ if subpath != 'tests':
+ # we have a temp dir in tests
+ subpath = 'tests/%s' % subpath
+ reg_key = 'Products.CMFCore:%s/%s' % (subpath, self._skinname)
+ _dirreg.registerDirectoryByKey(filepath, reg_key, ignore=ignore)
+ if obj is not None:
+ ob = obj.ob = DummyFolder()
+ info = _dirreg.getDirectoryInfo(reg_key)
+ for entry in info.getSubdirs():
+ entry_reg_key = '/'.join((reg_key, entry))
+ createDirectoryView(ob, entry_reg_key, entry)
def setUp(self):
# store the skin path name
self.skin_path_name = join(self.tempname,self._skinname,self._layername)
- def tearDown(self):
- self._free_warning_output()
-
class WritableFSDVTest(FSDVTest):
# Base class for FSDV test, creates a fake skin
# copy that can be edited.
Modified: Products.CMFCore/trunk/Products/CMFCore/tests/test_DirectoryView.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/tests/test_DirectoryView.py 2009-12-08 21:32:23 UTC (rev 106311)
+++ Products.CMFCore/trunk/Products/CMFCore/tests/test_DirectoryView.py 2009-12-08 21:34:37 UTC (rev 106312)
@@ -1,3 +1,20 @@
+##############################################################################
+#
+# 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 DirectoryView module.
+
+$Id$
+"""
+
import unittest
import Testing
@@ -32,7 +49,6 @@
"""
def setUp(self):
- self._trap_warning_output()
from Products.CMFCore.DirectoryView import registerDirectory
from Products.CMFCore.DirectoryView import addDirectoryViews
registerDirectory('fake_skins', _globals)
@@ -68,74 +84,8 @@
self.failUnless( hasattr(self.ob.fake_skin, 'test1'),
self.ob.fake_skin.getDirPath() )
- # 1 - 7, in effect, test the pre CMF 1.5 backwards compatibility code in
- # DirectoryView's __of__ method. See DirectoryView.py for details
-
- # windows INSTANCE_HOME
- def test_getDirectoryInfo1(self):
- skin = self.ob.fake_skin
- skin.manage_properties(r'Products\CMFCore\tests\fake_skins\fake_skin')
- self.failUnless( hasattr(self.ob.fake_skin, 'test1'),
- self.ob.fake_skin.getDirPath() )
-
- # windows SOFTWARE_HOME
- def test_getDirectoryInfo2(self):
- skin = self.ob.fake_skin
- skin.manage_properties(
- r'C:\Zope\2.5.1\Products\CMFCore\tests\fake_skins\fake_skin')
- self.failUnless( hasattr(self.ob.fake_skin, 'test1'),
- self.ob.fake_skin.getDirPath() )
-
- # *nix INSTANCE_HOME
- def test_getDirectoryInfo3(self):
- skin = self.ob.fake_skin
- skin.manage_properties('Products/CMFCore/tests/fake_skins/fake_skin')
- self.failUnless( hasattr(self.ob.fake_skin, 'test1'),
- self.ob.fake_skin.getDirPath() )
-
- # *nix SOFTWARE_HOME
- def test_getDirectoryInfo4(self):
- skin = self.ob.fake_skin
- skin.manage_properties(
- '/usr/local/zope/2.5.1/Products/CMFCore/tests/fake_skins/fake_skin')
- self.failUnless( hasattr(self.ob.fake_skin, 'test1'),
- self.ob.fake_skin.getDirPath() )
-
- # windows PRODUCTS_PATH
- def test_getDirectoryInfo5(self):
- skin = self.ob.fake_skin
- skin.manage_properties( mktemp() +
- r'\Products\CMFCore\tests\fake_skins\fake_skin')
- self.failUnless( hasattr(self.ob.fake_skin, 'test1'),
- self.ob.fake_skin.getDirPath() )
-
- # linux PRODUCTS_PATH
- def test_getDirectoryInfo6(self):
- skin = self.ob.fake_skin
- skin.manage_properties( mktemp() +
- '/Products/CMFCore/tests/fake_skins/fake_skin')
- self.failUnless( hasattr(self.ob.fake_skin, 'test1'),
- self.ob.fake_skin.getDirPath() )
-
- # second 'Products' in path
- def test_getDirectoryInfo7(self):
- skin = self.ob.fake_skin
- skin.manage_properties(
- r'C:\CoolProducts\Zope\Products\CMFCore\tests\fake_skins\fake_skin')
- self.failUnless( hasattr(self.ob.fake_skin, 'test1'),
- self.ob.fake_skin.getDirPath() )
-
- # Test pre CMF 2.1 backwards compatibility code in DirectoryView's __of__
- # method.
- def test_getDirectoryInfo8(self):
- skin = self.ob.fake_skin
- skin.manage_properties('CMFCore/tests/fake_skins/fake_skin')
- self.failUnless( hasattr(self.ob.fake_skin, 'test1'),
- self.ob.fake_skin.getDirPath() )
-
# Test we do nothing if given a really wacky path
def test_UnhandleableExpandPath( self ):
- from tempfile import mktemp
self._trap_warning_output()
file = mktemp()
self.ob.fake_skin.manage_properties(file)
@@ -147,14 +97,6 @@
self.assert_(text in warnings)
self.failUnless(text in self._our_stderr_stream.getvalue())
- def test_UnhandleableMinimalPath( self ):
- from Products.CMFCore.utils import minimalpath, normalize
- from tempfile import mktemp
- weirdpath = mktemp()
- # we need to normalize 'cos minimalpath does, btu we're not testing
- # normalize in this unit test.
- self.assertEqual( normalize(weirdpath), minimalpath(weirdpath) )
-
# this test tests that registerDirectory creates keys in the right format.
def test_registerDirectoryKeys(self):
from Products.CMFCore.DirectoryView import _dirreg
More information about the checkins
mailing list