Author: cziegeler
Date: Mon Aug 4 12:14:22 2008
New Revision: 682467
URL: http://svn.apache.org/viewvc?rev=682467&view=rev
Log:
Update mocks to R4.1 interfaces.
Modified:
incubator/sling/trunk/commons/testing/src/main/java/org/apache/sling/commons/testing/osgi/MockBundle.java
incubator/sling/trunk/commons/testing/src/main/java/org/apache/sling/commons/testing/osgi/MockServiceReference.java
incubator/sling/trunk/extensions/adapter/src/test/java/org/apache/sling/adapter/mock/MockBundle.java
incubator/sling/trunk/extensions/adapter/src/test/java/org/apache/sling/adapter/mock/MockServiceReference.java
incubator/sling/trunk/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/JcrResourceResolverFactoryImplTest.java
Modified:
incubator/sling/trunk/commons/testing/src/main/java/org/apache/sling/commons/testing/osgi/MockBundle.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/commons/testing/src/main/java/org/apache/sling/commons/testing/osgi/MockBundle.java?rev=682467&r1=682466&r2=682467&view=diff
==============================================================================
---
incubator/sling/trunk/commons/testing/src/main/java/org/apache/sling/commons/testing/osgi/MockBundle.java
(original)
+++
incubator/sling/trunk/commons/testing/src/main/java/org/apache/sling/commons/testing/osgi/MockBundle.java
Mon Aug 4 12:14:22 2008
@@ -25,6 +25,7 @@
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
+import org.osgi.framework.BundleException;
import org.osgi.framework.ServiceReference;
public class MockBundle implements Bundle {
@@ -124,4 +125,9 @@
return null;
}
+ public void start(int options) throws BundleException {
+ }
+
+ public void stop(int options) throws BundleException {
+ }
}
\ No newline at end of file
Modified:
incubator/sling/trunk/commons/testing/src/main/java/org/apache/sling/commons/testing/osgi/MockServiceReference.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/commons/testing/src/main/java/org/apache/sling/commons/testing/osgi/MockServiceReference.java?rev=682467&r1=682466&r2=682467&view=diff
==============================================================================
---
incubator/sling/trunk/commons/testing/src/main/java/org/apache/sling/commons/testing/osgi/MockServiceReference.java
(original)
+++
incubator/sling/trunk/commons/testing/src/main/java/org/apache/sling/commons/testing/osgi/MockServiceReference.java
Mon Aug 4 12:14:22 2008
@@ -29,7 +29,7 @@
public class MockServiceReference implements ServiceReference {
private static long serviceIdCounter = 0;
-
+
private Bundle bundle;
private Dictionary<String, Object> props;
@@ -37,7 +37,7 @@
public MockServiceReference(Bundle bundle) {
this.bundle = bundle;
this.props = new Hashtable<String, Object>();
-
+
// mockup a service id
props.put(Constants.SERVICE_ID, serviceIdCounter++);
}
@@ -66,4 +66,8 @@
return false;
}
+ public int compareTo(Object reference) {
+ return 0;
+ }
+
}
\ No newline at end of file
Modified:
incubator/sling/trunk/extensions/adapter/src/test/java/org/apache/sling/adapter/mock/MockBundle.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/extensions/adapter/src/test/java/org/apache/sling/adapter/mock/MockBundle.java?rev=682467&r1=682466&r2=682467&view=diff
==============================================================================
---
incubator/sling/trunk/extensions/adapter/src/test/java/org/apache/sling/adapter/mock/MockBundle.java
(original)
+++
incubator/sling/trunk/extensions/adapter/src/test/java/org/apache/sling/adapter/mock/MockBundle.java
Mon Aug 4 12:14:22 2008
@@ -25,6 +25,7 @@
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
+import org.osgi.framework.BundleException;
import org.osgi.framework.ServiceReference;
public class MockBundle implements Bundle {
@@ -124,4 +125,9 @@
return null;
}
+ public void start(int options) throws BundleException {
+ }
+
+ public void stop(int options) throws BundleException {
+ }
}
Modified:
incubator/sling/trunk/extensions/adapter/src/test/java/org/apache/sling/adapter/mock/MockServiceReference.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/extensions/adapter/src/test/java/org/apache/sling/adapter/mock/MockServiceReference.java?rev=682467&r1=682466&r2=682467&view=diff
==============================================================================
---
incubator/sling/trunk/extensions/adapter/src/test/java/org/apache/sling/adapter/mock/MockServiceReference.java
(original)
+++
incubator/sling/trunk/extensions/adapter/src/test/java/org/apache/sling/adapter/mock/MockServiceReference.java
Mon Aug 4 12:14:22 2008
@@ -59,4 +59,7 @@
return false;
}
+ public int compareTo(Object reference) {
+ return 0;
+ }
}
Modified:
incubator/sling/trunk/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/JcrResourceResolverFactoryImplTest.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/JcrResourceResolverFactoryImplTest.java?rev=682467&r1=682466&r2=682467&view=diff
==============================================================================
---
incubator/sling/trunk/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/JcrResourceResolverFactoryImplTest.java
(original)
+++
incubator/sling/trunk/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/JcrResourceResolverFactoryImplTest.java
Mon Aug 4 12:14:22 2008
@@ -125,6 +125,11 @@
// TODO Auto-generated method stub
return false;
}
+
+ public int compareTo(Object reference) {
+ // TODO Auto-generated method stub
+ return 0;
+ }
}
}