You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by se...@apache.org on 2015/07/05 20:48:08 UTC

svn commit: r1689275 [2/2] - in /directory/shared/trunk/integ/src/test/java/org/apache/directory/api/ldap: aci/ codec/api/ entry/ model/name/ subtree/

Modified: directory/shared/trunk/integ/src/test/java/org/apache/directory/api/ldap/model/name/AvaTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/integ/src/test/java/org/apache/directory/api/ldap/model/name/AvaTest.java?rev=1689275&r1=1689274&r2=1689275&view=diff
==============================================================================
--- directory/shared/trunk/integ/src/test/java/org/apache/directory/api/ldap/model/name/AvaTest.java (original)
+++ directory/shared/trunk/integ/src/test/java/org/apache/directory/api/ldap/model/name/AvaTest.java Sun Jul  5 18:48:07 2015
@@ -28,7 +28,6 @@ import java.util.Arrays;
 
 import org.apache.directory.api.ldap.model.exception.LdapException;
 import org.apache.directory.api.ldap.model.exception.LdapInvalidDnException;
-import org.apache.directory.api.ldap.model.name.Ava;
 import org.apache.directory.api.ldap.model.schema.SchemaManager;
 import org.apache.directory.api.ldap.schema.manager.impl.DefaultSchemaManager;
 import org.junit.BeforeClass;

Modified: directory/shared/trunk/integ/src/test/java/org/apache/directory/api/ldap/model/name/MultiThreadedTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/integ/src/test/java/org/apache/directory/api/ldap/model/name/MultiThreadedTest.java?rev=1689275&r1=1689274&r2=1689275&view=diff
==============================================================================
--- directory/shared/trunk/integ/src/test/java/org/apache/directory/api/ldap/model/name/MultiThreadedTest.java (original)
+++ directory/shared/trunk/integ/src/test/java/org/apache/directory/api/ldap/model/name/MultiThreadedTest.java Sun Jul  5 18:48:07 2015
@@ -23,9 +23,6 @@ package org.apache.directory.api.ldap.mo
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-import org.apache.directory.api.ldap.model.name.Ava;
-import org.apache.directory.api.ldap.model.name.Dn;
-import org.apache.directory.api.ldap.model.name.Rdn;
 import org.apache.directory.api.ldap.model.schema.SchemaManager;
 import org.apache.directory.api.ldap.schema.manager.impl.DefaultSchemaManager;
 import org.apache.directory.junit.tools.MultiThreadedMultiInvoker;

Modified: directory/shared/trunk/integ/src/test/java/org/apache/directory/api/ldap/model/name/RdnTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/integ/src/test/java/org/apache/directory/api/ldap/model/name/RdnTest.java?rev=1689275&r1=1689274&r2=1689275&view=diff
==============================================================================
--- directory/shared/trunk/integ/src/test/java/org/apache/directory/api/ldap/model/name/RdnTest.java (original)
+++ directory/shared/trunk/integ/src/test/java/org/apache/directory/api/ldap/model/name/RdnTest.java Sun Jul  5 18:48:07 2015
@@ -20,7 +20,6 @@
 package org.apache.directory.api.ldap.model.name;
 
 import org.apache.directory.api.ldap.model.exception.LdapException;
-import org.apache.directory.api.ldap.model.name.Rdn;
 import org.apache.directory.api.ldap.model.schema.SchemaManager;
 import org.apache.directory.api.ldap.schema.manager.impl.DefaultSchemaManager;
 import org.junit.BeforeClass;
@@ -145,12 +144,12 @@ public class RdnTest
         
         if ( !"exemple + rdn\u00E4".equals( rdn.getValue( "ou" ) ) )
         {
-            errors += "\nRdn.getValue( 'ou' ) fails '" + (String)rdn.getValue( "ou" ) + "'";
+            errors += "\nRdn.getValue( 'ou' ) fails '" + ( String ) rdn.getValue( "ou" ) + "'";
         }
         
         if ( !"test".equals( rdn.getValue( "cn" ) ) )
         {
-            errors += "\nRdn.getValue( 'cn' ) fails '" + (String)rdn.getValue( "cn" ) + "'";
+            errors += "\nRdn.getValue( 'cn' ) fails '" + ( String ) rdn.getValue( "cn" ) + "'";
         }
         
         if ( !"OU = Exemple \\+ Rdn\\C3\\A4\\ +cn= TEST".equals( rdn.toString() ) )

Modified: directory/shared/trunk/integ/src/test/java/org/apache/directory/api/ldap/model/name/SchemaAwareDnSerializationTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/integ/src/test/java/org/apache/directory/api/ldap/model/name/SchemaAwareDnSerializationTest.java?rev=1689275&r1=1689274&r2=1689275&view=diff
==============================================================================
--- directory/shared/trunk/integ/src/test/java/org/apache/directory/api/ldap/model/name/SchemaAwareDnSerializationTest.java (original)
+++ directory/shared/trunk/integ/src/test/java/org/apache/directory/api/ldap/model/name/SchemaAwareDnSerializationTest.java Sun Jul  5 18:48:07 2015
@@ -29,7 +29,6 @@ import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 
 import org.apache.directory.api.ldap.model.exception.LdapException;
-import org.apache.directory.api.ldap.model.name.Dn;
 import org.apache.directory.api.ldap.model.schema.SchemaManager;
 import org.apache.directory.api.ldap.schema.manager.impl.DefaultSchemaManager;
 import org.junit.BeforeClass;

Modified: directory/shared/trunk/integ/src/test/java/org/apache/directory/api/ldap/subtree/SubtreeSpecificationParserTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/integ/src/test/java/org/apache/directory/api/ldap/subtree/SubtreeSpecificationParserTest.java?rev=1689275&r1=1689274&r2=1689275&view=diff
==============================================================================
--- directory/shared/trunk/integ/src/test/java/org/apache/directory/api/ldap/subtree/SubtreeSpecificationParserTest.java (original)
+++ directory/shared/trunk/integ/src/test/java/org/apache/directory/api/ldap/subtree/SubtreeSpecificationParserTest.java Sun Jul  5 18:48:07 2015
@@ -117,10 +117,10 @@ public class SubtreeSpecificationParserT
     private static SchemaManager schemaManager;
 
     /** Some global OC */
-    private static ObjectClass TOP_OC; // 2.5.6.0
-    private static ObjectClass ALIAS_OC; // 2.5.6.1
-    private static ObjectClass COUNTRY_OC; // 2.5.6.2
-    private static ObjectClass PERSON_OC; // 2.5.6.6
+    private static ObjectClass topOC; // 2.5.6.0
+    private static ObjectClass aliasOC; // 2.5.6.1
+    private static ObjectClass countryOC; // 2.5.6.2
+    private static ObjectClass personOC; // 2.5.6.6
 
 
     /**
@@ -136,10 +136,10 @@ public class SubtreeSpecificationParserT
 
         parser = new SubtreeSpecificationParser( schemaManager );
 
-        TOP_OC = schemaManager.lookupObjectClassRegistry( "top" );
-        ALIAS_OC = schemaManager.lookupObjectClassRegistry( "alias" );
-        COUNTRY_OC = schemaManager.lookupObjectClassRegistry( "country" );
-        PERSON_OC = schemaManager.lookupObjectClassRegistry( "person" );
+        topOC = schemaManager.lookupObjectClassRegistry( "top" );
+        aliasOC = schemaManager.lookupObjectClassRegistry( "alias" );
+        countryOC = schemaManager.lookupObjectClassRegistry( "country" );
+        personOC = schemaManager.lookupObjectClassRegistry( "person" );
     }
 
 
@@ -303,10 +303,10 @@ public class SubtreeSpecificationParserT
         SubtreeSpecification ss = parser.parse( SPEC_WITH_REFINEMENT );
 
         // The items
-        Refinement topItem = new ItemRefinement( TOP_OC );
-        Refinement aliasItem = new ItemRefinement( ALIAS_OC );
-        Refinement personItem = new ItemRefinement( PERSON_OC );
-        Refinement countryItem = new ItemRefinement( COUNTRY_OC );
+        Refinement topItem = new ItemRefinement( topOC );
+        Refinement aliasItem = new ItemRefinement( aliasOC );
+        Refinement personItem = new ItemRefinement( personOC );
+        Refinement countryItem = new ItemRefinement( countryOC );
 
         // The inner OR refinement or:{item:2.5.6.1, item:person}
         List<Refinement> orList = new ArrayList<Refinement>();