diff --git a/src/test/java/org/alfresco/AllRepositoryTestsCatalogue.java b/src/test/java/org/alfresco/AllRepositoryTestsCatalogue.java index 44f6f1ba1a..ec21c2e816 100644 --- a/src/test/java/org/alfresco/AllRepositoryTestsCatalogue.java +++ b/src/test/java/org/alfresco/AllRepositoryTestsCatalogue.java @@ -240,15 +240,25 @@ public class AllRepositoryTestsCatalogue // needs a clean DB to run suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.calendar.CalendarServiceImplTest.class)); + suite.addTest(new JUnit4TestAdapter(RepositoryStartupTest.class)); suite.addTestSuite(ContentStoreCleanerTest.class); suite.addTestSuite(RoutingContentServiceTest.class); + suite.addTestSuite(org.alfresco.repo.exporter.ExporterComponentTest.class); + + // the following two tests fail on windows + suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.rendition.MultiUserRenditionTest.class)); + suite.addTestSuite(org.alfresco.repo.rendition.RenditionServiceIntegrationTest.class); + + suite.addTest(new JUnit4TestAdapter(PublishingQueueImplTest.class)); + suite.addTest(new JUnit4TestAdapter(PublishingIntegratedTest.class)); + suite.addTestSuite(org.alfresco.repo.lock.LockBehaviourImplTest.class); + suite.addTestSuite(org.alfresco.repo.node.archive.LargeArchiveAndRestoreTest.class); suite.addTestSuite(org.alfresco.repo.copy.CopyServiceImplTest.class); suite.addTestSuite(org.alfresco.repo.descriptor.DescriptorServiceTest.class); suite.addTestSuite(org.alfresco.repo.dictionary.DictionaryModelTypeTest.class); suite.addTestSuite(org.alfresco.repo.dictionary.DictionaryRepositoryBootstrapTest.class); suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.dictionary.ModelValidatorTest.class)); suite.addTestSuite(org.alfresco.repo.dictionary.types.period.PeriodTest.class); - suite.addTestSuite(org.alfresco.repo.exporter.ExporterComponentTest.class); suite.addTestSuite(org.alfresco.repo.exporter.RepositoryExporterComponentTest.class); suite.addTestSuite(org.alfresco.repo.i18n.MessageServiceImplTest.class); suite.addTestSuite(org.alfresco.repo.importer.FileImporterTest.class); @@ -257,65 +267,27 @@ public class AllRepositoryTestsCatalogue suite.addTestSuite(org.alfresco.repo.jscript.RhinoScriptTest.class); // needs a clean DB to run suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.links.LinksServiceImplTest.class)); - suite.addTestSuite(org.alfresco.repo.lock.JobLockServiceTest.class); - suite.addTestSuite(org.alfresco.repo.lock.LockBehaviourImplTest.class); suite.addTestSuite(org.alfresco.repo.lock.LockServiceImplTest.class); suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.lock.mem.LockStoreImplTxTest.class)); suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.lock.mem.LockableAspectInterceptorTest.class)); suite.addTestSuite(org.alfresco.repo.management.JmxDumpUtilTest.class); - } - - // [classpath:alfresco/application-context.xml] - part 4 - static void applicationContext_04(TestSuite suite) - { - suite.addTestSuite(org.alfresco.repo.module.ModuleComponentHelperTest.class); suite.addTestSuite(org.alfresco.repo.node.ConcurrentNodeServiceSearchTest.class); suite.addTestSuite(org.alfresco.repo.node.ConcurrentNodeServiceTest.class); suite.addTestSuite(org.alfresco.repo.node.FullNodeServiceTest.class); suite.addTestSuite(org.alfresco.repo.node.NodeRefPropertyMethodInterceptorTest.class); suite.addTestSuite(org.alfresco.repo.node.PerformanceNodeServiceTest.class); suite.addTestSuite(org.alfresco.repo.node.archive.ArchiveAndRestoreTest.class); - suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.node.cleanup.TransactionCleanupTest.class)); suite.addTest(new JUnit4TestAdapter(ChannelServiceImplIntegratedTest.class)); - suite.addTest(new JUnit4TestAdapter(PublishingRootObjectTest.class)); - suite.addTest(new JUnit4TestAdapter(PublishingQueueImplTest.class)); suite.addTest(new JUnit4TestAdapter(PublishingPackageSerializerTest.class)); - suite.addTest(new JUnit4TestAdapter(PublishingIntegratedTest.class)); + suite.addTest(new JUnit4TestAdapter(PublishingRootObjectTest.class)); + suite.addTestSuite(org.alfresco.repo.node.db.DbNodeServiceImplTest.class); + suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.node.cleanup.TransactionCleanupTest.class)); + suite.addTestSuite(org.alfresco.repo.node.db.DbNodeServiceImplPropagationTest.class); } - // [classpath:alfresco/application-context.xml] - part 5 - static void applicationContext_05(TestSuite suite) - { - suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.client.config.ClientAppConfigTest.class)); - suite.addTestSuite(org.alfresco.repo.rendition.StandardRenditionLocationResolverTest.class); - suite.addTestSuite(org.alfresco.repo.rendition.executer.HTMLRenderingEngineTest.class); - suite.addTestSuite(org.alfresco.repo.rendition.executer.XSLTFunctionsTest.class); // fails if with previous tests - suite.addTestSuite(org.alfresco.repo.rendition.executer.XSLTRenderingEngineTest.class); - suite.addTestSuite(org.alfresco.repo.replication.ReplicationServiceIntegrationTest.class); - suite.addTestSuite(org.alfresco.repo.template.XSLTProcessorTest.class); - suite.addTestSuite(QueryRegisterComponentTest.class); - suite.addTestSuite(SearchServiceTest.class); - suite.addTestSuite(ALF947Test.class); - suite.addTestSuite(LuceneIndexBackupComponentTest.class); - suite.addTestSuite(org.alfresco.repo.tagging.UpdateTagScopesActionExecuterTest.class); - suite.addTestSuite(org.alfresco.repo.thumbnail.conditions.NodeEligibleForRethumbnailingEvaluatorTest.class); - suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.transaction.ConnectionPoolOverloadTest.class)); - suite.addTestSuite(org.alfresco.repo.transfer.NodeCrawlerTest.class); - suite.addTestSuite(org.alfresco.repo.transfer.TransferServiceCallbackTest.class); - suite.addTestSuite(org.alfresco.repo.transfer.TransferServiceImplTest.class); - suite.addTestSuite(org.alfresco.repo.transfer.TransferServiceToBeRefactoredTest.class); - suite.addTestSuite(org.alfresco.repo.transfer.TransferVersionCheckerImplTest.class); - suite.addTestSuite(org.alfresco.repo.transfer.manifest.ManifestIntegrationTest.class); - suite.addTestSuite(org.alfresco.repo.transfer.script.ScriptTransferServiceTest.class); - // does not want to work in the same test suite as org.alfresco.repo.rule.* tests - suite.addTestSuite(org.alfresco.opencmis.search.OpenCmisQueryTest.class); - - suite.addTestSuite(org.alfresco.repo.action.scheduled.CronScheduledQueryBasedTemplateActionDefinitionTest.class); - } - - // [classpath:alfresco/application-context.xml] - part 6 - static void applicationContext_06(TestSuite suite) + // [classpath:alfresco/application-context.xml] - part 4 + static void applicationContext_04(TestSuite suite) { suite.addTest(org.alfresco.repo.usage.UsageTestSuite.suite()); suite.addTestSuite(VersionServiceImplTest.class); @@ -331,38 +303,20 @@ public class AllRepositoryTestsCatalogue // This test opens, closes and again opens the alfresco application context. suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.dictionary.CustomModelRepoRestartTest.class)); - suite.addTest(new JUnit4TestAdapter(org.alfresco.util.schemacomp.DbToXMLTest.class)); - suite.addTest(new JUnit4TestAdapter(org.alfresco.util.schemacomp.ExportDbTest.class)); - suite.addTest(new JUnit4TestAdapter(org.alfresco.util.schemacomp.SchemaReferenceFileTest.class)); - } - - // [classpath:alfresco/application-context.xml] - part 7 - static void applicationContext_07(TestSuite suite) - { - suite.addTest(new JUnit4TestAdapter(RepositoryStartupTest.class)); - suite.addTest(new JUnit4TestAdapter(org.alfresco.util.CronTriggerBeanSystemTest.class)); - suite.addTest(new JUnit4TestAdapter(org.alfresco.filesys.auth.cifs.CifsAuthenticatorPassthruTest.class)); - // the following fails locally - on windows - suite.addTestSuite(org.alfresco.repo.content.transform.DifferrentMimeTypeTest.class); - - suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.attributes.PropTablesCleanupJobIntegrationTest.class)); - suite.addTest(new JUnit4TestAdapter(org.alfresco.service.ServiceRegistryTest.class)); - suite.addTestSuite(org.alfresco.repo.node.archive.LargeArchiveAndRestoreTest.class); - suite.addTestSuite(org.alfresco.repo.node.db.DbNodeServiceImplTest.class); - suite.addTestSuite(org.alfresco.repo.node.db.DbNodeServiceImplPropagationTest.class); - } - - // [classpath:alfresco/application-context.xml] - part 8 - static void applicationContext_08(TestSuite suite) - { - suite.addTestSuite(org.alfresco.repo.node.getchildren.GetChildrenCannedQueryTest.class); - suite.addTestSuite(org.alfresco.repo.node.index.FullIndexRecoveryComponentTest.class); - suite.addTestSuite(org.alfresco.repo.node.index.IndexTransactionTrackerTest.class); - } - - // [classpath:alfresco/application-context.xml] - part 9 - static void applicationContext_09(TestSuite suite) - { + suite.addTestSuite(org.alfresco.repo.rendition.StandardRenditionLocationResolverTest.class); + suite.addTestSuite(org.alfresco.repo.rendition.executer.HTMLRenderingEngineTest.class); + suite.addTestSuite(org.alfresco.repo.rendition.executer.XSLTFunctionsTest.class); + suite.addTestSuite(org.alfresco.repo.rendition.executer.XSLTRenderingEngineTest.class); + suite.addTestSuite(org.alfresco.repo.replication.ReplicationServiceIntegrationTest.class); + suite.addTestSuite(org.alfresco.repo.template.XSLTProcessorTest.class); + suite.addTestSuite(QueryRegisterComponentTest.class); + suite.addTestSuite(SearchServiceTest.class); + suite.addTestSuite(ALF947Test.class); + suite.addTestSuite(LuceneIndexBackupComponentTest.class); + suite.addTestSuite(org.alfresco.repo.tagging.UpdateTagScopesActionExecuterTest.class); + suite.addTestSuite(org.alfresco.repo.thumbnail.conditions.NodeEligibleForRethumbnailingEvaluatorTest.class); + suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.transaction.ConnectionPoolOverloadTest.class)); + suite.addTestSuite(org.alfresco.repo.action.scheduled.CronScheduledQueryBasedTemplateActionDefinitionTest.class); suite.addTestSuite(org.alfresco.repo.node.index.MissingContentReindexComponentTest.class); suite.addTestSuite(org.alfresco.repo.node.integrity.IncompleteNodeTaggerTest.class); suite.addTestSuite(org.alfresco.repo.node.integrity.IntegrityTest.class); @@ -373,11 +327,34 @@ public class AllRepositoryTestsCatalogue suite.addTestSuite(org.alfresco.repo.imap.ImapServiceImplTest.class); suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.bulkimport.impl.BulkImportTest.class)); suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.discussion.DiscussionServiceImplTest.class)); + suite.addTestSuite(org.alfresco.repo.transfer.NodeCrawlerTest.class); + suite.addTestSuite(org.alfresco.repo.transfer.TransferServiceCallbackTest.class); + suite.addTestSuite(org.alfresco.repo.transfer.TransferServiceImplTest.class); + suite.addTestSuite(org.alfresco.repo.transfer.TransferServiceToBeRefactoredTest.class); + suite.addTestSuite(org.alfresco.repo.transfer.TransferVersionCheckerImplTest.class); + suite.addTestSuite(org.alfresco.repo.transfer.manifest.ManifestIntegrationTest.class); + suite.addTestSuite(org.alfresco.repo.transfer.script.ScriptTransferServiceTest.class); + suite.addTest(new JUnit4TestAdapter(org.alfresco.util.schemacomp.DbToXMLTest.class)); + suite.addTest(new JUnit4TestAdapter(org.alfresco.util.schemacomp.ExportDbTest.class)); + suite.addTest(new JUnit4TestAdapter(org.alfresco.util.schemacomp.SchemaReferenceFileTest.class)); + suite.addTestSuite(org.alfresco.repo.module.ModuleComponentHelperTest.class); + suite.addTestSuite(org.alfresco.repo.node.getchildren.GetChildrenCannedQueryTest.class); + suite.addTestSuite(org.alfresco.repo.node.index.FullIndexRecoveryComponentTest.class); + suite.addTestSuite(org.alfresco.repo.node.index.IndexTransactionTrackerTest.class); + suite.addTest(new JUnit4TestAdapter(org.alfresco.util.CronTriggerBeanSystemTest.class)); + suite.addTest(new JUnit4TestAdapter(org.alfresco.filesys.auth.cifs.CifsAuthenticatorPassthruTest.class)); + // the following test fails locally - on windows + suite.addTestSuite(org.alfresco.repo.content.transform.DifferrentMimeTypeTest.class); + + suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.attributes.PropTablesCleanupJobIntegrationTest.class)); + suite.addTest(new JUnit4TestAdapter(org.alfresco.service.ServiceRegistryTest.class)); + // does not want to work in the same test suite as org.alfresco.repo.rule.* tests + suite.addTestSuite(org.alfresco.opencmis.search.OpenCmisQueryTest.class); } - // [classpath:alfresco/application-context.xml] - part 10 - static void applicationContext_10(TestSuite suite) + // [classpath:alfresco/application-context.xml] - part 5 + static void applicationContext_05(TestSuite suite) { suite.addTest(new JUnit4TestAdapter(NodeDAOTest.class)); suite.addTestSuite(AuthenticationBootstrapTest.class); @@ -423,8 +400,8 @@ public class AllRepositoryTestsCatalogue suite.addTestSuite(org.alfresco.repo.transfer.RepoTransferReceiverImplTest.class); } - // [classpath:alfresco/application-context.xml] - part 11 - static void applicationContext_11(TestSuite suite) + // [classpath:alfresco/application-context.xml] - part 6 + static void applicationContext_06(TestSuite suite) { suite.addTestSuite(org.alfresco.repo.solr.SOLRTrackingComponentTest.class); suite.addTestSuite(org.alfresco.repo.tagging.TaggingServiceImplTest.class); @@ -442,13 +419,6 @@ public class AllRepositoryTestsCatalogue suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.blog.BlogServiceImplTest.class)); } - // [classpath:alfresco/application-context.xml] - part 12 - static void applicationContext_12(TestSuite suite) - { - suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.rendition.MultiUserRenditionTest.class)); - suite.addTestSuite(org.alfresco.repo.rendition.RenditionServiceIntegrationTest.class); - } - // [classpath:alfresco/application-context.xml, classpath:cache-test/cache-test-context.xml] static void applicationContext_cacheTestContext(TestSuite suite) { @@ -470,6 +440,10 @@ public class AllRepositoryTestsCatalogue // classpath:org/alfresco/util/test/junitrules/dummy2-context.xml] suite.addTest(new JUnit4TestAdapter(org.alfresco.util.test.junitrules.ApplicationContextInitTest.class)); + // [classpath:alfresco/application-context.xml, + // classpath:org/alfresco/repo/client/config/test-repo-clients-apps-context.xml] + suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.client.config.ClientAppConfigTest.class)); + // [classpath:alfresco/application-context.xml, // classpath:org/alfresco/repo/policy/annotation/test-qname-type-editor-context.xml] suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.policy.annotation.QNameTypeEditorTest.class)); @@ -546,6 +520,8 @@ public class AllRepositoryTestsCatalogue suite.addTestSuite(org.alfresco.repo.subscriptions.SubscriptionServiceImplTest.class); } + // These tests can be extracted in a separate test suite + // if/when we decide to move the transformations in a separate component static void applicationContext_testThumnailContext(TestSuite suite) { // [classpath:alfresco/application-context.xml, classpath:org/alfresco/repo/thumbnail/test-thumbnail-context.xml] diff --git a/src/test/java/org/alfresco/AppContext07TestSuite.java b/src/test/java/org/alfresco/AppContext07TestSuite.java deleted file mode 100644 index 4c0ee9f561..0000000000 --- a/src/test/java/org/alfresco/AppContext07TestSuite.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * #%L - * Alfresco Repository - * %% - * Copyright (C) 2005 - 2017 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * 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 . - * #L% - */ -package org.alfresco; - -import junit.framework.Test; -import junit.framework.TestSuite; - -public class AppContext07TestSuite extends TestSuite -{ - public static Test suite() - { - TestSuite suite = new TestSuite(); - AllRepositoryTestsCatalogue.applicationContext_07(suite); - return suite; - } -} diff --git a/src/test/java/org/alfresco/AppContext08TestSuite.java b/src/test/java/org/alfresco/AppContext08TestSuite.java deleted file mode 100644 index cfe641b047..0000000000 --- a/src/test/java/org/alfresco/AppContext08TestSuite.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * #%L - * Alfresco Repository - * %% - * Copyright (C) 2005 - 2017 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * 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 . - * #L% - */ -package org.alfresco; - -import junit.framework.Test; -import junit.framework.TestSuite; - -public class AppContext08TestSuite extends TestSuite -{ - public static Test suite() - { - TestSuite suite = new TestSuite(); - AllRepositoryTestsCatalogue.applicationContext_08(suite); - return suite; - } -} diff --git a/src/test/java/org/alfresco/AppContext09TestSuite.java b/src/test/java/org/alfresco/AppContext09TestSuite.java deleted file mode 100644 index 017e0b1341..0000000000 --- a/src/test/java/org/alfresco/AppContext09TestSuite.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * #%L - * Alfresco Repository - * %% - * Copyright (C) 2005 - 2017 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * 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 . - * #L% - */ -package org.alfresco; - -import junit.framework.Test; -import junit.framework.TestSuite; - -public class AppContext09TestSuite -{ - public static Test suite() - { - TestSuite suite = new TestSuite(); - AllRepositoryTestsCatalogue.applicationContext_09(suite); - return suite; - } -} diff --git a/src/test/java/org/alfresco/AppContext10TestSuite.java b/src/test/java/org/alfresco/AppContext10TestSuite.java deleted file mode 100644 index 23e4c3e2d6..0000000000 --- a/src/test/java/org/alfresco/AppContext10TestSuite.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * #%L - * Alfresco Repository - * %% - * Copyright (C) 2005 - 2017 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * 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 . - * #L% - */ -package org.alfresco; - -import junit.framework.Test; -import junit.framework.TestSuite; - -public class AppContext10TestSuite extends TestSuite -{ - public static Test suite() - { - TestSuite suite = new TestSuite(); - AllRepositoryTestsCatalogue.applicationContext_10(suite); - return suite; - } -} diff --git a/src/test/java/org/alfresco/AppContext11TestSuite.java b/src/test/java/org/alfresco/AppContext11TestSuite.java deleted file mode 100644 index 36b1d839d1..0000000000 --- a/src/test/java/org/alfresco/AppContext11TestSuite.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * #%L - * Alfresco Repository - * %% - * Copyright (C) 2005 - 2017 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * 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 . - * #L% - */ -package org.alfresco; - -import junit.framework.Test; -import junit.framework.TestSuite; - -public class AppContext11TestSuite extends TestSuite -{ - public static Test suite() - { - TestSuite suite = new TestSuite(); - AllRepositoryTestsCatalogue.applicationContext_11(suite); - return suite; - } -} diff --git a/src/test/java/org/alfresco/AppContext12TestSuite.java b/src/test/java/org/alfresco/AppContext12TestSuite.java deleted file mode 100644 index 39c38cc0fd..0000000000 --- a/src/test/java/org/alfresco/AppContext12TestSuite.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * #%L - * Alfresco Repository - * %% - * Copyright (C) 2005 - 2017 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * 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 . - * #L% - */ -package org.alfresco; - -import junit.framework.Test; -import junit.framework.TestSuite; - -public class AppContext12TestSuite extends TestSuite -{ - public static Test suite() - { - TestSuite suite = new TestSuite(); - AllRepositoryTestsCatalogue.applicationContext_12(suite); - return suite; - } -} diff --git a/src/test/java/org/alfresco/AppContextExtra01TestSuite.java b/src/test/java/org/alfresco/AppContextExtra01TestSuite.java deleted file mode 100644 index 3369441553..0000000000 --- a/src/test/java/org/alfresco/AppContextExtra01TestSuite.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * #%L - * Alfresco Repository - * %% - * Copyright (C) 2005 - 2017 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * 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 . - * #L% - */ -package org.alfresco; - -import junit.framework.Test; -import junit.framework.TestSuite; - -public class AppContextExtra01TestSuite extends TestSuite -{ - public static Test suite() - { - TestSuite suite = new TestSuite(); - AllRepositoryTestsCatalogue.applicationContext_globalIntegrationTestContext(suite); - AllRepositoryTestsCatalogue.applicationContext_extra(suite); - return suite; - } -} diff --git a/src/test/java/org/alfresco/AppContextExtra02TestSuite.java b/src/test/java/org/alfresco/AppContextExtraTestSuite.java similarity index 88% rename from src/test/java/org/alfresco/AppContextExtra02TestSuite.java rename to src/test/java/org/alfresco/AppContextExtraTestSuite.java index d3c1d45f34..0cd7197e38 100644 --- a/src/test/java/org/alfresco/AppContextExtra02TestSuite.java +++ b/src/test/java/org/alfresco/AppContextExtraTestSuite.java @@ -28,12 +28,13 @@ package org.alfresco; import junit.framework.Test; import junit.framework.TestSuite; -public class AppContextExtra02TestSuite extends TestSuite +public class AppContextExtraTestSuite extends TestSuite { public static Test suite() { TestSuite suite = new TestSuite(); - + AllRepositoryTestsCatalogue.applicationContext_globalIntegrationTestContext(suite); + AllRepositoryTestsCatalogue.applicationContext_extra(suite); // any other order may lead to failing tests AllRepositoryTestsCatalogue.applicationContext_virtualizationTestContext(suite); AllRepositoryTestsCatalogue.applicationContext_testSubscriptionsContext(suite); diff --git a/src/test/java/org/alfresco/MinContextTestSuite.java b/src/test/java/org/alfresco/MinContextTestSuite.java deleted file mode 100644 index 5516964aac..0000000000 --- a/src/test/java/org/alfresco/MinContextTestSuite.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * #%L - * Alfresco Repository - * %% - * Copyright (C) 2005 - 2017 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * 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 . - * #L% - */ -package org.alfresco; - -import junit.framework.Test; -import junit.framework.TestSuite; - -public class MinContextTestSuite extends TestSuite -{ - public static Test suite() - { - TestSuite suite = new TestSuite(); - AllRepositoryTestsCatalogue.minimalContext(suite); - return suite; - } -} diff --git a/src/test/java/org/alfresco/MiscContextTestSuite.java b/src/test/java/org/alfresco/MiscContextTestSuite.java index e02d00e2d4..229c987489 100644 --- a/src/test/java/org/alfresco/MiscContextTestSuite.java +++ b/src/test/java/org/alfresco/MiscContextTestSuite.java @@ -33,7 +33,11 @@ public class MiscContextTestSuite public static Test suite() { TestSuite suite = new TestSuite(); + AllRepositoryTestsCatalogue.minimalContext(suite); AllRepositoryTestsCatalogue.miscContext(suite); + // the following tests can be extracted in a separate test suite + // if/when we decide to move the transformations in a separate component + AllRepositoryTestsCatalogue.applicationContext_testThumnailContext(suite); return suite; } } diff --git a/src/test/java/org/alfresco/RepositoryStartupTest.java b/src/test/java/org/alfresco/RepositoryStartupTest.java index eb94026250..cef52eced7 100644 --- a/src/test/java/org/alfresco/RepositoryStartupTest.java +++ b/src/test/java/org/alfresco/RepositoryStartupTest.java @@ -48,13 +48,14 @@ import junit.framework.TestCase; */ public class RepositoryStartupTest extends TestCase { - private static ApplicationContext ctx = ApplicationContextHelper.getApplicationContext(); + private ApplicationContext ctx; private ServiceRegistry serviceRegistry; private TransactionService transactionService; public void setUp() throws Exception - { + { + ctx = ApplicationContextHelper.getApplicationContext(); serviceRegistry = (ServiceRegistry) ctx.getBean(ServiceRegistry.SERVICE_REGISTRY); transactionService = serviceRegistry.getTransactionService(); AuthenticationUtil.setRunAsUserSystem(); diff --git a/src/test/java/org/alfresco/TransformerTestSuite.java b/src/test/java/org/alfresco/TransformerTestSuite.java deleted file mode 100644 index d854b9adc0..0000000000 --- a/src/test/java/org/alfresco/TransformerTestSuite.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * #%L - * Alfresco Repository - * %% - * Copyright (C) 2005 - 2017 Alfresco Software Limited - * %% - * This file is part of the Alfresco software. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * 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 . - * #L% - */ -package org.alfresco; - -import junit.framework.Test; -import junit.framework.TestSuite; - -public class TransformerTestSuite -{ - public static Test suite() - { - TestSuite suite = new TestSuite(); - AllRepositoryTestsCatalogue.applicationContext_testThumnailContext(suite); - return suite; - } -} diff --git a/src/test/java/org/alfresco/filesys/auth/cifs/CifsAuthenticatorPassthruTest.java b/src/test/java/org/alfresco/filesys/auth/cifs/CifsAuthenticatorPassthruTest.java index 873ee89078..8e84c84c8a 100644 --- a/src/test/java/org/alfresco/filesys/auth/cifs/CifsAuthenticatorPassthruTest.java +++ b/src/test/java/org/alfresco/filesys/auth/cifs/CifsAuthenticatorPassthruTest.java @@ -25,44 +25,43 @@ */ package org.alfresco.filesys.auth.cifs; -import static org.junit.Assert.assertEquals; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyString; -import static org.mockito.Mockito.doNothing; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - -import org.alfresco.filesys.alfresco.AlfrescoClientInfo; -import org.alfresco.jlan.server.SrvSession; -import org.alfresco.jlan.server.auth.ClientInfo; -import org.alfresco.jlan.server.auth.ICifsAuthenticator; -import org.alfresco.jlan.server.auth.passthru.AuthenticateSession; -import org.alfresco.jlan.server.auth.passthru.PassthruDetails; -import org.alfresco.jlan.smb.server.SMBSrvSession; -import org.alfresco.model.ContentModel; -import org.alfresco.repo.security.authentication.AbstractAuthenticationComponent; -import org.alfresco.repo.security.authentication.AuthenticationContext; -import org.alfresco.repo.security.authentication.AuthenticationUtil; -import org.alfresco.repo.security.sync.UserRegistrySynchronizer; -import org.alfresco.repo.transaction.RetryingTransactionHelper; -import org.alfresco.service.cmr.repository.NodeService; -import org.alfresco.service.cmr.security.AuthorityType; -import org.alfresco.service.cmr.security.PersonService; -import org.alfresco.service.transaction.TransactionService; -import org.alfresco.util.ApplicationContextHelper; -import org.alfresco.util.GUID; -import org.alfresco.util.PropertyMap; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; -import org.mockito.invocation.InvocationOnMock; -import org.mockito.stubbing.Answer; +import static org.junit.Assert.assertEquals; +import static org.mockito.Matchers.any; +import static org.mockito.Matchers.anyInt; +import static org.mockito.Matchers.anyString; +import static org.mockito.Mockito.doNothing; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +import org.alfresco.filesys.alfresco.AlfrescoClientInfo; +import org.alfresco.jlan.server.SrvSession; +import org.alfresco.jlan.server.auth.ClientInfo; +import org.alfresco.jlan.server.auth.ICifsAuthenticator; +import org.alfresco.jlan.server.auth.passthru.AuthenticateSession; +import org.alfresco.jlan.server.auth.passthru.PassthruDetails; +import org.alfresco.jlan.smb.server.SMBSrvSession; +import org.alfresco.model.ContentModel; +import org.alfresco.repo.security.authentication.AbstractAuthenticationComponent; +import org.alfresco.repo.security.authentication.AuthenticationContext; +import org.alfresco.repo.security.authentication.AuthenticationUtil; +import org.alfresco.repo.security.sync.UserRegistrySynchronizer; +import org.alfresco.repo.transaction.RetryingTransactionHelper; +import org.alfresco.service.cmr.repository.NodeService; +import org.alfresco.service.cmr.security.AuthorityType; +import org.alfresco.service.cmr.security.PersonService; +import org.alfresco.service.transaction.TransactionService; +import org.alfresco.util.ApplicationContextHelper; +import org.alfresco.util.GUID; +import org.alfresco.util.PropertyMap; +import org.junit.Before; +import org.junit.Test; +import org.mockito.invocation.InvocationOnMock; +import org.mockito.stubbing.Answer; import org.springframework.context.ApplicationContext; public class CifsAuthenticatorPassthruTest { - private static ApplicationContext ctx = null; + private ApplicationContext ctx = null; private PersonService personService; private TransactionService transactionService; @@ -73,17 +72,14 @@ public class CifsAuthenticatorPassthruTest private String userExistingLocal = "user1." + GUID.generate(); private String userMissingLocal = "user2." + GUID.generate(); - @BeforeClass - public static void init() - { - ApplicationContextHelper.setUseLazyLoading(false); - ApplicationContextHelper.setNoAutoStart(true); - ctx = ApplicationContextHelper.getApplicationContext(); - } @Before public void before() throws Exception - { + { + ApplicationContextHelper.setUseLazyLoading(false); + //ApplicationContextHelper.setNoAutoStart(true); + ctx = ApplicationContextHelper.getApplicationContext(); + this.personService = (PersonService) ctx.getBean("personService"); this.transactionService = (TransactionService) ctx.getBean("transactionService"); this.nodeService = (NodeService) ctx.getBean("nodeService"); diff --git a/src/test/java/org/alfresco/opencmis/BaseCMISTest.java b/src/test/java/org/alfresco/opencmis/BaseCMISTest.java index 5386347634..8b7cd5867e 100644 --- a/src/test/java/org/alfresco/opencmis/BaseCMISTest.java +++ b/src/test/java/org/alfresco/opencmis/BaseCMISTest.java @@ -68,7 +68,7 @@ import org.springframework.context.ApplicationContext; */ public abstract class BaseCMISTest extends TestCase { - protected static ApplicationContext ctx = ApplicationContextHelper.getApplicationContext(); + protected ApplicationContext ctx; protected CMISMapping cmisMapping; @@ -96,9 +96,9 @@ public abstract class BaseCMISTest extends TestCase protected CMISQueryService cmisQueryService; - private MutableAuthenticationService authenticationService; + protected MutableAuthenticationService authenticationService; - private MutableAuthenticationDao authenticationDAO; + protected MutableAuthenticationDao authenticationDAO; protected SearchService searchService; @@ -121,7 +121,8 @@ public abstract class BaseCMISTest extends TestCase protected StoreRef storeRef; public void setUp() throws Exception - { + { + ctx = ApplicationContextHelper.getApplicationContext(); serviceRegistry = (ServiceRegistry) ctx.getBean("ServiceRegistry"); cmisDictionaryService = (CMISDictionaryService) ctx.getBean("OpenCMISDictionaryService"); @@ -192,7 +193,6 @@ public abstract class BaseCMISTest extends TestCase { testTX.rollback(); } - AuthenticationUtil.clearCurrentSecurityContext(); super.tearDown(); } } diff --git a/src/test/java/org/alfresco/opencmis/search/OpenCmisQueryTest.java b/src/test/java/org/alfresco/opencmis/search/OpenCmisQueryTest.java index b5715af2ae..65faee10f5 100644 --- a/src/test/java/org/alfresco/opencmis/search/OpenCmisQueryTest.java +++ b/src/test/java/org/alfresco/opencmis/search/OpenCmisQueryTest.java @@ -511,11 +511,20 @@ public class OpenCmisQueryTest extends BaseCMISTest nodeService.setProperty(c10, ContentModel.PROP_VERSION_LABEL, "label"); } - @Override - protected void tearDown() throws Exception - { - super.tearDown(); - this.luceneFTS.resume(); + @Override + protected void tearDown() throws Exception + { + super.tearDown(); + + cmisConnector.destroy(); // clean cached NodeRefs + + if (authenticationDAO.userExists("cmis")) + { + authenticationService.deleteAuthentication("cmis"); + } + this.luceneFTS.resume(); + + AuthenticationUtil.clearCurrentSecurityContext(); } diff --git a/src/test/java/org/alfresco/repo/action/scheduled/CronScheduledQueryBasedTemplateActionDefinitionTest.java b/src/test/java/org/alfresco/repo/action/scheduled/CronScheduledQueryBasedTemplateActionDefinitionTest.java index ac3f082619..0175490554 100644 --- a/src/test/java/org/alfresco/repo/action/scheduled/CronScheduledQueryBasedTemplateActionDefinitionTest.java +++ b/src/test/java/org/alfresco/repo/action/scheduled/CronScheduledQueryBasedTemplateActionDefinitionTest.java @@ -136,7 +136,7 @@ public class CronScheduledQueryBasedTemplateActionDefinitionTest extends TestCas private static final String TEST_FOLDER_NAME = String.format(ROOT_TEST_FOLDER_NAME_TEMPLATE, System.currentTimeMillis()); - private ApplicationContext applicationContext = ApplicationContextHelper.getApplicationContext(); + private ApplicationContext applicationContext; private ServiceRegistry registry; private UserTransaction transaction; @@ -156,7 +156,8 @@ public class CronScheduledQueryBasedTemplateActionDefinitionTest extends TestCas @Before @Override public void setUp() throws Exception - { + { + applicationContext = ApplicationContextHelper.getApplicationContext(); this.registry = (ServiceRegistry) applicationContext.getBean(ServiceRegistry.SERVICE_REGISTRY); initializeScheduler(); diff --git a/src/test/java/org/alfresco/repo/attributes/PropTablesCleanupJobIntegrationTest.java b/src/test/java/org/alfresco/repo/attributes/PropTablesCleanupJobIntegrationTest.java index 41cfe202f6..fd6616caf6 100644 --- a/src/test/java/org/alfresco/repo/attributes/PropTablesCleanupJobIntegrationTest.java +++ b/src/test/java/org/alfresco/repo/attributes/PropTablesCleanupJobIntegrationTest.java @@ -43,18 +43,13 @@ import org.springframework.context.ApplicationContext; */ public class PropTablesCleanupJobIntegrationTest { - private static ApplicationContext ctx; + private ApplicationContext ctx; private CronTriggerBean jobTrigger; - @BeforeClass - public static void setUpClass() - { - ctx = ApplicationContextHelper.getApplicationContext(); - } - @Before public void setUp() throws Exception - { + { + ctx = ApplicationContextHelper.getApplicationContext(); jobTrigger = ctx.getBean("propTablesCleanupTrigger", CronTriggerBean.class); } diff --git a/src/test/java/org/alfresco/repo/bulkimport/impl/AbstractBulkImportTests.java b/src/test/java/org/alfresco/repo/bulkimport/impl/AbstractBulkImportTests.java index 7bb311c07a..9caf31658c 100644 --- a/src/test/java/org/alfresco/repo/bulkimport/impl/AbstractBulkImportTests.java +++ b/src/test/java/org/alfresco/repo/bulkimport/impl/AbstractBulkImportTests.java @@ -76,7 +76,7 @@ import static org.junit.Assert.fail; */ public class AbstractBulkImportTests { - protected static ApplicationContext ctx = null; + protected static ApplicationContext ctx; protected FileFolderService fileFolderService; protected NodeService nodeService; @@ -154,12 +154,6 @@ public class AbstractBulkImportTests txn.commit(); } } - - @AfterClass - public static void afterTests() - { - stopContext(); - } protected List getFolders(NodeRef parent, String pattern) { diff --git a/src/test/java/org/alfresco/repo/client/config/ClientAppConfigTest.java b/src/test/java/org/alfresco/repo/client/config/ClientAppConfigTest.java index 256290950a..d86db71c6a 100644 --- a/src/test/java/org/alfresco/repo/client/config/ClientAppConfigTest.java +++ b/src/test/java/org/alfresco/repo/client/config/ClientAppConfigTest.java @@ -31,10 +31,13 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.fail; import org.alfresco.repo.client.config.ClientAppConfig.ClientApp; +import org.alfresco.service.cmr.repository.TemporalSourceOptions; import org.alfresco.util.ApplicationContextHelper; import org.junit.AfterClass; +import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; +import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import java.util.Collections; @@ -47,23 +50,17 @@ import java.util.Map; */ public class ClientAppConfigTest { - private static ClassPathXmlApplicationContext context; - private static ClientAppConfig clientAppConfig; + private ApplicationContext context; + private ClientAppConfig clientAppConfig; - @BeforeClass - public static void setUp() throws Exception + @Before + public void setUp() throws Exception { - context = new ClassPathXmlApplicationContext(new String[] { "classpath:org/alfresco/repo/client/config/test-repo-clients-apps-context.xml" }, - ApplicationContextHelper.getApplicationContext()); + ApplicationContextHelper.closeApplicationContext(); + context = ApplicationContextHelper.getApplicationContext(new String[] { ApplicationContextHelper.CONFIG_LOCATIONS[0], + "classpath:org/alfresco/repo/client/config/test-repo-clients-apps-context.xml" }); clientAppConfig = context.getBean("clientAppConfigTest", ClientAppConfig.class); - - } - - @AfterClass - public static void tearDown() throws Exception - { - context.close(); } @Test diff --git a/src/test/java/org/alfresco/repo/content/RoutingContentServiceTest.java b/src/test/java/org/alfresco/repo/content/RoutingContentServiceTest.java index ca56b7d8ae..e7d993cf2c 100644 --- a/src/test/java/org/alfresco/repo/content/RoutingContentServiceTest.java +++ b/src/test/java/org/alfresco/repo/content/RoutingContentServiceTest.java @@ -74,7 +74,7 @@ import org.springframework.context.ApplicationContext; @Category(OwnJVMTestsCategory.class) public class RoutingContentServiceTest extends TestCase { - private static ApplicationContext ctx = ApplicationContextHelper.getApplicationContext(); + private ApplicationContext ctx; private static final String SOME_CONTENT = "ABC"; @@ -95,7 +95,8 @@ public class RoutingContentServiceTest extends TestCase @Override public void setUp() throws Exception - { + { + ctx = ApplicationContextHelper.getApplicationContext(); transactionService = (TransactionService) ctx.getBean("TransactionService"); nodeService = (NodeService) ctx.getBean("NodeService"); contentService = (ContentService) ctx.getBean(ServiceRegistry.CONTENT_SERVICE.getLocalName()); diff --git a/src/test/java/org/alfresco/repo/content/cleanup/ContentStoreCleanerTest.java b/src/test/java/org/alfresco/repo/content/cleanup/ContentStoreCleanerTest.java index 50c11ee23e..94a7462f4a 100644 --- a/src/test/java/org/alfresco/repo/content/cleanup/ContentStoreCleanerTest.java +++ b/src/test/java/org/alfresco/repo/content/cleanup/ContentStoreCleanerTest.java @@ -74,7 +74,7 @@ import org.springframework.context.ApplicationContext; @Category(OwnJVMTestsCategory.class) public class ContentStoreCleanerTest extends TestCase { - private static ApplicationContext ctx = ApplicationContextHelper.getApplicationContext(); + private ApplicationContext ctx; private ContentService contentService; private NodeService nodeService; @@ -89,7 +89,8 @@ public class ContentStoreCleanerTest extends TestCase @Override public void setUp() throws Exception - { + { + ctx = ApplicationContextHelper.getApplicationContext(); AuthenticationUtil.setRunAsUserSystem(); ServiceRegistry serviceRegistry = (ServiceRegistry) ctx.getBean("ServiceRegistry"); diff --git a/src/test/java/org/alfresco/repo/copy/CopyServiceImplTest.java b/src/test/java/org/alfresco/repo/copy/CopyServiceImplTest.java index 2bc6120d52..7805966c95 100644 --- a/src/test/java/org/alfresco/repo/copy/CopyServiceImplTest.java +++ b/src/test/java/org/alfresco/repo/copy/CopyServiceImplTest.java @@ -104,7 +104,7 @@ import org.springframework.extensions.surf.util.I18NUtil; @Category(OwnJVMTestsCategory.class) public class CopyServiceImplTest extends TestCase { - private static ApplicationContext ctx = ApplicationContextHelper.getApplicationContext(); + private ApplicationContext ctx; /* * Services used by the tests @@ -182,7 +182,8 @@ public class CopyServiceImplTest extends TestCase @Override protected void setUp() throws Exception - { + { + ctx = ApplicationContextHelper.getApplicationContext(); if (AlfrescoTransactionSupport.isActualTransactionActive()) { fail("Test started with transaction in progress"); diff --git a/src/test/java/org/alfresco/repo/dictionary/ModelValidatorTest.java b/src/test/java/org/alfresco/repo/dictionary/ModelValidatorTest.java index 4ea0766750..150a8b741e 100644 --- a/src/test/java/org/alfresco/repo/dictionary/ModelValidatorTest.java +++ b/src/test/java/org/alfresco/repo/dictionary/ModelValidatorTest.java @@ -63,7 +63,7 @@ import org.springframework.context.ApplicationContext; */ public class ModelValidatorTest { - private static ApplicationContext ctx = ApplicationContextHelper.getApplicationContext(); + private ApplicationContext ctx; private String testNamespace; private String modelName; @@ -89,6 +89,7 @@ public class ModelValidatorTest @Before public void setUp() throws Exception { + ctx = ApplicationContextHelper.getApplicationContext(); this.modelValidator = (ModelValidator)ctx.getBean("modelValidator"); this.dictionaryDAO = (DictionaryDAO)ctx.getBean("dictionaryDAO"); this.qnameDAO = (QNameDAO)ctx.getBean("qnameDAO"); diff --git a/src/test/java/org/alfresco/repo/discussion/DiscussionServiceImplTest.java b/src/test/java/org/alfresco/repo/discussion/DiscussionServiceImplTest.java index f845adcb53..62fc90138c 100644 --- a/src/test/java/org/alfresco/repo/discussion/DiscussionServiceImplTest.java +++ b/src/test/java/org/alfresco/repo/discussion/DiscussionServiceImplTest.java @@ -42,7 +42,8 @@ import org.alfresco.query.PagingResults; import org.alfresco.repo.policy.BehaviourFilter; import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.repo.site.SiteModel; -import org.alfresco.repo.tenant.TenantAdminService; +import org.alfresco.repo.tenant.TenantAdminService; +import org.alfresco.repo.tenant.TenantContextHolder; import org.alfresco.repo.transaction.RetryingTransactionHelper; import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback; import org.alfresco.service.cmr.discussion.DiscussionService; @@ -81,7 +82,7 @@ public class DiscussionServiceImplTest private static final String TEST_SITE_PREFIX = "DiscussionsSiteTest"; private static final long ONE_DAY_MS = 24*60*60*1000; - private static final ApplicationContext testContext = ApplicationContextHelper.getApplicationContext(); + private static ApplicationContext testContext; // injected services private static MutableAuthenticationService AUTHENTICATION_SERVICE; @@ -115,7 +116,8 @@ public class DiscussionServiceImplTest private static List CLASS_TEST_NODES_TO_TIDY = new ArrayList(); @BeforeClass public static void initTestsContext() throws Exception - { + { + testContext = ApplicationContextHelper.getApplicationContext(); AUTHENTICATION_SERVICE = (MutableAuthenticationService)testContext.getBean("authenticationService"); BEHAVIOUR_FILTER = (BehaviourFilter)testContext.getBean("policyBehaviourFilter"); DISCUSSION_SERVICE = (DiscussionService)testContext.getBean("DiscussionService"); @@ -131,11 +133,13 @@ public class DiscussionServiceImplTest createTenant(); // Do the setup as admin - AuthenticationUtil.setFullyAuthenticatedUser(ADMIN_USER); + AuthenticationUtil.setFullyAuthenticatedUser(ADMIN_USER); + TenantContextHolder.setTenantDomain(TENANT_DOMAIN); createUser(TEST_USER); // We need to create the test site as the test user so that they can contribute content to it in tests below. - AuthenticationUtil.setFullyAuthenticatedUser(TEST_USER); + AuthenticationUtil.setFullyAuthenticatedUser(TEST_USER); + TenantContextHolder.setTenantDomain(TENANT_DOMAIN); createTestSites(); } @@ -248,7 +252,7 @@ public class DiscussionServiceImplTest for (TopicInfo topic : new TopicInfo[] {siteTopic, nodeTopic}) { AuthenticationUtil.setFullyAuthenticatedUser(ADMIN_USER); - + TenantContextHolder.setTenantDomain(TENANT_DOMAIN); // There are no posts to start with PagingResults posts = DISCUSSION_SERVICE.listPosts(topic, new PagingRequest(10)); @@ -400,7 +404,7 @@ public class DiscussionServiceImplTest // Run as the test user instead AuthenticationUtil.setFullyAuthenticatedUser(TEST_USER); - + TenantContextHolder.setTenantDomain(TENANT_DOMAIN); // Create two topics siteTopic = DISCUSSION_SERVICE.createTopic(DISCUSSION_SITE.getShortName(), "Site Title"); @@ -578,7 +582,8 @@ public class DiscussionServiceImplTest // Create several, some as Admin and some as the Test User TopicInfo siteT1 = DISCUSSION_SERVICE.createTopic(DISCUSSION_SITE.getShortName(), "ST1"); - AuthenticationUtil.setFullyAuthenticatedUser(TEST_USER); + AuthenticationUtil.setFullyAuthenticatedUser(TEST_USER); + TenantContextHolder.setTenantDomain(TENANT_DOMAIN); TopicInfo siteT2 = DISCUSSION_SERVICE.createTopic(DISCUSSION_SITE.getShortName(), "ST2"); TopicInfo nodeT1 = DISCUSSION_SERVICE.createTopic(FORUM_NODE, "NT1"); AuthenticationUtil.setFullyAuthenticatedUser(ADMIN_USER); @@ -1477,7 +1482,8 @@ public class DiscussionServiceImplTest // Now become the test user - AuthenticationUtil.setFullyAuthenticatedUser(TEST_USER); + AuthenticationUtil.setFullyAuthenticatedUser(TEST_USER); + TenantContextHolder.setTenantDomain(TENANT_DOMAIN); // Add Topics to the two sites and the test node @@ -1838,7 +1844,8 @@ public class DiscussionServiceImplTest }); // Create the alternate site as admin - AuthenticationUtil.setFullyAuthenticatedUser(ADMIN_USER); + AuthenticationUtil.setFullyAuthenticatedUser(ADMIN_USER); + TenantContextHolder.setTenantDomain(TENANT_DOMAIN); ALTERNATE_DISCUSSION_SITE = TRANSACTION_HELPER.doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback() { @Override @@ -1854,7 +1861,8 @@ public class DiscussionServiceImplTest return site; } }); - AuthenticationUtil.setFullyAuthenticatedUser(TEST_USER); + AuthenticationUtil.setFullyAuthenticatedUser(TEST_USER); + TenantContextHolder.setTenantDomain(TENANT_DOMAIN); } @@ -1879,7 +1887,8 @@ public class DiscussionServiceImplTest */ @Before public void setAdminUser() { - AuthenticationUtil.setFullyAuthenticatedUser(ADMIN_USER); + AuthenticationUtil.setFullyAuthenticatedUser(ADMIN_USER); + TenantContextHolder.setTenantDomain(TENANT_DOMAIN); } @After public void deleteTestNodes() throws Exception @@ -1891,7 +1900,11 @@ public class DiscussionServiceImplTest { performDeletionOfNodes(CLASS_TEST_NODES_TO_TIDY); deleteUser(TEST_USER); - deleteTenant(); + deleteTenant(); + + TenantContextHolder.setTenantDomain(""); + AuthenticationUtil.setMtEnabled(false); + AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName()); } private static void deleteTenant() diff --git a/src/test/java/org/alfresco/repo/doclink/DocumentLinkServiceImplTest.java b/src/test/java/org/alfresco/repo/doclink/DocumentLinkServiceImplTest.java index 5e574e8659..a7c964e138 100644 --- a/src/test/java/org/alfresco/repo/doclink/DocumentLinkServiceImplTest.java +++ b/src/test/java/org/alfresco/repo/doclink/DocumentLinkServiceImplTest.java @@ -68,7 +68,7 @@ import junit.framework.TestCase; public class DocumentLinkServiceImplTest extends TestCase { - private static final ApplicationContext ctx = ApplicationContextHelper.getApplicationContext(); + private ApplicationContext ctx; private static final String TEST_USER = DocumentLinkServiceImplTest.class.getSimpleName() + "_testuser"; private UserTransaction txn; @@ -102,6 +102,7 @@ public class DocumentLinkServiceImplTest extends TestCase @Override public void setUp() throws Exception { + ctx = ApplicationContextHelper.getApplicationContext(); // Set up the services ServiceRegistry serviceRegistry = (ServiceRegistry) ctx.getBean("ServiceRegistry"); transactionService = serviceRegistry.getTransactionService(); diff --git a/src/test/java/org/alfresco/repo/exporter/ExporterComponentTest.java b/src/test/java/org/alfresco/repo/exporter/ExporterComponentTest.java index 0027eab831..4d0b5f1005 100644 --- a/src/test/java/org/alfresco/repo/exporter/ExporterComponentTest.java +++ b/src/test/java/org/alfresco/repo/exporter/ExporterComponentTest.java @@ -25,58 +25,57 @@ */ package org.alfresco.repo.exporter; -import java.io.File; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.OutputStream; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Locale; -import java.util.Map; - -import org.alfresco.model.ContentModel; -import org.alfresco.repo.importer.ACPImportPackageHandler; -import org.alfresco.repo.security.authentication.AuthenticationComponent; -import org.alfresco.repo.security.permissions.AccessDeniedException; -import org.alfresco.repo.security.permissions.PermissionServiceSPI; -import org.alfresco.service.ServiceRegistry; -import org.alfresco.service.cmr.model.FileFolderService; -import org.alfresco.service.cmr.model.FileInfo; -import org.alfresco.service.cmr.repository.ChildAssociationRef; -import org.alfresco.service.cmr.repository.ContentData; -import org.alfresco.service.cmr.repository.MLText; -import org.alfresco.service.cmr.repository.NodeRef; -import org.alfresco.service.cmr.repository.NodeService; -import org.alfresco.service.cmr.repository.StoreRef; -import org.alfresco.service.cmr.search.CategoryService; -import org.alfresco.service.cmr.security.AccessPermission; -import org.alfresco.service.cmr.security.AccessStatus; -import org.alfresco.service.cmr.security.MutableAuthenticationService; -import org.alfresco.service.cmr.security.PermissionService; -import org.alfresco.service.cmr.view.Exporter; -import org.alfresco.service.cmr.view.ExporterContext; -import org.alfresco.service.cmr.view.ExporterCrawlerParameters; -import org.alfresco.service.cmr.view.ExporterService; -import org.alfresco.service.cmr.view.ImportPackageHandler; -import org.alfresco.service.cmr.view.ImporterService; -import org.alfresco.service.cmr.view.Location; -import org.alfresco.service.namespace.QName; -import org.alfresco.service.transaction.TransactionService; -import org.alfresco.test_category.BaseSpringTestsCategory; -import org.alfresco.test_category.OwnJVMTestsCategory; -import org.alfresco.util.BaseSpringTest; -import org.alfresco.util.GUID; -import org.alfresco.util.TempFileProvider; -import org.alfresco.util.debug.NodeStoreInspector; -import org.junit.experimental.categories.Category; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.OutputStream; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Locale; +import java.util.Map; + +import org.alfresco.model.ContentModel; +import org.alfresco.repo.importer.ACPImportPackageHandler; +import org.alfresco.repo.security.authentication.AuthenticationComponent; +import org.alfresco.repo.security.permissions.AccessDeniedException; +import org.alfresco.repo.security.permissions.PermissionServiceSPI; +import org.alfresco.service.ServiceRegistry; +import org.alfresco.service.cmr.model.FileFolderService; +import org.alfresco.service.cmr.model.FileInfo; +import org.alfresco.service.cmr.repository.ChildAssociationRef; +import org.alfresco.service.cmr.repository.ContentData; +import org.alfresco.service.cmr.repository.MLText; +import org.alfresco.service.cmr.repository.NodeRef; +import org.alfresco.service.cmr.repository.NodeService; +import org.alfresco.service.cmr.repository.StoreRef; +import org.alfresco.service.cmr.search.CategoryService; +import org.alfresco.service.cmr.security.AccessPermission; +import org.alfresco.service.cmr.security.AccessStatus; +import org.alfresco.service.cmr.security.MutableAuthenticationService; +import org.alfresco.service.cmr.security.PermissionService; +import org.alfresco.service.cmr.view.Exporter; +import org.alfresco.service.cmr.view.ExporterContext; +import org.alfresco.service.cmr.view.ExporterCrawlerParameters; +import org.alfresco.service.cmr.view.ExporterService; +import org.alfresco.service.cmr.view.ImportPackageHandler; +import org.alfresco.service.cmr.view.ImporterService; +import org.alfresco.service.cmr.view.Location; +import org.alfresco.service.namespace.QName; +import org.alfresco.service.transaction.TransactionService; +import org.alfresco.test_category.OwnJVMTestsCategory; +import org.alfresco.util.BaseSpringTest; +import org.alfresco.util.GUID; +import org.alfresco.util.TempFileProvider; +import org.alfresco.util.debug.NodeStoreInspector; +import org.junit.experimental.categories.Category; import org.springframework.extensions.surf.util.I18NUtil; @Category(OwnJVMTestsCategory.class) @@ -93,7 +92,8 @@ public class ExporterComponentTest extends BaseSpringTest private AuthenticationComponent authenticationComponent; private PermissionServiceSPI permissionService; private MutableAuthenticationService authenticationService; - + private Locale contentLocaleToRestore; + private Locale localeToRestore; @Override protected void onSetUpInTransaction() throws Exception @@ -117,8 +117,24 @@ public class ExporterComponentTest extends BaseSpringTest { authenticationComponent.clearCurrentSecurityContext(); super.onTearDownInTransaction(); - } - + } + + @Override + protected void onSetUp() throws Exception + { + super.onSetUp(); + contentLocaleToRestore = I18NUtil.getContentLocale(); + localeToRestore = I18NUtil.getLocale(); + } + + @Override + protected void onTearDown() throws Exception + { + super.onTearDown(); + I18NUtil.setContentLocale(contentLocaleToRestore); + I18NUtil.setLocale(localeToRestore); + } + public void testExport() throws Exception { diff --git a/src/test/java/org/alfresco/repo/i18n/MessageServiceImplTest.java b/src/test/java/org/alfresco/repo/i18n/MessageServiceImplTest.java index 79ba079589..022317d585 100644 --- a/src/test/java/org/alfresco/repo/i18n/MessageServiceImplTest.java +++ b/src/test/java/org/alfresco/repo/i18n/MessageServiceImplTest.java @@ -72,7 +72,7 @@ import org.springframework.core.io.support.PathMatchingResourcePatternResolver; @Category(OwnJVMTestsCategory.class) public class MessageServiceImplTest extends TestCase implements MessageDeployer { - private static ApplicationContext applicationContext = ApplicationContextHelper.getApplicationContext(); + private ApplicationContext applicationContext; private static final String BASE_BUNDLE_NAME = "testMessages"; private static final String BASE_RESOURCE_CLASSPATH = "org/alfresco/repo/i18n/"; @@ -111,7 +111,8 @@ public class MessageServiceImplTest extends TestCase implements MessageDeployer @Override protected void setUp() throws Exception - { + { + applicationContext = ApplicationContextHelper.getApplicationContext(); if (AlfrescoTransactionSupport.getTransactionReadState() != TxnReadState.TXN_NONE) { fail("Detected a leaked transaction from a previous test."); diff --git a/src/test/java/org/alfresco/repo/imap/ImapMessageTest.java b/src/test/java/org/alfresco/repo/imap/ImapMessageTest.java index 2f8a91efd2..71f8376d51 100644 --- a/src/test/java/org/alfresco/repo/imap/ImapMessageTest.java +++ b/src/test/java/org/alfresco/repo/imap/ImapMessageTest.java @@ -116,7 +116,7 @@ public class ImapMessageTest extends TestCase private Store store = null; private IMAPFolder folder = null; - private static ApplicationContext ctx = ApplicationContextHelper.getApplicationContext(); + private ApplicationContext ctx; private ServiceRegistry serviceRegistry; private TransactionService transactionService; private NodeService nodeService; @@ -140,7 +140,8 @@ public class ImapMessageTest extends TestCase @Override public void setUp() throws Exception - { + { + ctx = ApplicationContextHelper.getApplicationContext(); logger.debug("In SetUp"); serviceRegistry = (ServiceRegistry) ctx.getBean("ServiceRegistry"); transactionService = serviceRegistry.getTransactionService(); diff --git a/src/test/java/org/alfresco/repo/imap/ImapServiceImplCacheTest.java b/src/test/java/org/alfresco/repo/imap/ImapServiceImplCacheTest.java index aa61c9d08b..1a5618d333 100644 --- a/src/test/java/org/alfresco/repo/imap/ImapServiceImplCacheTest.java +++ b/src/test/java/org/alfresco/repo/imap/ImapServiceImplCacheTest.java @@ -68,7 +68,7 @@ public class ImapServiceImplCacheTest extends TestCase private static final String TEST_IMAP_FOLDER_NAME = "aaa"; - private static ApplicationContext ctx = ApplicationContextHelper.getApplicationContext(); + private ApplicationContext ctx; private NodeService nodeService; private MutableAuthenticationService authenticationService; private SearchService searchService; @@ -83,7 +83,8 @@ public class ImapServiceImplCacheTest extends TestCase @Override public void setUp() throws Exception - { + { + ctx = ApplicationContextHelper.getApplicationContext(); ServiceRegistry serviceRegistry = (ServiceRegistry) ctx.getBean("ServiceRegistry"); nodeService = serviceRegistry.getNodeService(); authenticationService = serviceRegistry.getAuthenticationService(); diff --git a/src/test/java/org/alfresco/repo/imap/ImapServiceImplTest.java b/src/test/java/org/alfresco/repo/imap/ImapServiceImplTest.java index db0ed01e45..02576e3b06 100644 --- a/src/test/java/org/alfresco/repo/imap/ImapServiceImplTest.java +++ b/src/test/java/org/alfresco/repo/imap/ImapServiceImplTest.java @@ -120,7 +120,7 @@ public class ImapServiceImplTest extends TestCase private static final String MAILBOX_NAME_B = "mailbox_b"; private static final String MAILBOX_PATTERN = "mailbox*"; - private static ApplicationContext ctx = ApplicationContextHelper.getApplicationContext(); + private ApplicationContext ctx; private TransactionService transactionService; private NodeService nodeService; private ImporterService importerService; @@ -143,7 +143,8 @@ public class ImapServiceImplTest extends TestCase @Override public void setUp() throws Exception - { + { + ctx = ApplicationContextHelper.getApplicationContext(); ServiceRegistry serviceRegistry = (ServiceRegistry) ctx.getBean("ServiceRegistry"); transactionService = serviceRegistry.getTransactionService(); nodeService = serviceRegistry.getNodeService(); diff --git a/src/test/java/org/alfresco/repo/importer/FileImporterTest.java b/src/test/java/org/alfresco/repo/importer/FileImporterTest.java index 83c86e51ab..ab4b272af6 100644 --- a/src/test/java/org/alfresco/repo/importer/FileImporterTest.java +++ b/src/test/java/org/alfresco/repo/importer/FileImporterTest.java @@ -63,7 +63,7 @@ import org.springframework.context.ApplicationContext; @Category(OwnJVMTestsCategory.class) public class FileImporterTest extends TestCase { - static ApplicationContext ctx = ApplicationContextHelper.getApplicationContext(); + ApplicationContext ctx; private NodeService nodeService; private SearchService searchService; private DictionaryService dictionaryService; @@ -89,7 +89,8 @@ public class FileImporterTest extends TestCase } public void setUp() - { + { + ctx = ApplicationContextHelper.getApplicationContext(); serviceRegistry = (ServiceRegistry) ctx.getBean(ServiceRegistry.SERVICE_REGISTRY); nodeService = serviceRegistry.getNodeService(); diff --git a/src/test/java/org/alfresco/repo/jscript/PeopleTest.java b/src/test/java/org/alfresco/repo/jscript/PeopleTest.java index a128912c23..39d73dde75 100644 --- a/src/test/java/org/alfresco/repo/jscript/PeopleTest.java +++ b/src/test/java/org/alfresco/repo/jscript/PeopleTest.java @@ -75,7 +75,7 @@ public class PeopleTest extends TestCase private static final UserInfo USER_7 = new UserInfo("user7", "sara jones", "doe"); private static final UserInfo USER_8 = new UserInfo("user8", "sara", "doe"); - private static final ApplicationContext ctx = ApplicationContextHelper.getApplicationContext(); + private ApplicationContext ctx; private TransactionService transactionService; private UserTransaction txn; @@ -87,7 +87,8 @@ public class PeopleTest extends TestCase * @see junit.framework.TestCase#setUp() */ protected void setUp() throws Exception - { + { + ctx = ApplicationContextHelper.getApplicationContext(); people = (People) ctx.getBean("peopleScript"); serviceRegistry = (ServiceRegistry) ctx.getBean("ServiceRegistry"); transactionService = serviceRegistry.getTransactionService(); diff --git a/src/test/java/org/alfresco/repo/jscript/RhinoScriptTest.java b/src/test/java/org/alfresco/repo/jscript/RhinoScriptTest.java index d5e86b2cae..23c703c10f 100644 --- a/src/test/java/org/alfresco/repo/jscript/RhinoScriptTest.java +++ b/src/test/java/org/alfresco/repo/jscript/RhinoScriptTest.java @@ -63,7 +63,7 @@ import org.springframework.context.ApplicationContext; @Category(OwnJVMTestsCategory.class) public class RhinoScriptTest extends TestCase { - private static final ApplicationContext ctx = ApplicationContextHelper.getApplicationContext(); + private ApplicationContext ctx; private ContentService contentService; private NodeService nodeService; @@ -78,7 +78,7 @@ public class RhinoScriptTest extends TestCase protected void setUp() throws Exception { super.setUp(); - + ctx = ApplicationContextHelper.getApplicationContext(); transactionService = (TransactionService)ctx.getBean("transactionComponent"); contentService = (ContentService)ctx.getBean("contentService"); nodeService = (NodeService)ctx.getBean("nodeService"); diff --git a/src/test/java/org/alfresco/repo/lock/JobLockServiceTest.java b/src/test/java/org/alfresco/repo/lock/JobLockServiceTest.java index 7cc00dd771..ceeac82308 100644 --- a/src/test/java/org/alfresco/repo/lock/JobLockServiceTest.java +++ b/src/test/java/org/alfresco/repo/lock/JobLockServiceTest.java @@ -61,7 +61,7 @@ public class JobLockServiceTest extends TestCase private static final Log logger = LogFactory.getLog(JobLockServiceTest.class); - private ApplicationContext ctx = ApplicationContextHelper.getApplicationContext(); + private ApplicationContext ctx; private TransactionService transactionService; private RetryingTransactionHelper txnHelper; @@ -79,7 +79,8 @@ public class JobLockServiceTest extends TestCase @Override public void setUp() throws Exception - { + { + ctx = ApplicationContextHelper.getApplicationContext(); ServiceRegistry serviceRegistry = (ServiceRegistry) ctx.getBean(ServiceRegistry.SERVICE_REGISTRY); transactionService = serviceRegistry.getTransactionService(); txnHelper = transactionService.getRetryingTransactionHelper(); diff --git a/src/test/java/org/alfresco/repo/lock/mem/LockableAspectInterceptorTest.java b/src/test/java/org/alfresco/repo/lock/mem/LockableAspectInterceptorTest.java index 9580e0b626..dc1e986681 100644 --- a/src/test/java/org/alfresco/repo/lock/mem/LockableAspectInterceptorTest.java +++ b/src/test/java/org/alfresco/repo/lock/mem/LockableAspectInterceptorTest.java @@ -60,15 +60,13 @@ import org.alfresco.service.namespace.QName; import org.alfresco.service.transaction.TransactionService; import org.alfresco.util.ApplicationContextHelper; import org.alfresco.util.GUID; -import org.junit.AfterClass; import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; import org.springframework.context.ApplicationContext; public class LockableAspectInterceptorTest { - private static ApplicationContext appCtx; + private ApplicationContext appCtx; private TransactionService transactionService; private NodeService nodeService; private NodeService rawNodeService; @@ -80,22 +78,11 @@ public class LockableAspectInterceptorTest private LockService lockService; private FileFolderService fileFolderService; private ActionService actionService; - - @BeforeClass - public static void setUpClass() throws Exception - { - appCtx = ApplicationContextHelper.getApplicationContext(); - } - - @AfterClass - public static void tearDownClass() throws Exception - { - ApplicationContextHelper.closeApplicationContext(); - } @Before public void setUp() - { + { + appCtx = ApplicationContextHelper.getApplicationContext(); // The user that will create locks, this should be different from the user that queries them (ALF-19465) lockOwner = "jbloggs"; // The 'current' user. diff --git a/src/test/java/org/alfresco/repo/management/JmxDumpUtilTest.java b/src/test/java/org/alfresco/repo/management/JmxDumpUtilTest.java index 83954a9a35..05b9cffe5f 100644 --- a/src/test/java/org/alfresco/repo/management/JmxDumpUtilTest.java +++ b/src/test/java/org/alfresco/repo/management/JmxDumpUtilTest.java @@ -25,21 +25,16 @@ */ package org.alfresco.repo.management; +import org.alfresco.util.ApplicationContextHelper; +import org.springframework.context.ApplicationContext; + import junit.framework.TestCase; -import org.alfresco.repo.security.authentication.AuthenticationComponent; -import org.alfresco.util.ApplicationContextHelper; -import org.springframework.context.ApplicationContext; - public class JmxDumpUtilTest extends TestCase { - - private static ApplicationContext ctx = ApplicationContextHelper.getApplicationContext(); - - private AuthenticationComponent authenticationComponent; - public void testUpdateOSNameAttribute() throws Exception - { + { + ApplicationContext ctx = ApplicationContextHelper.getApplicationContext(); String osName = System.getProperty("os.name"); if (osName.toLowerCase().startsWith("linux")) { diff --git a/src/test/java/org/alfresco/repo/node/BaseNodeServiceTest.java b/src/test/java/org/alfresco/repo/node/BaseNodeServiceTest.java index 34fd7361bf..1dafa352c9 100644 --- a/src/test/java/org/alfresco/repo/node/BaseNodeServiceTest.java +++ b/src/test/java/org/alfresco/repo/node/BaseNodeServiceTest.java @@ -51,7 +51,9 @@ import org.alfresco.repo.dictionary.M2Model; import org.alfresco.repo.node.NodeServicePolicies.BeforeDeleteNodePolicy; import org.alfresco.repo.node.NodeServicePolicies.OnDeleteNodePolicy; import org.alfresco.repo.node.encryption.MetadataEncryptor; -import org.alfresco.repo.node.integrity.IntegrityChecker; +import org.alfresco.repo.node.integrity.IntegrityChecker; +import org.alfresco.repo.policy.BehaviourDefinition; +import org.alfresco.repo.policy.ClassBehaviourBinding; import org.alfresco.repo.policy.JavaBehaviour; import org.alfresco.repo.policy.PolicyComponent; import org.alfresco.repo.security.authentication.AuthenticationComponent; @@ -3361,60 +3363,55 @@ public abstract class BaseNodeServiceTest extends BaseSpringTest setComplete(); endTransaction(); } - - public static boolean behaviourExecuted = false; - - public void testAR1303() throws Exception - { - Map props = new HashMap(1); - props.put(ContentModel.PROP_NAME, "test.txt"); - - NodeRef nodeRef = this.nodeService.createNode( - this.rootNodeRef, - ContentModel.ASSOC_CHILDREN, - ContentModel.ASSOC_CHILDREN, - ContentModel.TYPE_CONTENT, - props).getChildRef(); - - nodeService.addAspect(nodeRef, ContentModel.ASPECT_TITLED, null); - - nodeService.setProperty(nodeRef, ContentModel.PROP_DESCRIPTION, "my description"); - nodeService.setProperty(nodeRef, ContentModel.PROP_TITLE, "my title"); - - JavaBehaviour behaviour = new JavaBehaviour(this, "onUpdateProperties"); - PolicyComponent policyComponent = (PolicyComponent)this.applicationContext.getBean("policyComponent"); - policyComponent.bindClassBehaviour( - QName.createQName(NamespaceService.ALFRESCO_URI, "onUpdateProperties"), - ContentModel.ASPECT_TITLED, - behaviour); - - behaviourExecuted = false; - - // Update the title property and check that the behaviour has been fired - nodeService.setProperty(nodeRef, ContentModel.PROP_TITLE, "changed title"); - assertTrue("The onUpdateProperties behaviour has not been fired.", behaviourExecuted); - } - - public void onUpdateProperties( - NodeRef nodeRef, - Map before, - Map after) - { - behaviourExecuted = true; - assertFalse(String.valueOf(before.get(ContentModel.PROP_TITLE)).equals(String.valueOf(after.get(ContentModel.PROP_TITLE)))); - - System.out.print("Before values: "); - for (Map.Entry entry : before.entrySet()) - { - System.out.println(entry.getKey().toString() + " : " + entry.getValue().toString()); - } - System.out.print("\nAfter values: "); - for (Map.Entry entry : after.entrySet()) - { - System.out.println(entry.getKey().toString() + " : " + entry.getValue().toString()); - } - } - + + static boolean behaviourExecuted = false; + + public void testAR1303() throws Exception + { + PolicyComponent policyComponent = (PolicyComponent) this.applicationContext.getBean("policyComponent"); + JavaBehaviour behaviour = new JavaBehaviour(this, "onUpdateProperties"); + BehaviourDefinition bindClassBehaviour = null; + + Map props = new HashMap(1); + props.put(ContentModel.PROP_NAME, "test_testAR1303.txt"); + + NodeRef nodeRef = this.nodeService.createNode(this.rootNodeRef, ContentModel.ASSOC_CHILDREN, ContentModel.ASSOC_CHILDREN, + ContentModel.TYPE_CONTENT, props).getChildRef(); + + nodeService.addAspect(nodeRef, ContentModel.ASPECT_TITLED, null); + + nodeService.setProperty(nodeRef, ContentModel.PROP_DESCRIPTION, "my description"); + nodeService.setProperty(nodeRef, ContentModel.PROP_TITLE, "my title"); + try + { + bindClassBehaviour = policyComponent.bindClassBehaviour( + QName.createQName(NamespaceService.ALFRESCO_URI, "onUpdateProperties"), ContentModel.ASPECT_TITLED, + behaviour); + + behaviourExecuted = false; + + // Update the title property and check that the behaviour has been fired + nodeService.setProperty(nodeRef, ContentModel.PROP_TITLE, "changed title"); + assertTrue("The onUpdateProperties behaviour has not been fired.", behaviourExecuted); + } + finally + { + if (bindClassBehaviour != null) + { + policyComponent.removeClassDefinition(bindClassBehaviour); + } + } + } + + public void onUpdateProperties(NodeRef nodeRef, Map before, Map after) + { + behaviourExecuted = true; + assertFalse( + "Should not be equal:\nbefore: " + before.get(ContentModel.PROP_TITLE) + "\nafter: " + + after.get(ContentModel.PROP_TITLE), + String.valueOf(before.get(ContentModel.PROP_TITLE)).equals(String.valueOf(after.get(ContentModel.PROP_TITLE)))); + } + /** * Checks that unconvertable property values cannot be persisted. */ diff --git a/src/test/java/org/alfresco/repo/node/ConcurrentNodeServiceSearchTest.java b/src/test/java/org/alfresco/repo/node/ConcurrentNodeServiceSearchTest.java index 956da276db..15e01ece0f 100644 --- a/src/test/java/org/alfresco/repo/node/ConcurrentNodeServiceSearchTest.java +++ b/src/test/java/org/alfresco/repo/node/ConcurrentNodeServiceSearchTest.java @@ -69,7 +69,7 @@ public class ConcurrentNodeServiceSearchTest extends TestCase public static final QName PROP_QNAME_TEST_MIMETYPE = QName.createQName(NAMESPACE, "mimetype"); - static ApplicationContext ctx = ApplicationContextHelper.getApplicationContext(); + ApplicationContext ctx; private NodeService nodeService; @@ -87,7 +87,8 @@ public class ConcurrentNodeServiceSearchTest extends TestCase } protected void setUp() throws Exception - { + { + ctx = ApplicationContextHelper.getApplicationContext(); DictionaryDAO dictionaryDao = (DictionaryDAO) ctx.getBean("dictionaryDAO"); // load the system model ClassLoader cl = BaseNodeServiceTest.class.getClassLoader(); diff --git a/src/test/java/org/alfresco/repo/node/ConcurrentNodeServiceTest.java b/src/test/java/org/alfresco/repo/node/ConcurrentNodeServiceTest.java index 6ea16c4186..a4f6f77c52 100644 --- a/src/test/java/org/alfresco/repo/node/ConcurrentNodeServiceTest.java +++ b/src/test/java/org/alfresco/repo/node/ConcurrentNodeServiceTest.java @@ -73,7 +73,7 @@ public class ConcurrentNodeServiceTest extends TestCase private static Log logger = LogFactory.getLog(ConcurrentNodeServiceTest.class); - static ApplicationContext ctx = ApplicationContextHelper.getApplicationContext(); + ApplicationContext ctx; private NodeService nodeService; private NodeDAO nodeDAO; @@ -87,7 +87,8 @@ public class ConcurrentNodeServiceTest extends TestCase } protected void setUp() throws Exception - { + { + ctx = ApplicationContextHelper.getApplicationContext(); DictionaryDAO dictionaryDao = (DictionaryDAO) ctx.getBean("dictionaryDAO"); // load the system model ClassLoader cl = BaseNodeServiceTest.class.getClassLoader(); diff --git a/src/test/java/org/alfresco/repo/node/FullNodeServiceTest.java b/src/test/java/org/alfresco/repo/node/FullNodeServiceTest.java index a9ef99a6f1..953af200b8 100644 --- a/src/test/java/org/alfresco/repo/node/FullNodeServiceTest.java +++ b/src/test/java/org/alfresco/repo/node/FullNodeServiceTest.java @@ -56,11 +56,31 @@ import org.springframework.extensions.surf.util.I18NUtil; */ @Category(OwnJVMTestsCategory.class) public class FullNodeServiceTest extends BaseNodeServiceTest -{ +{ + private Locale contentLocaleToRestore; + private Locale localeToRestore; + protected NodeService getNodeService() { return (NodeService) applicationContext.getBean("NodeService"); } + + + @Override + protected void onSetUp() throws Exception + { + super.onSetUp(); + contentLocaleToRestore = I18NUtil.getContentLocale(); + localeToRestore = I18NUtil.getLocale(); + } + + @Override + protected void onTearDown() throws Exception + { + super.onTearDown(); + I18NUtil.setContentLocale(contentLocaleToRestore); + I18NUtil.setLocale(localeToRestore); + } @Override protected void onSetUpInTransaction() throws Exception @@ -180,7 +200,10 @@ public class FullNodeServiceTest extends BaseNodeServiceTest @SuppressWarnings("unchecked") public void testMLTextCollectionUpdatedForCorrectLanguage() { - Locale.setDefault(Locale.UK); + Locale.setDefault(Locale.UK); + I18NUtil.setContentLocale(Locale.UK); + I18NUtil.setLocale(Locale.UK); + MLPropertyInterceptor.setMLAware(true); ArrayList values = new ArrayList(); diff --git a/src/test/java/org/alfresco/repo/node/PerformanceNodeServiceTest.java b/src/test/java/org/alfresco/repo/node/PerformanceNodeServiceTest.java index 61e84555d4..ce5ad97a83 100644 --- a/src/test/java/org/alfresco/repo/node/PerformanceNodeServiceTest.java +++ b/src/test/java/org/alfresco/repo/node/PerformanceNodeServiceTest.java @@ -72,7 +72,7 @@ public class PerformanceNodeServiceTest extends TestCase private int testStringPropertyCount = 10; private int testContentPropertyCount = 10; - private static ApplicationContext applicationContext = ApplicationContextHelper.getApplicationContext(); + private ApplicationContext applicationContext; protected DictionaryService dictionaryService; protected NodeService nodeService; @@ -87,7 +87,8 @@ public class PerformanceNodeServiceTest extends TestCase @Override protected void setUp() throws Exception - { + { + applicationContext = ApplicationContextHelper.getApplicationContext(); DictionaryDAO dictionaryDao = (DictionaryDAO) applicationContext.getBean("dictionaryDAO"); // load the system model diff --git a/src/test/java/org/alfresco/repo/node/archive/ArchiveAndRestoreTest.java b/src/test/java/org/alfresco/repo/node/archive/ArchiveAndRestoreTest.java index 85fa244a34..2bdbc04517 100644 --- a/src/test/java/org/alfresco/repo/node/archive/ArchiveAndRestoreTest.java +++ b/src/test/java/org/alfresco/repo/node/archive/ArchiveAndRestoreTest.java @@ -91,7 +91,7 @@ public class ArchiveAndRestoreTest extends TestCase private static final QName QNAME_BB = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "bb"); private static final QName TYPE_QNAME_TEST_CONTENT = QName.createQName("http://www.alfresco.org/test/nodearchive", "content"); - private static ApplicationContext ctx = ApplicationContextHelper.getApplicationContext(); + private ApplicationContext ctx; private NodeArchiveService nodeArchiveService; private NodeService nodeService; @@ -126,7 +126,9 @@ public class ArchiveAndRestoreTest extends TestCase @Override public void setUp() throws Exception - { + { + ctx = ApplicationContextHelper.getApplicationContext(); + ServiceRegistry serviceRegistry = (ServiceRegistry) ctx.getBean("ServiceRegistry"); nodeArchiveService = (NodeArchiveService) ctx.getBean("nodeArchiveService"); nodeService = serviceRegistry.getNodeService(); diff --git a/src/test/java/org/alfresco/repo/node/archive/LargeArchiveAndRestoreTest.java b/src/test/java/org/alfresco/repo/node/archive/LargeArchiveAndRestoreTest.java index bd18845174..8f07a4bc24 100644 --- a/src/test/java/org/alfresco/repo/node/archive/LargeArchiveAndRestoreTest.java +++ b/src/test/java/org/alfresco/repo/node/archive/LargeArchiveAndRestoreTest.java @@ -60,7 +60,7 @@ import org.springframework.context.ApplicationContext; @Category(OwnJVMTestsCategory.class) public class LargeArchiveAndRestoreTest extends TestCase { - private static ApplicationContext ctx = ApplicationContextHelper.getApplicationContext(); + private ApplicationContext ctx; private static Log logger = LogFactory.getLog(LargeArchiveAndRestoreTest.class); @@ -74,7 +74,8 @@ public class LargeArchiveAndRestoreTest extends TestCase @Override public void setUp() throws Exception - { + { + ctx = ApplicationContextHelper.getApplicationContext(); ServiceRegistry serviceRegistry = (ServiceRegistry) ctx.getBean("ServiceRegistry"); nodeService = serviceRegistry.getNodeService(); fileFolderService = serviceRegistry.getFileFolderService(); diff --git a/src/test/java/org/alfresco/repo/node/getchildren/GetChildrenCannedQueryTest.java b/src/test/java/org/alfresco/repo/node/getchildren/GetChildrenCannedQueryTest.java index b4b3369952..fc8564647c 100644 --- a/src/test/java/org/alfresco/repo/node/getchildren/GetChildrenCannedQueryTest.java +++ b/src/test/java/org/alfresco/repo/node/getchildren/GetChildrenCannedQueryTest.java @@ -41,8 +41,6 @@ import java.util.Map; import java.util.Random; import java.util.Set; -import junit.framework.TestCase; - import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.model.ContentModel; import org.alfresco.model.RenditionModel; @@ -74,7 +72,6 @@ import org.alfresco.service.cmr.repository.ContentWriter; import org.alfresco.service.cmr.repository.MimetypeService; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeService; -import org.alfresco.service.cmr.repository.StoreRef; import org.alfresco.service.cmr.security.AccessStatus; import org.alfresco.service.cmr.security.MutableAuthenticationService; import org.alfresco.service.cmr.security.PermissionService; @@ -95,6 +92,8 @@ import org.junit.experimental.categories.Category; import org.springframework.context.ApplicationContext; import org.springframework.extensions.surf.util.I18NUtil; +import junit.framework.TestCase; + /** * GetChildren canned query - simple unit tests * @@ -106,7 +105,7 @@ public class GetChildrenCannedQueryTest extends TestCase { private Log logger = LogFactory.getLog(getClass()); - private static final ApplicationContext ctx = ApplicationContextHelper.getApplicationContext(); + private ApplicationContext ctx; private Repository repositoryHelper; private NodeService nodeService; @@ -156,6 +155,7 @@ public class GetChildrenCannedQueryTest extends TestCase @Override public void setUp() throws Exception { + ctx = ApplicationContextHelper.getApplicationContext(); repositoryHelper = (Repository)ctx.getBean("repositoryHelper"); nodeService = (NodeService)ctx.getBean("NodeService"); diff --git a/src/test/java/org/alfresco/repo/node/index/FullIndexRecoveryComponentTest.java b/src/test/java/org/alfresco/repo/node/index/FullIndexRecoveryComponentTest.java index eaf95bffec..02fb3a7839 100644 --- a/src/test/java/org/alfresco/repo/node/index/FullIndexRecoveryComponentTest.java +++ b/src/test/java/org/alfresco/repo/node/index/FullIndexRecoveryComponentTest.java @@ -55,7 +55,7 @@ import org.springframework.context.ApplicationContext; @Category(OwnJVMTestsCategory.class) public class FullIndexRecoveryComponentTest extends TestCase { - private static ApplicationContext ctx = ApplicationContextHelper.getApplicationContext(); + private ApplicationContext ctx; private FullIndexRecoveryComponent indexRecoverer; private NodeService nodeService; @@ -66,7 +66,8 @@ public class FullIndexRecoveryComponentTest extends TestCase private NodeDAO nodeDAO; public void setUp() throws Exception - { + { + ctx = ApplicationContextHelper.getApplicationContext(); ChildApplicationContextFactory luceneSubSystem = (ChildApplicationContextFactory) ctx.getBean("buildonly"); indexRecoverer = (FullIndexRecoveryComponent) luceneSubSystem.getApplicationContext().getBean("search.indexRecoveryComponent"); nodeService = (NodeService) ctx.getBean("nodeService"); diff --git a/src/test/java/org/alfresco/repo/node/index/IndexTransactionTrackerTest.java b/src/test/java/org/alfresco/repo/node/index/IndexTransactionTrackerTest.java index 4447effa61..51dc1724e5 100644 --- a/src/test/java/org/alfresco/repo/node/index/IndexTransactionTrackerTest.java +++ b/src/test/java/org/alfresco/repo/node/index/IndexTransactionTrackerTest.java @@ -63,7 +63,7 @@ import org.springframework.context.ApplicationContext; @Category(OwnJVMTestsCategory.class) public class IndexTransactionTrackerTest extends TestCase { - private static ApplicationContext ctx = ApplicationContextHelper.getApplicationContext(); + private ApplicationContext ctx; private AuthenticationComponent authenticationComponent; private SearchService searchService; @@ -78,7 +78,8 @@ public class IndexTransactionTrackerTest extends TestCase private IndexTransactionTracker indexTracker; public void setUp() throws Exception - { + { + ctx = ApplicationContextHelper.getApplicationContext(); ServiceRegistry serviceRegistry = (ServiceRegistry) ctx.getBean(ServiceRegistry.SERVICE_REGISTRY); searchService = (SearchService) ctx.getBean("searchService"); nodeService = (NodeService) ctx.getBean("nodeService"); diff --git a/src/test/java/org/alfresco/repo/node/index/MissingContentReindexComponentTest.java b/src/test/java/org/alfresco/repo/node/index/MissingContentReindexComponentTest.java index 3946f49b5f..85431d7ce1 100644 --- a/src/test/java/org/alfresco/repo/node/index/MissingContentReindexComponentTest.java +++ b/src/test/java/org/alfresco/repo/node/index/MissingContentReindexComponentTest.java @@ -66,7 +66,7 @@ import org.springframework.context.ApplicationContext; @Category(OwnJVMTestsCategory.class) public class MissingContentReindexComponentTest extends TestCase { - private static ApplicationContext ctx = ApplicationContextHelper.getApplicationContext(); + private ApplicationContext ctx; private AuthenticationComponent authenticationComponent; private SearchService searchService; @@ -80,7 +80,8 @@ public class MissingContentReindexComponentTest extends TestCase @Override protected void setUp() throws Exception - { + { + ctx = ApplicationContextHelper.getApplicationContext(); ServiceRegistry serviceRegistry = (ServiceRegistry) ctx.getBean(ServiceRegistry.SERVICE_REGISTRY); searchService = serviceRegistry.getSearchService(); nodeService = serviceRegistry.getNodeService(); diff --git a/src/test/java/org/alfresco/repo/node/integrity/IncompleteNodeTaggerTest.java b/src/test/java/org/alfresco/repo/node/integrity/IncompleteNodeTaggerTest.java index 8a59cb1c0a..dae69d1131 100644 --- a/src/test/java/org/alfresco/repo/node/integrity/IncompleteNodeTaggerTest.java +++ b/src/test/java/org/alfresco/repo/node/integrity/IncompleteNodeTaggerTest.java @@ -52,10 +52,12 @@ import org.alfresco.service.cmr.security.PermissionService; import org.alfresco.service.namespace.QName; import org.alfresco.service.transaction.TransactionService; import org.alfresco.test_category.OwnJVMTestsCategory; +import org.alfresco.util.ApplicationContextHelper; import org.alfresco.util.PropertyMap; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.experimental.categories.Category; +import org.springframework.context.ApplicationContext; /** * Checks that tagging of incomplete nodes is done properly. @@ -80,7 +82,8 @@ public class IncompleteNodeTaggerTest extends TestCase public void setUp() throws Exception { - DictionaryDAO dictionaryDao = (DictionaryDAO) IntegrityTest.ctx.getBean("dictionaryDAO"); + ApplicationContext ctx = ApplicationContextHelper.getApplicationContext(); + DictionaryDAO dictionaryDao = (DictionaryDAO) ctx.getBean("dictionaryDAO"); ClassLoader cl = BaseNodeServiceTest.class.getClassLoader(); // load the test model InputStream modelStream = cl.getResourceAsStream("org/alfresco/repo/node/integrity/IntegrityTest_model.xml"); @@ -88,13 +91,13 @@ public class IncompleteNodeTaggerTest extends TestCase M2Model model = M2Model.createModel(modelStream); dictionaryDao.putModel(model); - tagger = (IncompleteNodeTagger) IntegrityTest.ctx.getBean("incompleteNodeTagger"); + tagger = (IncompleteNodeTagger) ctx.getBean("incompleteNodeTagger"); - serviceRegistry = (ServiceRegistry) IntegrityTest.ctx.getBean(ServiceRegistry.SERVICE_REGISTRY); + serviceRegistry = (ServiceRegistry) ctx.getBean(ServiceRegistry.SERVICE_REGISTRY); nodeService = serviceRegistry.getNodeService(); authenticationService = serviceRegistry.getAuthenticationService(); permissionService = serviceRegistry.getPermissionService(); - this.authenticationComponent = (AuthenticationComponent)IntegrityTest.ctx.getBean("authenticationComponent"); + this.authenticationComponent = (AuthenticationComponent) ctx.getBean("authenticationComponent"); this.authenticationComponent.setSystemUserAsCurrentUser(); diff --git a/src/test/java/org/alfresco/repo/node/integrity/IntegrityTest.java b/src/test/java/org/alfresco/repo/node/integrity/IntegrityTest.java index 07dfcdb055..b56281be41 100644 --- a/src/test/java/org/alfresco/repo/node/integrity/IntegrityTest.java +++ b/src/test/java/org/alfresco/repo/node/integrity/IntegrityTest.java @@ -104,13 +104,7 @@ public class IntegrityTest extends TestCase public static final QName TEST_PROP_ENCRYPTED_A = QName.createQName(NAMESPACE, "prop-encrypted-a"); public static final QName TEST_PROP_ENCRYPTED_B = QName.createQName(NAMESPACE, "prop-encrypted-b"); public static final QName TEST_PROP_ENCRYPTED_C = QName.createQName(NAMESPACE, "prop-encrypted-c"); - - public static ApplicationContext ctx; - static - { - ctx = ApplicationContextHelper.getApplicationContext(); - } - + private IntegrityChecker integrityChecker; private ServiceRegistry serviceRegistry; private NodeService nodeService; @@ -120,7 +114,8 @@ public class IntegrityTest extends TestCase private AuthenticationComponent authenticationComponent; public void setUp() throws Exception - { + { + ApplicationContext ctx = ApplicationContextHelper.getApplicationContext(); DictionaryDAO dictionaryDao = (DictionaryDAO) ctx.getBean("dictionaryDAO"); ClassLoader cl = BaseNodeServiceTest.class.getClassLoader(); // load the test model diff --git a/src/test/java/org/alfresco/repo/policy/PolicyComponentTransactionTest.java b/src/test/java/org/alfresco/repo/policy/PolicyComponentTransactionTest.java index dbd68722c3..c2bbf1b0b3 100644 --- a/src/test/java/org/alfresco/repo/policy/PolicyComponentTransactionTest.java +++ b/src/test/java/org/alfresco/repo/policy/PolicyComponentTransactionTest.java @@ -73,7 +73,7 @@ public class PolicyComponentTransactionTest extends TestCase private static QName B_TYPE = QName.createQName(TEST_NAMESPACE, "b_type"); private static QName C_TYPE = QName.createQName(TEST_NAMESPACE, "c_type"); - private static ApplicationContext applicationContext = ApplicationContextHelper.getApplicationContext(); + private ApplicationContext applicationContext; private static ClassPolicyDelegate sideEffectDelegate = null; private PolicyComponent policyComponent; private BehaviourFilter behaviourFilter; @@ -90,7 +90,8 @@ public class PolicyComponentTransactionTest extends TestCase @Override protected void setUp() throws Exception - { + { + applicationContext = ApplicationContextHelper.getApplicationContext(); // initialise policy test model DictionaryBootstrap bootstrap = new DictionaryBootstrap(); List bootstrapModels = new ArrayList(); diff --git a/src/test/java/org/alfresco/repo/rendition/MultiUserRenditionTest.java b/src/test/java/org/alfresco/repo/rendition/MultiUserRenditionTest.java index 097c4b0f5f..e4996a016a 100644 --- a/src/test/java/org/alfresco/repo/rendition/MultiUserRenditionTest.java +++ b/src/test/java/org/alfresco/repo/rendition/MultiUserRenditionTest.java @@ -26,42 +26,41 @@ package org.alfresco.repo.rendition; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; - -import java.io.File; -import java.io.Serializable; -import java.net.URL; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.alfresco.model.ContentModel; -import org.alfresco.repo.content.MimetypeMap; -import org.alfresco.repo.content.transform.AbstractContentTransformerTest; -import org.alfresco.repo.model.Repository; -import org.alfresco.repo.security.authentication.AuthenticationUtil; -import org.alfresco.repo.transaction.RetryingTransactionHelper; -import org.alfresco.service.cmr.rendition.RenditionService; -import org.alfresco.service.cmr.repository.ContentService; -import org.alfresco.service.cmr.repository.ContentWriter; -import org.alfresco.service.cmr.repository.NodeRef; -import org.alfresco.service.cmr.repository.NodeService; -import org.alfresco.service.cmr.security.MutableAuthenticationService; -import org.alfresco.service.cmr.security.OwnableService; -import org.alfresco.service.cmr.security.PermissionService; -import org.alfresco.service.cmr.security.PersonService; -import org.alfresco.service.namespace.NamespaceService; -import org.alfresco.service.namespace.QName; -import org.alfresco.service.transaction.TransactionService; -import org.alfresco.util.ApplicationContextHelper; -import org.alfresco.util.Pair; -import org.alfresco.util.PropertyMap; -import org.junit.After; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; + +import java.io.File; +import java.io.Serializable; +import java.net.URL; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.alfresco.model.ContentModel; +import org.alfresco.repo.content.MimetypeMap; +import org.alfresco.repo.content.transform.AbstractContentTransformerTest; +import org.alfresco.repo.model.Repository; +import org.alfresco.repo.security.authentication.AuthenticationUtil; +import org.alfresco.repo.transaction.RetryingTransactionHelper; +import org.alfresco.service.cmr.rendition.RenditionService; +import org.alfresco.service.cmr.repository.ContentService; +import org.alfresco.service.cmr.repository.ContentWriter; +import org.alfresco.service.cmr.repository.NodeRef; +import org.alfresco.service.cmr.repository.NodeService; +import org.alfresco.service.cmr.security.MutableAuthenticationService; +import org.alfresco.service.cmr.security.OwnableService; +import org.alfresco.service.cmr.security.PermissionService; +import org.alfresco.service.cmr.security.PersonService; +import org.alfresco.service.namespace.NamespaceService; +import org.alfresco.service.namespace.QName; +import org.alfresco.service.transaction.TransactionService; +import org.alfresco.util.ApplicationContextHelper; +import org.alfresco.util.Pair; +import org.alfresco.util.PropertyMap; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; import org.springframework.context.ApplicationContext; /** @@ -72,27 +71,44 @@ import org.springframework.context.ApplicationContext; */ public class MultiUserRenditionTest { - private static ApplicationContext appContext; + private ApplicationContext appContext; private static String ADMIN_USER; private static final String NON_ADMIN_USER = "nonAdmin"; - private static MutableAuthenticationService authenticationService; - private static ContentService contentService; - private static NodeService nodeService; - private static PermissionService permissionService; - private static PersonService personService; - private static RenditionService renditionService; - private static Repository repositoryHelper; - private static RetryingTransactionHelper txnHelper; - private static TransactionService transactionService; - private static OwnableService ownableService; + private MutableAuthenticationService authenticationService; + private ContentService contentService; + private NodeService nodeService; + private PermissionService permissionService; + private PersonService personService; + private RenditionService renditionService; + private Repository repositoryHelper; + private RetryingTransactionHelper txnHelper; + private TransactionService transactionService; + private OwnableService ownableService; private List nodesToBeTidiedUp = new ArrayList(); private NodeRef testFolder; - - @BeforeClass - public static void initContextAndCreateUser() + + @Before public void createTestFolder() + { + initContextAndCreateUser(); + AuthenticationUtil.setFullyAuthenticatedUser(ADMIN_USER); + final NodeRef companyHome = repositoryHelper.getCompanyHome(); + + Map props = new HashMap(); + props.put(ContentModel.PROP_NAME, this.getClass() + "_testFolder"); + testFolder = nodeService.createNode(companyHome, + ContentModel.ASSOC_CONTAINS, + ContentModel.ASSOC_CONTAINS, + ContentModel.TYPE_FOLDER, + props).getChildRef(); + // Let anyone (meaning non-admin) do anything (meaning create new content) + permissionService.setPermission(testFolder, PermissionService.ALL_AUTHORITIES, PermissionService.ALL_PERMISSIONS, true); + this.nodesToBeTidiedUp.add(testFolder); + } + + public void initContextAndCreateUser() { appContext = ApplicationContextHelper.getApplicationContext(); @@ -114,7 +130,7 @@ public class MultiUserRenditionTest } - public static void createUser(String userName) + public void createUser(String userName) { AuthenticationUtil.setFullyAuthenticatedUser(ADMIN_USER); @@ -136,23 +152,6 @@ public class MultiUserRenditionTest } } - @Before public void createTestFolder() - { - AuthenticationUtil.setFullyAuthenticatedUser(ADMIN_USER); - final NodeRef companyHome = repositoryHelper.getCompanyHome(); - - Map props = new HashMap(); - props.put(ContentModel.PROP_NAME, this.getClass() + "_testFolder"); - testFolder = nodeService.createNode(companyHome, - ContentModel.ASSOC_CONTAINS, - ContentModel.ASSOC_CONTAINS, - ContentModel.TYPE_FOLDER, - props).getChildRef(); - // Let anyone (meaning non-admin) do anything (meaning create new content) - permissionService.setPermission(testFolder, PermissionService.ALL_AUTHORITIES, PermissionService.ALL_PERMISSIONS, true); - this.nodesToBeTidiedUp.add(testFolder); - } - /** * This test method ensures that users who cause renditions (thumbnails) to * be created on nodes are not made the modifier of the source node. diff --git a/src/test/java/org/alfresco/repo/replication/ReplicationServiceIntegrationTest.java b/src/test/java/org/alfresco/repo/replication/ReplicationServiceIntegrationTest.java index b49dc2f571..a80038eaee 100644 --- a/src/test/java/org/alfresco/repo/replication/ReplicationServiceIntegrationTest.java +++ b/src/test/java/org/alfresco/repo/replication/ReplicationServiceIntegrationTest.java @@ -100,8 +100,7 @@ import org.springframework.context.ConfigurableApplicationContext; @Category(OwnJVMTestsCategory.class) public class ReplicationServiceIntegrationTest extends TestCase { - private static ConfigurableApplicationContext ctx = - (ConfigurableApplicationContext)ApplicationContextHelper.getApplicationContext(); + private ConfigurableApplicationContext ctx; private static final Log log = LogFactory.getLog(ReplicationServiceIntegrationTest.class); @@ -151,7 +150,7 @@ public class ReplicationServiceIntegrationTest extends TestCase { fail("Dangling transaction detected, left by a previous test."); } - + ctx = (ConfigurableApplicationContext) ApplicationContextHelper.getApplicationContext(); replicationActionExecutor = (ReplicationActionExecutor) ctx.getBean("replicationActionExecutor"); replicationService = (ReplicationService) ctx.getBean("replicationService"); replicationParams = (ReplicationParams) ctx.getBean("replicationParams"); diff --git a/src/test/java/org/alfresco/repo/search/QueryRegisterComponentTest.java b/src/test/java/org/alfresco/repo/search/QueryRegisterComponentTest.java index 9a73a89139..6b812b5b00 100644 --- a/src/test/java/org/alfresco/repo/search/QueryRegisterComponentTest.java +++ b/src/test/java/org/alfresco/repo/search/QueryRegisterComponentTest.java @@ -38,7 +38,7 @@ import org.springframework.context.ApplicationContext; @Category(OwnJVMTestsCategory.class) public class QueryRegisterComponentTest extends TestCase { - static ApplicationContext ctx = ApplicationContextHelper.getApplicationContext(); + ApplicationContext ctx; private DictionaryService dictionaryService; private NamespaceService namespaceService; @@ -55,7 +55,7 @@ public class QueryRegisterComponentTest extends TestCase public void setUp() { - + ctx = ApplicationContextHelper.getApplicationContext(); dictionaryService = (DictionaryService) ctx.getBean("dictionaryService"); namespaceService = (NamespaceService) ctx.getBean("namespaceService"); diff --git a/src/test/java/org/alfresco/repo/search/SearchServiceTest.java b/src/test/java/org/alfresco/repo/search/SearchServiceTest.java index 1649563d8c..bec80e0375 100644 --- a/src/test/java/org/alfresco/repo/search/SearchServiceTest.java +++ b/src/test/java/org/alfresco/repo/search/SearchServiceTest.java @@ -52,7 +52,7 @@ import org.springframework.context.ApplicationContext; public class SearchServiceTest extends TestCase { - private static ApplicationContext ctx = ApplicationContextHelper.getApplicationContext(); + private ApplicationContext ctx; private AuthenticationComponent authenticationComponent; @@ -96,7 +96,8 @@ public class SearchServiceTest extends TestCase } public void setUp() throws Exception - { + { + ctx = ApplicationContextHelper.getApplicationContext(); nodeService = (NodeService) ctx.getBean("dbNodeService"); authenticationComponent = (AuthenticationComponent) ctx.getBean("authenticationComponent"); authenticationService = (MutableAuthenticationService) ctx.getBean("authenticationService"); diff --git a/src/test/java/org/alfresco/repo/search/impl/lucene/ALF947Test.java b/src/test/java/org/alfresco/repo/search/impl/lucene/ALF947Test.java index 62f4e9edc2..a279a5a6d3 100644 --- a/src/test/java/org/alfresco/repo/search/impl/lucene/ALF947Test.java +++ b/src/test/java/org/alfresco/repo/search/impl/lucene/ALF947Test.java @@ -61,7 +61,7 @@ import org.springframework.context.ApplicationContext; @Category(OwnJVMTestsCategory.class) public class ALF947Test extends TestCase { - private static ApplicationContext ctx = ApplicationContextHelper.getApplicationContext(); + private ApplicationContext ctx; private NodeService nodeService; private LuceneIndexerAndSearcher indexerAndSearcher; @@ -80,7 +80,8 @@ public class ALF947Test extends TestCase } public void setUp() throws Exception - { + { + ctx = ApplicationContextHelper.getApplicationContext(); this.nodeService = (NodeService) ctx.getBean("dbNodeService"); ChildApplicationContextFactory luceneSubSystem = (ChildApplicationContextFactory) ctx.getBean("buildonly"); this.indexerAndSearcher = (LuceneIndexerAndSearcher) luceneSubSystem.getApplicationContext().getBean("search.admLuceneIndexerAndSearcherFactory"); diff --git a/src/test/java/org/alfresco/repo/search/impl/lucene/LuceneIndexBackupComponentTest.java b/src/test/java/org/alfresco/repo/search/impl/lucene/LuceneIndexBackupComponentTest.java index 9d6380e97e..17b5f78cfe 100644 --- a/src/test/java/org/alfresco/repo/search/impl/lucene/LuceneIndexBackupComponentTest.java +++ b/src/test/java/org/alfresco/repo/search/impl/lucene/LuceneIndexBackupComponentTest.java @@ -48,7 +48,7 @@ import org.springframework.context.ApplicationContext; @Category(OwnJVMTestsCategory.class) public class LuceneIndexBackupComponentTest extends TestCase { - private static ApplicationContext ctx = ApplicationContextHelper.getApplicationContext(); + private ApplicationContext ctx; private LuceneIndexBackupComponent backupComponent; private File tempTargetDir; @@ -57,7 +57,8 @@ public class LuceneIndexBackupComponentTest extends TestCase @Override public void setUp() throws Exception - { + { + ctx = ApplicationContextHelper.getApplicationContext(); TransactionService transactionService = (TransactionService) ctx.getBean("transactionComponent"); NodeService nodeService = (NodeService) ctx.getBean("NodeService"); diff --git a/src/test/java/org/alfresco/repo/tagging/UpdateTagScopesActionExecuterTest.java b/src/test/java/org/alfresco/repo/tagging/UpdateTagScopesActionExecuterTest.java index 6623fa9e4c..b71c62d094 100644 --- a/src/test/java/org/alfresco/repo/tagging/UpdateTagScopesActionExecuterTest.java +++ b/src/test/java/org/alfresco/repo/tagging/UpdateTagScopesActionExecuterTest.java @@ -84,7 +84,7 @@ public class UpdateTagScopesActionExecuterTest extends TestCase private static final String TEST_DOCUMENT_NAME_PATTERN = "InFolder-%d-TestDocument-%d.txt"; - private ApplicationContext applicationContext = ApplicationContextHelper.getApplicationContext(); + private ApplicationContext applicationContext; private NodeService nodeService; @@ -109,7 +109,8 @@ public class UpdateTagScopesActionExecuterTest extends TestCase @Before @Override public void setUp() throws Exception - { + { + applicationContext = ApplicationContextHelper.getApplicationContext(); final ServiceRegistry registry = (ServiceRegistry) applicationContext.getBean(ServiceRegistry.SERVICE_REGISTRY); nodeService = registry.getNodeService(); diff --git a/src/test/java/org/alfresco/repo/usage/RepoUsageComponentTest.java b/src/test/java/org/alfresco/repo/usage/RepoUsageComponentTest.java index fd41d62b71..2c4d6d0de9 100644 --- a/src/test/java/org/alfresco/repo/usage/RepoUsageComponentTest.java +++ b/src/test/java/org/alfresco/repo/usage/RepoUsageComponentTest.java @@ -57,7 +57,7 @@ import org.springframework.context.ApplicationContext; @Category(OwnJVMTestsCategory.class) public class RepoUsageComponentTest extends TestCase { - private static ApplicationContext ctx = ApplicationContextHelper.getApplicationContext(); + private ApplicationContext ctx; private static final Log logger = LogFactory.getLog(RepoUsageComponentTest.class); @@ -70,6 +70,7 @@ public class RepoUsageComponentTest extends TestCase @Override protected void setUp() throws Exception { + ctx = ApplicationContextHelper.getApplicationContext(); if (AlfrescoTransactionSupport.isActualTransactionActive()) { fail("Test started with transaction in progress"); diff --git a/src/test/java/org/alfresco/repo/usage/UserUsageTest.java b/src/test/java/org/alfresco/repo/usage/UserUsageTest.java index ccb9c483ba..8779379918 100644 --- a/src/test/java/org/alfresco/repo/usage/UserUsageTest.java +++ b/src/test/java/org/alfresco/repo/usage/UserUsageTest.java @@ -75,7 +75,7 @@ public class UserUsageTest extends TestCase { private static Log logger = LogFactory.getLog(UserUsageTest.class); - private static ApplicationContext applicationContext = ApplicationContextHelper.getApplicationContext(); + private ApplicationContext applicationContext; protected NodeService nodeService; protected FileFolderService fileFolderService; @@ -103,7 +103,8 @@ public class UserUsageTest extends TestCase private List nodesToDelete = new LinkedList<>(); protected void setUp() throws Exception - { + { + applicationContext = ApplicationContextHelper.getApplicationContext(); if (AlfrescoTransactionSupport.isActualTransactionActive()) { fail("Test started with transaction in progress"); diff --git a/src/test/java/org/alfresco/repo/usage/UserUsageTrackingComponentTest.java b/src/test/java/org/alfresco/repo/usage/UserUsageTrackingComponentTest.java index a51f1ee0a0..1d5a432072 100644 --- a/src/test/java/org/alfresco/repo/usage/UserUsageTrackingComponentTest.java +++ b/src/test/java/org/alfresco/repo/usage/UserUsageTrackingComponentTest.java @@ -63,7 +63,7 @@ import org.springframework.context.ApplicationContext; @Category(OwnJVMTestsCategory.class) public class UserUsageTrackingComponentTest extends TestCase { - private static ApplicationContext applicationContext = ApplicationContextHelper.getApplicationContext(); + private ApplicationContext applicationContext; private static Log logger = LogFactory.getLog(UserUsageTrackingComponentTest.class); @@ -89,7 +89,8 @@ public class UserUsageTrackingComponentTest extends TestCase private static final int PROGRESS_SIZE = 100; protected void setUp() throws Exception - { + { + applicationContext = ApplicationContextHelper.getApplicationContext(); if (AlfrescoTransactionSupport.isActualTransactionActive()) { fail("Test started with transaction in progress"); diff --git a/src/test/java/org/alfresco/repo/virtual/VirtualizationIntegrationTest.java b/src/test/java/org/alfresco/repo/virtual/VirtualizationIntegrationTest.java index 7cb22a65de..280e772f75 100644 --- a/src/test/java/org/alfresco/repo/virtual/VirtualizationIntegrationTest.java +++ b/src/test/java/org/alfresco/repo/virtual/VirtualizationIntegrationTest.java @@ -136,7 +136,7 @@ public abstract class VirtualizationIntegrationTest extends TestCase implements protected static final String FORM_DATA_PROP_ALF_DEF = "alf_destination"; - protected static final ApplicationContext ctx = ApplicationContextHelper.getApplicationContext(CONFIG_LOCATIONS); + protected ApplicationContext ctx; protected FileFolderService fileAndFolderService; @@ -179,7 +179,9 @@ public abstract class VirtualizationIntegrationTest extends TestCase implements @Override protected void setUp() throws Exception - { + { + ctx = ApplicationContextHelper.getApplicationContext(CONFIG_LOCATIONS); + virtualizationConfigTestBootstrap = ctx.getBean(VIRTUALIZATION_CONFIG_TEST_BOOTSTRAP_BEAN_ID, VirtualizationConfigTestBootstrap.class); diff --git a/src/test/java/org/alfresco/repo/virtual/bundle/VirtualCheckOutCheckInServiceExtensionTest.java b/src/test/java/org/alfresco/repo/virtual/bundle/VirtualCheckOutCheckInServiceExtensionTest.java index 84e3bc6255..f7019deddc 100644 --- a/src/test/java/org/alfresco/repo/virtual/bundle/VirtualCheckOutCheckInServiceExtensionTest.java +++ b/src/test/java/org/alfresco/repo/virtual/bundle/VirtualCheckOutCheckInServiceExtensionTest.java @@ -69,9 +69,7 @@ public class VirtualCheckOutCheckInServiceExtensionTest extends VirtualizationIn private static final String PROP_FILE_NAME = "originalFile"; - private static final String PROP_WORKING_COPY_NAME = CheckOutCheckInServiceImpl - .createWorkingCopyName(PROP_FILE_NAME, - I18NUtil.getMessage("coci_service.working_copy_label")); + private String PROP_WORKING_COPY_NAME; private CheckOutCheckInService checkOutCheckInService; @@ -86,10 +84,14 @@ public class VirtualCheckOutCheckInServiceExtensionTest extends VirtualizationIn @Override protected void setUp() throws Exception { - super.setUp(); - checkOutCheckInService = VirtualCheckOutCheckInServiceExtensionTest.ctx.getBean("checkOutCheckInService", + super.setUp(); + PROP_WORKING_COPY_NAME = CheckOutCheckInServiceImpl + .createWorkingCopyName(PROP_FILE_NAME, + I18NUtil.getMessage("coci_service.working_copy_label")); + + checkOutCheckInService = ctx.getBean("checkOutCheckInService", CheckOutCheckInService.class); - versionService = VirtualCheckOutCheckInServiceExtensionTest.ctx.getBean("versionService", + versionService = ctx.getBean("versionService", VersionService.class); node = nodeService.getChildByName(virtualFolder1NodeRef, diff --git a/src/test/java/org/alfresco/repo/virtual/bundle/VirtualPermissionServiceExtensionTest.java b/src/test/java/org/alfresco/repo/virtual/bundle/VirtualPermissionServiceExtensionTest.java index 3b16e17b0b..c764cf3da5 100644 --- a/src/test/java/org/alfresco/repo/virtual/bundle/VirtualPermissionServiceExtensionTest.java +++ b/src/test/java/org/alfresco/repo/virtual/bundle/VirtualPermissionServiceExtensionTest.java @@ -84,12 +84,12 @@ public class VirtualPermissionServiceExtensionTest extends VirtualizationIntegra super.setUp(); // we set our own virtual user permissions in order to be context xml // independent - smartStore = VirtualPermissionServiceExtensionTest.ctx.getBean("smartStore", + smartStore = ctx.getBean("smartStore", VirtualStoreImpl.class); - permissionService = VirtualPermissionServiceExtensionTest.ctx.getBean("permissionServiceImpl", + permissionService = ctx.getBean("permissionServiceImpl", PermissionServiceSPI.class); - siteService = VirtualPermissionServiceExtensionTest.ctx.getBean("siteService", + siteService = ctx.getBean("siteService", SiteService.class); user1 = "user1"; diff --git a/src/test/java/org/alfresco/repo/virtual/bundle/VirtualRatingServiceExtensionTest.java b/src/test/java/org/alfresco/repo/virtual/bundle/VirtualRatingServiceExtensionTest.java index e55e0054b2..1a9567cc39 100644 --- a/src/test/java/org/alfresco/repo/virtual/bundle/VirtualRatingServiceExtensionTest.java +++ b/src/test/java/org/alfresco/repo/virtual/bundle/VirtualRatingServiceExtensionTest.java @@ -35,7 +35,6 @@ import org.alfresco.repo.virtual.ref.Reference; import org.alfresco.service.cmr.rating.RatingService; import org.alfresco.service.cmr.rating.RatingServiceException; import org.alfresco.service.cmr.repository.NodeRef; -import org.alfresco.service.cmr.security.AccessStatus; import org.junit.Test; public class VirtualRatingServiceExtensionTest extends VirtualizationIntegrationTest @@ -59,7 +58,7 @@ public class VirtualRatingServiceExtensionTest extends VirtualizationIntegration { super.setUp(); - ratingService = VirtualPermissionServiceExtensionTest.ctx.getBean("ratingService", + ratingService = ctx.getBean("ratingService", RatingService.class); user1 = "user1"; diff --git a/src/test/java/org/alfresco/repo/virtual/config/NodeRefPathExpressionTest.java b/src/test/java/org/alfresco/repo/virtual/config/NodeRefPathExpressionTest.java index 73c35dce1e..34ba870647 100644 --- a/src/test/java/org/alfresco/repo/virtual/config/NodeRefPathExpressionTest.java +++ b/src/test/java/org/alfresco/repo/virtual/config/NodeRefPathExpressionTest.java @@ -28,57 +28,23 @@ package org.alfresco.repo.virtual.config; import java.io.Serializable; -import javax.transaction.UserTransaction; - -import junit.framework.TestCase; - import org.alfresco.model.ContentModel; +import org.alfresco.repo.virtual.VirtualizationIntegrationTest; import org.alfresco.repo.virtual.VirtualizationTest; -import org.alfresco.service.ServiceRegistry; import org.alfresco.service.cmr.repository.NodeRef; -import org.alfresco.service.cmr.repository.NodeService; -import org.alfresco.service.transaction.TransactionService; -import org.alfresco.util.ApplicationContextHelper; import org.junit.Test; -import org.springframework.context.ApplicationContext; -public class NodeRefPathExpressionTest extends TestCase implements VirtualizationTest +public class NodeRefPathExpressionTest extends VirtualizationIntegrationTest implements VirtualizationTest { private static final String NODE_REF_PATH_EXPRESSION_FACTORY_ID = "config.NodeRefPathExpressionFactory"; - protected static final ApplicationContext ctx = ApplicationContextHelper.getApplicationContext(CONFIG_LOCATIONS); - - private UserTransaction txn; - - private ServiceRegistry serviceRegistry; - - private NodeService nodeService; - private NodeRefPathExpressionFactory nodeRefPathExpressionFactory; @Override protected void setUp() throws Exception { super.setUp(); - - serviceRegistry = (ServiceRegistry) ctx.getBean("ServiceRegistry"); - - nodeService = (NodeService) ctx.getBean("nodeService"); - nodeRefPathExpressionFactory = (NodeRefPathExpressionFactory) ctx.getBean(NODE_REF_PATH_EXPRESSION_FACTORY_ID); - - TransactionService transactionService = serviceRegistry.getTransactionService(); - - // start the transaction - txn = transactionService.getUserTransaction(); - txn.begin(); - } - - @Override - protected void tearDown() throws Exception - { - txn.rollback(); - super.tearDown(); } protected void assertResolvablePath(String path, String toName) diff --git a/src/test/java/org/alfresco/service/ServiceRegistryTest.java b/src/test/java/org/alfresco/service/ServiceRegistryTest.java index 7bc397bd8d..581cd5e690 100644 --- a/src/test/java/org/alfresco/service/ServiceRegistryTest.java +++ b/src/test/java/org/alfresco/service/ServiceRegistryTest.java @@ -36,13 +36,14 @@ import org.springframework.context.ApplicationContext; public class ServiceRegistryTest { - protected static ApplicationContext ctx = ApplicationContextHelper.getApplicationContext(); + protected ApplicationContext ctx; protected ServiceRegistry serviceRegistry; @Before public void before() throws Exception { + ctx = ApplicationContextHelper.getApplicationContext(); serviceRegistry = (ServiceRegistry) ctx.getBean("ServiceRegistry"); } diff --git a/src/test/java/org/alfresco/util/schemacomp/SchemaReferenceFileTest.java b/src/test/java/org/alfresco/util/schemacomp/SchemaReferenceFileTest.java index 20573004df..35df75ddce 100644 --- a/src/test/java/org/alfresco/util/schemacomp/SchemaReferenceFileTest.java +++ b/src/test/java/org/alfresco/util/schemacomp/SchemaReferenceFileTest.java @@ -67,15 +67,6 @@ public class SchemaReferenceFileTest ctx = (ClassPathXmlApplicationContext) ApplicationContextHelper.getApplicationContext(); schemaBootstrap = (SchemaBootstrap) ctx.getBean("schemaBootstrap"); } - - @After - public void tearDown() - { - if(ctx != null) - { - ctx.close(); - } - } @Test public void checkReferenceFile() diff --git a/src/test/resources/org/alfresco/repo/node/getchildren/testModel.xml b/src/test/resources/org/alfresco/repo/node/getchildren/testModel.xml index e981d8d6bf..a6a98807a4 100644 --- a/src/test/resources/org/alfresco/repo/node/getchildren/testModel.xml +++ b/src/test/resources/org/alfresco/repo/node/getchildren/testModel.xml @@ -1,4 +1,4 @@ - + Alfresco Content Model Alfresco @@ -12,7 +12,7 @@ - + @@ -23,12 +23,12 @@ - + Test Folder cm:folder true - + false true