From 167960a027b7d51813cd34395537ee017659d211 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 08 Jul 2015 13:26:05 +0000
Subject: [PATCH] AutoRefactor'ed TestNG asserts
---
opendj-server-legacy/src/test/java/org/opends/server/extensions/VirtualStaticGroupTestCase.java | 36 +++++++++++++++---------------------
1 files changed, 15 insertions(+), 21 deletions(-)
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/VirtualStaticGroupTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/VirtualStaticGroupTestCase.java
index 8ac1a55..3b904e9 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/VirtualStaticGroupTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/VirtualStaticGroupTestCase.java
@@ -618,15 +618,7 @@
TestCaseUtils.initializeTestBackend(true);
TestCaseUtils.addEntries(LDIF_LINES);
- VirtualAttributeRule rule = null;
- for (VirtualAttributeRule r : DirectoryServer.getVirtualAttributes())
- {
- if (r.getAttributeType().equals(memberType))
- {
- rule = r;
- break;
- }
- }
+ VirtualAttributeRule rule = getRule();
assertNotNull(rule);
MemberVirtualAttributeProvider provider =
@@ -662,7 +654,7 @@
assertFalse(provider.isSearchable(rule, searchOperation, true));
provider.processSearch(rule, searchOperation);
- assertFalse(searchOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotSame(searchOperation.getResultCode(), ResultCode.SUCCESS);
cleanUp();
}
@@ -682,15 +674,7 @@
TestCaseUtils.initializeTestBackend(true);
TestCaseUtils.addEntries(LDIF_LINES);
- VirtualAttributeRule rule = null;
- for (VirtualAttributeRule r : DirectoryServer.getVirtualAttributes())
- {
- if (r.getAttributeType().equals(memberType))
- {
- rule = r;
- break;
- }
- }
+ VirtualAttributeRule rule = getRule();
assertNotNull(rule);
MemberVirtualAttributeProvider provider =
@@ -726,12 +710,22 @@
assertFalse(provider.isSearchable(rule, searchOperation, false));
provider.processSearch(rule, searchOperation);
- assertFalse(searchOperation.getResultCode() == ResultCode.SUCCESS);
+ assertNotSame(searchOperation.getResultCode(), ResultCode.SUCCESS);
cleanUp();
}
-
+ private VirtualAttributeRule getRule()
+ {
+ for (VirtualAttributeRule r : DirectoryServer.getVirtualAttributes())
+ {
+ if (r.getAttributeType().equals(memberType))
+ {
+ return r;
+ }
+ }
+ return null;
+ }
/**
* Tests the behavior of the member virtual attribute with a dynamic group.
--
Gitblit v1.10.0