Merge pull request #112 from plone/conditional-bbb-at-imports

Made the bbb_at imports conditional.

CHANGES.rst

@@ -15,7 +15,8 @@ New features:
 Bug fixes:
 
 - Switch to new TestCase using AT after PloneTestcase is now DX.
-  [pbauer]
+  Fall back to the old TestCase in case of an older plone.app.testing.
+  [pbauer, maurits]
 
 
 1.15.3 (2018-06-18)

Products/Archetypes/tests/attestcase.py

@@ -1,4 +1,8 @@
-from plone.app.testing import bbb_at
+try:
+    from plone.app.testing import bbb_at
+except ImportError:
+    # plone.app.testing 5 or earlier
+    from plone.app.testing import bbb as bbb_at
 from plone.app.testing import FunctionalTesting, applyProfile
 from Products.GenericSetup import EXTENSION, profile_registry
 

Products/Archetypes/tests/test_date_components_support_script.py

@@ -1,5 +1,9 @@
 # -*- coding: utf-8 -*-
-from plone.app.testing.bbb_at import PloneTestCase
+try:
+    from plone.app.testing.bbb_at import PloneTestCase
+except ImportError:
+    # plone.app.testing 5 or earlier
+    from plone.app.testing.bbb import PloneTestCase
 
 from DateTime import DateTime
 

Products/Archetypes/tests/test_interfaces.py

@@ -48,7 +48,11 @@
     StorageLayer, AttributeStorage, ObjectManagedStorage, MetadataStorage
 from Products.Archetypes.atapi import registerType
 
-from plone.app.testing.bbb_at import PTC_FUNCTIONAL_TESTING
+try:
+    from plone.app.testing.bbb_at import PTC_FUNCTIONAL_TESTING
+except ImportError:
+    # plone.app.testing 5 or earlier
+    from plone.app.testing.bbb import PTC_FUNCTIONAL_TESTING
 
 
 def className(klass):