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 059AD17F4B for ; Tue, 24 Feb 2015 13:58:15 +0000 (UTC) Received: (qmail 69742 invoked by uid 500); 24 Feb 2015 13:58:15 -0000 Delivered-To: apmail-sling-commits-archive@sling.apache.org Received: (qmail 69677 invoked by uid 500); 24 Feb 2015 13:58:14 -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 69668 invoked by uid 99); 24 Feb 2015 13:58:14 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 24 Feb 2015 13:58:14 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id C20E3AC0051 for ; Tue, 24 Feb 2015 13:58:14 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1661954 - /sling/trunk/contrib/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/ValidationServiceImplTest.java Date: Tue, 24 Feb 2015 13:58:14 -0000 To: commits@sling.apache.org From: kwin@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150224135814.C20E3AC0051@hades.apache.org> Author: kwin Date: Tue Feb 24 13:58:14 2015 New Revision: 1661954 URL: http://svn.apache.org/r1661954 Log: add test for arguments parameter of the validate to never be null Modified: sling/trunk/contrib/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/ValidationServiceImplTest.java Modified: sling/trunk/contrib/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/ValidationServiceImplTest.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/ValidationServiceImplTest.java?rev=1661954&r1=1661953&r2=1661954&view=diff ============================================================================== --- sling/trunk/contrib/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/ValidationServiceImplTest.java (original) +++ sling/trunk/contrib/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/ValidationServiceImplTest.java Tue Feb 24 13:58:14 2015 @@ -44,6 +44,7 @@ import org.apache.sling.jcr.resource.Jcr import org.apache.sling.validation.api.ValidationModel; import org.apache.sling.validation.api.ValidationResult; import org.apache.sling.validation.api.Validator; +import org.apache.sling.validation.api.exceptions.SlingValidationException; import org.apache.sling.validation.impl.setup.MockedResourceResolver; import org.apache.sling.validation.impl.util.examplevalidators.DateValidator; import org.apache.sling.validation.impl.validators.RegexValidator; @@ -54,6 +55,7 @@ import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; +import org.mockito.Mockito; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; import org.powermock.reflect.Whitebox; @@ -258,6 +260,46 @@ public class ValidationServiceImplTest { } finally { if (model1 != null) { rr.delete(model1); + } + } + } + + @Test + public void testValidateNeverCalledWithNullValues() throws Exception { + + Validator myValidator = new Validator() { + @Override + public String validate(String data, ValueMap valueMap, ValueMap arguments) + throws SlingValidationException { + Assert.assertNotNull("ValueMap parameter for validate should never be null", valueMap); + Assert.assertNotNull("arguments parameter for validate should never be null", arguments); + return null; + } + + }; + + validationService.validators.put("testvalidator", + myValidator); + + TestProperty property = new TestProperty("field1"); + property.addValidator("testvalidator"); + Resource model1 = null; + try { + model1 = createValidationModelResource(rr, libsValidatorsRoot.getPath(), "testValidationModel1", + "sling/validation/test", new String[] { "/apps/validation" }, property); + + ValidationModel vm = validationService.getValidationModel("sling/validation/test", + "/apps/validation/1/resource"); + HashMap hashMap = new HashMap() { + { + put("field1", "1"); + } + }; + ValueMap map = new ValueMapDecorator(hashMap); + validationService.validate(map, vm); + } finally { + if (model1 != null) { + rr.delete(model1); } } }