From bbe43aa940dc9e1b4a45407751258bf1f737147b Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Thu, 11 Oct 2012 13:12:02 +0000
Subject: [PATCH] OPENDJ-610 Problem with testWriteEntryOutputStreamUsingByteArrayOutputStream fixed.
---
opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldif/LDIFChangeRecordWriterTestCase.java | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldif/LDIFChangeRecordWriterTestCase.java b/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldif/LDIFChangeRecordWriterTestCase.java
index a1a14ec..15a60af 100644
--- a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldif/LDIFChangeRecordWriterTestCase.java
+++ b/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldif/LDIFChangeRecordWriterTestCase.java
@@ -32,8 +32,11 @@
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
+import java.io.InputStreamReader;
import java.io.OutputStream;
import java.util.ArrayList;
import java.util.List;
@@ -1433,19 +1436,25 @@
final LDIFChangeRecordWriter writer = new LDIFChangeRecordWriter(out);
// @formatter:off
- final AddRequest changeRequest = Requests.newAddRequest(
+ final String[] lines = {
"dn: cn=scarter,dc=example,dc=com",
"changetype: add",
"sn: Carter"
- );
- // @ formatter:on
+ };
+ // @formatter:on
+ final AddRequest changeRequest = Requests.newAddRequest(lines);
writer.writeChangeRecord(changeRequest);
writer.close();
- assertThat(out.toString()).contains("dn: cn=scarter,dc=example,dc=com");
- assertThat(out.toString()).contains("changetype: add");
- assertThat(out.toString()).contains("sn: Carter");
- assertThat(out.toString().length()).isEqualTo(61); // 59 chars + 2 empty ( white line).
+ BufferedReader reader = new BufferedReader(
+ new InputStreamReader(
+ new ByteArrayInputStream(out.toString().getBytes())));
+
+ assertThat(reader.readLine()).isEqualTo(lines[0]);
+ assertThat(reader.readLine()).isEqualTo(lines[1]);
+ assertThat(reader.readLine()).isEqualTo(lines[2]);
+ assertThat(reader.readLine()).isEqualTo("");
+ assertThat(reader.readLine()).isNull();
}
}
--
Gitblit v1.10.0