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

Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

Browse Source 
58852: Recategorised some tests and test executions


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62048 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-12 00:22:36 +00:00
parent d6770deedc
commit d1ded43bbf
3 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pom.xml
View File

@@ -877,7 +877,6 @@
</configuration> </configuration>
</execution> </execution>
<!-- Execution for tests which use BaseSpring test --> <!-- Execution for tests which use BaseSpring test -->
<!--
<execution> <execution>
<id>base-spring-troublesome-tests</id> <id>base-spring-troublesome-tests</id>
<goals> <goals>
@@ -888,7 +887,6 @@
<testFailureIgnore>true</testFailureIgnore> <testFailureIgnore>true</testFailureIgnore>
</configuration> </configuration>
</execution> </execution>
-->
<!-- Execution for tests which require their own JVM --> <!-- Execution for tests which require their own JVM -->
<execution> <execution>
<id>run-ownJVMTestsCategory</id> <id>run-ownJVMTestsCategory</id>
@@ -905,11 +903,10 @@
<id>default-test</id> <id>default-test</id>
<configuration> <configuration>
<argLine>-Xmx3G -XX:MaxPermSize=512m -Duser.language=en -Dcom.sun.management.jmxremote</argLine> <argLine>-Xmx3G -XX:MaxPermSize=512m -Duser.language=en -Dcom.sun.management.jmxremote</argLine>
<excludedGroups>org.alfresco.test_category.OwnJVMTestsCategory</excludedGroups> <excludedGroups>org.alfresco.test_category.OwnJVMTestsCategory, org.alfresco.test_category.BaseSpringTestsCategory,org.alfresco.test_category.LegacyCategory</excludedGroups>
<testFailureIgnore>true</testFailureIgnore> <testFailureIgnore>true</testFailureIgnore>
</configuration> </configuration>
</execution> </execution>
<!--
<execution> <execution>
<id>run-legacy-tests</id> <id>run-legacy-tests</id>
<goals> <goals>
@@ -919,7 +916,6 @@
<groups>org.alfresco.test_category.LegacyCategory</groups> <groups>org.alfresco.test_category.LegacyCategory</groups>
</configuration> </configuration>
</execution> </execution>
-->
</executions> </executions>
<!-- Default configuration, specifying which tests to pass --> <!-- Default configuration, specifying which tests to pass -->

4
source/test-java/org/alfresco/repo/publishing/PublishWebContentActivitiTest.java
View File

@@ -22,7 +22,7 @@ package org.alfresco.repo.publishing;
import java.util.List; import java.util.List;
import org.alfresco.service.cmr.workflow.WorkflowPath; import org.alfresco.service.cmr.workflow.WorkflowPath;
import org.alfresco.test_category.BaseSpringTestsCategory; import org.alfresco.test_category.OwnJVMTestsCategory;
import org.junit.experimental.categories.Category; import org.junit.experimental.categories.Category;
@@ -31,7 +31,7 @@ import org.junit.experimental.categories.Category;
* @author Frederik Heremans * @author Frederik Heremans
* @since 4.0 * @since 4.0
*/ */
@Category(BaseSpringTestsCategory.class) @Category(OwnJVMTestsCategory.class)
public class PublishWebContentActivitiTest extends PublishWebContentProcessTest public class PublishWebContentActivitiTest extends PublishWebContentProcessTest
{ {
private static final String DEF_NAME = "activiti$publishWebContent"; private static final String DEF_NAME = "activiti$publishWebContent";

4
source/test-java/org/alfresco/repo/publishing/PublishWebContentJbpmTest.java
View File

@@ -19,7 +19,7 @@
package org.alfresco.repo.publishing; package org.alfresco.repo.publishing;
import org.alfresco.test_category.BaseSpringTestsCategory; import org.alfresco.test_category.OwnJVMTestsCategory;
import org.junit.experimental.categories.Category; import org.junit.experimental.categories.Category;
@@ -28,7 +28,7 @@ import org.junit.experimental.categories.Category;
* @author Frederik Heremans * @author Frederik Heremans
* @since 4.0 * @since 4.0
*/ */
@Category(BaseSpringTestsCategory.class) @Category(OwnJVMTestsCategory.class)
public class PublishWebContentJbpmTest extends PublishWebContentProcessTest public class PublishWebContentJbpmTest extends PublishWebContentProcessTest
{ {
private static final String DEF_NAME = "jbpm$publishWebContent"; private static final String DEF_NAME = "jbpm$publishWebContent";