Return-Path: X-Original-To: apmail-sling-commits-archive@www.apache.org Delivered-To: apmail-sling-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 75DE710E63 for ; Wed, 19 Mar 2014 23:22:03 +0000 (UTC) Received: (qmail 36461 invoked by uid 500); 19 Mar 2014 23:22:02 -0000 Delivered-To: apmail-sling-commits-archive@sling.apache.org Received: (qmail 36391 invoked by uid 500); 19 Mar 2014 23:22:02 -0000 Mailing-List: contact commits-help@sling.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@sling.apache.org Delivered-To: mailing list commits@sling.apache.org Received: (qmail 36383 invoked by uid 99); 19 Mar 2014 23:22:02 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 Mar 2014 23:22:02 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 Mar 2014 23:22:00 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 989F123888E2; Wed, 19 Mar 2014 23:21:40 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1579457 - /sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/MockedResourceResolverImplTest.java Date: Wed, 19 Mar 2014 23:21:40 -0000 To: commits@sling.apache.org From: cziegeler@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140319232140.989F123888E2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: cziegeler Date: Wed Mar 19 23:21:39 2014 New Revision: 1579457 URL: http://svn.apache.org/r1579457 Log: Fix NPE during tests Modified: sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/MockedResourceResolverImplTest.java Modified: sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/MockedResourceResolverImplTest.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/MockedResourceResolverImplTest.java?rev=1579457&r1=1579456&r2=1579457&view=diff ============================================================================== --- sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/MockedResourceResolverImplTest.java (original) +++ sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/MockedResourceResolverImplTest.java Wed Mar 19 23:21:39 2014 @@ -36,6 +36,7 @@ import org.apache.sling.api.resource.Res import org.apache.sling.api.resource.ResourceResolver; import org.apache.sling.api.resource.ResourceResolverFactory; import org.apache.sling.api.resource.ValueMap; +import org.apache.sling.api.wrappers.ValueMapDecorator; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -293,7 +294,11 @@ public class MockedResourceResolverImplT resourceMetadata.put(properties[i], properties[i+1]); vm.put(properties[i], properties[i+1]); } + Mockito.when(resource.getValueMap()).thenReturn(vm); Mockito.when(resource.adaptTo(Mockito.eq(ValueMap.class))).thenReturn(vm); + } else { + Mockito.when(resource.getValueMap()).thenReturn(ValueMapDecorator.EMPTY); + Mockito.when(resource.adaptTo(Mockito.eq(ValueMap.class))).thenReturn(ValueMapDecorator.EMPTY); } return resource;