From 940228e976f5cbe558804960f9689e5f95e7305f Mon Sep 17 00:00:00 2001 From: David Glick Date: Sun, 20 Oct 2024 17:01:14 -0700 Subject: [PATCH] Revert "Test event Occurrence serialization (#1811)" This reverts commit 344dd9c7d4ee822978e35bca7b073b1cb0c570dc. --- news/1809.internal | 2 - .../restapi/tests/test_serializer_summary.py | 74 ------------------- 2 files changed, 76 deletions(-) delete mode 100644 news/1809.internal diff --git a/news/1809.internal b/news/1809.internal deleted file mode 100644 index ae905f006..000000000 --- a/news/1809.internal +++ /dev/null @@ -1,2 +0,0 @@ -Test that recurrence serialization provides correct data -[erral] diff --git a/src/plone/restapi/tests/test_serializer_summary.py b/src/plone/restapi/tests/test_serializer_summary.py index 794579241..16b54f7b0 100644 --- a/src/plone/restapi/tests/test_serializer_summary.py +++ b/src/plone/restapi/tests/test_serializer_summary.py @@ -1,31 +1,19 @@ -from datetime import datetime -from datetime import timedelta from DateTime import DateTime from plone.app.contentlisting.interfaces import IContentListingObject -from plone.app.event.dx.traverser import OccurrenceTraverser from plone.app.testing import popGlobalRegistry from plone.app.testing import pushGlobalRegistry from plone.dexterity.utils import createContentInContainer -from plone.event.interfaces import IEvent -from plone.event.interfaces import IEventRecurrence from plone.restapi.interfaces import ISerializeToJsonSummary from plone.restapi.testing import PLONE_RESTAPI_DX_INTEGRATION_TESTING from plone.restapi.testing import register_static_uuid_utility from Products.CMFCore.utils import getToolByName from zope.component import getMultiAdapter from zope.component.hooks import getSite -from zope.interface import alsoProvides import Missing import unittest -try: - from plone.app.event.adapters import OccurrenceContentListingObject -except ImportError: - OccurrenceContentListingObject = None - - class TestSummarySerializers(unittest.TestCase): layer = PLONE_RESTAPI_DX_INTEGRATION_TESTING @@ -215,65 +203,3 @@ def test_dx_type_summary(self): }, summary, ) - - -class TestSummarySerializerswithRecurrenceObjects(unittest.TestCase): - layer = PLONE_RESTAPI_DX_INTEGRATION_TESTING - - def setUp(self): - self.portal = self.layer["portal"] - self.request = self.layer["request"] - - pushGlobalRegistry(getSite()) - register_static_uuid_utility(prefix="c6dcbd55ab2746e199cd4ed458") - - behaviors = self.portal.portal_types.DXTestDocument.behaviors - behaviors = behaviors + ( - "plone.eventbasic", - "plone.eventrecurrence", - ) - self.portal.portal_types.DXTestDocument.behaviors = behaviors - - self.event = createContentInContainer( - self.portal, - "DXTestDocument", - id="doc1", - title="Lorem Ipsum event", - description="Description event", - start=datetime.now(), - end=datetime.now() + timedelta(hours=1), - recurrence="RRULE:FREQ=DAILY;COUNT=3", # see https://github.com/plone/plone.app.event/blob/master/plone/app/event/tests/base_setup.py - ) - - alsoProvides(self.event, IEvent) - alsoProvides(self.event, IEventRecurrence) - - def tearDown(self): - popGlobalRegistry(getSite()) - - @unittest.skipIf( - OccurrenceContentListingObject is not None, - "this test needs a plone.app.event version that does not include a IContentListingObject adapter", - ) - def test_dx_event_with_recurrence_old_version(self): - tomorrow = datetime.now() + timedelta(days=1) - tomorrow_str = tomorrow.strftime("%Y-%m-%d") - ot = OccurrenceTraverser(self.event, self.request) - ocurrence = ot.publishTraverse(self.request, tomorrow_str) - - with self.assertRaises(TypeError): - getMultiAdapter((ocurrence, self.request), ISerializeToJsonSummary)() - - @unittest.skipIf( - OccurrenceContentListingObject is None, - "this test needs a plone.app.event version that includes a IContentListingObject adapter", - ) - def test_dx_event_with_recurrence_new_version(self): - tomorrow = datetime.now() + timedelta(days=1) - tomorrow_str = tomorrow.strftime("%Y-%m-%d") - ot = OccurrenceTraverser(self.event, self.request) - ocurrence = ot.publishTraverse(self.request, tomorrow_str) - summary = getMultiAdapter((ocurrence, self.request), ISerializeToJsonSummary)() - - self.assertEqual(summary["start"], tomorrow_str) - self.assertEqual(summary["Title"], ocurrence.Title())