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

BDE-73 BDE-78 Add more tests to compute coverage + fetch application context from classpath rather than file system

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@39409 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Samuel Langlois
2012-07-18 08:46:03 +00:00
parent ac7c5d5a4f
commit 2bfc1ca0cc
3 changed files with 35 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
pom.xml
View File

@@ -593,32 +593,41 @@
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<configuration> <configuration>
<includes> <includes>
<include>**/org/alfresco/RepositoryStartupTest.*</include> <!-- Standard test names -->
<include>**/org/alfresco/encryption/**</include> <include>**/*Test.*</include>
<include>**/org/alfresco/repo/action/**</include>
<include>**/org/alfresco/repo/bulkimport/**</include> <!-- Additional tests with non-conventional names -->
<include>**/org/alfresco/repo/cache/**</include> <include>**/org/alfresco/repo/avm/*TestP.*</include>
<include>**/org/alfresco/repo/calendar/**</include> <include>**/org/alfresco/repo/avm/AVMServiceTestBase.*</include>
<include>**/org/alfresco/repo/coci/**</include>
<include>**/org/alfresco/repo/cluster/**</include>
<include>**/org/alfresco/repo/configuration/**</include>
<include>**/org/alfresco/repo/content/**</include>
<include>**/org/alfresco/repo/deploy/ASRDeploymentTest.*</include>
<include>**/org/alfresco/repo/descriptor/**</include>
<include>**/org/alfresco/repo/dictionary/**</include>
<include>**/org/alfresco/repo/discussion/**</include>
<include>**/org/alfresco/repo/domain/*.*</include>
<include>**/org/alfresco/repo/domain/audit/**</include>
<include>**/org/alfresco/repo/forms/processor/workflow/WorkflowFormProcessorTest.*</include>
<include>**/org/alfresco/service/cmr/repository/**</include>
<include>**/org/alfresco/tools/**</include>
<include>**/org/alfresco/util/**</include>
</includes> </includes>
<excludes> <excludes>
<!-- Failing tests which are not run with Ant - OK to exclude -->
<exclude>**/org/alfresco/encryption/EncryptionTests.*</exclude> <exclude>**/org/alfresco/encryption/EncryptionTests.*</exclude>
<exclude>**/org/alfresco/jcr/test/BaseJCRTest.*</exclude>
<exclude>**/org/alfresco/repo/action/evaluator/HasChildEvaluatorTest.*</exclude> <exclude>**/org/alfresco/repo/action/evaluator/HasChildEvaluatorTest.*</exclude>
<exclude>**/org/alfresco/repo/action/scheduled/ScheduledPersistedActionServiceTest.*</exclude> <exclude>**/org/alfresco/repo/action/scheduled/ScheduledPersistedActionServiceTest.*</exclude>
<exclude>**/org/alfresco/repo/avm/AVMServiceRemoteSystemTest.*</exclude>
<exclude>**/org/alfresco/repo/content/transform/OOXMLThumbnailContentTransformerTest.*</exclude> <exclude>**/org/alfresco/repo/content/transform/OOXMLThumbnailContentTransformerTest.*</exclude>
<exclude>**/org/alfresco/repo/domain/avm/AVMStoreDAOTest.*</exclude>
<!-- TODO tests which pass with Ant, but not here. To investigate -->
<exclude>**/org/alfresco/RepositoryStartStopTest.*</exclude>
<exclude>**/org/alfresco/cmis/changelog/CMISChangeLogServiceTest.*</exclude>
<exclude>**/org/alfresco/cmis/renditions/CMISRenditionServiceTest.*</exclude>
<exclude>**/org/alfresco/repo/avm/AVMCrawlTestP.*</exclude>
<exclude>**/org/alfresco/repo/avm/AVMScaleTestP.*</exclude>
<exclude>**/org/alfresco/repo/avm/AVMStressTestP.*</exclude>
<exclude>**/org/alfresco/repo/avm/PurgeTestP.*</exclude>
<exclude>**/org/alfresco/repo/avm/AVMServiceLocalTest.*</exclude>
<exclude>**/org/alfresco/repo/avm/AVMServiceTest.*</exclude>
<exclude>**/org/alfresco/repo/avm/locking/AVMLockingServiceTest.*</exclude>
<exclude>**/org/alfresco/repo/blog/BlogServiceImplTest.*</exclude>
<exclude>**/org/alfresco/repo/deploy/DeploymentServiceImplFSTest.*</exclude>
<exclude>**/org/alfresco/repo/deploy/DeploymentServiceTest.*</exclude>
<!-- Test failing because we run on a slow machine... To be unleashed soon -->
<exclude>**/org/alfresco/repo/content/AbstractContentReaderLimitTest.*</exclude>
</excludes> </excludes>
</configuration> </configuration>
</plugin> </plugin>

6
source/java/org/alfresco/repo/deploy/DeploymentServiceImplFSTest.java
View File

@@ -42,7 +42,7 @@ import org.alfresco.util.Deleter;
import org.alfresco.util.NameMatcher; import org.alfresco.util.NameMatcher;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.springframework.context.support.FileSystemXmlApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext;
/** /**
* End to end test of deployment to a file system receiver (FSR). * End to end test of deployment to a file system receiver (FSR).
@@ -82,8 +82,8 @@ public class DeploymentServiceImplFSTest extends AVMServiceTestBase
* Start the FSR * Start the FSR
*/ */
@SuppressWarnings("unused") @SuppressWarnings("unused")
FileSystemXmlApplicationContext receiverContext = ClassPathXmlApplicationContext receiverContext =
new FileSystemXmlApplicationContext("../deployment/config/application-context.xml"); new ClassPathXmlApplicationContext("application-context.xml"); // Fetch application context from deployment
service = (DeploymentService)fContext.getBean("DeploymentService"); service = (DeploymentService)fContext.getBean("DeploymentService");
} }

6
source/java/org/alfresco/repo/deploy/DeploymentServiceTest.java
View File

@@ -60,7 +60,7 @@ import org.alfresco.wcm.util.WCMUtil;
import org.alfresco.wcm.webproject.WebProjectInfo; import org.alfresco.wcm.webproject.WebProjectInfo;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.springframework.context.support.FileSystemXmlApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext;
/** /**
* Test of deployment to a Test Server. * Test of deployment to a Test Server.
@@ -116,8 +116,8 @@ public class DeploymentServiceTest extends AbstractWCMServiceImplTest
* Start the FSR * Start the FSR
*/ */
@SuppressWarnings("unused") @SuppressWarnings("unused")
FileSystemXmlApplicationContext receiverContext = ClassPathXmlApplicationContext receiverContext =
new FileSystemXmlApplicationContext("../deployment/config/application-context.xml"); new ClassPathXmlApplicationContext("application-context.xml"); // Fetch application context from deployment
} }