From 218b2a22d685fef5602021786334a4d78a2460e2 Mon Sep 17 00:00:00 2001
From: ludovicp <ludovicp@localhost>
Date: Fri, 25 Jun 2010 09:40:08 +0000
Subject: [PATCH] Resolves an issue in Import due to entries with multiple RDNs. This patch changes the key format used by the DN2ID database. Rebuilding the index is required.
---
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 b912076..eda63a3 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
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2006-2008 Sun Microsystems, Inc.
+ * Copyright 2006-2010 Sun Microsystems, Inc.
*/
package org.opends.server.backends.jeb;
@@ -228,11 +228,11 @@
new DatabaseEntry(StaticUtils.getBytes(badDN));
DatabaseEntry data =
new EntryID(37).getDatabaseEntry();
- assertTrue(dn2id.putRaw(txn, key, data));
+ assertEquals(dn2id.put(txn, key, data), OperationStatus.SUCCESS);
//Add DN key with malformed entryID
key=new DatabaseEntry(StaticUtils.getBytes(junkDN2));
data= new DatabaseEntry(new byte[3]);
- assertTrue(dn2id.putRaw(txn, key, data));
+ assertEquals(dn2id.put(txn, key, data), OperationStatus.SUCCESS);
//Try to break JebFormat version
addID2EntryReturnKey(junkDN3, 20, true);
id=new EntryID(20);
@@ -445,7 +445,7 @@
ID2Entry.entryToDatabase(testEntry,
new DataConfig(false, false, null));
DatabaseEntry data= new DatabaseEntry(entryBytes.toByteArray());
- assertTrue(id2entry.putRaw(txn, key, data));
+ assertEquals(id2entry.put(txn, key, data), OperationStatus.SUCCESS);
//add entry with ramdom bytes
DatabaseEntry key1= new EntryID(4).getDatabaseEntry();
@@ -456,7 +456,7 @@
//set version correctly
eBytes[0]=0x01;
DatabaseEntry data1= new DatabaseEntry(eBytes);
- assertTrue(id2entry.putRaw(txn, key1, data1));
+ assertEquals(id2entry.put(txn, key1, data1), OperationStatus.SUCCESS);
performBECompleteVerify("telephoneNumber", 3);
}
finally
@@ -778,7 +778,7 @@
if(trashFormat)
entryBytes[0] = 0x67;
DatabaseEntry data= new DatabaseEntry(entryBytes);
- assertTrue(id2entry.putRaw(txn, key, data));
+ assertEquals(id2entry.put(txn, key, data), OperationStatus.SUCCESS);
return key;
}
--
Gitblit v1.10.0