Merge "Frameworks/base: Fix LineBreakBufferedWriter" into nyc-dev (e610e288) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/util/LineBreakBufferedWriter.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -96,7 +96,7 @@ public class LineBreakBufferedWriter extends PrintWriter {

		@Override
		public void write(int c) {
		if (bufferIndex < bufferSize) {
		if (bufferIndex < buffer.length) {
		buffer[bufferIndex] = (char)c;
		bufferIndex++;
		if ((char)c == '\n') {

+16 −0

Original line number	Diff line number	Diff line
		@@ -180,6 +180,22 @@ public class LineBreakBufferedWriterTest extends TestCase {
		assertOutput("aaaaaaaaaabbbbbc\nd", "ddddddddd");
		}

		public void testMoreThenInitialCapacitySimpleWrites() {
		// This check is different from testMoreThanBufferSizeChar. The initial capacity is lower
		// than the maximum buffer size here.
		final LineBreakBufferedWriter lw = new LineBreakBufferedWriter(mWriter, 1024, 3);

		for(int i = 0; i < 10; i++) {
		lw.print('$');
		}
		for(int i = 0; i < 10; i++) {
		lw.print('%');
		}
		lw.flush();

		assertOutput("$$$$$$$$$$%%%%%%%%%%");
		}

		private void assertOutput(String... golden) {
		List<String> goldList = createTestGolden(golden);
		assertEquals(goldList, mWriter.getStrings());