From e755a8ecb13752f63fd5c2f3e78d8edff0586d92 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Mon, 03 Mar 2014 18:01:36 +0000
Subject: [PATCH] Fix unstable unit test due to side-effects between tests.

---
 opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/PasswordModifyExtendedRequestTestCase.java |   13 +++++--------
 1 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/PasswordModifyExtendedRequestTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/PasswordModifyExtendedRequestTestCase.java
index 93f7005..b5eb8a1 100644
--- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/PasswordModifyExtendedRequestTestCase.java
+++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/PasswordModifyExtendedRequestTestCase.java
@@ -21,7 +21,7 @@
  * CDDL HEADER END
  *
  *
- *      Copyright 2013 ForgeRock AS.
+ *      Copyright 2013-2014 ForgeRock AS.
  */
 
 package org.forgerock.opendj.ldap.requests;
@@ -40,9 +40,6 @@
  */
 @SuppressWarnings("javadoc")
 public class PasswordModifyExtendedRequestTestCase extends RequestsTestCase {
-    private static final PasswordModifyExtendedRequest NEW_PASSWORDMODIFYEXTENDED_REQUEST = Requests
-            .newPasswordModifyExtendedRequest();
-
     @DataProvider(name = "passwordModifyExtendedRequests")
     private Object[][] getPasswordModifyExtendedRequests() throws Exception {
         return createModifiableInstance();
@@ -50,9 +47,7 @@
 
     @Override
     protected PasswordModifyExtendedRequest[] newInstance() {
-        return new PasswordModifyExtendedRequest[] {
-            NEW_PASSWORDMODIFYEXTENDED_REQUEST
-        };
+        return new PasswordModifyExtendedRequest[] { Requests.newPasswordModifyExtendedRequest() };
     }
 
     @Override
@@ -79,7 +74,9 @@
         assertThat(copy.getNewPassword()).isEqualTo(password.getBytes());
         assertThat(original.getNewPassword()).isNull();
         assertThat(copy.getOldPassword()).isEqualTo(oldPassword.getBytes());
-        assertThat(copy.getOID()).isEqualTo(original.getOID());
+        assertThat(original.getOldPassword()).isNull();
+        assertThat(copy.getUserIdentityAsString()).isEqualTo(userIdentity);
+        assertThat(original.getUserIdentityAsString()).isNull();
     }
 
     @Test(dataProvider = "passwordModifyExtendedRequests")

--
Gitblit v1.10.0