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/tasks/LockdownModeTaskTestCase.java | 21 ++++-----------------
1 files changed, 4 insertions(+), 17 deletions(-)
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/tasks/LockdownModeTaskTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/tasks/LockdownModeTaskTestCase.java
index 319dc58..e27dab8 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/tasks/LockdownModeTaskTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/tasks/LockdownModeTaskTestCase.java
@@ -26,8 +26,6 @@
*/
package org.opends.server.tasks;
-
-
import java.net.InetAddress;
import org.testng.annotations.Test;
@@ -35,8 +33,6 @@
import org.testng.annotations.BeforeClass;
import org.opends.server.TestCaseUtils;
-import org.opends.server.backends.task.Task;
-import org.opends.server.backends.task.TaskState;
import org.opends.server.core.DirectoryServer;
import org.opends.server.tools.LDAPSearch;
import org.opends.server.tools.LDAPModify;
@@ -44,11 +40,7 @@
import static org.testng.Assert.*;
-
-
-/**
- * Tests the enter and leave lockdown mode tasks.
- */
+/** Tests the enter and leave lockdown mode tasks. */
public class LockdownModeTaskTestCase
extends TasksTestCase
{
@@ -58,8 +50,7 @@
* @throws Exception If an unexpected problem occurs.
*/
@BeforeClass
- public void startServer()
- throws Exception
+ public void startServer() throws Exception
{
TestCaseUtils.startServer();
}
@@ -179,9 +170,7 @@
"-f", taskFile
};
assertEquals(LDAPModify.mainModify(args, false, null, System.err), 0);
- Task task = getCompletedTask(taskDN);
- assertNotNull(task);
- assertEquals(task.getTaskState(), TaskState.COMPLETED_SUCCESSFULLY);
+ waitTaskCompletedSuccessfully(taskDN);
assertTrue(DirectoryServer.lockdownMode());
@@ -276,9 +265,7 @@
"-f", taskFile
};
assertEquals(LDAPModify.mainModify(args, false, null, System.err), 0);
- task = getCompletedTask(taskDN);
- assertNotNull(task);
- assertEquals(task.getTaskState(), TaskState.COMPLETED_SUCCESSFULLY);
+ waitTaskCompletedSuccessfully(taskDN);
assertFalse(DirectoryServer.lockdownMode());
--
Gitblit v1.10.0