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 2014/10/21 21:22:32 UTC
svn commit: r1633438 - in /sling/trunk/testing/mocks/sling-mock/src:
main/java/org/apache/sling/testing/mock/sling/context/
test/java/org/apache/sling/testing/mock/sling/context/
test/java/org/apache/sling/testing/mock/sling/junit/
Author: sseifert
Date: Tue Oct 21 19:22:32 2014
New Revision: 1633438
URL: http://svn.apache.org/r1633438
Log:
SLING-4085 NPE when using SlingContext rule without constructor argument
Added:
sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/junit/SlingContextDefaultRRTypeTest.java (with props)
Modified:
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/context/ContextResourceResolverFactory.java
sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/context/SlingContextImplTest.java
Modified: sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/context/ContextResourceResolverFactory.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/context/ContextResourceResolverFactory.java?rev=1633438&r1=1633437&r2=1633438&view=diff
==============================================================================
--- sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/context/ContextResourceResolverFactory.java (original)
+++ sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/context/ContextResourceResolverFactory.java Tue Oct 21 19:22:32 2014
@@ -38,10 +38,14 @@ final class ContextResourceResolverFacto
}
public static ResourceResolverFactory get(final ResourceResolverType resourceResolverType) {
+ ResourceResolverType type = resourceResolverType;
+ if (type == null) {
+ type = MockSling.DEFAULT_RESOURCERESOLVER_TYPE;
+ }
try {
- ResourceResolverFactory factory = MockSling.newResourceResolverFactory(resourceResolverType);
+ ResourceResolverFactory factory = MockSling.newResourceResolverFactory(type);
- switch (resourceResolverType) {
+ switch (type) {
case JCR_MOCK:
initializeJcrMock(factory);
break;
@@ -52,12 +56,12 @@ final class ContextResourceResolverFacto
initializeResourceResolverMock(factory);
break;
default:
- throw new IllegalArgumentException("Invalid resource resolver type: " + resourceResolverType);
+ throw new IllegalArgumentException("Invalid resource resolver type: " + type);
}
return factory;
} catch (Throwable ex) {
- throw new RuntimeException("Unable to initialize " + resourceResolverType + " resource resolver factory.", ex);
+ throw new RuntimeException("Unable to initialize " + type + " resource resolver factory.", ex);
}
}
Modified: sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/context/SlingContextImplTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/context/SlingContextImplTest.java?rev=1633438&r1=1633437&r2=1633438&view=diff
==============================================================================
--- sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/context/SlingContextImplTest.java (original)
+++ sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/context/SlingContextImplTest.java Tue Oct 21 19:22:32 2014
@@ -200,6 +200,14 @@ public class SlingContextImplTest {
assertNotNull(factory);
}
+ @Test
+ public void testWithoutResourceResolverType() {
+ SlingContextImpl contextTest = new SlingContextImpl();
+ contextTest.setUp();
+ ResourceResolverFactory factory = contextTest.getService(ResourceResolverFactory.class);
+ assertNotNull(factory);
+ }
+
@Model(adaptables = SlingHttpServletRequest.class)
public interface RequestAttributeModel {
@Inject
Added: sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/junit/SlingContextDefaultRRTypeTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/junit/SlingContextDefaultRRTypeTest.java?rev=1633438&view=auto
==============================================================================
--- sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/junit/SlingContextDefaultRRTypeTest.java (added)
+++ sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/junit/SlingContextDefaultRRTypeTest.java Tue Oct 21 19:22:32 2014
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.sling.testing.mock.sling.junit;
+
+import static org.junit.Assert.assertNotNull;
+
+import org.junit.Rule;
+import org.junit.Test;
+
+public class SlingContextDefaultRRTypeTest {
+
+ // Run all unit tests for each resource resolver types listed here
+ @Rule
+ public SlingContext context = new SlingContext();
+
+ @Test
+ public void testRequest() {
+ assertNotNull(context.request());
+ }
+
+}
Propchange: sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/junit/SlingContextDefaultRRTypeTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/junit/SlingContextDefaultRRTypeTest.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Tue Oct 21 19:22:32 2014
@@ -0,0 +1 @@
+LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Author
Propchange: sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/junit/SlingContextDefaultRRTypeTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain