You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ss...@apache.org on 2016/09/13 09:33:02 UTC
svn commit: r1760504 - in /sling: branches/testing/mocks/sling-mock-1.x/
branches/testing/mocks/sling-mock-1.x/src/main/java/org/apache/sling/testing/mock/sling/builder/
branches/testing/mocks/sling-mock-1.x/src/test/java/org/apache/sling/testing/mock/...
Author: sseifert
Date: Tue Sep 13 09:33:02 2016
New Revision: 1760504
URL: http://svn.apache.org/viewvc?rev=1760504&view=rev
Log:
SLING-6049 use MapUtil from osgi-mock
Modified:
sling/branches/testing/mocks/sling-mock-1.x/pom.xml
sling/branches/testing/mocks/sling-mock-1.x/src/main/java/org/apache/sling/testing/mock/sling/builder/ContentBuilder.java
sling/branches/testing/mocks/sling-mock-1.x/src/test/java/org/apache/sling/testing/mock/sling/context/ModelAdapterFactoryUtilTest.java
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/builder/ContentBuilder.java
sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/context/ModelAdapterFactoryUtilTest.java
Modified: sling/branches/testing/mocks/sling-mock-1.x/pom.xml
URL: http://svn.apache.org/viewvc/sling/branches/testing/mocks/sling-mock-1.x/pom.xml?rev=1760504&r1=1760503&r2=1760504&view=diff
==============================================================================
--- sling/branches/testing/mocks/sling-mock-1.x/pom.xml (original)
+++ sling/branches/testing/mocks/sling-mock-1.x/pom.xml Tue Sep 13 09:33:02 2016
@@ -45,7 +45,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.osgi-mock</artifactId>
- <version>1.7.2</version>
+ <version>1.7.3-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
Modified: sling/branches/testing/mocks/sling-mock-1.x/src/main/java/org/apache/sling/testing/mock/sling/builder/ContentBuilder.java
URL: http://svn.apache.org/viewvc/sling/branches/testing/mocks/sling-mock-1.x/src/main/java/org/apache/sling/testing/mock/sling/builder/ContentBuilder.java?rev=1760504&r1=1760503&r2=1760504&view=diff
==============================================================================
--- sling/branches/testing/mocks/sling-mock-1.x/src/main/java/org/apache/sling/testing/mock/sling/builder/ContentBuilder.java (original)
+++ sling/branches/testing/mocks/sling-mock-1.x/src/main/java/org/apache/sling/testing/mock/sling/builder/ContentBuilder.java Tue Sep 13 09:33:02 2016
@@ -27,7 +27,7 @@ import org.apache.sling.api.resource.Res
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.api.resource.ResourceUtil;
import org.apache.sling.api.resource.ValueMap;
-import org.apache.sling.resourcebuilder.impl.MapArgsConverter;
+import org.apache.sling.testing.mock.osgi.MapUtil;
import com.google.common.collect.ImmutableMap;
@@ -83,17 +83,8 @@ public class ContentBuilder {
* @param properties Properties for resource.
* @return Resource object
*/
- @SuppressWarnings("unchecked")
public final Resource resource(String path, Object... properties) {
- if (properties == null || properties.length == 0) {
- return resource(path);
- }
- else if (properties.length == 1 && properties[0] instanceof Map) {
- return resource(path, (Map<String,Object>)properties[0]);
- }
- else {
- return resource(path, MapArgsConverter.toMap(properties));
- }
+ return resource(path, MapUtil.toMap(properties));
}
/**
Modified: sling/branches/testing/mocks/sling-mock-1.x/src/test/java/org/apache/sling/testing/mock/sling/context/ModelAdapterFactoryUtilTest.java
URL: http://svn.apache.org/viewvc/sling/branches/testing/mocks/sling-mock-1.x/src/test/java/org/apache/sling/testing/mock/sling/context/ModelAdapterFactoryUtilTest.java?rev=1760504&r1=1760503&r2=1760504&view=diff
==============================================================================
--- sling/branches/testing/mocks/sling-mock-1.x/src/test/java/org/apache/sling/testing/mock/sling/context/ModelAdapterFactoryUtilTest.java (original)
+++ sling/branches/testing/mocks/sling-mock-1.x/src/test/java/org/apache/sling/testing/mock/sling/context/ModelAdapterFactoryUtilTest.java Tue Sep 13 09:33:02 2016
@@ -55,7 +55,7 @@ public class ModelAdapterFactoryUtilTest
@Test
public void testOsgiService() {
- context.registerService(MimeTypeService.class, new MockMimeTypeService(), null);
+ context.registerService(MimeTypeService.class, new MockMimeTypeService());
OsgiServiceModel model = context.resourceResolver().adaptTo(OsgiServiceModel.class);
assertNotNull(model);
Modified: sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/builder/ContentBuilder.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/builder/ContentBuilder.java?rev=1760504&r1=1760503&r2=1760504&view=diff
==============================================================================
--- sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/builder/ContentBuilder.java (original)
+++ sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/builder/ContentBuilder.java Tue Sep 13 09:33:02 2016
@@ -27,7 +27,7 @@ import org.apache.sling.api.resource.Res
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.api.resource.ResourceUtil;
import org.apache.sling.api.resource.ValueMap;
-import org.apache.sling.resourcebuilder.impl.MapArgsConverter;
+import org.apache.sling.testing.mock.osgi.MapUtil;
import com.google.common.collect.ImmutableMap;
@@ -83,17 +83,8 @@ public class ContentBuilder {
* @param properties Properties for resource.
* @return Resource object
*/
- @SuppressWarnings("unchecked")
public final Resource resource(String path, Object... properties) {
- if (properties == null || properties.length == 0) {
- return resource(path);
- }
- else if (properties.length == 1 && properties[0] instanceof Map) {
- return resource(path, (Map<String,Object>)properties[0]);
- }
- else {
- return resource(path, MapArgsConverter.toMap(properties));
- }
+ return resource(path, MapUtil.toMap(properties));
}
/**
Modified: sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/context/ModelAdapterFactoryUtilTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/context/ModelAdapterFactoryUtilTest.java?rev=1760504&r1=1760503&r2=1760504&view=diff
==============================================================================
--- sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/context/ModelAdapterFactoryUtilTest.java (original)
+++ sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/context/ModelAdapterFactoryUtilTest.java Tue Sep 13 09:33:02 2016
@@ -55,7 +55,7 @@ public class ModelAdapterFactoryUtilTest
@Test
public void testOsgiService() {
- context.registerService(MimeTypeService.class, new MockMimeTypeService(), null);
+ context.registerService(MimeTypeService.class, new MockMimeTypeService());
OsgiServiceModel model = context.resourceResolver().adaptTo(OsgiServiceModel.class);
assertNotNull(model);