From 0f9971aca05f8f4beeb84db13708fe7de79156e4 Mon Sep 17 00:00:00 2001 From: Nick Burch Date: Thu, 11 Mar 2010 16:37:13 +0000 Subject: [PATCH] Package up the Web Script tests into a suite All except one test have gone into the suite, that one is listed explicitly in build.xml as it needs to be run in its own JVM as it has its own custom context that won't shut down properly. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19232 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../repo/web/scripts/WebScriptTestSuite.java | 92 +++++++++++++++++++ .../thumbnail/ThumbnailServiceTest.java | 1 + 2 files changed, 93 insertions(+) create mode 100644 source/java/org/alfresco/repo/web/scripts/WebScriptTestSuite.java diff --git a/source/java/org/alfresco/repo/web/scripts/WebScriptTestSuite.java b/source/java/org/alfresco/repo/web/scripts/WebScriptTestSuite.java new file mode 100644 index 0000000000..19d249de0e --- /dev/null +++ b/source/java/org/alfresco/repo/web/scripts/WebScriptTestSuite.java @@ -0,0 +1,92 @@ +/* + * Copyright (C) 2005-2010 Alfresco Software Limited. + * + * This file is part of Alfresco + * + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + */ +package org.alfresco.repo.web.scripts; + +import junit.framework.Test; +import junit.framework.TestSuite; + +import org.alfresco.repo.web.scripts.activities.SiteActivitySystemTest; +import org.alfresco.repo.web.scripts.activities.feed.control.FeedControlTest; +import org.alfresco.repo.web.scripts.blog.BlogServiceTest; +import org.alfresco.repo.web.scripts.dictionary.DictionaryRestApiTest; +import org.alfresco.repo.web.scripts.discussion.DiscussionServiceTest; +import org.alfresco.repo.web.scripts.forms.FormRestApiGet_Test; +import org.alfresco.repo.web.scripts.forms.FormRestApiJsonPost_Test; +import org.alfresco.repo.web.scripts.groups.GroupsTest; +import org.alfresco.repo.web.scripts.invitation.InvitationTest; +import org.alfresco.repo.web.scripts.invite.InviteServiceTest; +import org.alfresco.repo.web.scripts.person.PersonServiceTest; +import org.alfresco.repo.web.scripts.preference.PreferenceServiceTest; +import org.alfresco.repo.web.scripts.rule.RuleServiceTest; +import org.alfresco.repo.web.scripts.search.PersonSearchTest; +import org.alfresco.repo.web.scripts.site.SiteServiceTest; +import org.alfresco.repo.web.scripts.tagging.TaggingServiceTest; +import org.alfresco.repo.web.scripts.thumbnail.ThumbnailServiceTest; +import org.alfresco.repo.web.scripts.transfer.TransferWebScriptTest; +import org.alfresco.repo.web.scripts.wcm.WebProjectTest; +import org.alfresco.repo.web.scripts.wcm.membership.WebProjectMembershipTest; +import org.alfresco.repo.web.scripts.wcm.sandbox.AssetTest; +import org.alfresco.repo.web.scripts.wcm.sandbox.SandboxTest; +import org.alfresco.util.ApplicationContextHelper; + +/** + * Web Scripts test suite + */ +public class WebScriptTestSuite extends TestSuite +{ + public static Test suite() + { + TestSuite suite = new TestSuite(); + + // Ensure that a suitable context is available + TestWebScriptRepoServer.getTestServer(); + + // Add the tests + suite.addTestSuite( ThumbnailServiceTest.class ); + suite.addTestSuite( TransferWebScriptTest.class ); + suite.addTestSuite( DiscussionServiceTest.class ); + suite.addTestSuite( LoginTest.class ); + suite.addTestSuite( FormRestApiJsonPost_Test.class ); + suite.addTestSuite( FormRestApiGet_Test.class ); + suite.addTestSuite( TaggingServiceTest.class ); + suite.addTestSuite( PersonServiceTest.class ); + suite.addTestSuite( SiteServiceTest.class ); + suite.addTestSuite( RepositoryContainerTest.class ); + suite.addTestSuite( FeedControlTest.class ); + suite.addTestSuite( InvitationTest.class ); + suite.addTestSuite( PreferenceServiceTest.class ); + suite.addTestSuite( RuleServiceTest.class ); + suite.addTestSuite( GroupsTest.class ); + suite.addTestSuite( InviteServiceTest.class ); + suite.addTestSuite( WebProjectMembershipTest.class ); + suite.addTestSuite( WebProjectTest.class ); + suite.addTestSuite( SandboxTest.class ); + suite.addTestSuite( BlogServiceTest.class ); + suite.addTestSuite( PersonSearchTest.class ); + suite.addTestSuite( DictionaryRestApiTest.class ); + suite.addTestSuite( ThumbnailServiceTest.class ); + + // This uses a slightly different context + // As such, we can't run it in the same suite as the others, + // due to finalisers closing caches when we're not looking + //suite.addTestSuite( AssetTest.class ); + + return suite; + } +} \ No newline at end of file diff --git a/source/java/org/alfresco/repo/web/scripts/thumbnail/ThumbnailServiceTest.java b/source/java/org/alfresco/repo/web/scripts/thumbnail/ThumbnailServiceTest.java index 272ff933a6..112bde0be1 100644 --- a/source/java/org/alfresco/repo/web/scripts/thumbnail/ThumbnailServiceTest.java +++ b/source/java/org/alfresco/repo/web/scripts/thumbnail/ThumbnailServiceTest.java @@ -97,6 +97,7 @@ public class ThumbnailServiceTest extends BaseWebScriptTest { super.tearDown(); + AuthenticationUtil.clearCurrentSecurityContext(); } public void testCreateThumbnail() throws Exception