From e564c8908d3f46bb95fd9a84f85afacaea14358f Mon Sep 17 00:00:00 2001
From: neil_a_wilson <neil_a_wilson@localhost>
Date: Sun, 29 Jul 2007 21:32:52 +0000
Subject: [PATCH] Update a number of tasks test cases so that the getCompletedTask method is made available in the parent TasksTestCase class rather than duplicated in each test class that needs this functionality.
---
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/TasksTestCase.java | 54 ++++++++++
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/AllowedTaskTestCase.java | 53 ----------
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/LockdownModeTaskTestCase.java | 53 ----------
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/AddSchemaFileTaskTestCase.java | 53 ----------
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/DisconnectClientTaskTestCase.java | 53 ----------
5 files changed, 53 insertions(+), 213 deletions(-)
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/AddSchemaFileTaskTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/AddSchemaFileTaskTestCase.java
index f0ea97b..ffe2e6f 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/AddSchemaFileTaskTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/AddSchemaFileTaskTestCase.java
@@ -398,58 +398,5 @@
assertFalse(resultCode == 0);
invalidFile.delete();
}
-
-
-
- /**
- * Retrieves the specified task from the server, waiting for it to finish all
- * the running its going to do before returning.
- *
- * @param taskEntryDN The DN of the entry for the task to retrieve.
- *
- * @return The requested task entry.
- *
- * @throws Exception If an unexpected problem occurs.
- */
- private Task getCompletedTask(DN taskEntryDN)
- throws Exception
- {
- TaskBackend taskBackend =
- (TaskBackend) DirectoryServer.getBackend(DN.decode("cn=tasks"));
- Task task = taskBackend.getScheduledTask(taskEntryDN);
- if (task == null)
- {
- long stopWaitingTime = System.currentTimeMillis() + 10000L;
- while ((task == null) && (System.currentTimeMillis() < stopWaitingTime))
- {
- Thread.sleep(10);
- task = taskBackend.getScheduledTask(taskEntryDN);
- }
- }
-
- if (task == null)
- {
- throw new AssertionError("There is no such task " +
- taskEntryDN.toString());
- }
-
- if (! TaskState.isDone(task.getTaskState()))
- {
- long stopWaitingTime = System.currentTimeMillis() + 20000L;
- while ((! TaskState.isDone(task.getTaskState())) &&
- (System.currentTimeMillis() < stopWaitingTime))
- {
- Thread.sleep(10);
- }
- }
-
- if (! TaskState.isDone(task.getTaskState()))
- {
- throw new AssertionError("Task " + taskEntryDN.toString() +
- " did not complete in a timely manner.");
- }
-
- return task;
- }
}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/AllowedTaskTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/AllowedTaskTestCase.java
index ccdb0e2..6afad5a 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/AllowedTaskTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/AllowedTaskTestCase.java
@@ -176,58 +176,5 @@
assertEquals(LDAPModify.mainModify(args, false, System.out, System.err),
LDAPResultCode.UNWILLING_TO_PERFORM);
}
-
-
-
- /**
- * Retrieves the specified task from the server, waiting for it to finish all
- * the running its going to do before returning.
- *
- * @param taskEntryDN The DN of the entry for the task to retrieve.
- *
- * @return The requested task entry.
- *
- * @throws Exception If an unexpected problem occurs.
- */
- private Task getCompletedTask(DN taskEntryDN)
- throws Exception
- {
- TaskBackend taskBackend =
- (TaskBackend) DirectoryServer.getBackend(DN.decode("cn=tasks"));
- Task task = taskBackend.getScheduledTask(taskEntryDN);
- if (task == null)
- {
- long stopWaitingTime = System.currentTimeMillis() + 10000L;
- while ((task == null) && (System.currentTimeMillis() < stopWaitingTime))
- {
- Thread.sleep(10);
- task = taskBackend.getScheduledTask(taskEntryDN);
- }
- }
-
- if (task == null)
- {
- throw new AssertionError("There is no such task " +
- taskEntryDN.toString());
- }
-
- if (! TaskState.isDone(task.getTaskState()))
- {
- long stopWaitingTime = System.currentTimeMillis() + 20000L;
- while ((! TaskState.isDone(task.getTaskState())) &&
- (System.currentTimeMillis() < stopWaitingTime))
- {
- Thread.sleep(10);
- }
- }
-
- if (! TaskState.isDone(task.getTaskState()))
- {
- throw new AssertionError("Task " + taskEntryDN.toString() +
- " did not complete in a timely manner.");
- }
-
- return task;
- }
}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/DisconnectClientTaskTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/DisconnectClientTaskTestCase.java
index 1efb90b..0dde670 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/DisconnectClientTaskTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/DisconnectClientTaskTestCase.java
@@ -214,58 +214,5 @@
s.close();
} catch (Exception e) {}
}
-
-
-
- /**
- * Retrieves the specified task from the server, waiting for it to finish all
- * the running its going to do before returning.
- *
- * @param taskEntryDN The DN of the entry for the task to retrieve.
- *
- * @return The requested task entry.
- *
- * @throws Exception If an unexpected problem occurs.
- */
- private Task getCompletedTask(DN taskEntryDN)
- throws Exception
- {
- TaskBackend taskBackend =
- (TaskBackend) DirectoryServer.getBackend(DN.decode("cn=tasks"));
- Task task = taskBackend.getScheduledTask(taskEntryDN);
- if (task == null)
- {
- long stopWaitingTime = System.currentTimeMillis() + 10000L;
- while ((task == null) && (System.currentTimeMillis() < stopWaitingTime))
- {
- Thread.sleep(10);
- task = taskBackend.getScheduledTask(taskEntryDN);
- }
- }
-
- if (task == null)
- {
- throw new AssertionError("There is no such task " +
- taskEntryDN.toString());
- }
-
- if (! TaskState.isDone(task.getTaskState()))
- {
- long stopWaitingTime = System.currentTimeMillis() + 20000L;
- while ((! TaskState.isDone(task.getTaskState())) &&
- (System.currentTimeMillis() < stopWaitingTime))
- {
- Thread.sleep(10);
- }
- }
-
- if (! TaskState.isDone(task.getTaskState()))
- {
- throw new AssertionError("Task " + taskEntryDN.toString() +
- " did not complete in a timely manner.");
- }
-
- return task;
- }
}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/LockdownModeTaskTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/LockdownModeTaskTestCase.java
index fe66793..d9649b2 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/LockdownModeTaskTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/LockdownModeTaskTestCase.java
@@ -282,58 +282,5 @@
};
assertEquals(LDAPSearch.mainSearch(args, false, null, System.err), 0);
}
-
-
-
- /**
- * Retrieves the specified task from the server, waiting for it to finish all
- * the running its going to do before returning.
- *
- * @param taskEntryDN The DN of the entry for the task to retrieve.
- *
- * @return The requested task entry.
- *
- * @throws Exception If an unexpected problem occurs.
- */
- private Task getCompletedTask(DN taskEntryDN)
- throws Exception
- {
- TaskBackend taskBackend =
- (TaskBackend) DirectoryServer.getBackend(DN.decode("cn=tasks"));
- Task task = taskBackend.getScheduledTask(taskEntryDN);
- if (task == null)
- {
- long stopWaitingTime = System.currentTimeMillis() + 10000L;
- while ((task == null) && (System.currentTimeMillis() < stopWaitingTime))
- {
- Thread.sleep(10);
- task = taskBackend.getScheduledTask(taskEntryDN);
- }
- }
-
- if (task == null)
- {
- throw new AssertionError("There is no such task " +
- taskEntryDN.toString());
- }
-
- if (! TaskState.isDone(task.getTaskState()))
- {
- long stopWaitingTime = System.currentTimeMillis() + 20000L;
- while ((! TaskState.isDone(task.getTaskState())) &&
- (System.currentTimeMillis() < stopWaitingTime))
- {
- Thread.sleep(10);
- }
- }
-
- if (! TaskState.isDone(task.getTaskState()))
- {
- throw new AssertionError("Task " + taskEntryDN.toString() +
- " did not complete in a timely manner.");
- }
-
- return task;
- }
}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/TasksTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/TasksTestCase.java
index 1148909..eee691b 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/TasksTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/TasksTestCase.java
@@ -41,7 +41,7 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.internal.InternalSearchOperation;
-import org.opends.server.backends.task.TaskState;
+import org.opends.server.backends.task.*;
import org.opends.server.types.*;
import java.util.ArrayList;
@@ -154,4 +154,56 @@
}
}
+
+
+ /**
+ * Retrieves the specified task from the server, waiting for it to finish all
+ * the running its going to do before returning.
+ *
+ * @param taskEntryDN The DN of the entry for the task to retrieve.
+ *
+ * @return The requested task entry.
+ *
+ * @throws Exception If an unexpected problem occurs.
+ */
+ protected Task getCompletedTask(DN taskEntryDN)
+ throws Exception
+ {
+ TaskBackend taskBackend =
+ (TaskBackend) DirectoryServer.getBackend(DN.decode("cn=tasks"));
+ Task task = taskBackend.getScheduledTask(taskEntryDN);
+ if (task == null)
+ {
+ long stopWaitingTime = System.currentTimeMillis() + 10000L;
+ while ((task == null) && (System.currentTimeMillis() < stopWaitingTime))
+ {
+ Thread.sleep(10);
+ task = taskBackend.getScheduledTask(taskEntryDN);
+ }
+ }
+
+ if (task == null)
+ {
+ throw new AssertionError("There is no such task " +
+ taskEntryDN.toString());
+ }
+
+ if (! TaskState.isDone(task.getTaskState()))
+ {
+ long stopWaitingTime = System.currentTimeMillis() + 20000L;
+ while ((! TaskState.isDone(task.getTaskState())) &&
+ (System.currentTimeMillis() < stopWaitingTime))
+ {
+ Thread.sleep(10);
+ }
+ }
+
+ if (! TaskState.isDone(task.getTaskState()))
+ {
+ throw new AssertionError("Task " + taskEntryDN.toString() +
+ " did not complete in a timely manner.");
+ }
+
+ return task;
+ }
}
--
Gitblit v1.10.0