From 97eaa897d7f912266710fa43d21a4d36de27de41 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 29 Jan 2016 15:01:26 +0000
Subject: [PATCH] *Test*.java: Changed client code from DirectoryServer.getAttributeTypeOrNull() to DirectoryServer.getAttributeType()
---
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 001c1eb..73fda64 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
@@ -120,7 +120,7 @@
}
- AttributeType attType = DirectoryServer.getAttributeTypeOrNull(type);
+ AttributeType attType = DirectoryServer.getAttributeType(type);
ByteString attVal = null;
if (attType != null)
{
@@ -199,7 +199,7 @@
// input parameter
String rawAttTypeTest = type;
- AttributeType attTypeTest = DirectoryServer.getAttributeTypeOrNull(type);
+ AttributeType attTypeTest = DirectoryServer.getAttributeType(type);
ByteString subInitialTest = ByteString.valueOfUtf8(subInitial);
List<ByteString> subAnyTest = new ArrayList<>(subAny.size());
for (String s : subAny)
@@ -377,7 +377,7 @@
}
// ( AttributeType attributeType, ByteString assertionValue
- AttributeType attType = DirectoryServer.getAttributeTypeOrNull(type);
+ AttributeType attType = DirectoryServer.getAttributeType(type);
ByteString attVal = null;
if (attType != null)
{
@@ -473,7 +473,7 @@
}
- AttributeType attType = DirectoryServer.getAttributeTypeOrNull(type);
+ AttributeType attType = DirectoryServer.getAttributeType(type);
ByteString attVal = null ;
if (attType != null)
{
@@ -549,7 +549,7 @@
assertEquals(mvf.getMatchType(), MatchedValuesFilter.PRESENT_TYPE);
// ( AttributeType attributeType
- AttributeType attType = DirectoryServer.getAttributeTypeOrNull(type);
+ AttributeType attType = DirectoryServer.getAttributeType(type);
try
{
@@ -618,7 +618,7 @@
}
// ( AttributeType attributeType, ByteString assertionValue
- AttributeType attType = DirectoryServer.getAttributeTypeOrNull(type);
+ AttributeType attType = DirectoryServer.getAttributeType(type);
ByteString attVal = null ;
if (attType != null)
{
@@ -690,7 +690,7 @@
// input value
String rawAttTypeTest = type ;
- AttributeType attTypeTest = DirectoryServer.getAttributeTypeOrNull(type) ;
+ AttributeType attTypeTest = DirectoryServer.getAttributeType(type) ;
String matchingRuleIdTest = matchingRule.getOID() ;
ByteString attValueTest = (attTypeTest == null) ? null : ByteString.valueOfUtf8(value);
// parameter used for the test.
@@ -800,7 +800,7 @@
public void testDifferentNormalization(String type, ByteString value,
String assertion)
{
- AttributeType attrType = DirectoryServer.getAttributeTypeOrNull("usercertificate");
+ AttributeType attrType = DirectoryServer.getAttributeType("usercertificate");
MatchedValuesFilter mvf = MatchedValuesFilter.createEqualityFilter(type, ByteString.valueOfUtf8(assertion));
assertTrue(mvf.valueMatches(attrType, value));
}
--
Gitblit v1.10.0