From 44aad3f84d2a820094f3b5e73722778edc8c23f5 Mon Sep 17 00:00:00 2001
From: neil_a_wilson <neil_a_wilson@localhost>
Date: Tue, 24 Apr 2007 22:40:57 +0000
Subject: [PATCH] Make several significant changes to the OpenDS code base, including:
---
opends/tests/unit-tests-testng/src/server/org/opends/server/controls/MatchedValuesControlTest.java | 97 ++++++++++++++++++++++++------------------------
1 files changed, 49 insertions(+), 48 deletions(-)
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/MatchedValuesControlTest.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/MatchedValuesControlTest.java
index db62f92..651418b 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/MatchedValuesControlTest.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/MatchedValuesControlTest.java
@@ -33,12 +33,13 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.protocols.asn1.ASN1Element;
import org.opends.server.protocols.asn1.ASN1OctetString;
-import org.opends.server.protocols.ldap.LDAPException;
import org.opends.server.schema.BooleanEqualityMatchingRule;
import org.opends.server.schema.DistinguishedNameEqualityMatchingRule;
import org.opends.server.schema.IntegerEqualityMatchingRule;
import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeValue;
+import org.opends.server.types.ByteString;
+import org.opends.server.types.LDAPException;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
@@ -50,7 +51,7 @@
public class MatchedValuesControlTest
extends ControlsTestCase
{
-
+
/**
* Check "enum" values
*/
@@ -63,9 +64,9 @@
assertEquals(MatchedValuesFilter.LESS_OR_EQUAL_TYPE,(byte)0xA6);
assertEquals(MatchedValuesFilter.PRESENT_TYPE ,(byte)0x87);
assertEquals(MatchedValuesFilter.APPROXIMATE_MATCH_TYPE,(byte)0xA8);
- assertEquals(MatchedValuesFilter.EXTENSIBLE_MATCH_TYPE,(byte)0xA9);
+ assertEquals(MatchedValuesFilter.EXTENSIBLE_MATCH_TYPE,(byte)0xA9);
}
-
+
@DataProvider(name = "equalityFilterData")
public Object[][] createEqualityFilterData()
{
@@ -84,7 +85,7 @@
throws Exception
{
MatchedValuesFilter mvf;
- //
+ //
// ( String rawAttributeType, ASN1OctetStringrawAssertionValue)
//
// Check null, null
@@ -143,7 +144,7 @@
// excepted behavior
}
- //
+ //
// ( AttributeType attributeType, AttributeValue assertionValue
//
AttributeType attType = DirectoryServer.getAttributeType(type);
@@ -215,7 +216,7 @@
// excepted behavior
}
}
-
+
@DataProvider(name = "substringsFilterData")
public Object[][] createSubstringsFilterData()
{
@@ -223,7 +224,7 @@
l.add("subAny") ;
l.add("o") ;
l.add("fakesubAny");
-
+
return new Object[][]
{
{ "description", "subInitial" ,l, "subFinal" },
@@ -231,7 +232,7 @@
{ "fakeobjecttype", "fakesubInitial" , l,"fakesubFinal"}, };
}
-
+
/**
* Test createEqualityFilter
*/
@@ -244,20 +245,20 @@
String rawAttTypeTest = type;
AttributeType attTypeTest = DirectoryServer.getAttributeType(type);
ASN1OctetString subInitialTest = new ASN1OctetString(subInitial);
- List<ASN1OctetString> subAnyTest =
- new ArrayList<ASN1OctetString>(subAny.size());
+ List<ByteString> subAnyTest =
+ new ArrayList<ByteString>(subAny.size());
for (String s : subAny)
{
subAnyTest.add(new ASN1OctetString(s));
}
- ASN1OctetString subFinalTest = new ASN1OctetString(subFinal);
+ ByteString subFinalTest = new ASN1OctetString(subFinal);
// test parameter
- AttributeType attTypeCurrent;
- String rawAttTypeTestCurrent;
- ASN1OctetString subInitialTestCurrent;
- List<ASN1OctetString> subAnyTestCurrent;
- ASN1OctetString subFinalTestCurrent;
+ AttributeType attTypeCurrent;
+ String rawAttTypeTestCurrent;
+ ByteString subInitialTestCurrent;
+ List<ByteString> subAnyTestCurrent;
+ ByteString subFinalTestCurrent;
for (int i = 0; i <= 15; i++)
{
@@ -306,10 +307,10 @@
}
else
{
- List<ASN1OctetString> ret = mvf.getSubAnyElements();
+ List<ByteString> ret = mvf.getSubAnyElements();
assertNotNull(ret);
assertEquals(subAnyTestCurrent.size(), ret.size());
- for (ASN1OctetString r : ret)
+ for (ByteString r : ret)
{
assertTrue(subAnyTestCurrent.contains(r));
}
@@ -346,7 +347,7 @@
ret = mvf.getSubAnyElements();
assertNotNull(ret);
assertEquals(subAnyTestCurrent.size(), ret.size());
- for (ASN1OctetString r : ret)
+ for (ByteString r : ret)
{
assertTrue(subAnyTestCurrent.contains(r));
}
@@ -370,7 +371,7 @@
}
}
}
-
+
/**
* Test GreaterOrEqualFilter
*/
@@ -379,7 +380,7 @@
throws Exception
{
MatchedValuesFilter mvf;
- //
+ //
// ( String rawAttributeType, ASN1OctetStringrawAssertionValue)
//
// Check null, null
@@ -446,7 +447,7 @@
// excepted behavior
}
- //
+ //
// ( AttributeType attributeType, AttributeValue assertionValue
//
AttributeType attType = DirectoryServer.getAttributeType(type);
@@ -515,7 +516,7 @@
// excepted behavior
}
}
-
+
/**
* Test LessOrEqualFilter
*/
@@ -523,7 +524,7 @@
public void checkLessOrEqualFilter(String type, String value)
throws Exception
{
- //
+ //
// ( String rawAttributeType, ASN1OctetStringrawAssertionValue)
//
// Check null, null
@@ -581,7 +582,7 @@
}
;
- //
+ //
// ( AttributeType attributeType, AttributeValue assertionValue
//
AttributeType attType = DirectoryServer.getAttributeType(type);
@@ -649,7 +650,7 @@
// excepted behavior
}
}
-
+
/**
* Test PresentFilter
*/
@@ -657,7 +658,7 @@
public void checkPresentFilter(
String type, String value) throws Exception
{
- //
+ //
// ( String rawAttributeType)
//
// Check null
@@ -675,18 +676,18 @@
{
// excepted behavior
}
-
+
// Check type
mvf = MatchedValuesFilter.createPresentFilter(type);
assertNotNull(mvf);
assertEquals(mvf.getRawAttributeType(), type);
assertEquals(mvf.getMatchType(), MatchedValuesFilter.PRESENT_TYPE);
-
- //
+
+ //
// ( AttributeType attributeType
//
AttributeType attType = DirectoryServer.getAttributeType(type);
-
+
// Check null
try
{
@@ -711,7 +712,7 @@
assertEquals(mvf.getMatchType(), MatchedValuesFilter.PRESENT_TYPE);
}
}
-
+
/**
* Test ApproximateFilter
*/
@@ -720,12 +721,12 @@
throws Exception
{
MatchedValuesFilter mvf;
- //
+ //
// ( String rawAttributeType, ASN1OctetStringrawAssertionValue)
//
// Check null, null
try
- {
+ {
mvf = MatchedValuesFilter.createApproximateFilter((String) null,
(ASN1OctetString) null);
assertTrue(false, "Expected NullPointerException");
@@ -779,7 +780,7 @@
// excepted behavior
}
- //
+ //
// ( AttributeType attributeType, AttributeValue assertionValue
//
AttributeType attType = DirectoryServer.getAttributeType(type);
@@ -850,18 +851,18 @@
// excepted behavior
}
}
-
+
@DataProvider(name = "extensibleMatchFilterData")
public Object[][] createExtensibleMatchFilterData()
{
-
+
return new Object[][]
{
{ "description", new BooleanEqualityMatchingRule(), "description" },
{ "objectclass", new IntegerEqualityMatchingRule() ,"top" },
{ "fakeobjecttype", new DistinguishedNameEqualityMatchingRule(), "fakevalue" }, };
}
-
+
/**
* Test ExtensibleMatchFilter
*/
@@ -870,10 +871,10 @@
String type, MatchingRule matchingRule, String value)
throws Exception
{
-
+
// input value
String rawAttTypeTest = type ;
- AttributeType attTypeTest = DirectoryServer.getAttributeType(type) ;
+ AttributeType attTypeTest = DirectoryServer.getAttributeType(type) ;
String matchingRuleIdTest = matchingRule.getOID() ;
ASN1OctetString rawAttValueTest = (attTypeTest == null) ? null : new ASN1OctetString(value);
AttributeValue attValueTest = (attTypeTest == null) ? null : new AttributeValue(attTypeTest, value);
@@ -881,12 +882,12 @@
// parameter used for the test.
String rawAttTypeTestCurrent;
AttributeType attTypeTestCurrent ;
- String rawMatchingRuleidTestCurrent ;
+ String rawMatchingRuleidTestCurrent ;
MatchingRule matchingRuleidTestCurrent ;
ASN1OctetString rawAttValueTestCurrent;
AttributeValue attValueTestCurrent;
-
+
for (int i= 0 ; i <= 7 ; i++)
{
rawAttTypeTestCurrent = null;
@@ -895,14 +896,14 @@
rawAttValueTestCurrent = null;
attTypeTestCurrent = null;
attValueTestCurrent = null ;
-
+
if ((i & 0x4) != 0) attTypeTestCurrent = attTypeTest;
if ((i & 0x4) != 0) rawAttTypeTestCurrent = rawAttTypeTest;
if ((i & 0x2) != 0) rawMatchingRuleidTestCurrent = matchingRuleIdTest;
if ((i & 0x2) != 0) matchingRuleidTestCurrent = matchingRule ;
if ((i & 0x1) != 0) rawAttValueTestCurrent = rawAttValueTest;
if ((i & 0x1) != 0) attValueTestCurrent = attValueTest;
-
+
boolean exceptionExpected = (attTypeTestCurrent == null)
|| (attValueTestCurrent == null) || (matchingRuleidTestCurrent == null);
@@ -942,14 +943,14 @@
}
}
}
-
+
/**
* Check encode/decode method
*/
private void checkEncodeDecode(MatchedValuesFilter mvf)
{
ASN1Element asn1Elt = mvf.encode() ;
- try
+ try
{
MatchedValuesFilter newMvf = MatchedValuesFilter.decode(asn1Elt) ;
assertEquals(newMvf.toString(), mvf.toString());
@@ -958,6 +959,6 @@
{
assertTrue(false, "Unexpected LDAPException ; msg=" + e.getMessage());
}
-
+
}
}
--
Gitblit v1.10.0