Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id CFC65200B68 for ; Fri, 19 Aug 2016 17:25:03 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id CE17C160AAB; Fri, 19 Aug 2016 15:25:03 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id EE9C3160A79 for ; Fri, 19 Aug 2016 17:25:02 +0200 (CEST) Received: (qmail 51011 invoked by uid 500); 19 Aug 2016 15:25: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 51002 invoked by uid 99); 19 Aug 2016 15:25:02 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 19 Aug 2016 15:25:02 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id BF593180140 for ; Fri, 19 Aug 2016 15:25:01 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -0.426 X-Spam-Level: X-Spam-Status: No, score=-0.426 tagged_above=-999 required=6.31 tests=[KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-1.426] autolearn=disabled Received: from mx2-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id dT1-C-GeZp5A for ; Fri, 19 Aug 2016 15:24:59 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx2-lw-eu.apache.org (ASF Mail Server at mx2-lw-eu.apache.org) with ESMTP id 329575F245 for ; Fri, 19 Aug 2016 15:24:59 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id 49820E0054 for ; Fri, 19 Aug 2016 15:24:58 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 067E63A0E73 for ; Fri, 19 Aug 2016 15:24:57 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1756923 - /sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/impl/ConfigurationResolverImplTest.java Date: Fri, 19 Aug 2016 15:24:57 -0000 To: commits@sling.apache.org From: sseifert@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20160819152458.067E63A0E73@svn01-us-west.apache.org> archived-at: Fri, 19 Aug 2016 15:25:04 -0000 Author: sseifert Date: Fri Aug 19 15:24:57 2016 New Revision: 1756923 URL: http://svn.apache.org/viewvc?rev=1756923&view=rev Log: SLING-5886 default value handling is now working for annotations classes Modified: sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/impl/ConfigurationResolverImplTest.java Modified: sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/impl/ConfigurationResolverImplTest.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/impl/ConfigurationResolverImplTest.java?rev=1756923&r1=1756922&r2=1756923&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/impl/ConfigurationResolverImplTest.java (original) +++ sling/trunk/contrib/extensions/contextaware-config/impl/src/test/java/org/apache/sling/contextaware/config/impl/ConfigurationResolverImplTest.java Fri Aug 19 15:24:57 2016 @@ -18,6 +18,17 @@ */ package org.apache.sling.contextaware.config.impl; +import static org.apache.sling.contextaware.config.example.AllTypesDefaults.BOOL_DEFAULT; +import static org.apache.sling.contextaware.config.example.AllTypesDefaults.BOOL_DEFAULT_2; +import static org.apache.sling.contextaware.config.example.AllTypesDefaults.DOUBLE_DEFAULT; +import static org.apache.sling.contextaware.config.example.AllTypesDefaults.DOUBLE_DEFAULT_2; +import static org.apache.sling.contextaware.config.example.AllTypesDefaults.INT_DEFAULT; +import static org.apache.sling.contextaware.config.example.AllTypesDefaults.INT_DEFAULT_2; +import static org.apache.sling.contextaware.config.example.AllTypesDefaults.LONG_DEFAULT; +import static org.apache.sling.contextaware.config.example.AllTypesDefaults.LONG_DEFAULT_2; +import static org.apache.sling.contextaware.config.example.AllTypesDefaults.STRING_DEFAULT; +import static org.apache.sling.contextaware.config.example.AllTypesDefaults.STRING_DEFAULT_2; +import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; @@ -69,6 +80,11 @@ public class ConfigurationResolverImplTe .put("longParam", 3456L) .put("doubleParam", 0.123d) .put("boolParam", true) + .put("stringArrayParam", new String[] {STRING_DEFAULT_2,STRING_DEFAULT}) + .put("intArrayParam", new int[] {INT_DEFAULT_2}) + .put("longArrayParam", new long[] {LONG_DEFAULT_2,LONG_DEFAULT}) + .put("doubleArrayParam", new double[] {DOUBLE_DEFAULT_2}) + .put("boolArrayParam", new boolean[] {BOOL_DEFAULT_2,BOOL_DEFAULT}) .build()); context.create().resource("/config/content/site2/sling:configs/org.apache.sling.contextaware.config.example.NestedConfig", ImmutableMap.builder() @@ -115,26 +131,26 @@ public class ConfigurationResolverImplTe AllTypesConfig cfg = underTest.get(site1Page1).as(AllTypesConfig.class); assertNull(cfg.stringParam()); - //FIXME: assertEquals(STRING_DEFAULT, cfg.stringArrayParamWithDefault()); + assertEquals(STRING_DEFAULT, cfg.stringParamWithDefault()); assertEquals(0, cfg.intParam()); - //FIXME: assertEquals(INT_DEFAULT, cfg.intParamWithDefault()); + assertEquals(INT_DEFAULT, cfg.intParamWithDefault()); assertEquals(0L, cfg.longParam()); - //FIXME: assertEquals(LONG_DEFAULT, cfg.longParamWithDefault()); + assertEquals(LONG_DEFAULT, cfg.longParamWithDefault()); assertEquals(0d, cfg.doubleParam(), 0.001d); - //FIXME: assertEquals(DOUBLE_DEFAULT, cfg.doubleParamWithDefault(), 0.001d); + assertEquals(DOUBLE_DEFAULT, cfg.doubleParamWithDefault(), 0.001d); assertEquals(false, cfg.boolParam()); - //FIXME: assertEquals(BOOL_DEFAULT, cfg.boolParamWithDefault()); + assertEquals(BOOL_DEFAULT, cfg.boolParamWithDefault()); assertNull(cfg.stringArrayParam()); - //FIXME: assertArrayEquals(new String[] { STRING_DEFAULT, STRING_DEFAULT_2 }, cfg.stringArrayParamWithDefault()); + assertArrayEquals(new String[] { STRING_DEFAULT, STRING_DEFAULT_2 }, cfg.stringArrayParamWithDefault()); assertNull(cfg.intArrayParam()); - //FIXME: assertArrayEquals(new int[] { INT_DEFAULT, INT_DEFAULT_2 }, cfg.intArrayParamWithDefault()); + assertArrayEquals(new int[] { INT_DEFAULT, INT_DEFAULT_2 }, cfg.intArrayParamWithDefault()); assertNull(cfg.longArrayParam()); - //FIXME: assertArrayEquals(new long[] { LONG_DEFAULT, LONG_DEFAULT_2 }, cfg.longArrayParamWithDefault()); + assertArrayEquals(new long[] { LONG_DEFAULT, LONG_DEFAULT_2 }, cfg.longArrayParamWithDefault()); assertNull(cfg.doubleArrayParam()); - //FIXME: assertArrayEquals(new double[] { DOUBLE_DEFAULT, DOUBLE_DEFAULT_2 }, cfg.doubleArrayParamWithDefault(), 0.001d); + assertArrayEquals(new double[] { DOUBLE_DEFAULT, DOUBLE_DEFAULT_2 }, cfg.doubleArrayParamWithDefault(), 0.001d); assertNull(cfg.boolArrayParam()); - //FIXME: assertArrayEquals(new boolean[] { BOOL_DEFAULT, BOOL_DEFAULT_2 }, cfg.boolArrayParamWithDefault()); + assertArrayEquals(new boolean[] { BOOL_DEFAULT, BOOL_DEFAULT_2 }, cfg.boolArrayParamWithDefault()); } @Test @@ -149,7 +165,7 @@ public class ConfigurationResolverImplTe assertNull(cfg.stringParam()); assertNull(cfg.subConfig()); - // FIXME - Converter currently returns null: assertEquals(0, cfg.subListConfig().length); + assertNull(cfg.subListConfig()); } @@ -167,26 +183,26 @@ public class ConfigurationResolverImplTe AllTypesConfig cfg = underTest.get(site2Page1).as(AllTypesConfig.class); assertEquals("configValue2", cfg.stringParam()); - //FIXME: assertEquals(STRING_DEFAULT, cfg.stringArrayParamWithDefault()); + assertEquals(STRING_DEFAULT, cfg.stringParamWithDefault()); assertEquals(222, cfg.intParam()); - //FIXME: assertEquals(INT_DEFAULT, cfg.intParamWithDefault()); + assertEquals(INT_DEFAULT, cfg.intParamWithDefault()); assertEquals(3456L, cfg.longParam()); - //FIXME: assertEquals(LONG_DEFAULT, cfg.longParamWithDefault()); + assertEquals(LONG_DEFAULT, cfg.longParamWithDefault()); assertEquals(0.123d, cfg.doubleParam(), 0.001d); - //FIXME: assertEquals(DOUBLE_DEFAULT, cfg.doubleParamWithDefault(), 0.001d); + assertEquals(DOUBLE_DEFAULT, cfg.doubleParamWithDefault(), 0.001d); assertEquals(true, cfg.boolParam()); - //FIXME: assertEquals(BOOL_DEFAULT, cfg.boolParamWithDefault()); + assertEquals(BOOL_DEFAULT, cfg.boolParamWithDefault()); - //FIXME: assertArrayEquals(new String[0], cfg.stringArrayParam()); - //FIXME: assertArrayEquals(new String[] { STRING_DEFAULT, STRING_DEFAULT_2 }, cfg.stringArrayParamWithDefault()); - //FIXME: assertArrayEquals(new int[0], cfg.intArrayParam()); - //FIXME: assertArrayEquals(new int[] { INT_DEFAULT, INT_DEFAULT_2 }, cfg.intArrayParamWithDefault()); - //FIXME: assertArrayEquals(new long[0], cfg.longArrayParam()); - //FIXME: assertArrayEquals(new long[] { LONG_DEFAULT, LONG_DEFAULT_2 }, cfg.longArrayParamWithDefault()); - //FIXME: assertArrayEquals(new double[0], cfg.doubleArrayParam(), 0.001d); - //FIXME: assertArrayEquals(new double[] { DOUBLE_DEFAULT, DOUBLE_DEFAULT_2 }, cfg.doubleArrayParamWithDefault(), 0.001d); - //FIXME: assertArrayEquals(new boolean[0], cfg.boolArrayParam()); - //FIXME: assertArrayEquals(new boolean[] { BOOL_DEFAULT, BOOL_DEFAULT_2 }, cfg.boolArrayParamWithDefault()); + assertArrayEquals(new String[] {STRING_DEFAULT_2,STRING_DEFAULT}, cfg.stringArrayParam()); + assertArrayEquals(new String[] { STRING_DEFAULT, STRING_DEFAULT_2 }, cfg.stringArrayParamWithDefault()); + assertArrayEquals(new int[] {INT_DEFAULT_2}, cfg.intArrayParam()); + assertArrayEquals(new int[] { INT_DEFAULT, INT_DEFAULT_2 }, cfg.intArrayParamWithDefault()); + assertArrayEquals(new long[] {LONG_DEFAULT_2,LONG_DEFAULT}, cfg.longArrayParam()); + assertArrayEquals(new long[] { LONG_DEFAULT, LONG_DEFAULT_2 }, cfg.longArrayParamWithDefault()); + assertArrayEquals(new double[] {DOUBLE_DEFAULT_2}, cfg.doubleArrayParam(), 0.001d); + assertArrayEquals(new double[] { DOUBLE_DEFAULT, DOUBLE_DEFAULT_2 }, cfg.doubleArrayParamWithDefault(), 0.001d); + assertArrayEquals(new boolean[] {BOOL_DEFAULT_2,BOOL_DEFAULT}, cfg.boolArrayParam()); + assertArrayEquals(new boolean[] { BOOL_DEFAULT, BOOL_DEFAULT_2 }, cfg.boolArrayParamWithDefault()); } @Test