From 47a7850de1d469f2f254bd131954e3877044317d Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Wed, 23 Dec 2020 14:46:19 +0100 Subject: [PATCH] Fixed test failures Former-commit-id: b6be86c5d6ad819ef9b4dddca029ecfbda169fb5 --- .../AttachmentListManagerIT.java | 3 ++- .../ContentItemL10NManagerIT.java | 3 ++- .../contentsection/FolderManagerIT.java | 3 ++- .../ItemAttachmentManagerIT.java | 6 ++--- .../libreccm/shortcuts/ShortcutManagerIT.java | 21 +++++++++++------- .../shortcuts/ShortcutRepositoryIT.java | 22 +++++++++---------- 6 files changed, 33 insertions(+), 25 deletions(-) diff --git a/ccm-cms/src/test/java/org/librecms/contentsection/AttachmentListManagerIT.java b/ccm-cms/src/test/java/org/librecms/contentsection/AttachmentListManagerIT.java index 0140b76d0..e5fa43faa 100644 --- a/ccm-cms/src/test/java/org/librecms/contentsection/AttachmentListManagerIT.java +++ b/ccm-cms/src/test/java/org/librecms/contentsection/AttachmentListManagerIT.java @@ -53,7 +53,7 @@ import org.jboss.arquillian.persistence.TestExecutionPhase; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.not; import static org.hamcrest.CoreMatchers.nullValue; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; /** * Tests for the {@link AttachmentListManager}. @@ -120,6 +120,7 @@ public class AttachmentListManagerIT { .addAsResource("test-persistence.xml", "META-INF/persistence.xml") .addAsWebInfResource("test-web.xml", "web.xml") + .addAsResource(EmptyAsset.INSTANCE, "META-INF/beans.xml") .addAsWebInfResource(EmptyAsset.INSTANCE, "WEB-INF/beans.xml"); } diff --git a/ccm-cms/src/test/java/org/librecms/contentsection/ContentItemL10NManagerIT.java b/ccm-cms/src/test/java/org/librecms/contentsection/ContentItemL10NManagerIT.java index 21b92f3ed..7b7c1f708 100644 --- a/ccm-cms/src/test/java/org/librecms/contentsection/ContentItemL10NManagerIT.java +++ b/ccm-cms/src/test/java/org/librecms/contentsection/ContentItemL10NManagerIT.java @@ -52,7 +52,7 @@ import org.jboss.arquillian.persistence.TestExecutionPhase; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.not; import static org.hamcrest.CoreMatchers.nullValue; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; /** * Verifies the methods of the {@link ContentItemL10NManager}. @@ -122,6 +122,7 @@ public class ContentItemL10NManagerIT { .addAsResource("test-persistence.xml", "META-INF/persistence.xml") .addAsWebInfResource("test-web.xml", "web.xml") + .addAsResource(EmptyAsset.INSTANCE, "META-INF/beans.xml") .addAsWebInfResource(EmptyAsset.INSTANCE, "WEB-INF/beans.xml"); } diff --git a/ccm-cms/src/test/java/org/librecms/contentsection/FolderManagerIT.java b/ccm-cms/src/test/java/org/librecms/contentsection/FolderManagerIT.java index 6c4c31f13..f132c9b1f 100644 --- a/ccm-cms/src/test/java/org/librecms/contentsection/FolderManagerIT.java +++ b/ccm-cms/src/test/java/org/librecms/contentsection/FolderManagerIT.java @@ -52,7 +52,7 @@ import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.not; import static org.hamcrest.CoreMatchers.nullValue; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; /** @@ -113,6 +113,7 @@ public class FolderManagerIT { "META-INF/persistence.xml") .addAsResource("configs/shiro.ini", "shiro.ini") .addAsWebInfResource("test-web.xml", "web.xml") + .addAsResource(EmptyAsset.INSTANCE, "META-INF/beans.xml") .addAsWebInfResource(EmptyAsset.INSTANCE, "WEB-INF/beans.xml"); } diff --git a/ccm-cms/src/test/java/org/librecms/contentsection/ItemAttachmentManagerIT.java b/ccm-cms/src/test/java/org/librecms/contentsection/ItemAttachmentManagerIT.java index 0240f365a..e18607087 100644 --- a/ccm-cms/src/test/java/org/librecms/contentsection/ItemAttachmentManagerIT.java +++ b/ccm-cms/src/test/java/org/librecms/contentsection/ItemAttachmentManagerIT.java @@ -51,8 +51,7 @@ import org.jboss.arquillian.persistence.TestExecutionPhase; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.not; import static org.hamcrest.CoreMatchers.nullValue; -import static org.junit.Assert.assertThat; - +import static org.hamcrest.MatcherAssert.assertThat; /** * Tests for the {@link ItemAttachmentManager}. @@ -118,7 +117,7 @@ public class ItemAttachmentManagerIT { return ShrinkWrap .create(WebArchive.class, "LibreCCM-org.librecms.assets.AssetManagerTest.war") - .addPackages(true, "com.arsdigita", "org.libreccm", "org.librecms") + .addPackages(true, "com.arsdigita", "org.libreccm", "org.librecms") .addAsLibraries(getCcmCoreDependencies()) .addAsResource("configs/shiro.ini", "shiro.ini") .addAsResource( @@ -127,6 +126,7 @@ public class ItemAttachmentManagerIT { .addAsResource("test-persistence.xml", "META-INF/persistence.xml") .addAsWebInfResource("test-web.xml", "web.xml") + .addAsResource(EmptyAsset.INSTANCE, "META-INF/beans.xml") .addAsWebInfResource(EmptyAsset.INSTANCE, "WEB-INF/beans.xml"); } diff --git a/ccm-shortcuts/src/test/java/org/libreccm/shortcuts/ShortcutManagerIT.java b/ccm-shortcuts/src/test/java/org/libreccm/shortcuts/ShortcutManagerIT.java index c7b0df7d4..de238ed6b 100644 --- a/ccm-shortcuts/src/test/java/org/libreccm/shortcuts/ShortcutManagerIT.java +++ b/ccm-shortcuts/src/test/java/org/libreccm/shortcuts/ShortcutManagerIT.java @@ -51,8 +51,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.libreccm.security.Shiro; -import static org.hamcrest.CoreMatchers.*; -import static org.junit.Assert.*; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.CoreMatchers.not; +import static org.hamcrest.CoreMatchers.nullValue; +import static org.hamcrest.MatcherAssert.assertThat; /** * @@ -112,13 +114,16 @@ public class ShortcutManagerIT { .addPackage(org.libreccm.categorization.Categorization.class .getPackage()) .addPackage(org.libreccm.cdi.utils.CdiUtil.class.getPackage()) - .addPackage(org.libreccm.configuration.Configuration.class - .getPackage()) + .addPackage( + org.libreccm.configuration.Configuration.class.getPackage() + ) .addPackage(org.libreccm.core.CcmCore.class.getPackage()) - .addPackage(org.libreccm.jpa.EntityManagerProducer.class - .getPackage()) - .addPackage(org.libreccm.l10n.LocalizedString.class - .getPackage()) + .addPackage( + org.libreccm.jpa.EntityManagerProducer.class.getPackage() + ) + .addPackage( + org.libreccm.l10n.LocalizedString.class.getPackage() + ) .addPackage(org.libreccm.security.Permission.class.getPackage()) .addPackage(org.libreccm.web.CcmApplication.class.getPackage()) .addPackage(org.libreccm.workflow.Workflow.class.getPackage()) diff --git a/ccm-shortcuts/src/test/java/org/libreccm/shortcuts/ShortcutRepositoryIT.java b/ccm-shortcuts/src/test/java/org/libreccm/shortcuts/ShortcutRepositoryIT.java index 027dfe57c..3ad6e599c 100644 --- a/ccm-shortcuts/src/test/java/org/libreccm/shortcuts/ShortcutRepositoryIT.java +++ b/ccm-shortcuts/src/test/java/org/libreccm/shortcuts/ShortcutRepositoryIT.java @@ -19,7 +19,6 @@ package org.libreccm.shortcuts; import static org.libreccm.testutils.DependenciesHelpers.getCcmCoreDependencies; -import static org.libreccm.testutils.DependenciesHelpers.getModuleDependencies; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.junit.Arquillian; @@ -52,7 +51,7 @@ import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.not; import static org.hamcrest.CoreMatchers.nullValue; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; /** * @@ -107,22 +106,23 @@ public class ShortcutRepositoryIT { "LibreCCM-org.libreccm.shortcuts.ShortcutRepositoryTest-web.war" ) .addPackage(org.libreccm.auditing.CcmRevision.class.getPackage()) - .addPackage(org.libreccm.categorization.Categorization.class - .getPackage()) - .addPackage(org.libreccm.configuration.Configuration.class - .getPackage()) + .addPackage( + org.libreccm.categorization.Categorization.class.getPackage() + ) + .addPackage( + org.libreccm.configuration.Configuration.class.getPackage() + ) .addPackage(org.libreccm.core.CcmCore.class.getPackage()) - .addPackage(org.libreccm.jpa.EntityManagerProducer.class - .getPackage()) - .addPackage(org.libreccm.l10n.LocalizedString.class - .getPackage()) + .addPackage( + org.libreccm.jpa.EntityManagerProducer.class.getPackage() + ) + .addPackage(org.libreccm.l10n.LocalizedString.class.getPackage()) .addPackage(org.libreccm.security.Permission.class.getPackage()) .addPackage(org.libreccm.web.CcmApplication.class.getPackage()) .addPackage(org.libreccm.workflow.Workflow.class.getPackage()) .addClass(org.libreccm.imexport.Exportable.class) .addClass(org.libreccm.shortcuts.Shortcut.class) .addClass(org.libreccm.shortcuts.ShortcutRepository.class) - .addAsLibraries(getModuleDependencies()) .addAsLibraries(getCcmCoreDependencies()) .addAsResource( "test-persistence.xml", "META-INF/persistence.xml"