You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2012/02/28 17:59:01 UTC
svn commit: r1294732 - in /directory/shared/trunk:
dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyRequest/
dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchRequest/
integ/src/test/java/org/apache/directory/shared/l...
Author: elecharny
Date: Tue Feb 28 16:59:00 2012
New Revision: 1294732
URL: http://svn.apache.org/viewvc?rev=1294732&view=rev
Log:
Removed useless javax.naming imports
Modified:
directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyRequest/ModifyRequestTest.java
directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchRequest/SearchRequestTest.java
directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/entry/SchemaAwareAttributeTest.java
directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/model/name/DnTest.java
Modified: directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyRequest/ModifyRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyRequest/ModifyRequestTest.java?rev=1294732&r1=1294731&r2=1294732&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyRequest/ModifyRequestTest.java (original)
+++ directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyRequest/ModifyRequestTest.java Tue Feb 28 16:59:00 2012
@@ -32,14 +32,13 @@ import java.util.Collection;
import java.util.Iterator;
import java.util.Map;
-import javax.naming.NamingException;
-
import org.apache.directory.shared.dsmlv2.AbstractTest;
import org.apache.directory.shared.dsmlv2.DsmlControl;
import org.apache.directory.shared.dsmlv2.Dsmlv2Parser;
import org.apache.directory.shared.ldap.model.entry.Attribute;
import org.apache.directory.shared.ldap.model.entry.Modification;
import org.apache.directory.shared.ldap.model.entry.ModificationOperation;
+import org.apache.directory.shared.ldap.model.exception.LdapException;
import org.apache.directory.shared.ldap.model.message.Control;
import org.apache.directory.shared.ldap.model.message.ModifyRequest;
import org.apache.directory.shared.util.Strings;
@@ -285,7 +284,7 @@ public class ModifyRequestTest extends A
* @throws NamingException
*/
@Test
- public void testRequestWith1Modification() throws NamingException
+ public void testRequestWith1Modification() throws LdapException
{
Dsmlv2Parser parser = null;
try
@@ -323,7 +322,7 @@ public class ModifyRequestTest extends A
* @throws UnsupportedEncodingException
*/
@Test
- public void testRequestWith1ModificationBase64Value() throws NamingException, UnsupportedEncodingException
+ public void testRequestWith1ModificationBase64Value() throws LdapException, UnsupportedEncodingException
{
Dsmlv2Parser parser = null;
try
@@ -366,7 +365,7 @@ public class ModifyRequestTest extends A
* @throws NamingException
*/
@Test
- public void testRequestWith2Modifications() throws NamingException
+ public void testRequestWith2Modifications() throws LdapException
{
Dsmlv2Parser parser = null;
try
@@ -434,7 +433,7 @@ public class ModifyRequestTest extends A
* @throws NamingException
*/
@Test
- public void testRequestWithOperationAdd() throws NamingException
+ public void testRequestWithOperationAdd() throws LdapException
{
Dsmlv2Parser parser = null;
try
@@ -467,7 +466,7 @@ public class ModifyRequestTest extends A
* @throws NamingException
*/
@Test
- public void testRequestWithOperationDelete() throws NamingException
+ public void testRequestWithOperationDelete() throws LdapException
{
Dsmlv2Parser parser = null;
try
@@ -500,7 +499,7 @@ public class ModifyRequestTest extends A
* @throws NamingException
*/
@Test
- public void testRequestWithOperationReplace() throws NamingException
+ public void testRequestWithOperationReplace() throws LdapException
{
Dsmlv2Parser parser = null;
try
@@ -543,7 +542,7 @@ public class ModifyRequestTest extends A
* @throws NamingException
*/
@Test
- public void testRequestWithModificationWithoutValue() throws NamingException
+ public void testRequestWithModificationWithoutValue() throws LdapException
{
Dsmlv2Parser parser = null;
try
@@ -580,7 +579,7 @@ public class ModifyRequestTest extends A
* @throws NamingException
*/
@Test
- public void testRequestWithModificationWith2Values() throws NamingException
+ public void testRequestWithModificationWith2Values() throws LdapException
{
Dsmlv2Parser parser = null;
try
@@ -621,7 +620,7 @@ public class ModifyRequestTest extends A
* @throws NamingException
*/
@Test
- public void testRequestWithModificationWithEmptyValue() throws NamingException
+ public void testRequestWithModificationWithEmptyValue() throws LdapException
{
Dsmlv2Parser parser = null;
try
Modified: directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchRequest/SearchRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchRequest/SearchRequestTest.java?rev=1294732&r1=1294731&r2=1294732&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchRequest/SearchRequestTest.java (original)
+++ directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchRequest/SearchRequestTest.java Tue Feb 28 16:59:00 2012
@@ -31,13 +31,12 @@ import static org.junit.Assert.fail;
import java.util.List;
import java.util.Map;
-import javax.naming.NamingException;
-
import com.mycila.junit.concurrent.Concurrency;
import com.mycila.junit.concurrent.ConcurrentJunitRunner;
import org.apache.directory.shared.dsmlv2.AbstractTest;
import org.apache.directory.shared.dsmlv2.DsmlControl;
import org.apache.directory.shared.dsmlv2.Dsmlv2Parser;
+import org.apache.directory.shared.ldap.model.exception.LdapException;
import org.apache.directory.shared.ldap.model.filter.AndNode;
import org.apache.directory.shared.ldap.model.filter.ApproximateNode;
import org.apache.directory.shared.ldap.model.filter.EqualityNode;
@@ -808,7 +807,7 @@ public class SearchRequestTest extends A
* @throws NamingException
*/
@Test
- public void testRequestWithAttributes1Attribute() throws NamingException
+ public void testRequestWithAttributes1Attribute() throws LdapException
{
Dsmlv2Parser parser = null;
try
@@ -840,7 +839,7 @@ public class SearchRequestTest extends A
* @throws NamingException
*/
@Test
- public void testRequestWithAttributes2Attribute() throws NamingException
+ public void testRequestWithAttributes2Attribute() throws LdapException
{
Dsmlv2Parser parser = null;
try
Modified: directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/entry/SchemaAwareAttributeTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/entry/SchemaAwareAttributeTest.java?rev=1294732&r1=1294731&r2=1294732&view=diff
==============================================================================
--- directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/entry/SchemaAwareAttributeTest.java (original)
+++ directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/entry/SchemaAwareAttributeTest.java Tue Feb 28 16:59:00 2012
@@ -6,16 +6,16 @@
* 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.
- *
+ * under the License.
+ *
*/
package org.apache.directory.shared.ldap.entry;
@@ -38,8 +38,6 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
-import javax.naming.directory.InvalidAttributeValueException;
-
import org.apache.directory.shared.ldap.model.entry.Attribute;
import org.apache.directory.shared.ldap.model.entry.BinaryValue;
import org.apache.directory.shared.ldap.model.entry.DefaultAttribute;
@@ -201,7 +199,7 @@ public class SchemaAwareAttributeTest
/**
- * Test method isValid( SyntaxChecker )
+ * Test method isValid( SyntaxChecker )
*/
@Test
public void testIsValidSyntaxChecker() throws LdapException
@@ -1127,7 +1125,7 @@ public class SchemaAwareAttributeTest
* Test method put( byte[]... )
*/
@Test
- public void testPutByteArray() throws InvalidAttributeValueException, Exception
+ public void testPutByteArray() throws LdapException, Exception
{
Attribute attr1 = new DefaultAttribute( atPwd );
@@ -1822,7 +1820,7 @@ public class SchemaAwareAttributeTest
/**
- * Test constructor DefaultEntryAttribute( AttributeType, String... )
+ * Test constructor DefaultEntryAttribute( AttributeType, String... )
*/
@Test
public void testDefaultServerAttributeAttributeTypeStringArray() throws LdapException
@@ -1889,7 +1887,7 @@ public class SchemaAwareAttributeTest
/**
- * Test method DefaultEntryAttribute( AttributeType, byte[]... )
+ * Test method DefaultEntryAttribute( AttributeType, byte[]... )
*/
@Test
public void testDefaultServerAttributeAttributeTypeByteArray() throws LdapException
@@ -2014,7 +2012,7 @@ public class SchemaAwareAttributeTest
/**
- * Test the conversion method
+ * Test the conversion method
*/
@Test
public void testToClientAttribute() throws LdapException
Modified: directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/model/name/DnTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/model/name/DnTest.java?rev=1294732&r1=1294731&r2=1294732&view=diff
==============================================================================
--- directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/model/name/DnTest.java (original)
+++ directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/model/name/DnTest.java Tue Feb 28 16:59:00 2012
@@ -2204,7 +2204,7 @@ public class DnTest
* @throws LdapException
*/
@Test
- public void testDoubleQuoteInNameDIRSERVER_642() throws LdapException, InvalidNameException
+ public void testDoubleQuoteInNameDIRSERVER_642() throws LdapException, LdapException
{
Dn name1 = new Dn( "cn=\"Kylie Minogue\",dc=example,dc=com" );