From 3a4ec3048f69d3963cbde2da82faa422978bb450 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Wed, 12 Feb 2014 10:29:47 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) 60133: BDE-239 (HEAD-BUG-FIX) Identify tests starting the repository which are not in suites - typo in test numbers git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62272 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../org/alfresco/Repository01TestSuite.java | 54 +++++++++---------- .../org/alfresco/Repository64TestSuite.java | 37 ------------- 2 files changed, 27 insertions(+), 64 deletions(-) delete mode 100644 source/test-java/org/alfresco/Repository64TestSuite.java diff --git a/source/test-java/org/alfresco/Repository01TestSuite.java b/source/test-java/org/alfresco/Repository01TestSuite.java index c7093704fe..50bce989ea 100644 --- a/source/test-java/org/alfresco/Repository01TestSuite.java +++ b/source/test-java/org/alfresco/Repository01TestSuite.java @@ -298,12 +298,12 @@ public class Repository01TestSuite extends TestSuite suite.addTestSuite(org.alfresco.repo.node.index.IndexTransactionTrackerTest.class); } - static void tests39(TestSuite suite) // Hangs with the previous 4 tests + static void tests37(TestSuite suite) // Hangs with the previous 4 tests { suite.addTestSuite(org.alfresco.repo.node.index.MissingContentReindexComponentTest.class); } - static void tests40(TestSuite suite) + static void tests38(TestSuite suite) { suite.addTestSuite(org.alfresco.repo.node.integrity.IncompleteNodeTaggerTest.class); suite.addTestSuite(org.alfresco.repo.node.integrity.IntegrityEventTest.class); @@ -317,12 +317,12 @@ public class Repository01TestSuite extends TestSuite suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.preference.PreferenceServiceImplTest.class)); } - static void tests41(TestSuite suite) + static void tests39(TestSuite suite) { suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.publishing.WebPublishingTestSuite.class)); } - static void tests42(TestSuite suite) + static void tests40(TestSuite suite) { suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.quickshare.QuickShareServiceIntegrationTest.class)); suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.rating.RatingServiceIntegrationTest.class)); @@ -334,13 +334,13 @@ public class Repository01TestSuite extends TestSuite suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.rendition.RenditionServicePermissionsTest.class)); } - static void tests43(TestSuite suite) // tests="6" time="120.585" + static void tests41(TestSuite suite) // tests="6" time="120.585" { suite.addTestSuite(org.alfresco.repo.rendition.StandardRenditionLocationResolverTest.class); suite.addTestSuite(org.alfresco.repo.rendition.executer.HTMLRenderingEngineTest.class); } - static void tests44(TestSuite suite) // tests="27" time="134.585" + static void tests42(TestSuite suite) // tests="27" time="134.585" { suite.addTestSuite(org.alfresco.repo.rendition.executer.XSLTFunctionsTest.class); // fails if with previous tests suite.addTestSuite(org.alfresco.repo.rendition.executer.XSLTRenderingEngineTest.class); @@ -349,40 +349,40 @@ public class Repository01TestSuite extends TestSuite suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.rule.MiscellaneousRulesTest.class)); } - static void tests45(TestSuite suite) // tests="53" time="113.999" + static void tests43(TestSuite suite) // tests="53" time="113.999" { suite.addTestSuite(org.alfresco.repo.rule.RuleLinkTest.class); // fails if with previous tests suite.addTestSuite(org.alfresco.repo.rule.RuleServiceCoverageTest.class); suite.addTestSuite(org.alfresco.repo.rule.RuleServiceImplTest.class); } - static void tests46(TestSuite suite) // tests="2" time="104.636" errors="1" + static void tests44(TestSuite suite) // tests="2" time="104.636" errors="1" { suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.rule.RuleServiceIntegrationTest.class)); // fails locally even on its own } - static void tests47(TestSuite suite) // tests="13" time="97.186" + static void tests45(TestSuite suite) // tests="13" time="97.186" { suite.addTestSuite(org.alfresco.repo.rule.RuleTypeImplTest.class); suite.addTestSuite(org.alfresco.repo.rule.ruletrigger.RuleTriggerTest.class); } - static void tests48(TestSuite suite) + static void tests46(TestSuite suite) { suite.addTest(org.alfresco.repo.search.SearchTestSuite.suite()); } - static void tests49(TestSuite suite) + static void tests47(TestSuite suite) { suite.addTest(org.alfresco.repo.security.SecurityTestSuite.suite()); } - static void tests50(TestSuite suite) + static void tests48(TestSuite suite) { suite.addTestSuite(org.alfresco.repo.security.sync.ChainingUserRegistrySynchronizerTest.class); // failed on agent - split from following tests? } - static void tests51(TestSuite suite) // Not sure this break is needed + static void tests49(TestSuite suite) // Not sure this break is needed { suite.addTestSuite(org.alfresco.repo.service.StoreRedirectorProxyFactoryTest.class); suite.addTestSuite(org.alfresco.repo.site.RoleComparatorImplTest.class); @@ -390,42 +390,42 @@ public class Repository01TestSuite extends TestSuite suite.addTestSuite(org.alfresco.repo.site.SiteServiceImplTest.class); } - static void tests52(TestSuite suite) + static void tests50(TestSuite suite) { suite.addTestSuite(org.alfresco.repo.solr.SOLRTrackingComponentTest.class); } - static void tests53(TestSuite suite) + static void tests51(TestSuite suite) { suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.subscriptions.SubscriptionServiceActivitiesTest.class)); } - static void tests54(TestSuite suite) + static void tests52(TestSuite suite) { suite.addTestSuite(org.alfresco.repo.subscriptions.SubscriptionServiceImplTest.class); } - static void tests55(TestSuite suite) + static void tests53(TestSuite suite) { suite.addTestSuite(org.alfresco.repo.tagging.TaggingServiceImplTest.class); } - static void tests56(TestSuite suite) + static void tests54(TestSuite suite) { suite.addTestSuite(org.alfresco.repo.template.AVMTemplateNodeTest.class); } - static void tests57(TestSuite suite) + static void tests55(TestSuite suite) { suite.addTestSuite(org.alfresco.repo.template.TemplateServiceImplTest.class); } - static void tests58(TestSuite suite) + static void tests56(TestSuite suite) { suite.addTestSuite(org.alfresco.repo.tenant.MultiTDemoTest.class); } - static void tests59(TestSuite suite) + static void tests57(TestSuite suite) { suite.addTestSuite(org.alfresco.repo.tenant.MultiTNodeServiceInterceptorTest.class); suite.addTestSuite(org.alfresco.repo.template.XSLTProcessorTest.class); // Moved, was before MultiTDemoTest @@ -450,32 +450,32 @@ public class Repository01TestSuite extends TestSuite suite.addTestSuite(org.alfresco.repo.urlshortening.BitlyUrlShortenerTest.class); } - static void tests60(TestSuite suite) + static void tests58(TestSuite suite) { suite.addTest(org.alfresco.repo.usage.UsageTestSuite.suite()); } - static void tests61(TestSuite suite) + static void tests59(TestSuite suite) { suite.addTest(org.alfresco.repo.version.VersionTestSuite.suite()); } - static void tests62(TestSuite suite) + static void tests60(TestSuite suite) { suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.wiki.WikiServiceImplTest.class)); } - static void tests63(TestSuite suite) + static void tests61(TestSuite suite) { suite.addTest(org.alfresco.repo.workflow.WorkflowTestSuite.suite()); } - static void tests64(TestSuite suite) + static void tests62(TestSuite suite) { suite.addTest(new JUnit4TestAdapter(org.alfresco.service.cmr.calendar.CalendarRecurrenceHelperTest.class)); } - static void tests65(TestSuite suite) // tests="187" time="364.334" + static void tests63(TestSuite suite) // tests="187" time="364.334" { suite.addTest(new JUnit4TestAdapter(org.alfresco.service.cmr.calendar.CalendarTimezoneHelperTest.class)); suite.addTest(new JUnit4TestAdapter(org.alfresco.service.cmr.repository.TemporalSourceOptionsTest.class)); diff --git a/source/test-java/org/alfresco/Repository64TestSuite.java b/source/test-java/org/alfresco/Repository64TestSuite.java deleted file mode 100644 index a4759d2ec6..0000000000 --- a/source/test-java/org/alfresco/Repository64TestSuite.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (C) 2005-2014 Alfresco Software Limited. - * - * This file is part of Alfresco - * - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Alfresco is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - */ -package org.alfresco; - -import junit.framework.Test; -import junit.framework.TestSuite; - -/** - * See {@link RepositoryMisc01TestSuite} - * - * @Author Alan Davis - */ -public class Repository64TestSuite extends TestSuite -{ - public static Test suite() - { - TestSuite suite = new TestSuite(); - Repository01TestSuite.tests64(suite); - return suite; - } -}