summaryrefslogtreecommitdiffstats
path: root/core/tests
diff options
context:
space:
mode:
authorGilles Debunne <debunne@google.com>2012-04-20 10:56:05 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-04-20 10:56:05 -0700
commit0b568ff17983ee84b6099e28c89cac414abd0739 (patch)
treece7432aca2377a96be759be64f754419ab30c4d7 /core/tests
parent80a76276dc9440ffad30dc4c820eb7d65f4df368 (diff)
parent157aafcbee0eabda798a3be406ccc4200ee86756 (diff)
downloadframeworks_base-0b568ff17983ee84b6099e28c89cac414abd0739.zip
frameworks_base-0b568ff17983ee84b6099e28c89cac414abd0739.tar.gz
frameworks_base-0b568ff17983ee84b6099e28c89cac414abd0739.tar.bz2
Merge "TextView's sub display lists have tighten bounds"
Diffstat (limited to 'core/tests')
-rw-r--r--core/tests/coretests/src/android/text/DynamicLayoutBlocksTest.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/core/tests/coretests/src/android/text/DynamicLayoutBlocksTest.java b/core/tests/coretests/src/android/text/DynamicLayoutBlocksTest.java
index 73da84f..2e42e5a 100644
--- a/core/tests/coretests/src/android/text/DynamicLayoutBlocksTest.java
+++ b/core/tests/coretests/src/android/text/DynamicLayoutBlocksTest.java
@@ -45,18 +45,18 @@ public class DynamicLayoutBlocksTest extends TestCase {
public void printBlocks(String message) {
System.out.print(message);
for (int i = 0; i < dl.getNumberOfBlocks(); i++) {
- System.out.print(" " + Integer.toString(dl.getBlockEnds()[i]));
+ System.out.print(" " + Integer.toString(dl.getBlockEndLines()[i]));
}
System.out.println();
}
public void checkInvariants() {
assertTrue(dl.getNumberOfBlocks() > 0);
- assertTrue(dl.getNumberOfBlocks() <= dl.getBlockEnds().length);
- assertEquals(dl.getBlockEnds().length, dl.getBlockIndices().length);
+ assertTrue(dl.getNumberOfBlocks() <= dl.getBlockEndLines().length);
+ assertEquals(dl.getBlockEndLines().length, dl.getBlockIndices().length);
for (int i = 1; i < dl.getNumberOfBlocks(); i++) {
- assertTrue(dl.getBlockEnds()[i] > dl.getBlockEnds()[i-1]);
+ assertTrue(dl.getBlockEndLines()[i] > dl.getBlockEndLines()[i-1]);
}
}
@@ -78,7 +78,7 @@ public class DynamicLayoutBlocksTest extends TestCase {
}
for (int i = 0; i < dl.getNumberOfBlocks(); i++) {
- assertEquals(ends[i], dl.getBlockEnds()[i]);
+ assertEquals(ends[i], dl.getBlockEndLines()[i]);
assertEquals(indices[i], dl.getBlockIndices()[i]);
}
}