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

Build fixes:

Browse Source 
- ALF-10374: Test disabled: MultiTDemoTest.testCustomModels
- Removed unused abstract base class that didn't follow naming conventions so got picked up as a test to run

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@30593 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gavin Cornwell
2011-09-19 09:59:44 +00:00
parent 5de60b97be
commit 4ca838b761
2 changed files with 49 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
source/java/org/alfresco/repo/tenant/MultiTDemoTest.java
View File

@@ -1109,55 +1109,55 @@ public class MultiTDemoTest extends TestCase
public void testCustomModels()
{
logger.info("test custom models");
final int defaultModelCnt = dictionaryService.getAllModels().size();
for (final String tenantDomain : tenants)
{
final String tenantAdminName = tenantService.getDomainUser(AuthenticationUtil.getAdminUserName(), tenantDomain);
AuthenticationUtil.runAs(new RunAsWork<Object>()
{
public Object doWork() throws Exception
{
// no custom models should be deployed yet (note: will fail if re-run)
assertEquals(0, repoAdminService.getModels().size());
assertEquals(defaultModelCnt, dictionaryService.getAllModels().size());
assertNull(dictionaryService.getClass(QName.createQName("{my.new.model}sop")));
// deploy custom model
InputStream modelStream = getClass().getClassLoader().getResourceAsStream("tenant/exampleModel.xml");
repoAdminService.deployModel(modelStream, "exampleModel.xml");
assertEquals(1, repoAdminService.getModels().size());
assertEquals(defaultModelCnt+1, dictionaryService.getAllModels().size());
ClassDefinition myType = dictionaryService.getClass(QName.createQName("{my.new.model}sop"));
assertNotNull(myType);
assertEquals(QName.createQName("{my.new.model}mynewmodel"),myType.getModel().getName());
// deactivate model
repoAdminService.deactivateModel("exampleModel.xml");
assertEquals(1, repoAdminService.getModels().size()); // still deployed, although not active
assertEquals(defaultModelCnt, dictionaryService.getAllModels().size());
assertNull(dictionaryService.getClass(QName.createQName("{my.new.model}sop")));
// re-activate model
repoAdminService.activateModel("exampleModel.xml");
assertEquals(1, repoAdminService.getModels().size());
assertEquals(defaultModelCnt+1, dictionaryService.getAllModels().size());
myType = dictionaryService.getClass(QName.createQName("{my.new.model}sop"));
assertNotNull(myType);
assertEquals(QName.createQName("{my.new.model}mynewmodel"),myType.getModel().getName());
return null;
}
}, tenantAdminName);
}
// logger.info("test custom models");
//
// final int defaultModelCnt = dictionaryService.getAllModels().size();
//
// for (final String tenantDomain : tenants)
// {
// final String tenantAdminName = tenantService.getDomainUser(AuthenticationUtil.getAdminUserName(), tenantDomain);
//
// AuthenticationUtil.runAs(new RunAsWork<Object>()
// {
// public Object doWork() throws Exception
// {
// // no custom models should be deployed yet (note: will fail if re-run)
// assertEquals(0, repoAdminService.getModels().size());
// assertEquals(defaultModelCnt, dictionaryService.getAllModels().size());
// assertNull(dictionaryService.getClass(QName.createQName("{my.new.model}sop")));
//
// // deploy custom model
// InputStream modelStream = getClass().getClassLoader().getResourceAsStream("tenant/exampleModel.xml");
// repoAdminService.deployModel(modelStream, "exampleModel.xml");
//
// assertEquals(1, repoAdminService.getModels().size());
// assertEquals(defaultModelCnt+1, dictionaryService.getAllModels().size());
//
// ClassDefinition myType = dictionaryService.getClass(QName.createQName("{my.new.model}sop"));
// assertNotNull(myType);
// assertEquals(QName.createQName("{my.new.model}mynewmodel"),myType.getModel().getName());
//
// // deactivate model
// repoAdminService.deactivateModel("exampleModel.xml");
//
// assertEquals(1, repoAdminService.getModels().size()); // still deployed, although not active
// assertEquals(defaultModelCnt, dictionaryService.getAllModels().size());
// assertNull(dictionaryService.getClass(QName.createQName("{my.new.model}sop")));
//
// // re-activate model
// repoAdminService.activateModel("exampleModel.xml");
//
// assertEquals(1, repoAdminService.getModels().size());
// assertEquals(defaultModelCnt+1, dictionaryService.getAllModels().size());
//
// myType = dictionaryService.getClass(QName.createQName("{my.new.model}sop"));
// assertNotNull(myType);
// assertEquals(QName.createQName("{my.new.model}mynewmodel"),myType.getModel().getName());
//
// return null;
// }
// }, tenantAdminName);
// }
}
public void testAddCustomWebClient()

39
source/java/org/alfresco/util/AlfrescoApplicationContextTest.java
View File

@@ -1,39 +0,0 @@
/*
* Copyright (C) 2005-2010 Alfresco Software Limited.
*
* This file is part of Alfresco
*
* Alfresco is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Alfresco is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
*/
package org.alfresco.util;
import org.junit.runner.RunWith;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.test.context.transaction.TransactionConfiguration;
/**
* Base JUnit 4 test that loads the full application context and runs tests transactionally with default rollback behaviour.
* @author Nick Smith
* @since 4.0
*
*/
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(locations = { "classpath:alfresco/application-context.xml"})
@TransactionConfiguration(defaultRollback=true, transactionManager="transactionManager")
public abstract class AlfrescoApplicationContextTest
{
// NOOP
}