You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2013/02/22 16:51:03 UTC
svn commit: r1449082 - in /sling/trunk/bundles/jcr/resource: ./
src/test/java/org/apache/sling/jcr/resource/internal/
src/test/java/org/apache/sling/jcr/resource/internal/helper/jcr/
Author: cziegeler
Date: Fri Feb 22 15:51:02 2013
New Revision: 1449082
URL: http://svn.apache.org/r1449082
Log:
Use Mockito instead of extra mock classes
Removed:
sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/helper/jcr/MockResourceResolver.java
Modified:
sling/trunk/bundles/jcr/resource/pom.xml
sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/JcrResourceListenerTest.java
sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrItemResourceTestBase.java
sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrNodeResourceTest.java
Modified: sling/trunk/bundles/jcr/resource/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/resource/pom.xml?rev=1449082&r1=1449081&r2=1449082&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/resource/pom.xml (original)
+++ sling/trunk/bundles/jcr/resource/pom.xml Fri Feb 22 15:51:02 2013
@@ -232,7 +232,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
- <version>1.8.2</version>
+ <version>1.9.5</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/JcrResourceListenerTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/JcrResourceListenerTest.java?rev=1449082&r1=1449081&r2=1449082&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/JcrResourceListenerTest.java (original)
+++ sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/JcrResourceListenerTest.java Fri Feb 22 15:51:02 2013
@@ -21,25 +21,20 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
-import java.util.Map;
import javax.jcr.Node;
-import javax.jcr.PathNotFoundException;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
-import javax.servlet.http.HttpServletRequest;
import org.apache.sling.api.SlingConstants;
-import org.apache.sling.api.resource.LoginException;
-import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.api.resource.ResourceResolverFactory;
import org.apache.sling.commons.testing.jcr.EventHelper;
import org.apache.sling.commons.testing.jcr.RepositoryTestBase;
import org.apache.sling.commons.testing.jcr.RepositoryUtil;
import org.apache.sling.jcr.resource.internal.helper.jcr.JcrNodeResource;
+import org.mockito.Mockito;
import org.osgi.framework.BundleContext;
import org.osgi.service.event.Event;
import org.osgi.service.event.EventAdmin;
@@ -125,161 +120,12 @@ public class JcrResourceListenerTest ext
addNodeToModify(session);
addNodeToDelete(session);
- final ResourceResolver resolver = new ResourceResolver() {
+ final ResourceResolver resolver = Mockito.mock(ResourceResolver.class);
+ Mockito.when(resolver.adaptTo(Mockito.any(Class.class))).thenReturn(session);
+ Mockito.when(resolver.getResource(Mockito.anyString())).thenReturn(new JcrNodeResource(resolver, session.getNode("/"), null));
- public <AdapterType> AdapterType adaptTo(Class<AdapterType> type) {
- return (AdapterType)session;
- }
-
- public Resource resolve(HttpServletRequest request, String absPath) {
- // TODO Auto-generated method stub
- return null;
- }
-
- public Resource resolve(String absPath) {
- // TODO Auto-generated method stub
- return null;
- }
-
- public Resource resolve(HttpServletRequest request) {
- // TODO Auto-generated method stub
- return null;
- }
-
- public String map(String resourcePath) {
- // TODO Auto-generated method stub
- return null;
- }
-
- public String map(HttpServletRequest request, String resourcePath) {
- // TODO Auto-generated method stub
- return null;
- }
-
- public Resource getResource(String path) {
- // TODO Auto-generated method stub
- try {
- return new JcrNodeResource(this, session.getNode(path), null);
- } catch (PathNotFoundException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (RepositoryException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- return null;
- }
-
- public Resource getResource(Resource base, String path) {
- // TODO Auto-generated method stub
- return null;
- }
-
- public String[] getSearchPath() {
- // TODO Auto-generated method stub
- return null;
- }
-
- public Iterator<Resource> listChildren(Resource parent) {
- // TODO Auto-generated method stub
- return null;
- }
-
- public Iterable<Resource> getChildren(Resource parent) {
- // TODO Auto-generated method stub
- return null;
- }
-
- public Iterator<Resource> findResources(String query, String language) {
- // TODO Auto-generated method stub
- return null;
- }
-
- public Iterator<Map<String, Object>> queryResources(String query, String language) {
- // TODO Auto-generated method stub
- return null;
- }
-
- public ResourceResolver clone(Map<String, Object> authenticationInfo) throws LoginException {
- // TODO Auto-generated method stub
- return null;
- }
-
- public boolean isLive() {
- // TODO Auto-generated method stub
- return false;
- }
-
- public void close() {
- // TODO Auto-generated method stub
-
- }
-
- public String getUserID() {
- // TODO Auto-generated method stub
- return null;
- }
-
- public Iterator<String> getAttributeNames() {
- // TODO Auto-generated method stub
- return null;
- }
-
- public Object getAttribute(String name) {
- // TODO Auto-generated method stub
- return null;
- }
-
- public void delete(Resource resource) {
- // TODO Auto-generated method stub
- }
-
- public Resource create(Resource parent, String name, Map<String, Object> properties) {
- // TODO Auto-generated method stub
- return null;
- }
-
- public void revert() {
- // TODO Auto-generated method stub
-
- }
-
- public void commit() {
- // TODO Auto-generated method stub
-
- }
-
- public boolean hasChanges() {
- // TODO Auto-generated method stub
- return false;
- }
-
- public String getResourceSuperType(Resource resource) {
- // TODO Auto-generated method stub
- return null;
- }
-
- public String getResourceSuperType(String resourceType) {
- // TODO Auto-generated method stub
- return null;
- }
-
- public boolean isResourceType(Resource resource,
- String resourceType) {
- // TODO Auto-generated method stub
- return false;
- }
- };
- final ResourceResolverFactory factory = new ResourceResolverFactory() {
-
- public ResourceResolver getResourceResolver(Map<String, Object> authenticationInfo) throws LoginException {
- return null;
- }
-
- public ResourceResolver getAdministrativeResourceResolver(Map<String, Object> authenticationInfo) throws LoginException {
- return resolver;
- }
- };
+ final ResourceResolverFactory factory = Mockito.mock(ResourceResolverFactory.class);
+ Mockito.when(factory.getAdministrativeResourceResolver(Mockito.anyMap())).thenReturn(resolver);
final EventAdmin mockEA = new EventAdmin() {
@@ -309,6 +155,7 @@ public class JcrResourceListenerTest ext
Node modified = session.getNode(pathToModify);
modified.setProperty("foo", "bar");
+
session.save();
Node deleted = session.getNode(pathToDelete);
Modified: sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrItemResourceTestBase.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrItemResourceTestBase.java?rev=1449082&r1=1449081&r2=1449082&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrItemResourceTestBase.java (original)
+++ sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrItemResourceTestBase.java Fri Feb 22 15:51:02 2013
@@ -25,7 +25,6 @@ import javax.jcr.NamespaceRegistry;
import javax.jcr.Node;
import org.apache.sling.api.SlingConstants;
-import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.commons.testing.jcr.RepositoryTestBase;
import org.apache.sling.jcr.resource.JcrResourceConstants;
@@ -40,16 +39,16 @@ public class JcrItemResourceTestBase ext
protected static final byte[] TEST_DATA = { 'S', 'o', 'm', 'e', ' ', 'T',
'e', 's', 't' };
- protected ResourceResolver resourceResolver;
-
protected String rootPath;
protected Node rootNode;
+ @Override
protected void setUp() throws Exception {
super.setUp();
- resourceResolver = new MockResourceResolver(getSession());
+ // create the session
+ getSession();
try {
NamespaceRegistry nsr = session.getWorkspace().getNamespaceRegistry();
@@ -71,7 +70,7 @@ public class JcrItemResourceTestBase ext
rootNode.remove();
getSession().save();
}
-
+
super.tearDown();
}
Modified: sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrNodeResourceTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrNodeResourceTest.java?rev=1449082&r1=1449081&r2=1449082&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrNodeResourceTest.java (original)
+++ sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrNodeResourceTest.java Fri Feb 22 15:51:02 2013
@@ -126,7 +126,7 @@ public class JcrNodeResourceTest extends
node.setProperty(JcrResourceConstants.SLING_RESOURCE_TYPE_PROPERTY, typeName);
getSession().save();
- Resource jnr = new JcrNodeResource(resourceResolver, node, null);
+ Resource jnr = new JcrNodeResource(null, node, null);
assertEquals(typeName, jnr.getResourceType());
// default super type is null
@@ -137,7 +137,7 @@ public class JcrNodeResourceTest extends
typeNode.setProperty(JcrResourceConstants.SLING_RESOURCE_SUPER_TYPE_PROPERTY, superTypeName);
getSession().save();
- jnr = new JcrNodeResource(resourceResolver, typeNode, null);
+ jnr = new JcrNodeResource(null, typeNode, null);
assertEquals(JcrConstants.NT_UNSTRUCTURED, jnr.getResourceType());
assertEquals(superTypeName, jnr.getResourceSuperType());
@@ -146,7 +146,7 @@ public class JcrNodeResourceTest extends
node.setProperty(JcrResourceConstants.SLING_RESOURCE_SUPER_TYPE_PROPERTY, otherSuperTypeName);
getSession().save();
- jnr = new JcrNodeResource(resourceResolver, node, null);
+ jnr = new JcrNodeResource(null, node, null);
assertEquals(typeName, jnr.getResourceType());
assertEquals(otherSuperTypeName, jnr.getResourceSuperType());
@@ -154,7 +154,7 @@ public class JcrNodeResourceTest extends
node.getProperty(JcrResourceConstants.SLING_RESOURCE_SUPER_TYPE_PROPERTY).remove();
getSession().save();
- jnr = new JcrNodeResource(resourceResolver, node, null);
+ jnr = new JcrNodeResource(null, node, null);
assertEquals(typeName, jnr.getResourceType());
assertNull(jnr.getResourceSuperType());
}