From d710c5f04c40abee7b9d79284f79a2295a96c214 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jn.rouvignac@gmail.com>
Date: Mon, 31 Aug 2015 12:20:33 +0000
Subject: [PATCH] TasksTestCase.java: Extracted method waitTaskCompletedSuccessfully() from test classes.
---
opendj-server-legacy/src/test/java/org/opends/server/backends/LDIFBackendTestCase.java | 17 +++++------------
1 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/backends/LDIFBackendTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/backends/LDIFBackendTestCase.java
index a8e49cd..22579ce 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/backends/LDIFBackendTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/backends/LDIFBackendTestCase.java
@@ -39,8 +39,6 @@
import org.opends.server.TestCaseUtils;
import org.opends.server.api.Backend;
import org.opends.server.api.Backend.BackendOperation;
-import org.opends.server.backends.task.Task;
-import org.opends.server.backends.task.TaskState;
import org.opends.server.core.AddOperation;
import org.opends.server.core.CompareOperation;
import org.opends.server.core.DeleteOperation;
@@ -103,8 +101,8 @@
"config" + File.separator + "MakeLDIF";
LdifFileWriter.makeLdif(ldifFile.getPath(), resourcePath, templateFilePath);
- String taskDN = "ds-task-id=" + UUID.randomUUID() +
- ",cn=Scheduled Tasks,cn=Tasks";
+ DN taskDN = DN.valueOf("ds-task-id=" + UUID.randomUUID() +
+ ",cn=Scheduled Tasks,cn=Tasks");
TestCaseUtils.addEntry(
"dn: " + taskDN,
@@ -115,9 +113,7 @@
"ds-task-import-backend-id: ldifRoot",
"ds-task-import-ldif-file: " + ldifFile.getAbsolutePath());
- Task t = TasksTestCase.getCompletedTask(DN.valueOf(taskDN));
- assertNotNull(t);
- assertEquals(t.getTaskState(), TaskState.COMPLETED_SUCCESSFULLY);
+ TasksTestCase.waitTaskCompletedSuccessfully(taskDN);
}
@@ -129,8 +125,7 @@
* @throws Exception If an unexpected problem occurs.
*/
@Test
- public void testAddAndDelete()
- throws Exception
+ public void testAddAndDelete() throws Exception
{
// Add a number of entries to the server.
int resultCode = TestCaseUtils.applyModifications(false,
@@ -700,9 +695,7 @@
"ds-task-export-backend-id: ldifRoot",
"ds-task-export-ldif-file: " + tempFilePath);
- Task t = TasksTestCase.getCompletedTask(DN.valueOf(taskDN));
- assertNotNull(t);
- assertEquals(t.getTaskState(), TaskState.COMPLETED_SUCCESSFULLY);
+ TasksTestCase.waitTaskCompletedSuccessfully(DN.valueOf(taskDN));
}
--
Gitblit v1.10.0