inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

REPO-2774: add the correct ApplicationContextHelper.getApplicationContext method call for getting the context in the setUp method

Browse Source
This commit is contained in:
Andrei Rebegea
2017-08-07 19:54:19 +03:00
parent 5e635d95bc
commit 0f17b27a95
3 changed files with 3 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/test/java/org/alfresco/AppContextExtra02TestSuite.java
View File

@@ -39,8 +39,7 @@ public class AppContextExtra02TestSuite extends TestSuite
AllRepositoryTestsCatalogue.applicationContext_testSubscriptionsContext(suite); AllRepositoryTestsCatalogue.applicationContext_testSubscriptionsContext(suite);
AllRepositoryTestsCatalogue.applicationContext_openCmisContext(suite); AllRepositoryTestsCatalogue.applicationContext_openCmisContext(suite);
AllRepositoryTestsCatalogue.applicationContext_cacheTestContext(suite); AllRepositoryTestsCatalogue.applicationContext_cacheTestContext(suite);
// TODO Uncomment the following line after REPO-2790 is implemented AllRepositoryTestsCatalogue.applicationContext_mtAllContext(suite);
// AllRepositoryTestsCatalogue.applicationContext_mtAllContext(suite);
return suite; return suite;
} }

46
src/test/java/org/alfresco/AppContextExtra03TestSuite.java
View File

@@ -1,46 +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 <http://www.gnu.org/licenses/>.
* #L%
*/
package org.alfresco;
import junit.framework.Test;
import junit.framework.TestSuite;
/**
* Temporary class. Please read the comments on {@link AppContextExtra02TestSuite}
*
* Tests were split just because the limitation on the bamboo agents DB config see REPO-2790
*/
public class AppContextExtra03TestSuite extends TestSuite
{
public static Test suite()
{
TestSuite suite = new TestSuite();
AllRepositoryTestsCatalogue.applicationContext_mtAllContext(suite);
return suite;
}
}

5
src/test/java/org/alfresco/repo/tenant/MultiTDemoTest.java
View File

@@ -181,9 +181,8 @@ public class MultiTDemoTest extends TestCase
@Override @Override
protected void setUp() throws Exception protected void setUp() throws Exception
{ {
super.setUp(); super.setUp();
ctx = new ClassPathXmlApplicationContext( ctx = ApplicationContextHelper.getApplicationContext(new String[] { ApplicationContextHelper.CONFIG_LOCATIONS[0], "classpath:tenant/mt-*context.xml" });
new String[] { ApplicationContextHelper.CONFIG_LOCATIONS[0], "classpath:tenant/mt-*context.xml" });
nodeService = (NodeService) ctx.getBean("NodeService"); nodeService = (NodeService) ctx.getBean("NodeService");
nodeArchiveService = (NodeArchiveService) ctx.getBean("nodeArchiveService"); nodeArchiveService = (NodeArchiveService) ctx.getBean("nodeArchiveService");