From e7d1971b7bf34a77a52a7788c8ab04409e388206 Mon Sep 17 00:00:00 2001
From: dugan <dugan@localhost>
Date: Wed, 19 Aug 2009 02:13:00 +0000
Subject: [PATCH] Fix problems with unit tests.
---
opendj-sdk/opends/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java | 30 +-----------------------------
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/TestImportAndExport.java | 3 +--
opendj-sdk/opends/src/server/org/opends/server/backends/jeb/importLDIF/IndexBuffer.java | 2 +-
opendj-sdk/opends/src/server/org/opends/server/backends/jeb/importLDIF/Suffix.java | 4 ----
4 files changed, 3 insertions(+), 36 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java
index 341624a..aac3a7a 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java
@@ -1203,7 +1203,7 @@
while((nodeID = dn2id.get(null, dn, LockMode.DEFAULT)) == null) {
try {
Thread.sleep(50);
- if(i == 3) {
+ if(i == 10) {
return null;
}
i++;
@@ -2900,33 +2900,5 @@
return type.getPrimaryName() + "." +
StaticUtils.toLowerCase(indexType.name());
}
-
- /**
- * Returns a previously allocated byte array having sub-string length size
- * if the index key is a sub-string index and the desired size is equal to
- * sub-string size. This is a performance hack for sub-string indexes only.
- *
- * @param size The size of byte array desired.
- * @return Either a previously allocated byte array, or a freshly created
- * one using the size parameter.
- */
- public byte[] getKeyBytes(int size)
- {
- if(keyBytes != null)
- {
- if(size == keyBytes.length)
- {
- return this.keyBytes;
- }
- else
- {
- return new byte[size];
- }
- }
- else
- {
- return new byte[size];
- }
- }
}
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/importLDIF/IndexBuffer.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/importLDIF/IndexBuffer.java
index 2099944..8ee2d6f 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/importLDIF/IndexBuffer.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/importLDIF/IndexBuffer.java
@@ -394,7 +394,7 @@
{
int recOffset = getIntValue(x * 4);
int keyLen = getIntValue(recOffset + 4);
- byte[] keyBytes = indexKey.getKeyBytes(keyLen);
+ byte[] keyBytes = new byte[keyLen];
System.arraycopy(buffer, recOffset + 8, keyBytes, 0, keyLen);
return keyBytes;
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/importLDIF/Suffix.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/importLDIF/Suffix.java
index 12764f4..33d6565 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/importLDIF/Suffix.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/importLDIF/Suffix.java
@@ -230,12 +230,10 @@
try {
Thread.sleep(50);
if(i == 10) {
- System.out.println("Timed out waiting for: " + parentDN.toString());
return null;
}
i++;
} catch (Exception e) {
- System.out.println("Exception: " + parentDN.toString());
return null;
}
}
@@ -250,8 +248,6 @@
}
parentIDMap.put(parentDN, parentID);
}
- } else {
- System.out.println("parent not found: " + parentDN.toString());
}
return parentID;
}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/TestImportAndExport.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/TestImportAndExport.java
index dba4ed2..9678318 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/TestImportAndExport.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/TestImportAndExport.java
@@ -361,8 +361,7 @@
* @param taskEntry The task entry.
* @param expectedState The expected completion state of the task.
*/
-// @Test(dataProvider = "importexport", groups = "slow")
- @Test(enabled=false)
+ @Test(dataProvider = "importexport", groups = "slow")
public void testImportExport(Entry taskEntry, TaskState expectedState)
throws Exception
{
--
Gitblit v1.10.0