Skip to content

Commit

Permalink
LPS-152969 _create implies not touching the DB. In this case, we're a…
Browse files Browse the repository at this point in the history 
…dding.
  • Loading branch information
@brianchandotcom
brianchandotcom committed May 11, 2022
1 parent 9778e1f commit 73510a9
Showing 1 changed file with 40 additions and 40 deletions.
80 changes: 40 additions & 40 deletions ...gation/menu/item/asset/vocabulary/test/AssetVocabularySiteNavigationMenuItemTypeTest.java
View file
Expand Up @@ -96,32 +96,32 @@ public void setUp() throws Exception {

@Test
public void testGetChildrenSiteNavigationMenuItems() throws Exception {
_createAssetCategory(0);
_createAssetCategory(0);
_addAssetCategory(0);
_addAssetCategory(0);

AssetCategory rootAssetCategory = _createAssetCategory(0);
AssetCategory rootAssetCategory = _addAssetCategory(0);

_createAssetCategory(rootAssetCategory.getCategoryId());
_createAssetCategory(rootAssetCategory.getCategoryId());
_addAssetCategory(rootAssetCategory.getCategoryId());
_addAssetCategory(rootAssetCategory.getCategoryId());

AssetCategory firstLevelAssetCategory = _createAssetCategory(
AssetCategory firstLevelAssetCategory = _addAssetCategory(
rootAssetCategory.getCategoryId());

_createAssetCategory(firstLevelAssetCategory.getCategoryId());
_createAssetCategory(firstLevelAssetCategory.getCategoryId());
_addAssetCategory(firstLevelAssetCategory.getCategoryId());
_addAssetCategory(firstLevelAssetCategory.getCategoryId());

AssetCategory secondLevelAssetCategory = _createAssetCategory(
AssetCategory secondLevelAssetCategory = _addAssetCategory(
firstLevelAssetCategory.getCategoryId());

_createAssetCategory(secondLevelAssetCategory.getCategoryId());
_createAssetCategory(secondLevelAssetCategory.getCategoryId());
_addAssetCategory(secondLevelAssetCategory.getCategoryId());
_addAssetCategory(secondLevelAssetCategory.getCategoryId());

AssetCategory thirdLevelAssetCategory = _createAssetCategory(
AssetCategory thirdLevelAssetCategory = _addAssetCategory(
secondLevelAssetCategory.getCategoryId());

_createAssetCategory(thirdLevelAssetCategory.getCategoryId());
_createAssetCategory(thirdLevelAssetCategory.getCategoryId());
_createAssetCategory(thirdLevelAssetCategory.getCategoryId());
_addAssetCategory(thirdLevelAssetCategory.getCategoryId());
_addAssetCategory(thirdLevelAssetCategory.getCategoryId());
_addAssetCategory(thirdLevelAssetCategory.getCategoryId());

Assert.assertEquals(
15,
Expand All @@ -147,7 +147,7 @@ public void testGetChildrenSiteNavigationMenuItems() throws Exception {
Locale locale = _portal.getSiteDefaultLocale(_group.getGroupId());

_assertGetChildrenSiteNavigationMenuItems(
locale, 0, _createSiteNavigationMenuItem(locale, "{}", false));
locale, 0, _addSiteNavigationMenuItem(locale, "{}", false));
}

@Test
Expand All @@ -162,7 +162,7 @@ public void testGetChildrenSiteNavigationMenuItemsEmptyAssetVocabulary()
Locale locale = _portal.getSiteDefaultLocale(_group.getGroupId());

_assertGetChildrenSiteNavigationMenuItems(
locale, 0, _createSiteNavigationMenuItem(locale, "{}", false));
locale, 0, _addSiteNavigationMenuItem(locale, "{}", false));
}

@Test
Expand All @@ -176,7 +176,7 @@ public void testGetRegularURLAssetCategoryTypeWithDisplayPageTemplate()
LayoutPageTemplateEntryTypeConstants.TYPE_DISPLAY_PAGE, 0, true, 0,
0, 0, 0, _serviceContext);

AssetCategory assetCategory = _createAssetCategory(0);
AssetCategory assetCategory = _addAssetCategory(0);

MockHttpServletRequest mockHttpServletRequest =
new MockHttpServletRequest();
Expand Down Expand Up @@ -244,7 +244,7 @@ public void testGetRegularURLAssetVocabularyType() throws Exception {
StringPool.BLANK,
siteNavigationMenuItemType.getRegularURL(
mockHttpServletRequest,
_createSiteNavigationMenuItem(
_addSiteNavigationMenuItem(
_portal.getSiteDefaultLocale(_group.getGroupId()), "{}",
false)));
}
Expand Down Expand Up @@ -286,9 +286,9 @@ public void testGetSiteNavigationMenuItemsAssetCategoryType()
public void testGetSiteNavigationMenuItemsAssetVocabularyTypeShowAssetVocabularyLevelDisabled()
throws Exception {

_createAssetCategory(0);
_createAssetCategory(0);
_createAssetCategory(0);
_addAssetCategory(0);
_addAssetCategory(0);
_addAssetCategory(0);

List<AssetCategory> assetCategories =
_assetCategoryLocalService.getVocabularyCategories(
Expand All @@ -311,7 +311,7 @@ public void testGetSiteNavigationMenuItemsAssetVocabularyTypeShowAssetVocabulary
SiteNavigationMenuItemTypeConstants.ASSET_VOCABULARY);

SiteNavigationMenuItem assetVocabularySiteNavigationMenuItem =
_createSiteNavigationMenuItem(locale, "{}", false);
_addSiteNavigationMenuItem(locale, "{}", false);

List<SiteNavigationMenuItem> siteNavigationMenuItems =
siteNavigationMenuItemType.getSiteNavigationMenuItems(
Expand All @@ -336,9 +336,9 @@ public void testGetSiteNavigationMenuItemsAssetVocabularyTypeShowAssetVocabulary
public void testGetSiteNavigationMenuItemsAssetVocabularyTypeShowAssetVocabularyLevelEnabled()
throws Exception {

_createAssetCategory(0);
_createAssetCategory(0);
_createAssetCategory(0);
_addAssetCategory(0);
_addAssetCategory(0);
_addAssetCategory(0);

Assert.assertEquals(
3,
Expand All @@ -356,7 +356,7 @@ public void testGetSiteNavigationMenuItemsAssetVocabularyTypeShowAssetVocabulary
SiteNavigationMenuItemTypeConstants.ASSET_VOCABULARY);

SiteNavigationMenuItem assetVocabularySiteNavigationMenuItem =
_createSiteNavigationMenuItem(
_addSiteNavigationMenuItem(
_portal.getSiteDefaultLocale(_group.getGroupId()), "{}", true);

List<SiteNavigationMenuItem> siteNavigationMenuItems =
Expand Down Expand Up @@ -386,14 +386,14 @@ public void testGetStatusIconEmptyAssetVocabulary() throws Exception {
Assert.assertEquals(
"warning-full",
siteNavigationMenuItemType.getStatusIcon(
_createSiteNavigationMenuItem(
_addSiteNavigationMenuItem(
_portal.getSiteDefaultLocale(_group.getGroupId()), "{}",
false)));
}

@Test
public void testGetStatusIconNotEmptyAssetVocabulary() throws Exception {
_createAssetCategory(0);
_addAssetCategory(0);

Assert.assertEquals(
1,
Expand All @@ -407,7 +407,7 @@ public void testGetStatusIconNotEmptyAssetVocabulary() throws Exception {
Assert.assertEquals(
StringPool.BLANK,
siteNavigationMenuItemType.getStatusIcon(
_createSiteNavigationMenuItem(
_addSiteNavigationMenuItem(
_portal.getSiteDefaultLocale(_group.getGroupId()), "{}",
false)));
}
Expand All @@ -420,7 +420,7 @@ public void testGetTitleAssetCategoryType() throws Exception {
mockHttpServletRequest.setAttribute(
WebKeys.THEME_DISPLAY, _getThemeDisplay());

AssetCategory assetCategory = _createAssetCategory(0);
AssetCategory assetCategory = _addAssetCategory(0);

SiteNavigationMenuItemType siteNavigationMenuItemType =
_siteNavigationMenuItemTypeRegistry.getSiteNavigationMenuItemType(
Expand Down Expand Up @@ -448,7 +448,7 @@ public void testGetTitleAssetVocabularyType() throws Exception {
Locale locale = _portal.getSiteDefaultLocale(_group.getGroupId());

SiteNavigationMenuItem assetVocabularySiteNavigationMenuItem =
_createSiteNavigationMenuItem(locale, "{}", false);
_addSiteNavigationMenuItem(locale, "{}", false);

Assert.assertEquals(
_assetVocabulary.getTitle(locale),
Expand All @@ -469,7 +469,7 @@ public void testGetTitleAssetVocabularyTypeUseCustomName()
String expectedTitle = RandomTestUtil.randomString();

SiteNavigationMenuItem assetVocabularySiteNavigationMenuItem =
_createSiteNavigationMenuItem(
_addSiteNavigationMenuItem(
locale,
JSONUtil.put(
LocaleUtil.toLanguageId(locale), expectedTitle
Expand All @@ -495,7 +495,7 @@ public void testGetTitleAssetVocabularyTypeUseCustomNameNondefaultLocale()
String expectedTitle = RandomTestUtil.randomString();

SiteNavigationMenuItem assetVocabularySiteNavigationMenuItem =
_createSiteNavigationMenuItem(
_addSiteNavigationMenuItem(
locale,
JSONUtil.put(
LocaleUtil.toLanguageId(locale),
Expand Down Expand Up @@ -524,7 +524,7 @@ public void testGetTitleAssetVocabularyTypeUseCustomNameNontranslatedLocale()
String expectedTitle = RandomTestUtil.randomString();

SiteNavigationMenuItem assetVocabularySiteNavigationMenuItem =
_createSiteNavigationMenuItem(
_addSiteNavigationMenuItem(
locale,
JSONUtil.put(
LocaleUtil.toLanguageId(locale), expectedTitle
Expand Down Expand Up @@ -621,7 +621,7 @@ public void testIsBrowsableAssetVocabularyType() throws Exception {
SiteNavigationMenuItemTypeConstants.ASSET_VOCABULARY);

SiteNavigationMenuItem siteNavigationMenuItem =
_createSiteNavigationMenuItem(
_addSiteNavigationMenuItem(
_portal.getSiteDefaultLocale(_group.getGroupId()), "{}", false);

Assert.assertFalse(
Expand Down Expand Up @@ -696,7 +696,7 @@ private void _assertGetChildrenSiteNavigationMenuItems(
}
}

private AssetCategory _createAssetCategory(long parentAssetCategoryId)
private AssetCategory _addAssetCategory(long parentAssetCategoryId)
throws Exception {

return _assetCategoryLocalService.addCategory(
Expand All @@ -706,7 +706,7 @@ private AssetCategory _createAssetCategory(long parentAssetCategoryId)
_assetVocabulary.getVocabularyId(), null, _serviceContext);
}

private SiteNavigationMenuItem _createSiteNavigationMenuItem(
private SiteNavigationMenuItem _addSiteNavigationMenuItem(
Locale defaultLocale, String localizedNames,
boolean showAssetVocabularyLevel)
throws Exception {
Expand Down Expand Up @@ -755,7 +755,7 @@ private SiteNavigationMenuItem _getAssetCategorySiteNavigationMenuItem(
throws Exception {

SiteNavigationMenuItem assetVocabularySiteNavigationMenuItem =
_createSiteNavigationMenuItem(locale, "{}", false);
_addSiteNavigationMenuItem(locale, "{}", false);

List<SiteNavigationMenuItem> childrenSiteNavigationMenuItems =
siteNavigationMenuItemType.getChildrenSiteNavigationMenuItems(
Expand All @@ -779,7 +779,7 @@ private SiteNavigationMenuItem _getAssetCategorySiteNavigationMenuItem(
SiteNavigationMenuItemType siteNavigationMenuItemType)
throws Exception {

AssetCategory assetCategory = _createAssetCategory(0);
AssetCategory assetCategory = _addAssetCategory(0);

return _getAssetCategorySiteNavigationMenuItem(
assetCategory, mockHttpServletRequest, locale,
Expand Down

0 comments on commit 73510a9

Please sign in to comment.