From 3872f27722f9bf2f6a601a86bdc769aa933801d0 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 21 Apr 2015 15:07:12 +0000
Subject: [PATCH] AutoRefactor'ed TestNG assertions Code cleanup: - factorized code by extracting methods
---
opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/AlternateRootDN.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/AlternateRootDN.java b/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/AlternateRootDN.java
index aa7ca0e..787fac3 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/AlternateRootDN.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/authorization/dseecompat/AlternateRootDN.java
@@ -26,6 +26,7 @@
*/
package org.opends.server.authorization.dseecompat;
+import static org.opends.server.TestCaseUtils.*;
import static org.opends.server.config.ConfigConstants.*;
import static org.opends.server.util.ServerConstants.*;
@@ -96,19 +97,19 @@
String adminDNResults =
LDAPSearchParams(adminDN, PWD, null, null, null,
user1, pwdFilter, ATTR_USER_PASSWORD);
- Assert.assertFalse("".equals(adminDNResults));
+ assertNotEquals(adminDNResults, "");
Map<String, String> attrMap = getAttrMap(adminDNResults);
Assert.assertTrue(attrMap.containsKey(ATTR_USER_PASSWORD));
String adminRootDNResults =
LDAPSearchParams(adminRootDN, PWD, null, null, null,
user1, pwdFilter, ATTR_USER_PASSWORD);
- Assert.assertFalse("".equals(adminRootDNResults));
+ assertNotEquals(adminRootDNResults, "");
Map<String, String> attrMap1 = getAttrMap(adminRootDNResults);
Assert.assertTrue(attrMap1.containsKey(ATTR_USER_PASSWORD));
String rootDNResults =
LDAPSearchParams(rootDN, PWD, null, null, null,
user1, pwdFilter, ATTR_USER_PASSWORD);
- Assert.assertFalse("".equals(rootDNResults));
+ assertNotEquals(rootDNResults, "");
Map<String, String> attrMap2 = getAttrMap(rootDNResults);
Assert.assertTrue(attrMap2.containsKey(ATTR_USER_PASSWORD));
deleteAttrFromEntry(user1, "aci");
@@ -133,19 +134,19 @@
String adminDNResults =
LDAPSearchParams(user3, PWD, adminDN, null, null,
user1, pwdFilter, ATTR_USER_PASSWORD);
- Assert.assertFalse("".equals(adminDNResults));
+ assertNotEquals(adminDNResults, "");
Map<String, String> attrMap = getAttrMap(adminDNResults);
Assert.assertTrue(attrMap.containsKey(ATTR_USER_PASSWORD));
String adminRootDNResults =
LDAPSearchParams(user3, PWD, adminRootDN, null, null,
user1, pwdFilter, ATTR_USER_PASSWORD);
- Assert.assertFalse("".equals(adminRootDNResults));
+ assertNotEquals(adminRootDNResults, "");
Map<String, String> attrMap1 = getAttrMap(adminRootDNResults);
Assert.assertTrue(attrMap1.containsKey(ATTR_USER_PASSWORD));
String rootDNResults =
LDAPSearchParams(user3, PWD, adminDN, null, null,
user1, pwdFilter, ATTR_USER_PASSWORD);
- Assert.assertFalse("".equals(rootDNResults));
+ assertNotEquals(rootDNResults, "");
Map<String, String> attrMap2 = getAttrMap(rootDNResults);
Assert.assertTrue(attrMap2.containsKey(ATTR_USER_PASSWORD));
deleteAttrFromEntry(user1, "aci");
--
Gitblit v1.10.0