You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ju...@apache.org on 2014/08/22 16:18:42 UTC
svn commit: r1619818 - in
/sling/trunk/bundles/extensions/models/impl/src/test/java/org/apache/sling/models/impl:
MultipleInjectorTest.java ServicePropertiesMap.java
Author: justin
Date: Fri Aug 22 14:18:41 2014
New Revision: 1619818
URL: http://svn.apache.org/r1619818
Log:
fixing error in Sling Models test code - service ranking must be an integer to be effective
Modified:
sling/trunk/bundles/extensions/models/impl/src/test/java/org/apache/sling/models/impl/MultipleInjectorTest.java
sling/trunk/bundles/extensions/models/impl/src/test/java/org/apache/sling/models/impl/ServicePropertiesMap.java
Modified: sling/trunk/bundles/extensions/models/impl/src/test/java/org/apache/sling/models/impl/MultipleInjectorTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/models/impl/src/test/java/org/apache/sling/models/impl/MultipleInjectorTest.java?rev=1619818&r1=1619817&r2=1619818&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/models/impl/src/test/java/org/apache/sling/models/impl/MultipleInjectorTest.java (original)
+++ sling/trunk/bundles/extensions/models/impl/src/test/java/org/apache/sling/models/impl/MultipleInjectorTest.java Fri Aug 22 14:18:41 2014
@@ -68,9 +68,9 @@ public class MultipleInjectorTest {
factory = new ModelAdapterFactory();
factory.activate(componentCtx);
- factory.bindInjector(bindingsInjector, new ServicePropertiesMap(2, 2));
- factory.bindInjector(attributesInjector, new ServicePropertiesMap(1, 1));
- factory.bindInjectAnnotationProcessorFactory(bindingsInjector, new ServicePropertiesMap(2, 2));
+ factory.bindInjector(bindingsInjector, new ServicePropertiesMap(1, 1));
+ factory.bindInjector(attributesInjector, new ServicePropertiesMap(2, 2));
+ factory.bindInjectAnnotationProcessorFactory(bindingsInjector, new ServicePropertiesMap(1, 1));
when(request.getAttribute(SlingBindings.class.getName())).thenReturn(bindings);
}
Modified: sling/trunk/bundles/extensions/models/impl/src/test/java/org/apache/sling/models/impl/ServicePropertiesMap.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/models/impl/src/test/java/org/apache/sling/models/impl/ServicePropertiesMap.java?rev=1619818&r1=1619817&r2=1619818&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/models/impl/src/test/java/org/apache/sling/models/impl/ServicePropertiesMap.java (original)
+++ sling/trunk/bundles/extensions/models/impl/src/test/java/org/apache/sling/models/impl/ServicePropertiesMap.java Fri Aug 22 14:18:41 2014
@@ -23,7 +23,7 @@ import org.osgi.framework.Constants;
@SuppressWarnings("serial")
public class ServicePropertiesMap extends HashMap<String, Object> {
- public ServicePropertiesMap(long serviceId, long serviceRanking) {
+ public ServicePropertiesMap(long serviceId, int serviceRanking) {
super();
put(Constants.SERVICE_ID, serviceId);
put(Constants.SERVICE_RANKING, serviceRanking);