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/tasks/DisconnectClientTaskTestCase.java | 41 +++++++++++++++++++++++------------------
1 files changed, 23 insertions(+), 18 deletions(-)
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/DisconnectClientTaskTestCase.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/DisconnectClientTaskTestCase.java
index 818aaae..857c2c2 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/DisconnectClientTaskTestCase.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/DisconnectClientTaskTestCase.java
@@ -43,6 +43,7 @@
import org.opends.server.protocols.asn1.*;
import org.opends.server.protocols.ldap.*;
import org.opends.server.types.DN;
+import org.opends.server.types.ByteString;
import static org.testng.Assert.*;
@@ -82,16 +83,18 @@
{
// Establish a connection to the server, bind, and get the connection ID.
Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
- ASN1Reader r = new ASN1Reader(s);
- ASN1Writer w = new ASN1Writer(s);
+ org.opends.server.tools.LDAPReader r =
+ new org.opends.server.tools.LDAPReader(s);
+ org.opends.server.tools.LDAPWriter w =
+ new org.opends.server.tools.LDAPWriter(s);
BindRequestProtocolOp bindRequest =
- new BindRequestProtocolOp(new ASN1OctetString("cn=Directory Manager"),
- 3, new ASN1OctetString("password"));
+ new BindRequestProtocolOp(ByteString.valueOf("cn=Directory Manager"),
+ 3, ByteString.valueOf("password"));
LDAPMessage message = new LDAPMessage(1, bindRequest);
- w.writeElement(message.encode());
+ w.writeMessage(message);
- message = LDAPMessage.decode(r.readElement().decodeAsSequence());
+ message = r.readMessage();
BindResponseProtocolOp bindResponse = message.getBindResponseProtocolOp();
assertEquals(bindResponse.getResultCode(), LDAPResultCode.SUCCESS);
@@ -99,9 +102,9 @@
ExtendedRequestProtocolOp extendedRequest =
new ExtendedRequestProtocolOp(OID_GET_CONNECTION_ID_EXTOP);
message = new LDAPMessage(2, extendedRequest);
- w.writeElement(message.encode());
+ w.writeMessage(message);
- message = LDAPMessage.decode(r.readElement().decodeAsSequence());
+ message = r.readMessage();
ExtendedResponseProtocolOp extendedResponse =
message.getExtendedResponseProtocolOp();
assertEquals(extendedResponse.getResultCode(), LDAPResultCode.SUCCESS);
@@ -133,7 +136,7 @@
// Make sure that we get a notice of disconnection on the initial
// connection.
- message = LDAPMessage.decode(r.readElement().decodeAsSequence());
+ message = r.readMessage();
extendedResponse = message.getExtendedResponseProtocolOp();
assertEquals(extendedResponse.getOID(),
LDAPConstants.OID_NOTICE_OF_DISCONNECTION);
@@ -159,16 +162,18 @@
{
// Establish a connection to the server, bind, and get the connection ID.
Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
- ASN1Reader r = new ASN1Reader(s);
- ASN1Writer w = new ASN1Writer(s);
+ org.opends.server.tools.LDAPReader r =
+ new org.opends.server.tools.LDAPReader(s);
+ org.opends.server.tools.LDAPWriter w =
+ new org.opends.server.tools.LDAPWriter(s);
BindRequestProtocolOp bindRequest =
- new BindRequestProtocolOp(new ASN1OctetString("cn=Directory Manager"),
- 3, new ASN1OctetString("password"));
+ new BindRequestProtocolOp(ByteString.valueOf("cn=Directory Manager"),
+ 3, ByteString.valueOf("password"));
LDAPMessage message = new LDAPMessage(1, bindRequest);
- w.writeElement(message.encode());
+ w.writeMessage(message);
- message = LDAPMessage.decode(r.readElement().decodeAsSequence());
+ message = r.readMessage();
BindResponseProtocolOp bindResponse = message.getBindResponseProtocolOp();
assertEquals(bindResponse.getResultCode(), LDAPResultCode.SUCCESS);
@@ -176,9 +181,9 @@
ExtendedRequestProtocolOp extendedRequest =
new ExtendedRequestProtocolOp(OID_GET_CONNECTION_ID_EXTOP);
message = new LDAPMessage(2, extendedRequest);
- w.writeElement(message.encode());
+ w.writeMessage(message);
- message = LDAPMessage.decode(r.readElement().decodeAsSequence());
+ message = r.readMessage();
ExtendedResponseProtocolOp extendedResponse =
message.getExtendedResponseProtocolOp();
assertEquals(extendedResponse.getResultCode(), LDAPResultCode.SUCCESS);
@@ -208,7 +213,7 @@
// Make sure that the client connection has been closed with no notice of
// disconnection.
- assertNull(r.readElement());
+ assertNull(r.readMessage());
try
{
--
Gitblit v1.10.0