Mathijs den Burger pushed to branch feature/visual-editing-psp2 at cms-community / hippo-addon-channel-manager
Commits: e85db8a3 by Mathijs den Burger at 2017-04-24T11:26:21+02:00 CHANNELMGR-1244 Upgrade test to log4j2 - use the new Log4jInterceptor - add the PowerMockIgnore annotation to reduce stack trace noise - - - - - 1 changed file: - content-service/src/test/java/org/onehippo/cms/channelmanager/content/documenttype/field/type/RichTextFieldTypeTest.java Changes: ===================================== content-service/src/test/java/org/onehippo/cms/channelmanager/content/documenttype/field/type/RichTextFieldTypeTest.java ===================================== --- a/content-service/src/test/java/org/onehippo/cms/channelmanager/content/documenttype/field/type/RichTextFieldTypeTest.java +++ b/content-service/src/test/java/org/onehippo/cms/channelmanager/content/documenttype/field/type/RichTextFieldTypeTest.java @@ -33,8 +33,9 @@ import org.onehippo.cms.channelmanager.content.error.BadRequestException; import org.onehippo.cms.channelmanager.content.error.InternalServerErrorException; import org.onehippo.cms7.services.processor.html.HtmlProcessorFactory; import org.onehippo.repository.mock.MockNode; -import org.onehippo.testutils.log4j.Log4jListener; +import org.onehippo.testutils.log4j.Log4jInterceptor; import org.powermock.api.easymock.PowerMock; +import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; @@ -52,6 +53,7 @@ import static org.powermock.api.easymock.PowerMock.replay; import static org.powermock.api.easymock.PowerMock.replayAll; @RunWith(PowerMockRunner.class) +@PowerMockIgnore("javax.management.*") @PrepareForTest({FieldTypeUtils.class, HtmlProcessorFactory.class}) public class RichTextFieldTypeTest { @@ -87,7 +89,7 @@ public class RichTextFieldTypeTest { } private static void assertWarningsLogged(final long count, final Code code, final Code... verifications) throws Exception { - try (Log4jListener listener = Log4jListener.onWarn()) { + try (Log4jInterceptor listener = Log4jInterceptor.onWarn().trap(RichTextFieldType.class).build()) { try { code.run(); } finally { View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/e85db8a3e167f7af742ca5e9178edc3d606504b1
_______________________________________________ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn