From ddc834f5aa8f311192cc419cf57b0648b4971b5b Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 09 Jun 2016 13:57:09 +0000
Subject: [PATCH] Entry.getAttribute() now accepts a nameOrOid
---
opendj-server-legacy/src/test/java/org/opends/server/replication/ReplicationTestCase.java | 16 +++++-----------
1 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/ReplicationTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/ReplicationTestCase.java
index fe56e5b..1a781a3 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/ReplicationTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/ReplicationTestCase.java
@@ -621,18 +621,14 @@
InternalSearchOperation searchOperation = connection.processSearch(request);
Assertions.assertThat(searchOperation.getSearchEntries()).isNotEmpty();
Entry resultEntry = searchOperation.getSearchEntries().get(0);
- String completionTime = resultEntry.parseAttribute(
- ATTR_TASK_COMPLETION_TIME.toLowerCase()).asString();
+ String completionTime = resultEntry.parseAttribute(ATTR_TASK_COMPLETION_TIME).asString();
assertNotNull(completionTime, "The task has not completed");
return resultEntry;
}
});
// Check that the task state is as expected.
- String stateString = resultEntry.parseAttribute(
- ATTR_TASK_STATE.toLowerCase()).asString();
- TaskState taskState = TaskState.fromString(stateString);
- assertEquals(taskState, TaskState.COMPLETED_SUCCESSFULLY,
+ assertEquals(getTaskState(resultEntry), TaskState.COMPLETED_SUCCESSFULLY,
"The task completed in an unexpected state");
}
@@ -715,8 +711,7 @@
});
// Check that the task contains some log messages.
- Set<String> logMessages = resultEntry.parseAttribute(
- ATTR_TASK_LOG_MESSAGES.toLowerCase()).asSetOfString();
+ Set<String> logMessages = resultEntry.parseAttribute(ATTR_TASK_LOG_MESSAGES).asSetOfString();
TaskState taskState = getTaskState(resultEntry);
if (taskState != COMPLETED_SUCCESSFULLY && taskState != RUNNING)
@@ -748,10 +743,9 @@
}
}
- private TaskState getTaskState(Entry resultEntry)
+ private TaskState getTaskState(Entry entry)
{
- String stateString = resultEntry.parseAttribute(ATTR_TASK_STATE.toLowerCase()).asString();
- return TaskState.fromString(stateString);
+ return TaskState.fromString(entry.parseAttribute(ATTR_TASK_STATE).asString());
}
/** Add to the current DB the entries necessary to the test. */
--
Gitblit v1.10.0