From 3c297cc0da721d8d87f8bc57ce4db4faf66c7823 Mon Sep 17 00:00:00 2001
From: sin <sin@localhost>
Date: Thu, 18 Dec 2008 23:17:06 +0000
Subject: [PATCH] Fix for unit testcase failures and javadoc errors
---
opends/src/server/org/opends/server/schema/OctetStringSubstringMatchingRuleFactory.java | 2 +-
opends/src/server/org/opends/server/types/AttributeBuilder.java | 11 ++++++-----
opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CollationMatchingRuleTest.java | 2 +-
opends/src/server/org/opends/server/schema/OctetStringOrderingMatchingRuleFactory.java | 2 +-
opends/src/server/org/opends/server/types/AbstractAttribute.java | 10 +++++-----
5 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/opends/src/server/org/opends/server/schema/OctetStringOrderingMatchingRuleFactory.java b/opends/src/server/org/opends/server/schema/OctetStringOrderingMatchingRuleFactory.java
index fe87569..82350a8 100644
--- a/opends/src/server/org/opends/server/schema/OctetStringOrderingMatchingRuleFactory.java
+++ b/opends/src/server/org/opends/server/schema/OctetStringOrderingMatchingRuleFactory.java
@@ -38,7 +38,7 @@
/**
* This class is a factory class for
- * {@link OctectStringOrderingMatchingRule}.
+ * {@link OctetStringOrderingMatchingRule}.
*/
public final class OctetStringOrderingMatchingRuleFactory
extends MatchingRuleFactory<MatchingRuleCfg>
diff --git a/opends/src/server/org/opends/server/schema/OctetStringSubstringMatchingRuleFactory.java b/opends/src/server/org/opends/server/schema/OctetStringSubstringMatchingRuleFactory.java
index 6e7b111..9f27bb1 100644
--- a/opends/src/server/org/opends/server/schema/OctetStringSubstringMatchingRuleFactory.java
+++ b/opends/src/server/org/opends/server/schema/OctetStringSubstringMatchingRuleFactory.java
@@ -38,7 +38,7 @@
/**
* This class is a factory class for
- * {@link OctectStringSubstringMatchingRule}.
+ * {@link OctetStringSubstringMatchingRule}.
*/
public final class OctetStringSubstringMatchingRuleFactory
extends MatchingRuleFactory<MatchingRuleCfg>
diff --git a/opends/src/server/org/opends/server/types/AbstractAttribute.java b/opends/src/server/org/opends/server/types/AbstractAttribute.java
index 816b0dd..329d507 100644
--- a/opends/src/server/org/opends/server/types/AbstractAttribute.java
+++ b/opends/src/server/org/opends/server/types/AbstractAttribute.java
@@ -62,7 +62,7 @@
* <p>
* This implementation iterates through each attribute value in the
* provided collection, checking to see if this attribute contains
- * the value using {@link Attribute#contains(AttributeValue)}.
+ * the value using {@link #contains(AttributeValue)}.
*/
public boolean containsAll(Collection<AttributeValue> values)
{
@@ -172,7 +172,7 @@
* collection is non-empty and this attribute does not have any
* options then it returns <code>false</code>. Otherwise, each
* option in the provided collection is checked using
- * {@link Attribute#hasOption(String)} and <code>true</code> is
+ * {@link #hasOption(String)} and <code>true</code> is
* returned if all the provided options are present.
*/
public boolean hasAllOptions(Collection<String> options)
@@ -221,7 +221,7 @@
/**
* {@inheritDoc}
* <p>
- * This implementation calls {@link Attribute#getOptions()} to
+ * This implementation calls {@link #getOptions()} to
* retrieve this attribute's set of options and then compares them
* one at a time against the provided option. All comparisons are
* case insensitive (this is why we iterate through the set of
@@ -263,7 +263,7 @@
* {@inheritDoc}
* <p>
* This implementation returns <code>true</code> if the
- * {@link Attribute#size()} of this attribute is zero.
+ * {@link #size()} of this attribute is zero.
*/
public boolean isEmpty()
{
@@ -281,7 +281,7 @@
* the size of this attribute's options, return <code>false</code>
* if the sizes differ. If the sizes are the same then each option
* in the provided set is checked using
- * {@link Attribute#hasOption(String)} and <code>true</code> is
+ * {@link #hasOption(String)} and <code>true</code> is
* returned if all the provided options are present.
*/
public boolean optionsEqual(Set<String> options)
diff --git a/opends/src/server/org/opends/server/types/AttributeBuilder.java b/opends/src/server/org/opends/server/types/AttributeBuilder.java
index 6474b37..5b76b89 100644
--- a/opends/src/server/org/opends/server/types/AttributeBuilder.java
+++ b/opends/src/server/org/opends/server/types/AttributeBuilder.java
@@ -51,7 +51,6 @@
import org.opends.server.util.Validator;
-
/**
* This class provides an interface for creating new non-virtual
* {@link Attribute}s, or "real" attributes.
@@ -71,10 +70,12 @@
* the attribute before retrieving the updated attribute using the
* {@link #toAttribute()} method.
* <p>
- * The {@link Attributes} class contains convenience factory methods,
- * e.g. {@link Attributes#empty(String)} for creating empty
- * attributes, and {@link Attributes#create(String, String)} for
- * creating single-valued attributes.
+ * The {@link org.opends.server.types.Attributes} class contains
+ * convenience factory methods,
+ * e.g. {@link org.opends.server.types.Attributes#empty(String)} for
+ * creating empty attributes, and
+ * {@link org.opends.server.types.Attributes#create(String, String)}
+ * for creating single-valued attributes.
* <p>
* <code>AttributeBuilder</code>s can be re-used. Once an
* <code>AttributeBuilder</code> has been converted to an
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CollationMatchingRuleTest.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CollationMatchingRuleTest.java
index bf5d060..9a8f7d2 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CollationMatchingRuleTest.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CollationMatchingRuleTest.java
@@ -273,7 +273,7 @@
Integer.MAX_VALUE,
false,
LDAPFilter.
- decode("carLicense:fr.5:=ébe1"),
+ decode("carLicense:fr.5:=ebe1"),
null, null);
searchOperation.run();
--
Gitblit v1.10.0