From 4cdebf2eb1c54891b3fa3d6d2f1cb387532b83ac Mon Sep 17 00:00:00 2001
From: abobrov <abobrov@localhost>
Date: Thu, 11 Jun 2009 02:55:04 +0000
Subject: [PATCH] - update recurring task unit test to handle changes introduced in revision 5429 / [Issue 4029] : Recurring backup failling on Windows.

---
 opends/tests/unit-tests-testng/src/server/org/opends/server/backends/task/TaskBackendTestCase.java |   20 +++++++++++---------
 1 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/task/TaskBackendTestCase.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/task/TaskBackendTestCase.java
index 2532e20..a257383 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/task/TaskBackendTestCase.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/task/TaskBackendTestCase.java
@@ -485,7 +485,6 @@
     calendar.set(GregorianCalendar.MINUTE, 0);
     calendar.set(GregorianCalendar.SECOND, 0);
 
-    Date scheduledDate = calendar.getTime();
     int scheduledMonth =
       calendar.get(GregorianCalendar.MONTH) + 1;
 
@@ -496,16 +495,17 @@
     String taskSchedule = "00 * * " +
       Integer.toString(scheduledMonth) + " *";
 
-    String scheduledTaskID = taskID + " - " + scheduledDate.toString();
-    String scheduledTaskDN =
-        "ds-task-id=" + scheduledTaskID
-            + ",cn=Scheduled Tasks,cn=tasks";
+    TaskBackend taskBackend =
+      (TaskBackend) DirectoryServer.getBackend(DN.decode("cn=tasks"));
+    long tasksCountBefore = taskBackend.numSubordinates(DN.decode(
+      "cn=Scheduled Tasks,cn=tasks"), true);
 
     assertTrue(addRecurringTask(taskID, taskSchedule));
 
-    Task scheduledTask =
-        TasksTestCase.getTask(DN.decode(scheduledTaskDN));
-    assertTrue(TaskState.isPending(scheduledTask.getTaskState()));
+    // Make sure recurring task iteration got scheduled.
+    long tasksCountAfter = taskBackend.numSubordinates(DN.decode(
+      "cn=Scheduled Tasks,cn=tasks"), true);
+    assertTrue(tasksCountAfter == (tasksCountBefore + 1));
 
     // Perform a modification to update a non-state attribute.
     int resultCode =
@@ -523,7 +523,9 @@
     assertFalse(DirectoryServer.entryExists(DN.decode(taskDN)));
 
     // Make sure recurring task iteration got canceled and removed.
-    assertFalse(DirectoryServer.entryExists(DN.decode(scheduledTaskDN)));
+    tasksCountAfter = taskBackend.numSubordinates(DN.decode(
+      "cn=Scheduled Tasks,cn=tasks"), true);
+    assertTrue(tasksCountAfter == tasksCountBefore);
   }
 
 

--
Gitblit v1.10.0