Improve code compatibility with latest TestNG

Jean-Noël Rouvignac

26.24.2016 7a1647af2e82e4a10891e7e952069dbafca906ca

Improve code compatibility with latest TestNG

 opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/AlternateRootDN.java

@@ -12,24 +12,22 @@
 * information: "Portions Copyright [year] [name of copyright owner]".
 *
 * Copyright 2008-2009 Sun Microsystems, Inc.
 * Portions Copyright 2013-2015 ForgeRock AS.
 * Portions Copyright 2013-2016 ForgeRock AS.
 */
package org.opends.server.authorization.dseecompat;

import static org.testng.Assert.*;
import static org.opends.server.TestCaseUtils.*;
import static org.opends.server.config.ConfigConstants.*;
import static org.opends.server.util.ServerConstants.*;

import java.util.Map;

import org.testng.Assert;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;

/**
 * This class tests ACI behavior using alternate root bind DNs.
 */
/** This class tests ACI behavior using alternate root bind DNs. */
@SuppressWarnings("javadoc")
public class AlternateRootDN extends AciTestCase {

@@ -56,7 +54,6 @@
        "(version 3.0; acl \"pwd search, read " + rootDN + "\";" +
        "allow(read, search) userdn=\"ldap:///" + rootDN + "\";)";


  @BeforeClass
  public void setupClass() throws Exception {
    deleteAttrFromAdminEntry(ACCESS_HANDLER_DN, ATTR_AUTHZ_GLOBAL_ACI);
@@ -64,7 +61,6 @@
    addRootEntry();
  }


  @BeforeMethod
  public void clearBackend() throws Exception {
    deleteAttrFromEntry(user1, "aci");
@@ -89,24 +85,22 @@
                    user1, pwdFilter, ATTR_USER_PASSWORD);
    assertNotEquals(adminDNResults, "");
    Map<String, String> attrMap = getAttrMap(adminDNResults);
    Assert.assertTrue(attrMap.containsKey(ATTR_USER_PASSWORD));
    assertTrue(attrMap.containsKey(ATTR_USER_PASSWORD));
    String adminRootDNResults =
            LDAPSearchParams(adminRootDN, PWD, null, null, null,
                    user1, pwdFilter, ATTR_USER_PASSWORD);
    assertNotEquals(adminRootDNResults, "");
    Map<String, String> attrMap1 = getAttrMap(adminRootDNResults);
    Assert.assertTrue(attrMap1.containsKey(ATTR_USER_PASSWORD));
    assertTrue(attrMap1.containsKey(ATTR_USER_PASSWORD));
    String rootDNResults =
            LDAPSearchParams(rootDN, PWD, null, null, null,
                    user1, pwdFilter, ATTR_USER_PASSWORD);
    assertNotEquals(rootDNResults, "");
    Map<String, String> attrMap2 = getAttrMap(rootDNResults);
    Assert.assertTrue(attrMap2.containsKey(ATTR_USER_PASSWORD));
    assertTrue(attrMap2.containsKey(ATTR_USER_PASSWORD));
    deleteAttrFromEntry(user1, "aci");
  }



  /**
   * This test uses two ACIs, one allowing proxy authorization to a user, and
   * the other allowing access to the userPassword attribute based on one of the
@@ -126,19 +120,19 @@
                    user1, pwdFilter, ATTR_USER_PASSWORD);
    assertNotEquals(adminDNResults, "");
    Map<String, String> attrMap = getAttrMap(adminDNResults);
    Assert.assertTrue(attrMap.containsKey(ATTR_USER_PASSWORD));
    assertTrue(attrMap.containsKey(ATTR_USER_PASSWORD));
    String adminRootDNResults =
            LDAPSearchParams(user3, PWD, adminRootDN, null, null,
                    user1, pwdFilter, ATTR_USER_PASSWORD);
    assertNotEquals(adminRootDNResults, "");
    Map<String, String> attrMap1 = getAttrMap(adminRootDNResults);
    Assert.assertTrue(attrMap1.containsKey(ATTR_USER_PASSWORD));
    assertTrue(attrMap1.containsKey(ATTR_USER_PASSWORD));
    String rootDNResults =
            LDAPSearchParams(user3, PWD, adminDN, null, null,
                    user1, pwdFilter, ATTR_USER_PASSWORD);
    assertNotEquals(rootDNResults, "");
    Map<String, String> attrMap2 = getAttrMap(rootDNResults);
    Assert.assertTrue(attrMap2.containsKey(ATTR_USER_PASSWORD));
    assertTrue(attrMap2.containsKey(ATTR_USER_PASSWORD));
    deleteAttrFromEntry(user1, "aci");
  }
}

 opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/NestedGroupDNTestCase.java

@@ -12,17 +12,17 @@
 * information: "Portions Copyright [year] [name of copyright owner]".
 *
 * Copyright 2008-2009 Sun Microsystems, Inc.
 * Portions Copyright 2015 ForgeRock AS.
 * Portions Copyright 2015-2016 ForgeRock AS.
 */
package org.opends.server.authorization.dseecompat;

import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import org.testng.Assert;

import static org.opends.server.TestCaseUtils.*;
import static org.opends.server.config.ConfigConstants.ATTR_AUTHZ_GLOBAL_ACI;
import static org.testng.Assert.*;

/**
 * Test the groupdn keyword using nested groups.
@@ -73,7 +73,7 @@
            LDAPSearchParams(user5, PWD, null, null, null,
                    user5, filter, null);
    //Access to user5 should be denied, user5 is not in any groups.
    Assert.assertEquals(userResults, "");
    assertEquals(userResults, "");
    //Add user5 to group1.
    String member5Ldif=makeAddLDIF("member", group3DN, user5);
    LDIFModify(member5Ldif, DIR_MGR_DN, PWD);
@@ -104,7 +104,7 @@
    String userResults =
            LDAPSearchParams(user5, PWD, null, null, null,
                    user5, filter, null);
    Assert.assertEquals(userResults, "");
    assertEquals(userResults, "");
    //Add group4 (dynamic) to group3.
    String group3Ldif=makeAddLDIF("member", group3DN, group4DN);
    LDIFModify(group3Ldif, DIR_MGR_DN, PWD);
@@ -133,7 +133,7 @@
    String userResults =
            LDAPSearchParams(user5, PWD, null, null, null,
                    user5, filter, null);
    Assert.assertEquals(userResults, "");
    assertEquals(userResults, "");
    //Nest group1 in group3, creating circular nesting.
    String group3Ldif=makeAddLDIF("member", group3DN, group1DN);
    LDIFModify(group3Ldif, DIR_MGR_DN, PWD);
@@ -145,6 +145,6 @@
            LDAPSearchParams(user5, PWD, null, null, null,
                    user5, filter, null);
    //Results should not be returned because of circular condition.
    Assert.assertEquals(userResults1, "");
    assertEquals(userResults1, "");
  }
}