You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2005/10/26 22:38:43 UTC
svn commit: r328726 - in
/directory/shared/ldap/branches/shared-ldap-utf8/apache-provider/src/test/org/apache/ldap/common/berlib/asn1/decoder:
bind/ extended/ search/ testutils/
Author: elecharny
Date: Wed Oct 26 13:38:34 2005
New Revision: 328726
URL: http://svn.apache.org/viewcvs?rev=328726&view=rev
Log:
* fixed a test accordingly to the modification in the decoder
* cleaned the imports
Modified:
directory/shared/ldap/branches/shared-ldap-utf8/apache-provider/src/test/org/apache/ldap/common/berlib/asn1/decoder/bind/BindResponseRuleTest.java
directory/shared/ldap/branches/shared-ldap-utf8/apache-provider/src/test/org/apache/ldap/common/berlib/asn1/decoder/extended/ExtendedResponseRuleTest.java
directory/shared/ldap/branches/shared-ldap-utf8/apache-provider/src/test/org/apache/ldap/common/berlib/asn1/decoder/search/SearchRequestTest.java
directory/shared/ldap/branches/shared-ldap-utf8/apache-provider/src/test/org/apache/ldap/common/berlib/asn1/decoder/search/SearchResponseDoneRuleTest.java
directory/shared/ldap/branches/shared-ldap-utf8/apache-provider/src/test/org/apache/ldap/common/berlib/asn1/decoder/testutils/RuleTestCase.java
directory/shared/ldap/branches/shared-ldap-utf8/apache-provider/src/test/org/apache/ldap/common/berlib/asn1/decoder/testutils/TestUtils.java
Modified: directory/shared/ldap/branches/shared-ldap-utf8/apache-provider/src/test/org/apache/ldap/common/berlib/asn1/decoder/bind/BindResponseRuleTest.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/branches/shared-ldap-utf8/apache-provider/src/test/org/apache/ldap/common/berlib/asn1/decoder/bind/BindResponseRuleTest.java?rev=328726&r1=328725&r2=328726&view=diff
==============================================================================
--- directory/shared/ldap/branches/shared-ldap-utf8/apache-provider/src/test/org/apache/ldap/common/berlib/asn1/decoder/bind/BindResponseRuleTest.java (original)
+++ directory/shared/ldap/branches/shared-ldap-utf8/apache-provider/src/test/org/apache/ldap/common/berlib/asn1/decoder/bind/BindResponseRuleTest.java Wed Oct 26 13:38:34 2005
@@ -18,16 +18,11 @@
import org.apache.ldap.common.berlib.asn1.decoder.testutils.RuleTestCase;
-import org.apache.ldap.common.berlib.asn1.decoder.testutils.TestUtils;
import org.apache.ldap.common.message.BindResponse;
import org.apache.ldap.common.message.BindResponseImpl;
import org.apache.ldap.common.message.LdapResultImpl;
import org.apache.ldap.common.message.ReferralImpl;
import org.apache.ldap.common.message.ResultCodeEnum;
-import org.apache.ldap.common.message.Referral;
-import org.apache.ldap.common.message.LdapResult;
-
-import java.util.Iterator;
/**
Modified: directory/shared/ldap/branches/shared-ldap-utf8/apache-provider/src/test/org/apache/ldap/common/berlib/asn1/decoder/extended/ExtendedResponseRuleTest.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/branches/shared-ldap-utf8/apache-provider/src/test/org/apache/ldap/common/berlib/asn1/decoder/extended/ExtendedResponseRuleTest.java?rev=328726&r1=328725&r2=328726&view=diff
==============================================================================
--- directory/shared/ldap/branches/shared-ldap-utf8/apache-provider/src/test/org/apache/ldap/common/berlib/asn1/decoder/extended/ExtendedResponseRuleTest.java (original)
+++ directory/shared/ldap/branches/shared-ldap-utf8/apache-provider/src/test/org/apache/ldap/common/berlib/asn1/decoder/extended/ExtendedResponseRuleTest.java Wed Oct 26 13:38:34 2005
@@ -17,18 +17,12 @@
package org.apache.ldap.common.berlib.asn1.decoder.extended ;
-import org.apache.commons.lang.ArrayUtils;
import org.apache.ldap.common.berlib.asn1.decoder.testutils.RuleTestCase;
-import org.apache.ldap.common.berlib.asn1.decoder.testutils.TestUtils;
import org.apache.ldap.common.message.ExtendedResponse;
import org.apache.ldap.common.message.ExtendedResponseImpl;
-import org.apache.ldap.common.message.LdapResult;
import org.apache.ldap.common.message.LdapResultImpl;
-import org.apache.ldap.common.message.Referral;
import org.apache.ldap.common.message.ReferralImpl;
import org.apache.ldap.common.message.ResultCodeEnum;
-
-import java.util.Iterator;
/**
Modified: directory/shared/ldap/branches/shared-ldap-utf8/apache-provider/src/test/org/apache/ldap/common/berlib/asn1/decoder/search/SearchRequestTest.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/branches/shared-ldap-utf8/apache-provider/src/test/org/apache/ldap/common/berlib/asn1/decoder/search/SearchRequestTest.java?rev=328726&r1=328725&r2=328726&view=diff
==============================================================================
--- directory/shared/ldap/branches/shared-ldap-utf8/apache-provider/src/test/org/apache/ldap/common/berlib/asn1/decoder/search/SearchRequestTest.java (original)
+++ directory/shared/ldap/branches/shared-ldap-utf8/apache-provider/src/test/org/apache/ldap/common/berlib/asn1/decoder/search/SearchRequestTest.java Wed Oct 26 13:38:34 2005
@@ -18,7 +18,6 @@
import org.apache.ldap.common.berlib.asn1.decoder.testutils.RuleTestCase;
-import org.apache.ldap.common.berlib.asn1.decoder.testutils.TestUtils;
import org.apache.ldap.common.filter.BranchNode;
import org.apache.ldap.common.filter.BranchNormalizedVisitor;
import org.apache.ldap.common.filter.ExprNode;
@@ -33,10 +32,7 @@
import org.apache.ldap.common.message.SearchRequest;
import org.apache.ldap.common.message.SearchRequestImpl;
-import java.nio.ByteBuffer;
import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
/**
@@ -169,7 +165,7 @@
expected.addAttribute( "attr1" );
expected.addAttribute( "attr2" );
- expected.setFilter( new SimpleNode( "age", "30", SimpleNode.GREATEREQ ) );
+ expected.setFilter( new SimpleNode( "age", new byte[]{'3', '0'}, SimpleNode.GREATEREQ ) );
assertEquals( expected, decoded );
}
@@ -195,7 +191,7 @@
expected.addAttribute( "attr1" );
expected.addAttribute( "attr2" );
- expected.setFilter( new SimpleNode( "age", "30", SimpleNode.LESSEQ ) );
+ expected.setFilter( new SimpleNode( "age", new byte[]{'3', '0'}, SimpleNode.LESSEQ ) );
assertEquals( expected, decoded );
}
@@ -245,7 +241,7 @@
expected.addAttribute( "attr1" );
expected.addAttribute( "attr2" );
- expected.setFilter( new SimpleNode( "cn", "Alex Karasula",
+ expected.setFilter( new SimpleNode( "cn", new byte[]{'A', 'l', 'e', 'x', ' ', 'K', 'a', 'r', 'a', 's', 'u', 'l', 'a'},
SimpleNode.APPROXIMATE ) );
assertEquals( expected, decoded );
@@ -300,7 +296,7 @@
expected.addAttribute( "attr1" );
expected.addAttribute( "attr2" );
- ExtensibleNode node = new ExtensibleNode( "cn", "val", "1.1", true );
+ ExtensibleNode node = new ExtensibleNode( "cn", new byte[]{'v', 'a', 'l'}, "1.1", true );
expected.setFilter( node );
assertEquals( expected, decoded );
Modified: directory/shared/ldap/branches/shared-ldap-utf8/apache-provider/src/test/org/apache/ldap/common/berlib/asn1/decoder/search/SearchResponseDoneRuleTest.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/branches/shared-ldap-utf8/apache-provider/src/test/org/apache/ldap/common/berlib/asn1/decoder/search/SearchResponseDoneRuleTest.java?rev=328726&r1=328725&r2=328726&view=diff
==============================================================================
--- directory/shared/ldap/branches/shared-ldap-utf8/apache-provider/src/test/org/apache/ldap/common/berlib/asn1/decoder/search/SearchResponseDoneRuleTest.java (original)
+++ directory/shared/ldap/branches/shared-ldap-utf8/apache-provider/src/test/org/apache/ldap/common/berlib/asn1/decoder/search/SearchResponseDoneRuleTest.java Wed Oct 26 13:38:34 2005
@@ -18,16 +18,11 @@
import org.apache.ldap.common.berlib.asn1.decoder.testutils.RuleTestCase;
-import org.apache.ldap.common.berlib.asn1.decoder.testutils.TestUtils;
import org.apache.ldap.common.message.ReferralImpl;
import org.apache.ldap.common.message.ResultCodeEnum;
import org.apache.ldap.common.message.LdapResultImpl;
import org.apache.ldap.common.message.SearchResponseDoneImpl;
import org.apache.ldap.common.message.SearchResponseDone;
-import org.apache.ldap.common.message.LdapResult;
-import org.apache.ldap.common.message.Referral;
-
-import java.util.Iterator;
/**
Modified: directory/shared/ldap/branches/shared-ldap-utf8/apache-provider/src/test/org/apache/ldap/common/berlib/asn1/decoder/testutils/RuleTestCase.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/branches/shared-ldap-utf8/apache-provider/src/test/org/apache/ldap/common/berlib/asn1/decoder/testutils/RuleTestCase.java?rev=328726&r1=328725&r2=328726&view=diff
==============================================================================
--- directory/shared/ldap/branches/shared-ldap-utf8/apache-provider/src/test/org/apache/ldap/common/berlib/asn1/decoder/testutils/RuleTestCase.java (original)
+++ directory/shared/ldap/branches/shared-ldap-utf8/apache-provider/src/test/org/apache/ldap/common/berlib/asn1/decoder/testutils/RuleTestCase.java Wed Oct 26 13:38:34 2005
@@ -22,11 +22,8 @@
import org.apache.asn1.codec.stateful.CallbackHistory;
import org.apache.ldap.common.berlib.asn1.decoder.LdapDigesterFactory;
import org.apache.ldap.common.message.Message;
-import org.apache.ldap.common.message.MessageEncoder;
-import org.apache.ldap.common.message.spi.Provider;
import java.nio.ByteBuffer;
-import java.util.Properties;
/**
Modified: directory/shared/ldap/branches/shared-ldap-utf8/apache-provider/src/test/org/apache/ldap/common/berlib/asn1/decoder/testutils/TestUtils.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/branches/shared-ldap-utf8/apache-provider/src/test/org/apache/ldap/common/berlib/asn1/decoder/testutils/TestUtils.java?rev=328726&r1=328725&r2=328726&view=diff
==============================================================================
--- directory/shared/ldap/branches/shared-ldap-utf8/apache-provider/src/test/org/apache/ldap/common/berlib/asn1/decoder/testutils/TestUtils.java (original)
+++ directory/shared/ldap/branches/shared-ldap-utf8/apache-provider/src/test/org/apache/ldap/common/berlib/asn1/decoder/testutils/TestUtils.java Wed Oct 26 13:38:34 2005
@@ -18,16 +18,8 @@
import junit.framework.Assert;
-import org.apache.asn1.ber.DefaultMutableTupleNode;
-import org.apache.asn1.ber.TupleTreeDecoder;
-import org.apache.asn1.codec.stateful.CallbackHistory;
-import org.apache.ldap.common.message.Message;
-import org.apache.ldap.common.message.MessageEncoder;
-import org.apache.ldap.common.message.spi.Provider;
-import java.nio.ByteBuffer;
import java.util.Arrays;
-import java.util.Properties;
/**