From 1d9af63837afa26853bc29288429eb1929f958e3 Mon Sep 17 00:00:00 2001 From: jensp Date: Wed, 10 May 2017 14:00:08 +0000 Subject: [PATCH] CCM NG/ccm-cms: Working on the ContentTypeRepositoryTest git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4719 8810af33-2d31-482b-a856-94f89814c4df --- .../ContentTypeRepositoryTest.java | 287 ++++++++++++++++-- 1 file changed, 259 insertions(+), 28 deletions(-) diff --git a/ccm-cms/src/test/java/org/librecms/contentsection/ContentTypeRepositoryTest.java b/ccm-cms/src/test/java/org/librecms/contentsection/ContentTypeRepositoryTest.java index 17fddfae7..876178d08 100644 --- a/ccm-cms/src/test/java/org/librecms/contentsection/ContentTypeRepositoryTest.java +++ b/ccm-cms/src/test/java/org/librecms/contentsection/ContentTypeRepositoryTest.java @@ -102,8 +102,198 @@ public class ContentTypeRepositoryTest { public static WebArchive createDeployment() { return ShrinkWrap .create(WebArchive.class, - "LibreCCM-org.librecms.contentsection.ContentTypeRepositoryTest.war") + "LibreCCM-org.librecms.contentsection.ContentTypeRepositoryTest.war"). + addClass(com.arsdigita.bebop.AbstractSingleSelectionModel.class) + .addClass(com.arsdigita.bebop.BaseLink.class) + .addClass(com.arsdigita.bebop.BasePage.class) + .addClass(com.arsdigita.bebop.BebopConfig.class) + .addClass(com.arsdigita.bebop.BoxPanel.class) + .addClass(com.arsdigita.bebop.ColumnPanel.class) + .addClass(com.arsdigita.bebop.Completable.class) + .addClass(com.arsdigita.bebop.Component.class) + .addClass(com.arsdigita.bebop.ConfirmPage.class) + .addClass(com.arsdigita.bebop.Container.class) + .addClass(com.arsdigita.bebop.ControlLink.class) + .addClass(com.arsdigita.bebop.DescriptiveComponent.class) + .addClass(com.arsdigita.bebop.ElementComponent.class) + .addClass(com.arsdigita.bebop.Form.class) + .addClass(com.arsdigita.bebop.FormData.class) + .addClass(com.arsdigita.bebop.FormModel.class) + .addClass(com.arsdigita.bebop.FormProcessException.class) + .addClass(com.arsdigita.bebop.FormSection.class) + .addClass(com.arsdigita.bebop.GridPanel.class) + .addClass(com.arsdigita.bebop.Label.class) + .addClass(com.arsdigita.bebop.Link.class) + .addClass(com.arsdigita.bebop.List.class) + .addClass(com.arsdigita.bebop.ListPanel.class) + .addClass(com.arsdigita.bebop.Page.class) + .addClass(com.arsdigita.bebop.PageErrorDisplay.class) + .addClass(com.arsdigita.bebop.PageFactory.class) + .addClass(com.arsdigita.bebop.PageState.class) + .addClass(com.arsdigita.bebop.ParameterSingleSelectionModel.class) + .addClass(com.arsdigita.bebop.RequestLocal.class) + .addClass(com.arsdigita.bebop.SaveCancelSection.class) + .addClass(com.arsdigita.bebop.SessionExpiredException.class) + .addClass(com.arsdigita.bebop.SimpleComponent.class) + .addClass(com.arsdigita.bebop.SimpleContainer.class) + .addClass(com.arsdigita.bebop.SingleSelectionModel.class) + .addClass(com.arsdigita.bebop.event.ActionEvent.class) + .addClass(com.arsdigita.bebop.event.ActionListener.class) + .addClass(com.arsdigita.bebop.event.ChangeEvent.class) + .addClass(com.arsdigita.bebop.event.ChangeListener.class) + .addClass(com.arsdigita.bebop.event.EventListenerList.class) + .addClass(com.arsdigita.bebop.event.FormCancelListener.class) + .addClass(com.arsdigita.bebop.event.FormInitListener.class) + .addClass(com.arsdigita.bebop.event.FormProcessListener.class) + .addClass(com.arsdigita.bebop.event.FormSectionEvent.class) + .addClass(com.arsdigita.bebop.event.FormSubmissionListener.class) + .addClass(com.arsdigita.bebop.event.FormValidationListener.class) + .addClass(com.arsdigita.bebop.event.PageEvent.class) + .addClass(com.arsdigita.bebop.event.ParameterEvent.class) + .addClass(com.arsdigita.bebop.event.ParameterListener.class) + .addClass(com.arsdigita.bebop.event.PrintEvent.class) + .addClass(com.arsdigita.bebop.event.PrintListener.class) + .addClass(com.arsdigita.bebop.event.RequestEvent.class) + .addClass(com.arsdigita.bebop.event.RequestListener.class) + .addClass(com.arsdigita.bebop.form.CheckboxGroup.class) + .addClass(com.arsdigita.bebop.form.Hidden.class) + .addClass(com.arsdigita.bebop.form.Option.class) + .addClass(com.arsdigita.bebop.form.OptionGroup.class) + .addClass(com.arsdigita.bebop.form.Password.class) + .addClass(com.arsdigita.bebop.form.Submit.class) + .addClass(com.arsdigita.bebop.form.TextArea.class) + .addClass(com.arsdigita.bebop.form.TextField.class) + .addClass(com.arsdigita.bebop.form.Widget.class) + .addClass(com.arsdigita.bebop.list.DefaultListCellRenderer.class) + .addClass(com.arsdigita.bebop.list.ListCellRenderer.class) + .addClass(com.arsdigita.bebop.list.ListModel.class) + .addClass(com.arsdigita.bebop.list.ListModelBuilder.class) + .addClass(com.arsdigita.bebop.page.BebopApplicationServlet.class) + .addClass(com.arsdigita.bebop.page.PageTransformer.class) + .addClass(com.arsdigita.bebop.parameters.ArrayParameter.class) + .addClass(com.arsdigita.bebop.parameters.BitSetParameter.class) + .addClass(com.arsdigita.bebop.parameters.EmailParameter.class) + .addClass( + com.arsdigita.bebop.parameters.GlobalizedParameterListener.class). + addClass( + com.arsdigita.bebop.parameters.NotEmptyValidationListener.class) + .addClass( + com.arsdigita.bebop.parameters.NotNullValidationListener.class) + .addClass(com.arsdigita.bebop.parameters.ParameterData.class) + .addClass(com.arsdigita.bebop.parameters.ParameterModel.class) + .addClass( + com.arsdigita.bebop.parameters.StringLengthValidationListener.class). + addClass(com.arsdigita.bebop.parameters.StringParameter.class) + .addClass(com.arsdigita.bebop.parameters.URLParameter.class) + .addClass(com.arsdigita.bebop.util.Attributes.class) + .addClass(com.arsdigita.bebop.util.BebopConstants.class) + .addClass(com.arsdigita.bebop.util.GlobalizationUtil.class) + .addClass(com.arsdigita.bebop.util.PanelConstraints.class) + .addClass(com.arsdigita.bebop.util.Traversal.class) + .addClass(com.arsdigita.dispatcher.AbortRequestSignal.class) + .addClass(com.arsdigita.dispatcher.DirectoryListingException.class) + .addClass(com.arsdigita.dispatcher.DispatcherConfig.class) + .addClass("com.arsdigita.dispatcher.DispatcherConstants") + .addClass(com.arsdigita.dispatcher.DispatcherHelper.class) + .addClass(com.arsdigita.dispatcher.InitialRequestContext.class) + .addClass(com.arsdigita.dispatcher.MultipartHttpServletRequest.class). + addClass(com.arsdigita.dispatcher.RedirectException.class) + .addClass(com.arsdigita.dispatcher.RequestContext.class) + .addClass(com.arsdigita.globalization.Globalization.class) + .addClass(com.arsdigita.globalization.Globalized.class) + .addClass(com.arsdigita.globalization.GlobalizedMessage.class) .addClass(com.arsdigita.kernel.KernelConfig.class) + .addClass(com.arsdigita.kernel.security.DefaultSecurityHelper.class) + .addClass(com.arsdigita.kernel.security.SecurityConfig.class) + .addClass(com.arsdigita.kernel.security.SecurityHelper.class) + .addClass(com.arsdigita.kernel.security.Util.class) + .addClass(com.arsdigita.mail.ByteArrayDataSource.class) + .addClass(com.arsdigita.mail.Mail.class) + .addClass(com.arsdigita.mail.MailConfig.class) + .addClass("com.arsdigita.mail.MimeMessage") + .addClass(com.arsdigita.templating.ApplicationPatternGenerator.class). + addClass(com.arsdigita.templating.HostPatternGenerator.class) + .addClass(com.arsdigita.templating.LocalePatternGenerator.class) + .addClass("com.arsdigita.templating.LoggingErrorListener") + .addClass(com.arsdigita.templating.OutputTypePatternGenerator.class) + .addClass(com.arsdigita.templating.PatternGenerator.class) + .addClass(com.arsdigita.templating.PatternStylesheetResolver.class) + .addClass(com.arsdigita.templating.PrefixPatternGenerator.class) + .addClass(com.arsdigita.templating.PresentationManager.class) + .addClass("com.arsdigita.templating.SimpleURIResolver") + .addClass(com.arsdigita.templating.StylesheetResolver.class) + .addClass(com.arsdigita.templating.Templating.class) + .addClass(com.arsdigita.templating.TemplatingConfig.class) + .addClass(com.arsdigita.templating.URLPatternGenerator.class) + .addClass(com.arsdigita.templating.WebAppPatternGenerator.class) + .addClass(com.arsdigita.templating.WrappedTransformerException.class). + addClass(com.arsdigita.templating.XSLParameterGenerator.class) + .addClass(com.arsdigita.templating.XSLTemplate.class) + .addClass(com.arsdigita.ui.SimplePage.class) + .addClass("com.arsdigita.ui.SimplePageLayout") + .addClass(com.arsdigita.ui.UI.class) + .addClass(com.arsdigita.ui.UIConfig.class) + .addClass( + com.arsdigita.ui.admin.applications.AbstractAppInstanceForm.class). + addClass( + com.arsdigita.ui.admin.applications.AbstractAppSettingsPane.class). + addClass(com.arsdigita.ui.login.ChangePasswordForm.class) + .addClass("com.arsdigita.ui.login.DynamicLink") + .addClass(com.arsdigita.ui.login.EmailInitListener.class) + .addClass(com.arsdigita.ui.login.LoginConstants.class) + .addClass(com.arsdigita.ui.login.LoginGlobalizationUtil.class) + .addClass(com.arsdigita.ui.login.LoginHelper.class) + .addClass(com.arsdigita.ui.login.LoginServlet.class) + .addClass(com.arsdigita.ui.login.PasswordValidationListener.class) + .addClass(com.arsdigita.ui.login.RecoverPasswordForm.class) + .addClass(com.arsdigita.ui.login.ResetPasswordForm.class) + .addClass(com.arsdigita.ui.login.ScreenNameInitListener.class) + .addClass(com.arsdigita.ui.login.UserAccountActivationForm.class) + .addClass(com.arsdigita.ui.login.UserAuthenticationListener.class) + .addClass(com.arsdigita.ui.login.UserEditForm.class) + .addClass(com.arsdigita.ui.login.UserForm.class) + .addClass(com.arsdigita.ui.login.UserInfo.class) + .addClass(com.arsdigita.ui.login.UserLoginForm.class) + .addClass(com.arsdigita.ui.login.UserLogoutListener.class) + .addClass(com.arsdigita.ui.login.UserNewForm.class) + .addClass(com.arsdigita.util.Assert.class) + .addClass(com.arsdigita.util.Classes.class) + .addClass(com.arsdigita.util.ExceptionUnwrapper.class) + .addClass(com.arsdigita.util.Exceptions.class) + .addClass(com.arsdigita.util.IO.class) + .addClass(com.arsdigita.util.Lockable.class) + .addClass(com.arsdigita.util.MessageType.class) + .addClass(com.arsdigita.util.OrderedMap.class) + .addClass("com.arsdigita.util.OrderingComparator") + .addClass(com.arsdigita.util.ParameterProvider.class) + .addClass(com.arsdigita.util.Record.class) + .addClass(com.arsdigita.util.StringUtils.class) + .addClass(com.arsdigita.util.SystemInformation.class) + .addClass(com.arsdigita.util.URLRewriter.class) + .addClass(com.arsdigita.util.UncheckedWrapperException.class) + .addClass(com.arsdigita.util.servlet.HttpHost.class) + .addClass(com.arsdigita.web.ApplicationFileResolver.class) + .addClass(com.arsdigita.web.BaseApplicationServlet.class) + .addClass(com.arsdigita.web.BaseServlet.class) + .addClass(com.arsdigita.web.CCMDispatcherServlet.class) + .addClass(com.arsdigita.web.Debugger.class) + .addClass(com.arsdigita.web.DefaultApplicationFileResolver.class) + .addClass(com.arsdigita.web.DynamicHostProvider.class) + .addClass("com.arsdigita.web.InternalRequestLocal") + .addClass(com.arsdigita.web.LoginSignal.class) + .addClass(com.arsdigita.web.ParameterListener.class) + .addClass(com.arsdigita.web.ParameterMap.class) + .addClass(com.arsdigita.web.RedirectSignal.class) + .addClass(com.arsdigita.web.ReturnSignal.class) + .addClass("com.arsdigita.web.TransactionSignal") + .addClass(com.arsdigita.web.TransformationDebugger.class) + .addClass(com.arsdigita.web.URL.class) + .addClass(com.arsdigita.web.Web.class) + .addClass(com.arsdigita.web.WebConfig.class) + .addClass(com.arsdigita.web.WebContext.class) + .addClass(com.arsdigita.xml.Document.class) + .addClass(com.arsdigita.xml.Element.class) + .addClass(com.arsdigita.bebop.Component.class) .addClass(org.libreccm.categorization.Categorization.class) .addClass(org.libreccm.categorization.Category.class) .addClass(org.libreccm.categorization.Domain.class) @@ -113,42 +303,83 @@ public class ContentTypeRepositoryTest { .addClass(org.libreccm.configuration.BigDecimalSetting.class) .addClass(org.libreccm.configuration.BooleanSetting.class) .addClass(org.libreccm.configuration.Configuration.class) - .addClass(org.libreccm.configuration.ConfigurationManager.class) + .addClass(org.libreccm.configuration.ConfigurationException.class) .addClass(org.libreccm.configuration.ConfigurationInfo.class) + .addClass(org.libreccm.configuration.ConfigurationManager.class) .addClass(org.libreccm.configuration.DoubleSetting.class) .addClass(org.libreccm.configuration.EnumSetting.class) .addClass(org.libreccm.configuration.LocalizedStringSetting.class) .addClass(org.libreccm.configuration.LongSetting.class) .addClass(org.libreccm.configuration.Setting.class) .addClass("org.libreccm.configuration.SettingConverter") - .addClass(org.libreccm.configuration.SettingManager.class) .addClass(org.libreccm.configuration.SettingInfo.class) - .addClass(org.libreccm.configuration.StringSetting.class) + .addClass(org.libreccm.configuration.SettingManager.class) .addClass(org.libreccm.configuration.StringListSetting.class) + .addClass(org.libreccm.configuration.StringSetting.class) .addClass(org.libreccm.core.AbstractEntityRepository.class) .addClass(org.libreccm.core.CcmObject.class) + .addClass(org.libreccm.core.CcmObjectRepository.class) + .addClass(org.libreccm.core.CoreConstants.class) .addClass(org.libreccm.core.EmailAddress.class) .addClass(org.libreccm.core.Identifiable.class) .addClass(org.libreccm.core.Resource.class) .addClass(org.libreccm.core.ResourceType.class) + .addClass(org.libreccm.core.UnexpectedErrorException.class) .addClass(org.libreccm.jpa.EntityManagerProducer.class) + .addClass(org.libreccm.l10n.GlobalizationHelper.class) .addClass(org.libreccm.l10n.LocalizedString.class) + .addClass(org.libreccm.modules.CcmModule.class) + .addClass(org.libreccm.modules.InitEvent.class) + .addClass(org.libreccm.modules.InstallEvent.class) + .addClass(org.libreccm.modules.Module.class) + .addClass(org.libreccm.modules.ModuleEvent.class) + .addClass(org.libreccm.modules.RequiredModule.class) + .addClass(org.libreccm.modules.ShutdownEvent.class) + .addClass(org.libreccm.modules.UnInstallEvent.class) + .addClass(org.libreccm.pagemodel.ComponentModel.class) + .addClass(org.libreccm.pagemodel.PageModel.class) + .addClass(org.libreccm.pagemodel.PageModelComponentModel.class) + .addClass(org.libreccm.pagemodel.PageModelVersion.class) .addClass(org.libreccm.portation.Portable.class) + .addClass(org.libreccm.security.AuthorizationInterceptor.class) .addClass(org.libreccm.security.AuthorizationRequired.class) .addClass(org.libreccm.security.CcmShiroRealm.class) + .addClass("org.libreccm.security.CcmShiroRealmController") + .addClass(org.libreccm.security.ChallengeFailedException.class) + .addClass(org.libreccm.security.ChallengeManager.class) + .addClass(org.libreccm.security.EmailTemplates.class) .addClass(org.libreccm.security.Group.class) + .addClass(org.libreccm.security.GroupManager.class) .addClass(org.libreccm.security.GroupMembership.class) + .addClass(org.libreccm.security.GroupRepository.class) + .addClass(org.libreccm.security.OneTimeAuthConfig.class) + .addClass(org.libreccm.security.OneTimeAuthManager.class) + .addClass(org.libreccm.security.OneTimeAuthToken.class) + .addClass(org.libreccm.security.OneTimeAuthTokenPurpose.class) .addClass(org.libreccm.security.Party.class) .addClass(org.libreccm.security.Permission.class) + .addClass(org.libreccm.security.PermissionChecker.class) + .addClass(org.libreccm.security.PermissionManager.class) .addClass(org.libreccm.security.RecursivePermissions.class) + .addClass(org.libreccm.security.RegistrationManager.class) .addClass(org.libreccm.security.Relation.class) .addClass(org.libreccm.security.RequiresPrivilege.class) + .addClass(org.libreccm.security.RequiresRole.class) .addClass(org.libreccm.security.Role.class) .addClass(org.libreccm.security.RoleMembership.class) + .addClass(org.libreccm.security.RoleRepository.class) + .addClass("org.libreccm.security.SecuredHelper") .addClass(org.libreccm.security.Shiro.class) .addClass(org.libreccm.security.User.class) + .addClass(org.libreccm.security.UserManager.class) .addClass(org.libreccm.security.UserRepository.class) .addClass(org.libreccm.tests.categories.IntegrationTest.class) + .addClass(org.libreccm.testutils.DependenciesHelpers.class) + .addClass(org.libreccm.web.ApplicationCreateException.class) + .addClass(org.libreccm.web.ApplicationCreator.class) + .addClass(org.libreccm.web.ApplicationManager.class) + .addClass(org.libreccm.web.ApplicationRepository.class) + .addClass(org.libreccm.web.ApplicationType.class) .addClass(org.libreccm.web.CcmApplication.class) .addClass(org.libreccm.workflow.AssignableTask.class) .addClass(org.libreccm.workflow.Task.class) @@ -164,8 +395,8 @@ public class ContentTypeRepositoryTest { .addClass(org.librecms.contentsection.ContentItem.class) .addClass(org.librecms.contentsection.ContentItemVersion.class) .addClass(org.librecms.contentsection.ContentSection.class) - .addClass(org.librecms.contentsection.ContentSectionRepository.class) - .addClass(org.librecms.contentsection.ContentType.class) + .addClass(org.librecms.contentsection.ContentSectionRepository.class). + addClass(org.librecms.contentsection.ContentType.class) .addClass(org.librecms.contentsection.ContentTypeMode.class) .addClass(org.librecms.contentsection.ContentTypeRepository.class) .addClass(org.librecms.contentsection.Folder.class) @@ -186,7 +417,7 @@ public class ContentTypeRepositoryTest { "META-INF/persistence.xml") .addAsWebInfResource("test-web.xml", "web.xml") .addAsResource("configs/shiro.ini", "shiro.ini") - .addAsWebInfResource(EmptyAsset.INSTANCE, "WEB-INF/beans.xml"); + .addAsWebInfResource("META-INF/beans.xml", "WEB-INF/beans.xml"); } /** @@ -421,27 +652,27 @@ public class ContentTypeRepositoryTest { } // ToDo, does not work at the moment because including AuthorizationInterceptor -// pulls in to many other dependencies. -// /** -// * Verifies that an unused content type can be deleted. -// */ -// @Test(expected = UnauthorizedException.class) -// @InSequence(2000) -// @UsingDataSet("datasets/org/librecms/contentsection/" -// + "ContentTypeRepositoryTest/data.xml") -// @ShouldMatchDataSet("datasets/org/librecms/contentsection/" -// + "ContentTypeRepositoryTest/data.xml") -// @ShouldThrowException(UnauthorizedException.class) -// public void deleteUnusedContentTypeUnauthorized() { -// -// final ContentSection section = contentSectionRepo.findById(-1001L).get(); -// final Optional newsType = contentTypeRepo -// .findByContentSectionAndClass(section, News.class); -// assertThat(newsType.isPresent(), is(true)); -// -// contentTypeRepo.delete(newsType.get()); -// -// } +// pulls in to many other dependencies, more exactly most of Bebop... + /** + * Verifies that an unused content type can be deleted. + */ + @Test(expected = UnauthorizedException.class) + @InSequence(2000) + @UsingDataSet("datasets/org/librecms/contentsection/" + + "ContentTypeRepositoryTest/data.xml") + @ShouldMatchDataSet("datasets/org/librecms/contentsection/" + + "ContentTypeRepositoryTest/data.xml") + @ShouldThrowException(UnauthorizedException.class) + public void deleteUnusedContentTypeUnauthorized() { + + final ContentSection section = contentSectionRepo.findById(-1001L).get(); + final Optional newsType = contentTypeRepo + .findByContentSectionAndClass(section, News.class); + assertThat(newsType.isPresent(), is(true)); + + contentTypeRepo.delete(newsType.get()); + + } /** * Verifies that content types which are in use can't be deleted.