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 2019/05/21 08:26:33 UTC

[directory-server] branch master updated: Removed some commented @Ignore tags

This is an automated email from the ASF dual-hosted git repository.

elecharny pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/directory-server.git


The following commit(s) were added to refs/heads/master by this push:
     new 29c5c49  Removed some commented @Ignore tags
     new 1a58a32  Merge branch 'master' of https://gitbox.apache.org/repos/asf/directory-server
29c5c49 is described below

commit 29c5c49a269a2c98659102a6fdacea923d320e12
Author: emmanuel lecharny <el...@apache.org>
AuthorDate: Tue May 21 10:20:08 2019 +0200

    Removed some commented @Ignore tags
---
 .../directory/server/core/api/LdapCoreSessionConnectionTest.java     | 1 -
 .../server/kerberos/shared/messages/components/TicketTest.java       | 1 -
 .../server/ldap/replication/consumer/ReplicationConsumerImpl.java    | 5 ++---
 .../java/org/apache/directory/server/operations/bind/SaslBindIT.java | 1 -
 .../directory/server/operations/modifydn/DIRSERVER_1974_IT.java      | 1 -
 .../org/apache/directory/server/operations/modifydn/ModifyRdnIT.java | 1 -
 .../apache/directory/server/replication/ClientInitialRefreshIT.java  | 1 -
 7 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/core-integ/src/test/java/org/apache/directory/server/core/api/LdapCoreSessionConnectionTest.java b/core-integ/src/test/java/org/apache/directory/server/core/api/LdapCoreSessionConnectionTest.java
index ad1b672..7e903fc 100755
--- a/core-integ/src/test/java/org/apache/directory/server/core/api/LdapCoreSessionConnectionTest.java
+++ b/core-integ/src/test/java/org/apache/directory/server/core/api/LdapCoreSessionConnectionTest.java
@@ -122,7 +122,6 @@ public class LdapCoreSessionConnectionTest extends AbstractLdapTestUnit
     }
 
 
-    //@Ignore
     @Test
     public void testBindWithLdapCoreSessionConnection() throws LdapException
     {
diff --git a/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/messages/components/TicketTest.java b/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/messages/components/TicketTest.java
index 3b3d2e1..dd73fe3 100644
--- a/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/messages/components/TicketTest.java
+++ b/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/messages/components/TicketTest.java
@@ -45,7 +45,6 @@ import com.mycila.junit.concurrent.ConcurrentJunitRunner;
 public class TicketTest
 {
     @Test
-    //@Ignore
     public void testTicket() throws Exception
     {
         TicketFactory ticketFactory = new TicketFactory();
diff --git a/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/consumer/ReplicationConsumerImpl.java b/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/consumer/ReplicationConsumerImpl.java
index 8c39963..a8cca2d 100644
--- a/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/consumer/ReplicationConsumerImpl.java
+++ b/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/consumer/ReplicationConsumerImpl.java
@@ -46,7 +46,6 @@ import org.apache.directory.api.ldap.model.entry.DefaultModification;
 import org.apache.directory.api.ldap.model.entry.Entry;
 import org.apache.directory.api.ldap.model.entry.Modification;
 import org.apache.directory.api.ldap.model.entry.ModificationOperation;
-import org.apache.directory.api.ldap.model.entry.Value;
 import org.apache.directory.api.ldap.model.exception.LdapException;
 import org.apache.directory.api.ldap.model.exception.LdapNoSuchObjectException;
 import org.apache.directory.api.ldap.model.filter.AndNode;
@@ -1308,7 +1307,7 @@ public class ReplicationConsumerImpl implements ConnectionClosedEventListener, R
         {
             String uuid = Strings.uuidToString( limitedUuidList.get( 0 ) );
 
-            filter = new EqualityNode<String>( SchemaConstants.ENTRY_UUID_AT, new Value( uuid ).getString() );
+            filter = new EqualityNode<String>( SchemaConstants.ENTRY_UUID_AT, uuid );
             if ( isRefreshPresent )
             {
                 filter = new NotNode( filter );
@@ -1328,7 +1327,7 @@ public class ReplicationConsumerImpl implements ConnectionClosedEventListener, R
             for ( int i = 0; i < size; i++ )
             {
                 String uuid = Strings.uuidToString( limitedUuidList.get( i ) );
-                ExprNode uuidEqNode = new EqualityNode<String>( SchemaConstants.ENTRY_UUID_AT, new Value( uuid ) .getString() );
+                ExprNode uuidEqNode = new EqualityNode<String>( SchemaConstants.ENTRY_UUID_AT, uuid );
 
                 if ( isRefreshPresent )
                 {
diff --git a/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java b/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java
index bfe6579..0716e68 100644
--- a/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java
+++ b/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java
@@ -474,7 +474,6 @@ public class SaslBindIT extends AbstractLdapTestUnit
      * Tests to make sure GSS-API binds below the RootDSE work.
      */
     @Test
-    //@Ignore("Fails on ac OSX")
     public void testSaslGssApiBind() throws Exception
     {
         Dn userDn = new Dn( "uid=hnelson,ou=users,dc=example,dc=com" );
diff --git a/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/DIRSERVER_1974_IT.java b/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/DIRSERVER_1974_IT.java
index d1f2626..1fe942c 100755
--- a/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/DIRSERVER_1974_IT.java
+++ b/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/DIRSERVER_1974_IT.java
@@ -137,7 +137,6 @@ public class DIRSERVER_1974_IT extends AbstractLdapTestUnit
 
 
     @Test
-    //@Ignore
     public void testRenameWithALotOfDummiesAndSomeCustomAttributes() {
         LdapConnectionTemplate template = classCreateDsRule.getLdapConnectionTemplate();
         AddResponse response = null;
diff --git a/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/ModifyRdnIT.java b/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/ModifyRdnIT.java
index dce0e94..cc48efd 100644
--- a/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/ModifyRdnIT.java
+++ b/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/ModifyRdnIT.java
@@ -181,7 +181,6 @@ public class ModifyRdnIT extends AbstractLdapTestUnit
      * Modify Rdn of an entry, delete its old rdn value and search before and
      * after rename.
      */
-    //@Ignore
     @Test
     public void testModifyRdnAndDeleteOldWithSearchInBetween() throws Exception
     {
diff --git a/server-integ/src/test/java/org/apache/directory/server/replication/ClientInitialRefreshIT.java b/server-integ/src/test/java/org/apache/directory/server/replication/ClientInitialRefreshIT.java
index ec76d4c..256e5fe 100644
--- a/server-integ/src/test/java/org/apache/directory/server/replication/ClientInitialRefreshIT.java
+++ b/server-integ/src/test/java/org/apache/directory/server/replication/ClientInitialRefreshIT.java
@@ -72,7 +72,6 @@ import org.junit.Test;
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-//@Ignore
 public class ClientInitialRefreshIT
 {
     @Rule