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/backends/jeb/TestVerifyJob.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestVerifyJob.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestVerifyJob.java
index c0ced3f..b912076 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestVerifyJob.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestVerifyJob.java
@@ -441,10 +441,10 @@
byte[] shortBytes = new byte[3];
DatabaseEntry key= new DatabaseEntry(shortBytes);
Entry testEntry=bldStatEntry(junkDN);
- byte []entryBytes =
- JebFormat.entryToDatabase(testEntry,
+ ByteString entryBytes =
+ ID2Entry.entryToDatabase(testEntry,
new DataConfig(false, false, null));
- DatabaseEntry data= new DatabaseEntry(entryBytes);
+ DatabaseEntry data= new DatabaseEntry(entryBytes.toByteArray());
assertTrue(id2entry.putRaw(txn, key, data));
//add entry with ramdom bytes
@@ -773,8 +773,8 @@
DatabaseEntry key= new EntryID(id).getDatabaseEntry();
Entry testEntry=bldStatEntry(dn);
byte []entryBytes =
- JebFormat.entryToDatabase(testEntry,
- new DataConfig(false, false, null));
+ ID2Entry.entryToDatabase(testEntry,
+ new DataConfig(false, false, null)).toByteArray();
if(trashFormat)
entryBytes[0] = 0x67;
DatabaseEntry data= new DatabaseEntry(entryBytes);
@@ -876,7 +876,7 @@
attrType = DirectoryServer.getDefaultAttributeType(type);
List<Attribute> attrList = e.getAttribute(attrType, null);
AttributeValue v = attrList.get(0).iterator().next();
- long retVal = Long.parseLong(v.getStringValue());
+ long retVal = Long.parseLong(v.getValue().toString());
return (retVal);
}
--
Gitblit v1.10.0