LPD-45930 Update tests

liferay-page-management · Jan 30, 2025 · 6308dcb · 6308dcb
1 parent c23f082
commit 6308dcb
Show file tree

Hide file tree

Showing 27 changed files with 305 additions and 176 deletions.
diff --git a/.../fragment/renderer/categorization/inputs/impl/test/BaseInputFragmentRendererTestCase.java b/.../fragment/renderer/categorization/inputs/impl/test/BaseInputFragmentRendererTestCase.java
@@ -127,9 +127,10 @@ protected FragmentEntryLink addFragmentEntryLink(
 		FragmentRenderer fragmentRenderer = getFragmentRenderer();
 
 		Layout draftLayout = layout.fetchDraftLayout();
+
 		long segmentsExperienceId =
 			segmentsExperienceLocalService.fetchDefaultSegmentsExperienceId(
-				layout.getPlid());
+				draftLayout.getPlid());
 
 		JSONObject jsonObject = ContentLayoutTestUtil.addFormToLayout(
 			false,

diff --git a/...ment/internal/exportimport/data/handler/test/FragmentEntryStagedModelDataHandlerTest.java b/...ment/internal/exportimport/data/handler/test/FragmentEntryStagedModelDataHandlerTest.java
@@ -231,10 +231,12 @@ public void testUpdateFragmentEntryWithFragmentEntryLinkAddingDropZone()
 
 		FragmentEntry fragmentEntry = _addFragmentEntry(
 			StringPool.BLANK, stagingGroup, "<div class=\"fragment_1\"></div>");
+
+		Layout draftLayout = _layout.fetchDraftLayout();
+
 		long segmentsExperienceId =
 			_segmentsExperienceLocalService.fetchDefaultSegmentsExperienceId(
-				_layout.getPlid());
-		Layout draftLayout = _layout.fetchDraftLayout();
+				draftLayout.getPlid());
 
 		ServiceContext serviceContext =
 			ServiceContextTestUtil.getServiceContext(

diff --git a/...m/liferay/fragment/internal/upgrade/v2_13_1/test/FragmentEntryLinkUpgradeProcessTest.java b/...m/liferay/fragment/internal/upgrade/v2_13_1/test/FragmentEntryLinkUpgradeProcessTest.java
@@ -78,6 +78,8 @@ public void setUp() throws Exception {
 
 		_layout = LayoutTestUtil.addTypeContentLayout(_group);
 
+		_draftLayout = _layout.fetchDraftLayout();
+
 		_segmentsExperienceId =
 			_segmentsExperienceLocalService.fetchDefaultSegmentsExperienceId(
 				_layout.getPlid());
@@ -108,13 +110,11 @@ public void testUpgrade() throws Exception {
 				}
 			).build());
 
-		Layout draftLayout = _layout.fetchDraftLayout();
-
 		FragmentEntryLink draftLayoutFragmentEntryLink =
 			ContentLayoutTestUtil.addFragmentEntryLinkToLayout(
-				editableValues, draftLayout, _segmentsExperienceId);
+				editableValues, _draftLayout, _segmentsExperienceId);
 
-		ContentLayoutTestUtil.publishLayout(draftLayout, _layout);
+		ContentLayoutTestUtil.publishLayout(_draftLayout, _layout);
 
 		List<FragmentEntryLink> publishedLayoutFragmentEntryLinks =
 			_fragmentEntryLinkLocalService.getFragmentEntryLinksByPlid(
@@ -143,7 +143,7 @@ public void testUpgrade() throws Exception {
 	@Override
 	protected CTModel<?> addCTModel() throws Exception {
 		return ContentLayoutTestUtil.addFragmentEntryLinkToLayout(
-			"{}", _layout.fetchDraftLayout(), _segmentsExperienceId);
+			"{}", _draftLayout, _segmentsExperienceId);
 	}
 
 	@Override
@@ -263,6 +263,8 @@ private String _read(String fileName) throws Exception {
 	@Inject
 	private DLFileEntryLocalService _dlFileEntryLocalService;
 
+	private Layout _draftLayout;
+
 	@Inject
 	private EntityCache _entityCache;
 

diff --git a/...om/liferay/fragment/internal/upgrade/v2_9_1/test/FragmentEntryLinkUpgradeProcessTest.java b/...om/liferay/fragment/internal/upgrade/v2_9_1/test/FragmentEntryLinkUpgradeProcessTest.java
@@ -64,9 +64,11 @@ public void setUp() throws Exception {
 
 		_layout = LayoutTestUtil.addTypeContentLayout(_group);
 
+		_draftLayout = _layout.fetchDraftLayout();
+
 		_segmentsExperienceId =
 			_segmentsExperienceLocalService.fetchDefaultSegmentsExperienceId(
-				_layout.getPlid());
+				_draftLayout.getPlid());
 	}
 
 	@Test
@@ -116,8 +118,7 @@ public void testUpgrade() throws Exception {
 		FragmentEntryLink draftLayoutFragmentEntryLink2 =
 			_addFragmentEntryLinkToDraftLayout(editableValuesJSONObject2);
 
-		ContentLayoutTestUtil.publishLayout(
-			_layout.fetchDraftLayout(), _layout);
+		ContentLayoutTestUtil.publishLayout(_draftLayout, _layout);
 
 		List<FragmentEntryLink> fragmentEntryLinks =
 			_fragmentEntryLinkLocalService.getFragmentEntryLinksByPlid(
@@ -197,7 +198,7 @@ private FragmentEntryLink _addFragmentEntryLinkToDraftLayout(
 
 		FragmentEntryLink fragmentEntryLink =
 			ContentLayoutTestUtil.addFragmentEntryLinkToLayout(
-				editableValuesJSONObject.toString(), _layout.fetchDraftLayout(),
+				editableValuesJSONObject.toString(), _draftLayout,
 				_segmentsExperienceId);
 
 		_assertFragmentEntryLinkEditableValues(
@@ -241,6 +242,8 @@ private FragmentEntryLink _getPublishedLayoutFragmentEntryLink(
 	)
 	private static UpgradeStepRegistrator _upgradeStepRegistrator;
 
+	private Layout _draftLayout;
+
 	@Inject
 	private EntityCache _entityCache;
 

diff --git a/...om/liferay/fragment/internal/upgrade/v2_9_4/test/FragmentEntryLinkUpgradeProcessTest.java b/...om/liferay/fragment/internal/upgrade/v2_9_4/test/FragmentEntryLinkUpgradeProcessTest.java
@@ -63,9 +63,11 @@ public void setUp() throws Exception {
 
 		_layout = LayoutTestUtil.addTypeContentLayout(_group);
 
+		_draftLayout = _layout.fetchDraftLayout();
+
 		_segmentsExperienceId =
 			_segmentsExperienceLocalService.fetchDefaultSegmentsExperienceId(
-				_layout.getPlid());
+				_draftLayout.getPlid());
 	}
 
 	@Test
@@ -79,16 +81,15 @@ public void testUpgrade() throws Exception {
 						RandomTestUtil.randomString(),
 						RandomTestUtil.randomString())
 				).toString(),
-				_layout.fetchDraftLayout(), _segmentsExperienceId);
+				_draftLayout, _segmentsExperienceId);
 		FragmentEntryLink draftLayoutPortletFragmentEntryLink =
 			ContentLayoutTestUtil.addFragmentEntryLinkToLayout(
 				JSONUtil.put(
 					"portletId", RandomTestUtil.randomString()
 				).toString(),
-				_layout.fetchDraftLayout(), _segmentsExperienceId);
+				_draftLayout, _segmentsExperienceId);
 
-		ContentLayoutTestUtil.publishLayout(
-			_layout.fetchDraftLayout(), _layout);
+		ContentLayoutTestUtil.publishLayout(_draftLayout, _layout);
 
 		List<FragmentEntryLink> fragmentEntryLinks =
 			_fragmentEntryLinkLocalService.getFragmentEntryLinksByPlid(
@@ -131,7 +132,7 @@ public void testUpgrade() throws Exception {
 	@Override
 	protected CTModel<?> addCTModel() throws Exception {
 		return ContentLayoutTestUtil.addFragmentEntryLinkToLayout(
-			"{}", _layout.fetchDraftLayout(), _segmentsExperienceId);
+			"{}", _draftLayout, _segmentsExperienceId);
 	}
 
 	@Override
@@ -204,6 +205,8 @@ private void _updateFragmentEntryLinksType(
 	)
 	private static UpgradeStepRegistrator _upgradeStepRegistrator;
 
+	private Layout _draftLayout;
+
 	@Inject
 	private EntityCache _entityCache;
 

diff --git a/...y/info/field/item/selector/web/internal/test/InfoFieldItemSelectorViewDescriptorTest.java b/...y/info/field/item/selector/web/internal/test/InfoFieldItemSelectorViewDescriptorTest.java
@@ -181,7 +181,7 @@ public void testGetSearchContainerWithFormTypeMultistep() throws Exception {
 
 		long defaultSegmentsExperienceId =
 			_segmentsExperienceLocalService.fetchDefaultSegmentsExperienceId(
-				_layout.getPlid());
+				draftLayout.getPlid());
 
 		LayoutStructure layoutStructure = new LayoutStructure();
 
@@ -271,13 +271,15 @@ public void testRowCheckerWithCheckedInfoFields() throws Exception {
 		List<InfoField<?>> allInfoFields = ListUtil.filter(
 			infoForm.getAllInfoFields(), InfoField::isEditable);
 
+		Layout draftLayout = _layout.fetchDraftLayout();
+
 		JSONObject jsonObject = ContentLayoutTestUtil.addFormToLayout(
 			false,
 			String.valueOf(
 				_portal.getClassNameId(_objectDefinition1.getClassName())),
-			"0", _layout.fetchDraftLayout(), _layoutStructureProvider,
+			"0", draftLayout, _layoutStructureProvider,
 			_segmentsExperienceLocalService.fetchDefaultSegmentsExperienceId(
-				_layout.getPlid()),
+				draftLayout.getPlid()),
 			allInfoFields.toArray(new InfoField<?>[0]));
 
 		mockHttpServletRequest.setParameter(
@@ -348,11 +350,14 @@ private ItemSelectorViewDescriptor<Object> _getItemSelectorViewDescriptor(
 
 		mockHttpServletRequest.setParameter(
 			"itemType", _objectDefinition1.getClassName());
+
+		Layout draftLayout = _layout.fetchDraftLayout();
+
 		mockHttpServletRequest.setParameter(
 			"segmentsExperienceId",
 			String.valueOf(
 				_segmentsExperienceLocalService.
-					fetchDefaultSegmentsExperienceId(_layout.getPlid())));
+					fetchDefaultSegmentsExperienceId(draftLayout.getPlid())));
 
 		_infoFieldProviderItemSelectorView.renderHTML(
 			mockHttpServletRequest, new MockHttpServletResponse(),

diff --git a/...ray/info/collection/provider/test/RelatedAssetsRelatedInfoItemCollectionProviderTest.java b/...ray/info/collection/provider/test/RelatedAssetsRelatedInfoItemCollectionProviderTest.java
@@ -132,9 +132,11 @@ public void testCollectionDisplayWithInfoListRenderer() throws Exception {
 			_portal.getClassNameId(FileEntry.class.getName()),
 			_dlFileEntry.getFileEntryTypeId());
 
+		Layout draftLayout = layout.fetchDraftLayout();
+
 		long segmentsExperienceId =
 			_segmentsExperienceLocalService.fetchDefaultSegmentsExperienceId(
-				layout.getPlid());
+				draftLayout.getPlid());
 
 		_mapCollectionDisplayWithInfoListRenderer(
 			layout, "FileEntry_title", segmentsExperienceId);
@@ -152,9 +154,11 @@ public void testMapContentDisplayInCollectionDisplay() throws Exception {
 		Layout layout = _addDefaultDisplayPageTemplateLayout(
 			_portal.getClassNameId(BlogsEntry.class.getName()), 0);
 
+		Layout draftLayout = layout.fetchDraftLayout();
+
 		long segmentsExperienceId =
 			_segmentsExperienceLocalService.fetchDefaultSegmentsExperienceId(
-				layout.getPlid());
+				draftLayout.getPlid());
 
 		_mapContentDisplayInCollectionDisplay(
 			layout, "BlogsEntry_title", segmentsExperienceId);
@@ -173,9 +177,11 @@ public void testMapInfoFieldInCollectionDisplay() throws Exception {
 			_portal.getClassNameId(JournalArticle.class.getName()),
 			_journalArticle.getDDMStructureId());
 
+		Layout draftLayout = layout.fetchDraftLayout();
+
 		long segmentsExperienceId =
 			_segmentsExperienceLocalService.fetchDefaultSegmentsExperienceId(
-				layout.getPlid());
+				draftLayout.getPlid());
 
 		_mapInfoFieldInCollectionDisplay(
 			layout, "JournalArticle_title", segmentsExperienceId);
@@ -220,9 +226,11 @@ public void testMapInfoFieldInCollectionDisplayNestedInCollectionDisplayWithAsse
 		Layout layout = _addDefaultDisplayPageTemplateLayout(
 			_portal.getClassNameId(AssetCategory.class.getName()), 0);
 
+		Layout draftLayout = layout.fetchDraftLayout();
+
 		long segmentsExperienceId =
 			_segmentsExperienceLocalService.fetchDefaultSegmentsExperienceId(
-				layout.getPlid());
+				draftLayout.getPlid());
 
 		_mapInfoFieldInCollectionDisplayNestedInCollectionDisplay(
 			"com.liferay.asset.categories.admin.web.internal.info.collection." +
@@ -251,9 +259,11 @@ public void testMapInfoFieldInCollectionDisplayNestedInCollectionDisplayWithHigh
 
 		Layout layout = LayoutTestUtil.addTypeContentLayout(_group);
 
+		Layout draftLayout = layout.fetchDraftLayout();
+
 		long segmentsExperienceId =
 			_segmentsExperienceLocalService.fetchDefaultSegmentsExperienceId(
-				layout.getPlid());
+				draftLayout.getPlid());
 
 		_mapInfoFieldInCollectionDisplayNestedInCollectionDisplay(
 			"com.liferay.asset.internal.info.collection.provider." +

diff --git a/...t/admin/web/internal/exportimport/data/handler/test/LayoutStagedModelDataHandlerTest.java b/...t/admin/web/internal/exportimport/data/handler/test/LayoutStagedModelDataHandlerTest.java
@@ -392,16 +392,17 @@ public void testExportImportWithFileEntryContentReference()
 
 		Layout layout = LayoutTestUtil.addTypeContentLayout(stagingGroup);
 
+		Layout draftLayout = layout.fetchDraftLayout();
+
 		long segmentsExperienceId =
 			_segmentsExperienceLocalService.fetchDefaultSegmentsExperienceId(
-				layout.getPlid());
+				draftLayout.getPlid());
 
 		ContentLayoutTestUtil.addItemToLayout(
-			"{}", LayoutDataItemTypeConstants.TYPE_CONTAINER,
-			layout.fetchDraftLayout(), _layoutStructureProvider,
-			segmentsExperienceId);
+			"{}", LayoutDataItemTypeConstants.TYPE_CONTAINER, draftLayout,
+			_layoutStructureProvider, segmentsExperienceId);
 
-		ContentLayoutTestUtil.publishLayout(layout.fetchDraftLayout(), layout);
+		ContentLayoutTestUtil.publishLayout(draftLayout, layout);
 
 		Layout importedLayout = _getExportImportLayout(layout);
 
@@ -424,10 +425,9 @@ public void testExportImportWithFileEntryContentReference()
 
 		FragmentEntryLink draftLayoutFragmentEntryLink =
 			_addFragmentEntryLinkToLayout(
-				fileEntry, languageId, layout.fetchDraftLayout(),
-				segmentsExperienceId);
+				fileEntry, languageId, draftLayout, segmentsExperienceId);
 
-		ContentLayoutTestUtil.publishLayout(layout.fetchDraftLayout(), layout);
+		ContentLayoutTestUtil.publishLayout(draftLayout, layout);
 
 		Assert.assertNotNull(
 			_fragmentEntryLinkLocalService.getFragmentEntryLink(
@@ -717,9 +717,11 @@ public void testLocalStagingWithContentDisplay() throws Exception {
 		Layout stagingLayout = LayoutTestUtil.addTypeContentLayout(
 			stagingGroup);
 
+		Layout stagingDraftLayout = stagingLayout.fetchDraftLayout();
+
 		long stagingSegmentsExperienceId =
 			_segmentsExperienceLocalService.fetchDefaultSegmentsExperienceId(
-				stagingLayout.getPlid());
+				stagingDraftLayout.getPlid());
 
 		_mapJournalArticleToContentDisplay(
 			journalArticle, stagingLayout, stagingSegmentsExperienceId);
@@ -744,7 +746,9 @@ public void testLocalStagingWithContentDisplay() throws Exception {
 		_updateJournalArticle(updatedContent, journalArticle);
 
 		_assertRenderLayoutHTML(
-			updatedContent, stagingLayout, stagingSegmentsExperienceId);
+			updatedContent, stagingLayout,
+			_segmentsExperienceLocalService.fetchDefaultSegmentsExperienceId(
+				stagingLayout.getPlid()));
 
 		_assertRenderLayoutHTML(content, layout, segmentsExperienceId);
 
@@ -834,7 +838,7 @@ public void testSegmentsExperiencesPriority() throws Exception {
 
 		SegmentsExperience segmentsExperience1 =
 			SegmentsTestUtil.addSegmentsExperience(
-				group.getGroupId(), layout.getPlid());
+				group.getGroupId(), draftLayout.getPlid());
 
 		_layoutPageTemplateStructureRelLocalService.
 			addLayoutPageTemplateStructureRel(
@@ -847,7 +851,7 @@ public void testSegmentsExperiencesPriority() throws Exception {
 
 		SegmentsExperience segmentsExperience2 =
 			SegmentsTestUtil.addSegmentsExperience(
-				group.getGroupId(), layout.getPlid());
+				group.getGroupId(), draftLayout.getPlid());
 
 		_layoutPageTemplateStructureRelLocalService.
 			addLayoutPageTemplateStructureRel(
@@ -860,7 +864,7 @@ public void testSegmentsExperiencesPriority() throws Exception {
 
 		SegmentsExperience segmentsExperience3 =
 			SegmentsTestUtil.addSegmentsExperience(
-				group.getGroupId(), layout.getPlid());
+				group.getGroupId(), draftLayout.getPlid());
 
 		_layoutPageTemplateStructureRelLocalService.
 			addLayoutPageTemplateStructureRel(
@@ -1465,6 +1469,8 @@ private FragmentEntryLink _addFragmentEntryLinkToLayout(
 				FragmentConstants.TYPE_COMPONENT, null,
 				WorkflowConstants.STATUS_APPROVED, serviceContext);
 
+		Layout draftLayout = layout.fetchDraftLayout();
+
 		FragmentEntryLink fragmentEntryLink =
 			ContentLayoutTestUtil.addFragmentEntryLinkToLayout(
 				JSONUtil.put(
@@ -1478,9 +1484,9 @@ private FragmentEntryLink _addFragmentEntryLinkToLayout(
 				fragmentEntry.getFragmentEntryKey(), fragmentEntry.getType(),
 				null, 0,
 				_segmentsExperienceLocalService.
-					fetchDefaultSegmentsExperienceId(layout.getPlid()));
+					fetchDefaultSegmentsExperienceId(draftLayout.getPlid()));
 
-		ContentLayoutTestUtil.publishLayout(layout.fetchDraftLayout(), layout);
+		ContentLayoutTestUtil.publishLayout(draftLayout, layout);
 
 		return fragmentEntryLink;
 	}