Author: cziegeler
Date: Fri Aug 13 15:15:31 2010
New Revision: 985230
URL: http://svn.apache.org/viewvc?rev=985230&view=rev
Log:
Adapt testing to latest API
Modified:
sling/trunk/bundles/commons/testing/pom.xml
sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/sling/MockResource.java
sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/sling/MockResourceResolver.java
Modified: sling/trunk/bundles/commons/testing/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/commons/testing/pom.xml?rev=985230&r1=985229&r2=985230&view=diff
==============================================================================
--- sling/trunk/bundles/commons/testing/pom.xml (original)
+++ sling/trunk/bundles/commons/testing/pom.xml Fri Aug 13 15:15:31 2010
@@ -68,7 +68,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.api</artifactId>
- <version>2.0.8</version>
+ <version>2.0.9-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
Modified:
sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/sling/MockResource.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/sling/MockResource.java?rev=985230&r1=985229&r2=985230&view=diff
==============================================================================
---
sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/sling/MockResource.java
(original)
+++
sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/sling/MockResource.java
Fri Aug 13 15:15:31 2010
@@ -25,16 +25,16 @@ public class MockResource extends Synthe
private String resourceType;
private String resourceSuperType;
-
+
public MockResource(ResourceResolver resourceResolver, String path,
String resourceType) {
this(resourceResolver, path, resourceType, null);
}
-
+
public MockResource(ResourceResolver resourceResolver, String path,
String resourceType, String resourceSuperType) {
super(resourceResolver, path, resourceType);
-
+
setResourceType(resourceType);
setResourceSuperType(resourceSuperType);
}
@@ -43,17 +43,16 @@ public class MockResource extends Synthe
public String getResourceType() {
return resourceType;
}
-
- @Override
+
public void setResourceType(String resourceType) {
this.resourceType = resourceType;
}
-
+
@Override
public String getResourceSuperType() {
return resourceSuperType;
}
-
+
public void setResourceSuperType(String resourceSuperType) {
this.resourceSuperType = resourceSuperType;
}
Modified:
sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/sling/MockResourceResolver.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/sling/MockResourceResolver.java?rev=985230&r1=985229&r2=985230&view=diff
==============================================================================
---
sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/sling/MockResourceResolver.java
(original)
+++
sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/sling/MockResourceResolver.java
Fri Aug 13 15:15:31 2010
@@ -26,6 +26,7 @@ import java.util.NoSuchElementException;
import javax.servlet.http.HttpServletRequest;
+import org.apache.sling.api.resource.LoginException;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
@@ -171,4 +172,20 @@ public class MockResourceResolver implem
public boolean isLive() {
return true;
}
+
+ public ResourceResolver clone(Map<String, Object> authenticationInfo)
+ throws LoginException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public Object getAttribute(String name) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public Iterator<String> getAttributeNames() {
+ // TODO Auto-generated method stub
+ return null;
+ }
}