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

58375: Added ownJVMCategory for repository tests


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61970 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-11 23:19:44 +00:00
parent adf84a58fe
commit 9434548918
2 changed files with 22 additions and 2 deletions

21
pom.xml
View File

@@ -878,11 +878,26 @@
<failIfNoSpecifiedTests>false</failIfNoSpecifiedTests> <failIfNoSpecifiedTests>false</failIfNoSpecifiedTests>
</configuration> </configuration>
</execution> </execution>
<!-- Execution for tests which require their own JVM -->
<execution>
<id>run-ownJVMTestsCategory</id>
<goals>
<goal>test</goal>
</goals>
<phase>process-test-classes</phase>
<configuration>
<forkMode>always</forkMode>
<groups>org.alfresco.test_category.OwnJVMTestsCategory</groups>
</configuration>
</execution>
</executions> </executions>
<!-- Default configuration, specifying which tests to pass --> <!-- Default configuration, specifying which tests to pass -->
<configuration> <configuration>
<forkMode>always</forkMode> <!-- These are the default fork options -->
<forkCount>1</forkCount>
<reuseForks>true</reuseForks>
<!-- end of default fork options -->
<includes> <includes>
<!-- Standard test names --> <!-- Standard test names -->
<include>**/*Test.*</include> <include>**/*Test.*</include>
@@ -891,7 +906,9 @@
<include>**/org/alfresco/repo/avm/*TestP.*</include> <include>**/org/alfresco/repo/avm/*TestP.*</include>
<include>**/org/alfresco/repo/avm/AVMServiceTestBase.*</include> <include>**/org/alfresco/repo/avm/AVMServiceTestBase.*</include>
</includes> </includes>
<excludedGroups>
org.alfresco.test_category.OwnJVMTestsCategory
</excludedGroups>
<excludes> <excludes>
<exclude>**/org/alfresco/RepositoryStartupTest.*</exclude> <exclude>**/org/alfresco/RepositoryStartupTest.*</exclude>

View File

@@ -83,6 +83,7 @@ import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
import org.alfresco.service.cmr.repository.datatype.Duration; import org.alfresco.service.cmr.repository.datatype.Duration;
import org.alfresco.service.cmr.security.PermissionService; import org.alfresco.service.cmr.security.PermissionService;
import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.QName;
import org.alfresco.test_category.OwnJVMTestsCategory;
import org.alfresco.util.CachingDateFormat; import org.alfresco.util.CachingDateFormat;
import org.alfresco.util.ISO9075; import org.alfresco.util.ISO9075;
import org.antlr.runtime.ANTLRStringStream; import org.antlr.runtime.ANTLRStringStream;
@@ -95,11 +96,13 @@ import org.apache.chemistry.opencmis.commons.enums.BaseTypeId;
import org.apache.chemistry.opencmis.commons.enums.Cardinality; import org.apache.chemistry.opencmis.commons.enums.Cardinality;
import org.apache.chemistry.opencmis.commons.enums.PropertyType; import org.apache.chemistry.opencmis.commons.enums.PropertyType;
import org.apache.chemistry.opencmis.commons.exceptions.CmisBaseException; import org.apache.chemistry.opencmis.commons.exceptions.CmisBaseException;
import org.junit.experimental.categories.Category;
import org.springframework.extensions.surf.util.I18NUtil; import org.springframework.extensions.surf.util.I18NUtil;
/** /**
* @author andyh * @author andyh
*/ */
@Category(OwnJVMTestsCategory.class)
public class QueryTest extends BaseCMISTest public class QueryTest extends BaseCMISTest
{ {
private static final String TEST_NAMESPACE = "http://www.alfresco.org/test/cmis-query-test"; private static final String TEST_NAMESPACE = "http://www.alfresco.org/test/cmis-query-test";