From 3d4c0acccda6e62b23f248d75c1cc6721fc20bdf Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 07 Jun 2016 13:51:21 +0000
Subject: [PATCH] OPENDJ-3037 inlined DirectoryServer.getAttributeType(String)
---
opendj-server-legacy/src/test/java/org/opends/server/controls/MatchedValuesControlTest.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/controls/MatchedValuesControlTest.java b/opendj-server-legacy/src/test/java/org/opends/server/controls/MatchedValuesControlTest.java
index 18c5a8b..f4c9056 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/controls/MatchedValuesControlTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/controls/MatchedValuesControlTest.java
@@ -110,7 +110,7 @@
}
- AttributeType attType = DirectoryServer.getAttributeType(type);
+ AttributeType attType = DirectoryServer.getSchema().getAttributeType(type);
ByteString attVal = null;
if (attType != null)
{
@@ -189,7 +189,7 @@
// input parameter
String rawAttTypeTest = type;
- AttributeType attTypeTest = DirectoryServer.getAttributeType(type);
+ AttributeType attTypeTest = DirectoryServer.getSchema().getAttributeType(type);
ByteString subInitialTest = ByteString.valueOfUtf8(subInitial);
List<ByteString> subAnyTest = new ArrayList<>(subAny.size());
for (String s : subAny)
@@ -367,7 +367,7 @@
}
// ( AttributeType attributeType, ByteString assertionValue
- AttributeType attType = DirectoryServer.getAttributeType(type);
+ AttributeType attType = DirectoryServer.getSchema().getAttributeType(type);
ByteString attVal = null;
if (attType != null)
{
@@ -463,7 +463,7 @@
}
- AttributeType attType = DirectoryServer.getAttributeType(type);
+ AttributeType attType = DirectoryServer.getSchema().getAttributeType(type);
ByteString attVal = null ;
if (attType != null)
{
@@ -539,7 +539,7 @@
assertEquals(mvf.getMatchType(), MatchedValuesFilter.PRESENT_TYPE);
// ( AttributeType attributeType
- AttributeType attType = DirectoryServer.getAttributeType(type);
+ AttributeType attType = DirectoryServer.getSchema().getAttributeType(type);
try
{
@@ -608,7 +608,7 @@
}
// ( AttributeType attributeType, ByteString assertionValue
- AttributeType attType = DirectoryServer.getAttributeType(type);
+ AttributeType attType = DirectoryServer.getSchema().getAttributeType(type);
ByteString attVal = null ;
if (attType != null)
{
@@ -680,7 +680,7 @@
// input value
String rawAttTypeTest = type ;
- AttributeType attTypeTest = DirectoryServer.getAttributeType(type) ;
+ AttributeType attTypeTest = DirectoryServer.getSchema().getAttributeType(type) ;
String matchingRuleIdTest = matchingRule.getOID() ;
ByteString attValueTest = (attTypeTest == null) ? null : ByteString.valueOfUtf8(value);
// parameter used for the test.
@@ -790,7 +790,7 @@
public void testDifferentNormalization(String type, ByteString value,
String assertion)
{
- AttributeType attrType = DirectoryServer.getAttributeType("usercertificate");
+ AttributeType attrType = DirectoryServer.getSchema().getAttributeType("usercertificate");
MatchedValuesFilter mvf = MatchedValuesFilter.createEqualityFilter(type, ByteString.valueOfUtf8(assertion));
assertTrue(mvf.valueMatches(attrType, value));
}
--
Gitblit v1.10.0