From fff75d6076bea6145cd72bd8c7da8a1d1b5993f6 Mon Sep 17 00:00:00 2001 From: David Caruana Date: Wed, 6 May 2009 13:29:19 +0000 Subject: [PATCH] Fix test. Depends on partial Spring context initialisation which is not reliable. Removed dependency as it only requires a small helper class which can be constructed manually in test. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14206 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../repo/cmis/PropertyFilterTest.java | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/source/java/org/alfresco/repo/cmis/PropertyFilterTest.java b/source/java/org/alfresco/repo/cmis/PropertyFilterTest.java index 22a3ffe6f4..592e0119f4 100755 --- a/source/java/org/alfresco/repo/cmis/PropertyFilterTest.java +++ b/source/java/org/alfresco/repo/cmis/PropertyFilterTest.java @@ -24,15 +24,16 @@ */ package org.alfresco.repo.cmis; +import junit.framework.TestCase; + import org.alfresco.repo.cmis.ws.CmisException; import org.alfresco.repo.cmis.ws.EnumServiceException; import org.alfresco.repo.cmis.ws.utils.CmisObjectsUtils; -import org.springframework.test.AbstractDependencyInjectionSpringContextTests; /** * @author Dmitry Velichkevich */ -public class PropertyFilterTest extends AbstractDependencyInjectionSpringContextTests +public class PropertyFilterTest extends TestCase { private static final String NAME_TOKEN = "name"; @@ -58,12 +59,8 @@ public class PropertyFilterTest extends AbstractDependencyInjectionSpringContext private static final String INVALID_FILTER_WITH_DENIED_SYMBOL = "ObjectId; name"; private static final String INVALID_FILTER_WITH_LAST_INVALID_SYMBOL = "ObjectId, name*"; - private CmisObjectsUtils cmisObjectsUtils; + private CmisObjectsUtils cmisObjectsUtils = new CmisObjectsUtils(); - public void setCmisObjectsUtils(CmisObjectsUtils cmisObjectsUtils) - { - this.cmisObjectsUtils = cmisObjectsUtils; - } public void testValidFilters() throws Exception { @@ -158,12 +155,4 @@ public class PropertyFilterTest extends AbstractDependencyInjectionSpringContext } } - @Override - protected String[] getConfigLocations() - { - setAutowireMode(AUTOWIRE_BY_NAME); - setDependencyCheck(false); - - return new String[] { "classpath:alfresco/cmis-ws-context.xml" }; - } }