Author: cziegeler
Date: Fri Feb 22 15:12:42 2013
New Revision: 1449072
URL: http://svn.apache.org/r1449072
Log:
Use Mockito instead of extra mock classes
Modified:
sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/tree/ResourceProviderEntryTest.java
Modified:
sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/tree/ResourceProviderEntryTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/tree/ResourceProviderEntryTest.java?rev=1449072&r1=1449071&r2=1449072&view=diff
==============================================================================
---
sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/tree/ResourceProviderEntryTest.java
(original)
+++
sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/tree/ResourceProviderEntryTest.java
Fri Feb 22 15:12:42 2013
@@ -41,17 +41,15 @@ public class ResourceProviderEntryTest {
private ResourceResolver rootResolver;
- private ResourceProvider rootProvider;
-
private ResourceProviderEntry root;
@Before public void setUp() throws Exception {
this.rootResolver = Mockito.mock(ResourceResolver.class);
- this.rootProvider = Mockito.mock(ResourceProvider.class);
-
Mockito.when(this.rootProvider.getResource(Mockito.any(ResourceResolver.class),
Mockito.anyString())).thenReturn(new TestResource(this.rootResolver));
+ final ResourceProvider rootProvider =
Mockito.mock(ResourceProvider.class);
+
Mockito.when(rootProvider.getResource(Mockito.any(ResourceResolver.class),
Mockito.anyString())).thenReturn(new TestResource(this.rootResolver));
final Map<String, Object> props = new HashMap<String, Object>();
props.put(Constants.SERVICE_ID, (long)0);
- root = new ResourceProviderEntry("/", new ResourceProviderHandler[]{
new ResourceProviderHandler(rootProvider, props)});
+ this.root = new ResourceProviderEntry("/", new
ResourceProviderHandler[]{ new ResourceProviderHandler(rootProvider, props)});
}
@Test public void testRootProvider() {
