From 22094368c2865dcfb6daf8366425212b721a4657 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Thu, 05 Feb 2009 17:42:14 +0000
Subject: [PATCH] Merge ASN1 branch to trunk
---
opends/tests/unit-tests-testng/src/server/org/opends/server/schema/OrderingMatchingRuleTest.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/OrderingMatchingRuleTest.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/OrderingMatchingRuleTest.java
index 635b8a2..b78395b 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/OrderingMatchingRuleTest.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/OrderingMatchingRuleTest.java
@@ -30,7 +30,6 @@
import org.opends.server.api.OrderingMatchingRule;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.protocols.asn1.ASN1OctetString;
import org.opends.server.types.AcceptRejectWarn;
import org.opends.server.types.ByteString;
import org.opends.server.types.DirectoryException;
@@ -66,9 +65,9 @@
// ruleInstance.initializeMatchingRule(configEntry);
ByteString normalizedValue1 =
- ruleInstance.normalizeValue(new ASN1OctetString(value1));
+ ruleInstance.normalizeValue(ByteString.valueOf(value1));
ByteString normalizedValue2 =
- ruleInstance.normalizeValue(new ASN1OctetString(value2));
+ ruleInstance.normalizeValue(ByteString.valueOf(value2));
int res = ruleInstance.compareValues(normalizedValue1, normalizedValue2);
if (result == 0)
{
@@ -125,7 +124,7 @@
// normalize the 2 provided values
try
{
- ruleInstance.normalizeValue(new ASN1OctetString(value));
+ ruleInstance.normalizeValue(ByteString.valueOf(value));
} catch (DirectoryException e) {
// that's the expected path : the matching rule has detected that
// the value is incorrect.
@@ -152,7 +151,7 @@
// normalize the 2 provided values
try
{
- ruleInstance.normalizeValue(new ASN1OctetString(value));
+ ruleInstance.normalizeValue(ByteString.valueOf(value));
} catch (Exception e)
{
fail(ruleInstance + " in warn mode should not reject value " + value + e);
--
Gitblit v1.10.0