From 103d781e63db4b84fb8e0e26040bceff618a7d5f Mon Sep 17 00:00:00 2001 From: Nilton Vieira Date: Wed, 4 Dec 2024 10:51:14 -0300 Subject: [PATCH] LPD-43431 Avoid case-sensitive issues on PSQL --- .../test-journal-folder-1/journal_article.json | 2 +- .../test-journal-folder-2/journal_article.json | 2 +- .../test-journal-folder-1/journal_article.json | 2 +- .../test-journal-folder-2/journal_article.json | 2 +- .../test-journal-folder-3/journal_article.json | 2 +- .../internal/test/BundleSiteInitializerTest.java | 10 +++++----- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/modules/apps/site-initializer/site-initializer-extender/site-initializer-extender-test-bundle-1/src/main/resources/site-initializer/journal-articles/test-journal-folder-1/journal_article.json b/modules/apps/site-initializer/site-initializer-extender/site-initializer-extender-test-bundle-1/src/main/resources/site-initializer/journal-articles/test-journal-folder-1/journal_article.json index f240748d1c6f6e..044ea2ee4bab9d 100644 --- a/modules/apps/site-initializer/site-initializer-extender/site-initializer-extender-test-bundle-1/src/main/resources/site-initializer/journal-articles/test-journal-folder-1/journal_article.json +++ b/modules/apps/site-initializer/site-initializer-extender/site-initializer-extender-test-bundle-1/src/main/resources/site-initializer/journal-articles/test-journal-folder-1/journal_article.json @@ -1,5 +1,5 @@ { - "articleId": "test-journal-article-1", + "articleId": "TEST-JOURNAL-ARTICLE-1", "ddmStructureKey": "TEST DDM STRUCTURE NAME", "ddmTemplateKey": "TEST DDM TEMPLATE KEY 1", "folder": "test-journal-article-1", diff --git a/modules/apps/site-initializer/site-initializer-extender/site-initializer-extender-test-bundle-1/src/main/resources/site-initializer/journal-articles/test-journal-folder-2/journal_article.json b/modules/apps/site-initializer/site-initializer-extender/site-initializer-extender-test-bundle-1/src/main/resources/site-initializer/journal-articles/test-journal-folder-2/journal_article.json index 22c575cfeb6cf3..c6fd58135682c3 100644 --- a/modules/apps/site-initializer/site-initializer-extender/site-initializer-extender-test-bundle-1/src/main/resources/site-initializer/journal-articles/test-journal-folder-2/journal_article.json +++ b/modules/apps/site-initializer/site-initializer-extender/site-initializer-extender-test-bundle-1/src/main/resources/site-initializer/journal-articles/test-journal-folder-2/journal_article.json @@ -1,5 +1,5 @@ { - "articleId": "test-journal-article-2", + "articleId": "TEST-JOURNAL-ARTICLE-2", "ddmStructureKey": "TEST DDM STRUCTURE NAME", "ddmTemplateKey": "TEST DDM TEMPLATE KEY 1", "folder": "test-journal-article-2", diff --git a/modules/apps/site-initializer/site-initializer-extender/site-initializer-extender-test-bundle-2/src/main/resources/site-initializer/journal-articles/test-journal-folder-1/journal_article.json b/modules/apps/site-initializer/site-initializer-extender/site-initializer-extender-test-bundle-2/src/main/resources/site-initializer/journal-articles/test-journal-folder-1/journal_article.json index f240748d1c6f6e..044ea2ee4bab9d 100644 --- a/modules/apps/site-initializer/site-initializer-extender/site-initializer-extender-test-bundle-2/src/main/resources/site-initializer/journal-articles/test-journal-folder-1/journal_article.json +++ b/modules/apps/site-initializer/site-initializer-extender/site-initializer-extender-test-bundle-2/src/main/resources/site-initializer/journal-articles/test-journal-folder-1/journal_article.json @@ -1,5 +1,5 @@ { - "articleId": "test-journal-article-1", + "articleId": "TEST-JOURNAL-ARTICLE-1", "ddmStructureKey": "TEST DDM STRUCTURE NAME", "ddmTemplateKey": "TEST DDM TEMPLATE KEY 1", "folder": "test-journal-article-1", diff --git a/modules/apps/site-initializer/site-initializer-extender/site-initializer-extender-test-bundle-2/src/main/resources/site-initializer/journal-articles/test-journal-folder-2/journal_article.json b/modules/apps/site-initializer/site-initializer-extender/site-initializer-extender-test-bundle-2/src/main/resources/site-initializer/journal-articles/test-journal-folder-2/journal_article.json index ca3a3eafe59ad9..801e3788381222 100644 --- a/modules/apps/site-initializer/site-initializer-extender/site-initializer-extender-test-bundle-2/src/main/resources/site-initializer/journal-articles/test-journal-folder-2/journal_article.json +++ b/modules/apps/site-initializer/site-initializer-extender/site-initializer-extender-test-bundle-2/src/main/resources/site-initializer/journal-articles/test-journal-folder-2/journal_article.json @@ -1,5 +1,5 @@ { - "articleId": "test-journal-article-2", + "articleId": "TEST-JOURNAL-ARTICLE-2", "ddmStructureKey": "TEST DDM STRUCTURE NAME", "ddmTemplateKey": "TEST DDM TEMPLATE KEY 1", "folder": "test-journal-article-2", diff --git a/modules/apps/site-initializer/site-initializer-extender/site-initializer-extender-test-bundle-2/src/main/resources/site-initializer/journal-articles/test-journal-folder-3/journal_article.json b/modules/apps/site-initializer/site-initializer-extender/site-initializer-extender-test-bundle-2/src/main/resources/site-initializer/journal-articles/test-journal-folder-3/journal_article.json index 2b562e2b27e045..765c6de6697f70 100644 --- a/modules/apps/site-initializer/site-initializer-extender/site-initializer-extender-test-bundle-2/src/main/resources/site-initializer/journal-articles/test-journal-folder-3/journal_article.json +++ b/modules/apps/site-initializer/site-initializer-extender/site-initializer-extender-test-bundle-2/src/main/resources/site-initializer/journal-articles/test-journal-folder-3/journal_article.json @@ -1,5 +1,5 @@ { - "articleId": "test-journal-article-3", + "articleId": "TEST-JOURNAL-ARTICLE-3", "ddmStructureKey": "TEST DDM STRUCTURE NAME", "folder": "test-journal-article-3", "name": "Test Journal Article 3" diff --git a/modules/apps/site-initializer/site-initializer-extender/site-initializer-extender-test/src/testIntegration/java/com/liferay/site/initializer/extender/internal/test/BundleSiteInitializerTest.java b/modules/apps/site-initializer/site-initializer-extender/site-initializer-extender-test/src/testIntegration/java/com/liferay/site/initializer/extender/internal/test/BundleSiteInitializerTest.java index 8276fbdfb1bd72..3b6682fc831317 100644 --- a/modules/apps/site-initializer/site-initializer-extender/site-initializer-extender-test/src/testIntegration/java/com/liferay/site/initializer/extender/internal/test/BundleSiteInitializerTest.java +++ b/modules/apps/site-initializer/site-initializer-extender/site-initializer-extender-test/src/testIntegration/java/com/liferay/site/initializer/extender/internal/test/BundleSiteInitializerTest.java @@ -1774,7 +1774,7 @@ private void _assertFragmentEntries() throws Exception { private void _assertJournalArticles1() throws Exception { JournalArticle journalArticle1 = _journalArticleLocalService.fetchArticle( - _group.getGroupId(), "test-journal-article-1"); + _group.getGroupId(), "TEST-JOURNAL-ARTICLE-1"); Assert.assertNotNull(journalArticle1); Assert.assertEquals( @@ -1784,7 +1784,7 @@ private void _assertJournalArticles1() throws Exception { JournalArticle journalArticle2 = _journalArticleLocalService.fetchArticle( - _group.getGroupId(), "test-journal-article-2"); + _group.getGroupId(), "TEST-JOURNAL-ARTICLE-2"); Assert.assertNotNull(journalArticle2); Assert.assertEquals( @@ -1814,7 +1814,7 @@ private void _assertJournalArticles1() throws Exception { private void _assertJournalArticles2() throws Exception { JournalArticle journalArticle1 = _journalArticleLocalService.fetchArticle( - _group.getGroupId(), "test-journal-article-1"); + _group.getGroupId(), "TEST-JOURNAL-ARTICLE-1"); Assert.assertNotNull(journalArticle1); Assert.assertEquals( @@ -1824,7 +1824,7 @@ private void _assertJournalArticles2() throws Exception { JournalArticle journalArticle2 = _journalArticleLocalService.fetchArticle( - _group.getGroupId(), "test-journal-article-2"); + _group.getGroupId(), "TEST-JOURNAL-ARTICLE-2"); Assert.assertNotNull(journalArticle2); Assert.assertEquals( @@ -1834,7 +1834,7 @@ private void _assertJournalArticles2() throws Exception { JournalArticle journalArticle3 = _journalArticleLocalService.fetchArticle( - _group.getGroupId(), "test-journal-article-3"); + _group.getGroupId(), "TEST-JOURNAL-ARTICLE-3"); Assert.assertNotNull(journalArticle3); Assert.assertTrue(