OPENDJ-2987 Fix TaskBackendTestCase to use an existing attribute instead of...

Nicolas Capponi

18.40.2016 96374bcb8b8872bb04bbc3133ccb57600b69ee6b

OPENDJ-2987 Fix TaskBackendTestCase to use an existing attribute instead of a dummy attribute

 opendj-server-legacy/src/test/java/org/opends/server/backends/task/TaskBackendTestCase.java

@@ -26,6 +26,7 @@
import org.opends.server.TestCaseUtils;
import org.opends.server.backends.BackendTestCase;
import org.opends.server.core.DirectoryServer;
import org.opends.server.tasks.DummyTask;
import org.opends.server.tasks.TasksTestCase;
import org.forgerock.opendj.ldap.DN;
import org.testng.annotations.AfterClass;
@@ -104,7 +105,7 @@
      "ds-task-id: " + taskID,
      "ds-task-class-name: org.opends.server.tasks.DummyTask",
      "ds-task-scheduled-start-time: " + startTimeStr,
      "ds-task-dummy-sleep-time: 30000");
      DummyTask.TASK_SLEEP_TIME_ATTRIBUTE + ": 30000");

    Task task = TasksTestCase.getTask(DN.valueOf(taskDN));
    assertTrue(TaskState.isPending(task.getTaskState()));
@@ -140,7 +141,7 @@
      "objectClass: extensibleObject",
      "ds-task-id: " + taskID,
      "ds-task-class-name: org.opends.server.tasks.DummyTask",
      "ds-task-dummy-sleep-time: 300000");
      DummyTask.TASK_SLEEP_TIME_ATTRIBUTE + ": 300000");


    // Wait until we're sure that the task has started running.
@@ -231,7 +232,7 @@
      "ds-task-id: " + taskID,
      "ds-task-class-name: org.opends.server.tasks.DummyTask",
      "ds-task-scheduled-start-time: " + startTimeStr,
      "ds-task-dummy-sleep-time: 30000");
      DummyTask.TASK_SLEEP_TIME_ATTRIBUTE + ": 30000");

    Task task = TasksTestCase.getTask(DN.valueOf(taskDN));
    assertTrue(TaskState.isPending(task.getTaskState()));
@@ -283,7 +284,7 @@
      "objectClass: extensibleObject",
      "ds-task-id: " + taskID,
      "ds-task-class-name: org.opends.server.tasks.DummyTask",
      "ds-task-dummy-sleep-time: 300000");
      DummyTask.TASK_SLEEP_TIME_ATTRIBUTE + ": 300000");

    // Wait until we're sure that the task has started running.
    long startTime = System.currentTimeMillis();
@@ -580,7 +581,7 @@
      "ds-recurring-task-schedule: " + taskSchedule,
      "ds-task-id: " + taskID,
      "ds-task-class-name: org.opends.server.tasks.DummyTask",
      "ds-task-dummy-sleep-time: 0");
      DummyTask.TASK_SLEEP_TIME_ATTRIBUTE + ": 0");

    return rc == ResultCode.SUCCESS
        && DirectoryServer.entryExists(DN.valueOf(taskDN));

 opendj-server-legacy/src/test/java/org/opends/server/tasks/DummyTask.java

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

@@ -30,6 +30,9 @@
 */
public class DummyTask extends Task
{
  /** Re-using an existing attribute to handle sleep time attribute. */
  public final static String TASK_SLEEP_TIME_ATTRIBUTE = "ds-cfg-time-limit";

  /** The length of time that the task should sleep before completing. */
  private long sleepTime;

@@ -53,7 +56,7 @@
    Entry taskEntry = getTaskEntry();
    if (taskEntry != null)
    {
      for (Attribute a : taskEntry.getAttribute("ds-task-dummy-sleep-time"))
      for (Attribute a : taskEntry.getAttribute(TASK_SLEEP_TIME_ATTRIBUTE))
      {
        for (ByteString v : a)
        {