@@ -442,36 +442,29 @@ private void _testGetSitePageSpecificationStyleBooksPageWithLayoutTypes()
442442 designLibraryGroup .getGroupId (), themeId ,
443443 RandomTestUtil .randomString ());
444444
445- Layout typePortletLayout = LayoutTestUtil .addTypePortletLayout (
446- testGroup );
447-
448- StyleBookEntry siteStyleBookEntry = _addStyleBookEntry (
449- testGroup .getGroupId (), themeId , RandomTestUtil .randomString ());
450-
451- _testGetSitePageSpecificationStyleBooksPageWithLayout (
452- designLibraryStyleBookEntry ,
453- typePortletLayout .getExternalReferenceCode (), siteStyleBookEntry );
454-
455445 ServiceContext serviceContext =
456446 ServiceContextTestUtil .getServiceContext (
457447 testGroup .getGroupId (), TestPropsValues .getUserId ());
458448
459- Layout displayPageLayoutPageTemplateEntryLayout =
449+ Layout basicLayoutPageTemplateEntryLayout =
460450 LayoutPageTemplateEntryTestUtil .
461- getDisplayPageLayoutPageTemplateEntryLayout (serviceContext );
451+ getBasicLayoutPageTemplateEntryLayout (serviceContext );
452+
453+ StyleBookEntry siteStyleBookEntry = _addStyleBookEntry (
454+ testGroup .getGroupId (), themeId , RandomTestUtil .randomString ());
462455
463456 _testGetSitePageSpecificationStyleBooksPageWithLayout (
464457 designLibraryStyleBookEntry ,
465- displayPageLayoutPageTemplateEntryLayout .getExternalReferenceCode (),
458+ basicLayoutPageTemplateEntryLayout .getExternalReferenceCode (),
466459 siteStyleBookEntry );
467460
468- Layout masterLayoutPageTemplateEntryLayout =
461+ Layout displayPageLayoutPageTemplateEntryLayout =
469462 LayoutPageTemplateEntryTestUtil .
470- getMasterLayoutPageTemplateEntryLayout (serviceContext );
463+ getDisplayPageLayoutPageTemplateEntryLayout (serviceContext );
471464
472465 _testGetSitePageSpecificationStyleBooksPageWithLayout (
473466 designLibraryStyleBookEntry ,
474- masterLayoutPageTemplateEntryLayout .getExternalReferenceCode (),
467+ displayPageLayoutPageTemplateEntryLayout .getExternalReferenceCode (),
475468 siteStyleBookEntry );
476469
477470 Layout layoutUtilityPageEntryLayout =
@@ -483,15 +476,22 @@ private void _testGetSitePageSpecificationStyleBooksPageWithLayoutTypes()
483476 layoutUtilityPageEntryLayout .getExternalReferenceCode (),
484477 siteStyleBookEntry );
485478
486- Layout basicLayoutPageTemplateEntryLayout =
479+ Layout masterLayoutPageTemplateEntryLayout =
487480 LayoutPageTemplateEntryTestUtil .
488- getBasicLayoutPageTemplateEntryLayout (serviceContext );
481+ getMasterLayoutPageTemplateEntryLayout (serviceContext );
489482
490483 _testGetSitePageSpecificationStyleBooksPageWithLayout (
491484 designLibraryStyleBookEntry ,
492- basicLayoutPageTemplateEntryLayout .getExternalReferenceCode (),
485+ masterLayoutPageTemplateEntryLayout .getExternalReferenceCode (),
493486 siteStyleBookEntry );
494487
488+ Layout typePortletLayout = LayoutTestUtil .addTypePortletLayout (
489+ testGroup );
490+
491+ _testGetSitePageSpecificationStyleBooksPageWithLayout (
492+ designLibraryStyleBookEntry ,
493+ typePortletLayout .getExternalReferenceCode (), siteStyleBookEntry );
494+
495495 LayoutPageTemplateEntry widgetPageLayoutPageTemplateEntry =
496496 LayoutPageTemplateEntryTestUtil .
497497 getWidgetPageLayoutPageTemplateEntry (serviceContext );
0 commit comments