Return-Path: X-Original-To: apmail-directory-commits-archive@www.apache.org Delivered-To: apmail-directory-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 B0D0C1887B for ; Mon, 28 Dec 2015 18:00:26 +0000 (UTC) Received: (qmail 78663 invoked by uid 500); 28 Dec 2015 18:00:26 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 78614 invoked by uid 500); 28 Dec 2015 18:00:26 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 78605 invoked by uid 99); 28 Dec 2015 18:00:26 -0000 Received: from Unknown (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 28 Dec 2015 18:00:26 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 09406C83A8 for ; Mon, 28 Dec 2015 18:00:26 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.799 X-Spam-Level: * X-Spam-Status: No, score=1.799 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-0.001] autolearn=disabled Received: from mx1-us-west.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id ymnMztze1Se6 for ; Mon, 28 Dec 2015 18:00:25 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with ESMTP id CFF2B2050D for ; Mon, 28 Dec 2015 18:00:24 +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 70414E0428 for ; Mon, 28 Dec 2015 18:00:24 +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 219333A0363 for ; Mon, 28 Dec 2015 18:01:19 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1721965 - in /directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model: entry/EntryUtils.java filter/FilterEncoderTest.java ldif/LdifAttributesReaderTest.java ldif/LdifReaderTest.java ldif/LdifUtilsTest.java Date: Mon, 28 Dec 2015 18:01:19 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20151228180119.219333A0363@svn01-us-west.apache.org> Author: elecharny Date: Mon Dec 28 18:01:18 2015 New Revision: 1721965 URL: http://svn.apache.org/viewvc?rev=1721965&view=rev Log: Fixing some warnings Modified: directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/entry/EntryUtils.java directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/filter/FilterEncoderTest.java directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/ldif/LdifAttributesReaderTest.java directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/ldif/LdifReaderTest.java directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/ldif/LdifUtilsTest.java Modified: directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/entry/EntryUtils.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/entry/EntryUtils.java?rev=1721965&r1=1721964&r2=1721965&view=diff ============================================================================== --- directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/entry/EntryUtils.java (original) +++ directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/entry/EntryUtils.java Mon Dec 28 18:01:18 2015 @@ -162,7 +162,7 @@ public class EntryUtils { if ( value.isHumanReadable() ) { - return new StringValue( Strings.toLowerCase( value.getString() ) ); + return new StringValue( Strings.toLowerCaseAscii( value.getString() ) ); } throw new IllegalStateException( I18n.err( I18n.ERR_04474 ) ); @@ -171,7 +171,7 @@ public class EntryUtils public String normalize( String value ) throws LdapException { - return Strings.toLowerCase( value ); + return Strings.toLowerCaseAscii( value ); } }; Modified: directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/filter/FilterEncoderTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/filter/FilterEncoderTest.java?rev=1721965&r1=1721964&r2=1721965&view=diff ============================================================================== --- directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/filter/FilterEncoderTest.java (original) +++ directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/filter/FilterEncoderTest.java Mon Dec 28 18:01:18 2015 @@ -47,7 +47,7 @@ public class FilterEncoderTest @Test public void testFormatWithNoPlaceholdersAndCorrectArgumentCount() { - assertEquals( "(cn=foo)", FilterEncoder.format( "(cn=foo)", null ) ); + assertEquals( "(cn=foo)", FilterEncoder.format( "(cn=foo)", (String[])null ) ); assertEquals( "(cn=foo)", FilterEncoder.format( "(cn=foo)", ZERO ) ); } Modified: directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/ldif/LdifAttributesReaderTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/ldif/LdifAttributesReaderTest.java?rev=1721965&r1=1721964&r2=1721965&view=diff ============================================================================== --- directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/ldif/LdifAttributesReaderTest.java (original) +++ directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/ldif/LdifAttributesReaderTest.java Mon Dec 28 18:01:18 2015 @@ -100,7 +100,7 @@ public class LdifAttributesReaderTest @Test - public void testLdifNull() throws LdapLdifException + public void testLdifNull() throws LdapLdifException, IOException { String ldif = null; @@ -108,11 +108,12 @@ public class LdifAttributesReaderTest Entry entry = reader.parseEntry( ldif ); assertEquals( 0, entry.size() ); + reader.close(); } @Test - public void testLdifEmpty() throws LdapLdifException + public void testLdifEmpty() throws LdapLdifException, IOException { String ldif = ""; @@ -120,22 +121,24 @@ public class LdifAttributesReaderTest Entry entry = reader.parseEntry( ldif ); assertEquals( 0, entry.size() ); + reader.close(); } @Test - public void testLdifEmptyLines() throws LdapLdifException + public void testLdifEmptyLines() throws LdapLdifException, IOException { String ldif = "\n\n\r\r\n"; LdifAttributesReader reader = new LdifAttributesReader(); Entry entry = reader.parseEntry( ldif ); assertNull( entry ); + reader.close(); } @Test - public void testLdifComments() throws LdapLdifException + public void testLdifComments() throws LdapLdifException, IOException { String ldif = "#Comment 1\r" @@ -148,11 +151,12 @@ public class LdifAttributesReaderTest Entry entry = reader.parseEntry( ldif ); assertNull( entry ); + reader.close(); } @Test - public void testLdifVersionStart() throws LdapLdifException + public void testLdifVersionStart() throws LdapLdifException, IOException { String ldif = "cn: app1\n" @@ -170,6 +174,7 @@ public class LdifAttributesReaderTest Attribute attr = entry.get( "displayname" ); assertTrue( attr.contains( "app1" ) ); + reader.close(); } @@ -179,7 +184,7 @@ public class LdifAttributesReaderTest * @throws NamingException */ @Test - public void testLdifParserEndSpaces() throws LdapLdifException + public void testLdifParserEndSpaces() throws LdapLdifException, IOException { String ldif = "cn: app1\n" @@ -196,12 +201,12 @@ public class LdifAttributesReaderTest Attribute attr = entry.get( "displayname" ); assertTrue( attr.contains( "app1" ) ); - + reader.close(); } @Test - public void testLdifParser() throws LdapLdifException, LdapInvalidAttributeValueException + public void testLdifParser() throws LdapLdifException, LdapInvalidAttributeValueException, IOException { String ldif = "cn: app1\n" @@ -231,11 +236,12 @@ public class LdifAttributesReaderTest attr = entry.get( "envvars" ); assertNull( attr.get().getValue() ); + reader.close(); } @Test - public void testLdifParserMuiltiLineComments() throws LdapLdifException + public void testLdifParserMuiltiLineComments() throws LdapLdifException, IOException { String ldif = "#comment\n" @@ -270,11 +276,12 @@ public class LdifAttributesReaderTest attr = entry.get( "envvars" ); assertNull( attr.get().getValue() ); + reader.close(); } @Test - public void testLdifParserMultiLineEntries() throws LdapLdifException + public void testLdifParserMultiLineEntries() throws LdapLdifException, IOException { String ldif = "#comment\n" @@ -309,11 +316,12 @@ public class LdifAttributesReaderTest attr = entry.get( "envvars" ); assertNull( attr.get().getValue() ); + reader.close(); } @Test - public void testLdifParserBase64() throws LdapLdifException + public void testLdifParserBase64() throws LdapLdifException, IOException { String ldif = "#comment\n" @@ -347,11 +355,12 @@ public class LdifAttributesReaderTest attr = entry.get( "envvars" ); assertNull( attr.get().getValue() ); + reader.close(); } @Test - public void testLdifParserBase64MultiLine() throws LdapLdifException + public void testLdifParserBase64MultiLine() throws LdapLdifException, IOException { String ldif = "#comment\n" @@ -386,11 +395,12 @@ public class LdifAttributesReaderTest attr = entry.get( "envvars" ); assertNull( attr.get().getValue() ); + reader.close(); } @Test - public void testLdifParserRFC2849Sample1() throws LdapLdifException + public void testLdifParserRFC2849Sample1() throws LdapLdifException, IOException { String ldif = "objectclass: top\n" @@ -428,12 +438,12 @@ public class LdifAttributesReaderTest attr = entry.get( "description" ); assertTrue( attr.contains( "A big sailing fan." ) ); - + reader.close(); } @Test - public void testLdifParserRFC2849Sample2() throws LdapLdifException + public void testLdifParserRFC2849Sample2() throws LdapLdifException, IOException { String ldif = "objectclass: top\n" @@ -477,7 +487,7 @@ public class LdifAttributesReaderTest attr = entry.get( "title" ); assertTrue( attr.contains( "Product Manager, Rod and Reel Division" ) ); - + reader.close(); } @@ -523,6 +533,7 @@ public class LdifAttributesReaderTest assertTrue( attr .contains( "What a careful reader you are! This value is base-64-encoded because it has a control character in it (a CR).\r By the way, you should really get out more." .getBytes( StandardCharsets.UTF_8 ) ) ); + reader.close(); } @@ -568,6 +579,7 @@ public class LdifAttributesReaderTest assertTrue( attr .contains( "What a careful reader you are! This value is base-64-encoded because it has a control character in it (a CR).\r By the way, you should really get out more." .getBytes( StandardCharsets.UTF_8 ) ) ); + reader.close(); } @@ -614,6 +626,8 @@ public class LdifAttributesReaderTest assertTrue( attr.contains( values[j][1].getBytes( StandardCharsets.UTF_8 ) ) ); } } + + reader.close(); } @@ -669,6 +683,8 @@ public class LdifAttributesReaderTest } } } + + reader.close(); } @@ -701,6 +717,8 @@ public class LdifAttributesReaderTest assertTrue( I18n.err( I18n.ERR_12009_ERROR_PARSING_LDIF_BUFFER ), ne.getMessage().startsWith( I18n.ERR_12009_ERROR_PARSING_LDIF_BUFFER.getErrorCode() ) ); } + + reader.close(); } @@ -748,6 +766,7 @@ public class LdifAttributesReaderTest attr = attributes.get( "ou" ); assertTrue( attr.contains( "Users" ) ); + reader.close(); } @@ -806,5 +825,6 @@ public class LdifAttributesReaderTest attr = attributes.get( "prescriptiveACI" ); assertTrue( attr .contains( "{ identificationTag \"browseRoot\", precedence 100, authenticationLevel none, itemOrUserFirst userFirst: { userClasses { allUsers }, userPermissions { { protectedItems {entry}, grantsAndDenials { grantReturnDN, grantBrowse } } } } }" ) ); + reader.close(); } } Modified: directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/ldif/LdifReaderTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/ldif/LdifReaderTest.java?rev=1721965&r1=1721964&r2=1721965&view=diff ============================================================================== --- directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/ldif/LdifReaderTest.java (original) +++ directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/ldif/LdifReaderTest.java Mon Dec 28 18:01:18 2015 @@ -2259,9 +2259,11 @@ public class LdifReaderTest catch ( Exception e ) { } - + assertEquals( 1, reader.getLineNumber() ); + reader.close(); + ldif = "version: 1\n" + "d n: dc=example,dc=com\n" + // wrong name "d n" @@ -2279,6 +2281,8 @@ public class LdifReaderTest } assertEquals( 2, reader.getLineNumber() ); + + reader.close(); // wrong changetype ldif = @@ -2296,7 +2300,7 @@ public class LdifReaderTest catch ( Exception e ) { } - + assertEquals( 4, reader.getLineNumber() ); ldif = @@ -2315,6 +2319,7 @@ public class LdifReaderTest "displayName: app2 \n" + "dependencies:\n" + "envVars:"; + reader = new LdifReader(); try @@ -2327,6 +2332,7 @@ public class LdifReaderTest } assertEquals( 10, reader.getLineNumber() ); + reader.close(); } Modified: directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/ldif/LdifUtilsTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/ldif/LdifUtilsTest.java?rev=1721965&r1=1721964&r2=1721965&view=diff ============================================================================== --- directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/ldif/LdifUtilsTest.java (original) +++ directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/api/ldap/model/ldif/LdifUtilsTest.java Mon Dec 28 18:01:18 2015 @@ -534,6 +534,8 @@ public class LdifUtilsTest LdifEntry convertedEntry = entries.get( 0 ); assertEquals( expectedEntry, convertedEntry ); + + reader.close(); } @@ -574,5 +576,6 @@ public class LdifUtilsTest LdifEntry convertedEntry = entries.get( 0 ); assertEquals( expectedEntry, convertedEntry ); + reader.close(); } }