From c17cc2c25990a61d2765a4710595ec13ccd68e5f Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 17 Mar 2016 14:06:56 +0000
Subject: [PATCH] Redo code cleanup :)
---
opendj-server-legacy/src/test/java/org/opends/server/types/TestSubtreeSpecification.java | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/types/TestSubtreeSpecification.java b/opendj-server-legacy/src/test/java/org/opends/server/types/TestSubtreeSpecification.java
index a4f9640..2ba86c8 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/types/TestSubtreeSpecification.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/types/TestSubtreeSpecification.java
@@ -27,9 +27,6 @@
@SuppressWarnings("javadoc")
public final class TestSubtreeSpecification extends SubtreeSpecificationTestCase {
- /** Cached root DN. */
- private DN rootDN = DN.rootDN();
-
@DataProvider
public Object[][] valueOfData() {
return new Object[][] {
@@ -39,8 +36,8 @@
"{ base \"dc=sun,dc=com\" }" },
{ "{base \"dc=sun, dc=com\"}",
"{ base \"dc=sun,dc=com\" }" },
- { "{ base \"dc=sun, dc=com\", " + "specificationFilter item:ds-config-rootDN }",
- "{ base \"dc=sun,dc=com\", " + "specificationFilter item:ds-config-rootDN }" },
+ { "{ base \"dc=sun, dc=com\", specificationFilter item:ds-config-rootDN }",
+ "{ base \"dc=sun,dc=com\", specificationFilter item:ds-config-rootDN }" },
{ "{ base \"dc=sun, dc=com\", minimum 0 , maximum 10, "
+ "specificExclusions {chopBefore:\"o=abc\", "
+ "chopAfter:\"o=xyz\"} , specificationFilter not:not:item:foo }",
@@ -67,7 +64,7 @@
@Test(dataProvider = "valueOfData")
public void testValueOf(String specification, String expected) throws Exception {
- SubtreeSpecification ss = SubtreeSpecification.valueOf(rootDN, specification);
+ SubtreeSpecification ss = SubtreeSpecification.valueOf(DN.rootDN(), specification);
assertEquals(ss.toString(), expected);
}
@@ -117,7 +114,7 @@
@Test(dataProvider = "isWithinScopeData")
public void testIsWithinScope(String dnString, String value, boolean expected) throws Exception {
DN dn = DN.valueOf(dnString);
- SubtreeSpecification ss = SubtreeSpecification.valueOf(rootDN, value);
+ SubtreeSpecification ss = SubtreeSpecification.valueOf(DN.rootDN(), value);
assertEquals(ss.isWithinScope(createEntry(dn, getObjectClasses())), expected);
}
}
--
Gitblit v1.10.0