Fix unit tests broken in commit r9044.

Matthew Swift

25.34.2013 27f47fd50d05a4d23972d78bbb0270f81141ef3a

Fix unit tests broken in commit r9044.

 opends/tests/unit-tests-testng/src/server/org/opends/server/core/AddOperationTestCase.java

@@ -23,7 +23,7 @@
 *
 *
 *      Copyright 2006-2008 Sun Microsystems, Inc.
 *      Portions copyright 2011 ForgeRock AS.
 *      Portions copyright 2011-2013 ForgeRock AS.
 */
package org.opends.server.core;

@@ -2045,7 +2045,7 @@
           conn.processAdd(entry.getDN(), entry.getObjectClasses(),
                           entry.getUserAttributes(),
                           entry.getOperationalAttributes());
      assertFalse(addOperation.getResultCode() == ResultCode.SUCCESS);
      assertEquals(addOperation.getResultCode(), ResultCode.BUSY);
    }
    finally
    {

 opends/tests/unit-tests-testng/src/server/org/opends/server/core/CompareOperationTestCase.java

@@ -23,7 +23,7 @@
 *
 *
 *      Copyright 2006-2008 Sun Microsystems, Inc.
 *      Portions copyright 2011 ForgeRock AS.
 *      Portions copyright 2011-2013 ForgeRock AS.
 */

package org.opends.server.core;
@@ -703,8 +703,7 @@
        CompareResponseProtocolOp compareResponse =
             message.getCompareResponseProtocolOp();

        assertEquals(compareResponse.getResultCode(),
                     DirectoryServer.getServerErrorResultCode().getIntValue());
        assertEquals(compareResponse.getResultCode(), ResultCode.BUSY);

//        assertEquals(InvocationCounterPlugin.getPreParseCount(), 1);
//        assertEquals(InvocationCounterPlugin.getPreOperationCount(), 0);

 opends/tests/unit-tests-testng/src/server/org/opends/server/core/DeleteOperationTestCase.java

@@ -23,7 +23,7 @@
 *
 *
 *      Copyright 2006-2008 Sun Microsystems, Inc.
 *      Portions copyright 2011 ForgeRock AS.
 *      Portions copyright 2011-2013 ForgeRock AS.
 */
package org.opends.server.core;

@@ -858,7 +858,7 @@

      DeleteOperation deleteOperation =
           conn.processDelete(ByteString.valueOf("o=test"));
      assertFalse(deleteOperation.getResultCode() == ResultCode.SUCCESS);
      assertEquals(deleteOperation.getResultCode(), ResultCode.BUSY);
    }
    finally
    {

 opends/tests/unit-tests-testng/src/server/org/opends/server/core/ModifyOperationTestCase.java

@@ -4173,7 +4173,7 @@

      ModifyOperation modifyOperation =
           conn.processModify(ByteString.valueOf(baseDN), mods);
      assertFalse(modifyOperation.getResultCode() == ResultCode.SUCCESS);
      assertEquals(modifyOperation.getResultCode(), ResultCode.BUSY);
    }
    finally
    {

 opends/tests/unit-tests-testng/src/server/org/opends/server/core/TestModifyDNOperation.java

@@ -23,7 +23,7 @@
 *
 *
 *      Copyright 2006-2010 Sun Microsystems, Inc.
 *      Portions copyright 2011 ForgeRock AS.
 *      Portions copyright 2011-2013 ForgeRock AS.
 *      Portions copyright 2013 Manuel Gaupp
 */
package org.opends.server.core;
@@ -407,14 +407,14 @@

    InternalClientConnection conn =
         InternalClientConnection.getRootConnection();
    

    ModifyDNOperationBasis modifyDNOperation =
         new ModifyDNOperationBasis(conn, InternalClientConnection.nextOperationID(), InternalClientConnection.nextMessageID(),
                               noControls,
                               DN.decode("uid=user.0,ou=People,dc=example,dc=com"),
                               RDN.decode("uid=USER.0"), true,
                               null);
    

    modifyDNOperation.run();
    assertEquals(modifyDNOperation.getResultCode(),
                 ResultCode.SUCCESS);
@@ -422,9 +422,9 @@
    Entry newEntry = DirectoryServer.getEntry(DN.decode(
        "uid=user.0,ou=People,dc=example,dc=com"));
    assertNotNull(newEntry);
    

    assertTrue(newEntry.getDN().toString().equals("uid=USER.0,ou=People,dc=example,dc=com"));
    

    AttributeType at = DirectoryServer.getAttributeType("uid");
    List<Attribute> attrList = newEntry.getAttribute(at);

@@ -455,8 +455,8 @@
    assertNotNull(newEntry);

    examineCompletedOperation(modifyDNOperation);
  }  
  
  }

  /**
   * Add another attribute to the RDN and change case of the existing value
   */
@@ -473,20 +473,20 @@
         "givenName: Babs",
         "sn: Jensen",
         "cn: Babs Jensen");
    

    ArrayList<Control> noControls = new ArrayList<Control>(0);
    InvocationCounterPlugin.resetAllCounters();

    InternalClientConnection conn =
         InternalClientConnection.getRootConnection();
    

    ModifyDNOperationBasis modifyDNOperation =
         new ModifyDNOperationBasis(conn, InternalClientConnection.nextOperationID(), InternalClientConnection.nextMessageID(),
                               noControls,
                               DN.decode("uid=userid.0,ou=People,dc=example,dc=com"),
                               RDN.decode("uid=UserID.0+cn=Test"), false,
                               null);
    

    modifyDNOperation.run();
    assertEquals(modifyDNOperation.getResultCode(),
                 ResultCode.SUCCESS);
@@ -494,9 +494,9 @@
    Entry newEntry = DirectoryServer.getEntry(DN.decode(
        "uid=userid.0+cn=test,ou=People,dc=example,dc=com"));
    assertNotNull(newEntry);
    

    assertTrue(newEntry.getDN().toString().equals("uid=UserID.0+cn=Test,ou=People,dc=example,dc=com"));
    

    AttributeType at = DirectoryServer.getAttributeType("uid");
    List<Attribute> attrList = newEntry.getAttribute(at);

@@ -511,7 +511,7 @@
    examineCompletedOperation(modifyDNOperation);
    TestCaseUtils.deleteEntry(DN.decode("uid=UserID.0+cn=Test,ou=People,dc=example,dc=com"));
  }
  

  /**
   * Add a value to the RDN which is already part of the entry, but with another string representation
   */
@@ -528,20 +528,20 @@
         "givenName: Babs",
         "sn: Jensen",
         "cn: Babs Jensen");
    

    ArrayList<Control> noControls = new ArrayList<Control>(0);
    InvocationCounterPlugin.resetAllCounters();

    InternalClientConnection conn =
         InternalClientConnection.getRootConnection();
    

    ModifyDNOperationBasis modifyDNOperation =
         new ModifyDNOperationBasis(conn, InternalClientConnection.nextOperationID(), InternalClientConnection.nextMessageID(),
                               noControls,
                               DN.decode("uid=userid.0,ou=People,dc=example,dc=com"),
                               RDN.decode("uid=userid.0+sn=JENSEN"), false,
                               null);
    

    modifyDNOperation.run();
    assertEquals(modifyDNOperation.getResultCode(),
                 ResultCode.SUCCESS);
@@ -549,9 +549,9 @@
    Entry newEntry = DirectoryServer.getEntry(DN.decode(
        "uid=userid.0+sn=jensen,ou=People,dc=example,dc=com"));
    assertNotNull(newEntry);
    

    assertTrue(newEntry.getDN().toString().equals("uid=userid.0+sn=JENSEN,ou=People,dc=example,dc=com"));
    

    AttributeType at = DirectoryServer.getAttributeType("sn");
    List<Attribute> attrList = newEntry.getAttribute(at);

@@ -567,7 +567,7 @@
    examineCompletedOperation(modifyDNOperation);
    TestCaseUtils.deleteEntry(DN.decode("uid=userid.0+sn=Jensen,ou=People,dc=example,dc=com"));
  }
  

  @Test
  public void testRawDeleteOldRDNModify() throws Exception
  {
@@ -1420,8 +1420,7 @@
        ModifyDNResponseProtocolOp modifyResponse =
             message.getModifyDNResponseProtocolOp();

        assertEquals(modifyResponse.getResultCode(),
                     DirectoryServer.getServerErrorResultCode().getIntValue());
        assertEquals(modifyResponse.getResultCode(), ResultCode.BUSY);

//        assertEquals(InvocationCounterPlugin.getPreParseCount(), 1);
//        assertEquals(InvocationCounterPlugin.getPreOperationCount(), 0);