[Checkins] SVN: zope.security/trunk/ Collapse related test modules.

[Tres Seaver]

Log message for revision 128873:
  Collapse related test modules.

Changed:
  _U  zope.security/trunk/
  U   zope.security/trunk/src/zope/security/tests/test_protectclass.py
  D   zope.security/trunk/src/zope/security/tests/test_protectsubclass.py

-=-
Modified: zope.security/trunk/src/zope/security/tests/test_protectclass.py
===================================================================
--- zope.security/trunk/src/zope/security/tests/test_protectclass.py	2012-12-23 20:54:07 UTC (rev 128872)
+++ zope.security/trunk/src/zope/security/tests/test_protectclass.py	2012-12-23 20:54:08 UTC (rev 128873)
@@ -136,6 +136,36 @@
         self.assertState(module, m1P=P1, m2P=P2, m3P=P2)
         self.assertSetattrState(module, m1P=P1, m2P=P2, m3P=P2)
 
+    def testInherited(self):
+        from zope.component import provideUtility
+        from zope.security.checker import selectChecker
+        from zope.security.interfaces import IPermission
+        from zope.security.permission import Permission
+        from zope.security.protectclass import protectName
+
+        class B1(object):
+            def g(self): return 'B1.g'
+
+        class B2(object):
+            def h(self): return 'B2.h'
+
+        class S(B1, B2):
+            pass
+
+        provideUtility(Permission('B1', ''), IPermission, 'B1')
+        provideUtility(Permission('S', ''), IPermission, 'S')
+        protectName(B1, 'g', 'B1')
+        protectName(S, 'g', 'S')
+        protectName(S, 'h', 'S')
+
+        self.assertEqual(selectChecker(B1()).permission_id('g'), 'B1')
+        self.assertEqual(selectChecker(B2()).permission_id('h'), None)
+        self.assertEqual(selectChecker(S()).permission_id('g'), 'S')
+        self.assertEqual(selectChecker(S()).permission_id('h'), 'S')
+
+        self.assertEqual(S().g(), 'B1.g')
+        self.assertEqual(S().h(), 'B2.h')
+
 def test_suite():
     return unittest.TestSuite((
         unittest.makeSuite(Test),

Deleted: zope.security/trunk/src/zope/security/tests/test_protectsubclass.py
===================================================================
--- zope.security/trunk/src/zope/security/tests/test_protectsubclass.py	2012-12-23 20:54:07 UTC (rev 128872)
+++ zope.security/trunk/src/zope/security/tests/test_protectsubclass.py	2012-12-23 20:54:08 UTC (rev 128873)
@@ -1,57 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2001, 2002 Zope Foundation 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.
-#
-##############################################################################
-"""Test proper protection of inherited methods
-"""
-import unittest
-from zope.security.checker import selectChecker
-from zope.security.permission import Permission
-from zope import component
-from zope.component.testing import PlacelessSetup
-
-from zope.security.interfaces import IPermission
-from zope.security.protectclass import protectName
-
-class Test(PlacelessSetup, unittest.TestCase):
-
-    def testInherited(self):
-
-        class B1(object):
-            def g(self): return 'B1.g'
-
-        class B2(object):
-            def h(self): return 'B2.h'
-
-        class S(B1, B2):
-            pass
-
-        component.provideUtility(Permission('B1', ''), IPermission, 'B1')
-        component.provideUtility(Permission('S', ''), IPermission, 'S')
-        protectName(B1, 'g', 'B1')
-        protectName(S, 'g', 'S')
-        protectName(S, 'h', 'S')
-
-        self.assertEqual(selectChecker(B1()).permission_id('g'), 'B1')
-        self.assertEqual(selectChecker(B2()).permission_id('h'), None)
-        self.assertEqual(selectChecker(S()).permission_id('g'), 'S')
-        self.assertEqual(selectChecker(S()).permission_id('h'), 'S')
-
-        self.assertEqual(S().g(), 'B1.g')
-        self.assertEqual(S().h(), 'B2.h')
-
-
-def test_suite():
-    return unittest.makeSuite(Test)
-
-if __name__=='__main__':
-    unittest.main(defaultTest='test_suite')