Skip to content

Commit

Permalink
LPD-25046 Move ExpectedLogMethodTestRule to test/rule
Browse files Browse the repository at this point in the history
  • Loading branch information
@MarinhoFeliphe @brianchandotcom
MarinhoFeliphe authored and brianchandotcom committed May 7, 2024
1 parent 6d3bc84 commit 545a128
Show file tree
Hide file tree
Showing 19 changed files with 20 additions and 17 deletions.
2 changes: 1 addition & 1 deletion ...eray/portal/search/elasticsearch7/internal/logging/ElasticsearchExceptionHandlerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
import com.liferay.portal.kernel.log.LogFactoryUtil;
import com.liferay.portal.kernel.search.SearchException;
import com.liferay.portal.kernel.test.rule.AggregateTestRule;
import com.liferay.portal.search.test.rule.logging.ExpectedLogMethodTestRule;
import com.liferay.portal.search.test.util.logging.ExpectedLog;
import com.liferay.portal.search.test.util.logging.ExpectedLogMethodTestRule;
import com.liferay.portal.test.rule.LiferayUnitTestRule;

import org.junit.ClassRule;
Expand Down
2 changes: 1 addition & 1 deletion ...arch/elasticsearch7/internal/logging/ElasticsearchIndexSearcherLogExceptionsOnlyTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
import com.liferay.portal.search.elasticsearch7.internal.connection.ElasticsearchConnectionFixture;
import com.liferay.portal.search.elasticsearch7.internal.connection.ElasticsearchFixture;
import com.liferay.portal.search.elasticsearch7.internal.indexing.LiferayElasticsearchIndexingFixtureFactory;
import com.liferay.portal.search.test.rule.logging.ExpectedLogMethodTestRule;
import com.liferay.portal.search.test.util.indexing.BaseIndexingTestCase;
import com.liferay.portal.search.test.util.indexing.IndexingFixture;
import com.liferay.portal.search.test.util.logging.ExpectedLog;
import com.liferay.portal.search.test.util.logging.ExpectedLogMethodTestRule;
import com.liferay.portal.test.rule.LiferayUnitTestRule;

import java.util.Collections;
Expand Down
2 changes: 1 addition & 1 deletion .../portal/search/elasticsearch7/internal/logging/ElasticsearchIndexSearcherLoggingTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
import com.liferay.portal.search.elasticsearch7.internal.indexing.LiferayElasticsearchIndexingFixtureFactory;
import com.liferay.portal.search.elasticsearch7.internal.search.engine.adapter.search.CountSearchRequestExecutorImpl;
import com.liferay.portal.search.elasticsearch7.internal.search.engine.adapter.search.SearchSearchRequestExecutorImpl;
import com.liferay.portal.search.test.rule.logging.ExpectedLogMethodTestRule;
import com.liferay.portal.search.test.util.indexing.BaseIndexingTestCase;
import com.liferay.portal.search.test.util.indexing.IndexingFixture;
import com.liferay.portal.search.test.util.logging.ExpectedLog;
import com.liferay.portal.search.test.util.logging.ExpectedLogMethodTestRule;
import com.liferay.portal.test.rule.LiferayUnitTestRule;

import org.junit.ClassRule;
Expand Down
2 changes: 1 addition & 1 deletion ...portal/search/elasticsearch7/internal/logging/ElasticsearchIndexWriterExceptionsTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
import com.liferay.portal.kernel.test.rule.AggregateTestRule;
import com.liferay.portal.search.elasticsearch7.internal.ElasticsearchIndexWriter;
import com.liferay.portal.search.elasticsearch7.internal.indexing.LiferayElasticsearchIndexingFixtureFactory;
import com.liferay.portal.search.test.rule.logging.ExpectedLogMethodTestRule;
import com.liferay.portal.search.test.util.indexing.BaseIndexingTestCase;
import com.liferay.portal.search.test.util.indexing.DocumentCreationHelpers;
import com.liferay.portal.search.test.util.indexing.IndexingFixture;
import com.liferay.portal.search.test.util.logging.ExpectedLog;
import com.liferay.portal.search.test.util.logging.ExpectedLogMethodTestRule;
import com.liferay.portal.test.rule.LiferayUnitTestRule;

import java.util.ArrayList;
Expand Down
2 changes: 1 addition & 1 deletion ...search/elasticsearch7/internal/logging/ElasticsearchIndexWriterLogExceptionsOnlyTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
import com.liferay.portal.search.elasticsearch7.internal.connection.ElasticsearchFixture;
import com.liferay.portal.search.elasticsearch7.internal.indexing.LiferayElasticsearchIndexingFixtureFactory;
import com.liferay.portal.search.elasticsearch7.internal.search.engine.adapter.document.BulkDocumentRequestExecutorImpl;
import com.liferay.portal.search.test.rule.logging.ExpectedLogMethodTestRule;
import com.liferay.portal.search.test.util.indexing.BaseIndexingTestCase;
import com.liferay.portal.search.test.util.indexing.DocumentCreationHelpers;
import com.liferay.portal.search.test.util.indexing.IndexingFixture;
import com.liferay.portal.search.test.util.logging.ExpectedLog;
import com.liferay.portal.search.test.util.logging.ExpectedLogMethodTestRule;
import com.liferay.portal.test.rule.LiferayUnitTestRule;

import java.util.ArrayList;
Expand Down
2 changes: 1 addition & 1 deletion ...om/liferay/portal/search/opensearch2/internal/logging/OpenSearchExceptionHandlerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
import com.liferay.portal.kernel.search.SearchException;
import com.liferay.portal.kernel.test.rule.AggregateTestRule;
import com.liferay.portal.search.opensearch2.internal.OpenSearchTestRule;
import com.liferay.portal.search.test.rule.logging.ExpectedLogMethodTestRule;
import com.liferay.portal.search.test.util.logging.ExpectedLog;
import com.liferay.portal.search.test.util.logging.ExpectedLogMethodTestRule;
import com.liferay.portal.test.rule.LiferayUnitTestRule;

import org.junit.ClassRule;
Expand Down
2 changes: 1 addition & 1 deletion ...tal/search/opensearch2/internal/logging/OpenSearchIndexSearcherLogExceptionsOnlyTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
import com.liferay.portal.search.opensearch2.internal.OpenSearchTestRule;
import com.liferay.portal.search.opensearch2.internal.connection.TestOpenSearchConnectionManager;
import com.liferay.portal.search.opensearch2.internal.indexing.LiferayOpenSearchIndexingFixtureFactory;
import com.liferay.portal.search.test.rule.logging.ExpectedLogMethodTestRule;
import com.liferay.portal.search.test.util.indexing.BaseIndexingTestCase;
import com.liferay.portal.search.test.util.indexing.IndexingFixture;
import com.liferay.portal.search.test.util.logging.ExpectedLog;
import com.liferay.portal.search.test.util.logging.ExpectedLogMethodTestRule;
import com.liferay.portal.test.rule.LiferayUnitTestRule;

import org.junit.ClassRule;
Expand Down
2 changes: 1 addition & 1 deletion ...iferay/portal/search/opensearch2/internal/logging/OpenSearchIndexSearcherLoggingTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
import com.liferay.portal.search.opensearch2.internal.indexing.LiferayOpenSearchIndexingFixtureFactory;
import com.liferay.portal.search.opensearch2.internal.search.engine.adapter.search.CountSearchRequestExecutorImpl;
import com.liferay.portal.search.opensearch2.internal.search.engine.adapter.search.SearchSearchRequestExecutorImpl;
import com.liferay.portal.search.test.rule.logging.ExpectedLogMethodTestRule;
import com.liferay.portal.search.test.util.indexing.BaseIndexingTestCase;
import com.liferay.portal.search.test.util.indexing.IndexingFixture;
import com.liferay.portal.search.test.util.logging.ExpectedLog;
import com.liferay.portal.search.test.util.logging.ExpectedLogMethodTestRule;
import com.liferay.portal.test.rule.LiferayUnitTestRule;

import org.junit.ClassRule;
Expand Down
2 changes: 1 addition & 1 deletion ...feray/portal/search/opensearch2/internal/logging/OpenSearchIndexWriterExceptionsTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
import com.liferay.portal.search.opensearch2.internal.OpenSearchIndexWriter;
import com.liferay.portal.search.opensearch2.internal.OpenSearchTestRule;
import com.liferay.portal.search.opensearch2.internal.indexing.LiferayOpenSearchIndexingFixtureFactory;
import com.liferay.portal.search.test.rule.logging.ExpectedLogMethodTestRule;
import com.liferay.portal.search.test.util.indexing.BaseIndexingTestCase;
import com.liferay.portal.search.test.util.indexing.DocumentCreationHelpers;
import com.liferay.portal.search.test.util.indexing.IndexingFixture;
import com.liferay.portal.search.test.util.logging.ExpectedLog;
import com.liferay.portal.search.test.util.logging.ExpectedLogMethodTestRule;
import com.liferay.portal.test.rule.LiferayUnitTestRule;

import java.util.ArrayList;
Expand Down
2 changes: 1 addition & 1 deletion ...ortal/search/opensearch2/internal/logging/OpenSearchIndexWriterLogExceptionsOnlyTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@
import com.liferay.portal.search.opensearch2.internal.connection.TestOpenSearchConnectionManager;
import com.liferay.portal.search.opensearch2.internal.indexing.LiferayOpenSearchIndexingFixtureFactory;
import com.liferay.portal.search.opensearch2.internal.search.engine.adapter.document.BulkDocumentRequestExecutorImpl;
import com.liferay.portal.search.test.rule.logging.ExpectedLogMethodTestRule;
import com.liferay.portal.search.test.util.indexing.BaseIndexingTestCase;
import com.liferay.portal.search.test.util.indexing.DocumentCreationHelpers;
import com.liferay.portal.search.test.util.indexing.IndexingFixture;
import com.liferay.portal.search.test.util.logging.ExpectedLog;
import com.liferay.portal.search.test.util.logging.ExpectedLogMethodTestRule;
import com.liferay.portal.test.rule.LiferayUnitTestRule;

import java.util.ArrayList;
Expand Down
2 changes: 1 addition & 1 deletion .../liferay/portal/search/solr8/internal/logging/SolrIndexSearcherLogExceptionsOnlyTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
import com.liferay.portal.search.solr8.internal.SolrIndexSearcher;
import com.liferay.portal.search.solr8.internal.SolrUnitTestRequirements;
import com.liferay.portal.search.solr8.internal.indexing.SolrIndexingFixture;
import com.liferay.portal.search.test.rule.logging.ExpectedLogMethodTestRule;
import com.liferay.portal.search.test.util.indexing.BaseIndexingTestCase;
import com.liferay.portal.search.test.util.indexing.IndexingFixture;
import com.liferay.portal.search.test.util.logging.ExpectedLog;
import com.liferay.portal.search.test.util.logging.ExpectedLogMethodTestRule;
import com.liferay.portal.test.rule.LiferayUnitTestRule;

import org.junit.Assume;
Expand Down
2 changes: 1 addition & 1 deletion ...t/java/com/liferay/portal/search/solr8/internal/logging/SolrIndexSearcherLoggingTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
import com.liferay.portal.search.solr8.internal.indexing.SolrIndexingFixture;
import com.liferay.portal.search.solr8.internal.search.engine.adapter.search.CountSearchRequestExecutorImpl;
import com.liferay.portal.search.solr8.internal.search.engine.adapter.search.SearchSearchRequestExecutorImpl;
import com.liferay.portal.search.test.rule.logging.ExpectedLogMethodTestRule;
import com.liferay.portal.search.test.util.indexing.BaseIndexingTestCase;
import com.liferay.portal.search.test.util.indexing.IndexingFixture;
import com.liferay.portal.search.test.util.logging.ExpectedLog;
import com.liferay.portal.search.test.util.logging.ExpectedLogMethodTestRule;
import com.liferay.portal.test.rule.LiferayUnitTestRule;

import org.junit.Assume;
Expand Down
2 changes: 1 addition & 1 deletion ...om/liferay/portal/search/solr8/internal/logging/SolrIndexWriterLogExceptionsOnlyTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
import com.liferay.portal.search.solr8.internal.SolrUnitTestRequirements;
import com.liferay.portal.search.solr8.internal.indexing.SolrIndexingFixture;
import com.liferay.portal.search.solr8.internal.search.engine.adapter.document.BulkDocumentRequestExecutorImpl;
import com.liferay.portal.search.test.rule.logging.ExpectedLogMethodTestRule;
import com.liferay.portal.search.test.util.indexing.BaseIndexingTestCase;
import com.liferay.portal.search.test.util.indexing.DocumentCreationHelpers;
import com.liferay.portal.search.test.util.indexing.IndexingFixture;
import com.liferay.portal.search.test.util.logging.ExpectedLog;
import com.liferay.portal.search.test.util.logging.ExpectedLogMethodTestRule;
import com.liferay.portal.test.rule.LiferayUnitTestRule;

import java.util.Collections;
Expand Down
2 changes: 1 addition & 1 deletion ...est/java/com/liferay/portal/search/solr8/internal/logging/SolrIndexWriterLoggingTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
import com.liferay.portal.search.solr8.internal.SolrUnitTestRequirements;
import com.liferay.portal.search.solr8.internal.indexing.SolrIndexingFixture;
import com.liferay.portal.search.solr8.internal.search.engine.adapter.document.BulkDocumentRequestExecutorImpl;
import com.liferay.portal.search.test.rule.logging.ExpectedLogMethodTestRule;
import com.liferay.portal.search.test.util.indexing.BaseIndexingTestCase;
import com.liferay.portal.search.test.util.indexing.IndexingFixture;
import com.liferay.portal.search.test.util.logging.ExpectedLog;
import com.liferay.portal.search.test.util.logging.ExpectedLogMethodTestRule;
import com.liferay.portal.test.rule.LiferayUnitTestRule;

import java.util.Collections;
Expand Down
2 changes: 1 addition & 1 deletion .../com/liferay/portal/search/solr8/internal/logging/SolrSearchEngineAdapterLoggingTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
import com.liferay.portal.search.solr8.internal.indexing.SolrIndexingFixture;
import com.liferay.portal.search.solr8.internal.search.engine.adapter.search.CountSearchRequestExecutorImpl;
import com.liferay.portal.search.solr8.internal.search.engine.adapter.search.SearchSearchRequestExecutorImpl;
import com.liferay.portal.search.test.rule.logging.ExpectedLogMethodTestRule;
import com.liferay.portal.search.test.util.indexing.BaseIndexingTestCase;
import com.liferay.portal.search.test.util.indexing.IndexingFixture;
import com.liferay.portal.search.test.util.logging.ExpectedLog;
import com.liferay.portal.search.test.util.logging.ExpectedLogMethodTestRule;
import com.liferay.portal.test.rule.LiferayUnitTestRule;

import org.junit.Assume;
Expand Down
1 change: 1 addition & 0 deletions modules/apps/portal-search/portal-search-test-util/bnd.bnd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ Bundle-Name: Liferay Portal Search Test Utilities
Bundle-SymbolicName: com.liferay.portal.search.test.util
Bundle-Version: 10.2.5
Export-Package:\
com.liferay.portal.search.test.rule.logging,\
com.liferay.portal.search.test.util,\
com.liferay.portal.search.test.util.logging
Import-Package:\
Expand Down
3 changes: 2 additions & 1 deletion ...il/logging/ExpectedLogMethodTestRule.java → ...le/logging/ExpectedLogMethodTestRule.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@
* SPDX-License-Identifier: LGPL-2.1-or-later OR LicenseRef-Liferay-DXP-EULA-2.0.0-2023-06
*/

package com.liferay.portal.search.test.util.logging;
package com.liferay.portal.search.test.rule.logging;

import com.liferay.petra.string.StringBundler;
import com.liferay.portal.kernel.test.rule.MethodTestRule;
import com.liferay.portal.search.test.util.logging.ExpectedLog;
import com.liferay.portal.test.log.LogCapture;
import com.liferay.portal.test.log.LogEntry;
import com.liferay.portal.test.log.LoggerTestUtil;
Expand Down
1 change: 1 addition & 0 deletions ...arch-test-util/src/main/resources/com/liferay/portal/search/test/rule/logging/packageinfo
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
version 1.0.0
2 changes: 1 addition & 1 deletion portal-test/src/com/liferay/portal/kernel/test/rule/AggregateTestRule.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public Statement apply(Statement statement, Description description) {
"WebDAVEnvironmentConfigClassTestRule",
"com.liferay.portal.test.rule.PermissionCheckerMethodTestRule",
InitializeKernelUtilTestRule.class.getName(),
"com.liferay.portal.search.test.util.logging.ExpectedLogMethodTestRule",
"com.liferay.portal.search.test.rule.logging.ExpectedLogMethodTestRule",
"com.liferay.portal.security.script.management.test.rule." +
"ScriptManagementConfigurationTestRule"
};
Expand Down

0 comments on commit 545a128

Please sign in to comment.