From 4f6891a8bd4d017a41b5f75748398ff59787501c Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 15 Oct 2015 19:38:35 +0000
Subject: [PATCH] Renamed DirectoryServer.getAttributeType() to DirectoryServer.getAttributeTypeOrNull().
---
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 947f4af..48e0028 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
@@ -125,7 +125,7 @@
}
- AttributeType attType = DirectoryServer.getAttributeType(type);
+ AttributeType attType = DirectoryServer.getAttributeTypeOrNull(type);
ByteString attVal = null;
if (attType != null)
{
@@ -204,7 +204,7 @@
// input parameter
String rawAttTypeTest = type;
- AttributeType attTypeTest = DirectoryServer.getAttributeType(type);
+ AttributeType attTypeTest = DirectoryServer.getAttributeTypeOrNull(type);
ByteString subInitialTest = ByteString.valueOf(subInitial);
List<ByteString> subAnyTest = new ArrayList<>(subAny.size());
for (String s : subAny)
@@ -382,7 +382,7 @@
}
// ( AttributeType attributeType, ByteString assertionValue
- AttributeType attType = DirectoryServer.getAttributeType(type);
+ AttributeType attType = DirectoryServer.getAttributeTypeOrNull(type);
ByteString attVal = null;
if (attType != null)
{
@@ -478,7 +478,7 @@
}
- AttributeType attType = DirectoryServer.getAttributeType(type);
+ AttributeType attType = DirectoryServer.getAttributeTypeOrNull(type);
ByteString attVal = null ;
if (attType != null)
{
@@ -554,7 +554,7 @@
assertEquals(mvf.getMatchType(), MatchedValuesFilter.PRESENT_TYPE);
// ( AttributeType attributeType
- AttributeType attType = DirectoryServer.getAttributeType(type);
+ AttributeType attType = DirectoryServer.getAttributeTypeOrNull(type);
try
{
@@ -623,7 +623,7 @@
}
// ( AttributeType attributeType, ByteString assertionValue
- AttributeType attType = DirectoryServer.getAttributeType(type);
+ AttributeType attType = DirectoryServer.getAttributeTypeOrNull(type);
ByteString attVal = null ;
if (attType != null)
{
@@ -704,7 +704,7 @@
// input value
String rawAttTypeTest = type ;
- AttributeType attTypeTest = DirectoryServer.getAttributeType(type) ;
+ AttributeType attTypeTest = DirectoryServer.getAttributeTypeOrNull(type) ;
String matchingRuleIdTest = matchingRule.getOID() ;
ByteString attValueTest = (attTypeTest == null) ? null : ByteString.valueOf(value);
// parameter used for the test.
@@ -814,7 +814,7 @@
public void testDifferentNormalization(String type, ByteString value,
String assertion)
{
- AttributeType attrType = DirectoryServer.getAttributeType("usercertificate");
+ AttributeType attrType = DirectoryServer.getAttributeTypeOrNull("usercertificate");
MatchedValuesFilter mvf = MatchedValuesFilter.createEqualityFilter(type, ByteString.valueOf(assertion));
assertTrue(mvf.valueMatches(attrType, value));
}
--
Gitblit v1.10.0