cleanup formating (e.g. no trailing spaces)
git-svn-id: http://skia.googlecode.com/svn/trunk@143 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/tests/StreamTest.cpp b/tests/StreamTest.cpp
index 704ab4a..e62f2ed 100644
--- a/tests/StreamTest.cpp
+++ b/tests/StreamTest.cpp
@@ -29,14 +29,15 @@
int bufferSize = 1 + (rand.nextU() & 0xFFFF);
SkMemoryStream mstream(storage, size);
SkBufferStream bstream(&mstream, bufferSize);
-
+
int bytesRead = 0;
while (bytesRead < size) {
int s = 17 + (rand.nextU() & 0xFFFF);
int ss = bstream.read(storage2, s);
REPORTER_ASSERT(reporter, ss > 0 && ss <= s);
REPORTER_ASSERT(reporter, bytesRead + ss <= size);
- REPORTER_ASSERT(reporter, memcmp(storage + bytesRead, storage2, ss) == 0);
+ REPORTER_ASSERT(reporter,
+ memcmp(storage + bytesRead, storage2, ss) == 0);
bytesRead += ss;
}
REPORTER_ASSERT(reporter, bytesRead == size);
@@ -45,16 +46,16 @@
}
static void TestRStream(skiatest::Reporter* reporter) {
- static const char s[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
+ static const char s[] =
+ "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
char copy[sizeof(s)];
SkRandom rand;
-
- for (int i = 0; i < 65; i++)
- {
+
+ for (int i = 0; i < 65; i++) {
char* copyPtr = copy;
SkMemoryStream mem(s, sizeof(s));
SkBufferStream buff(&mem, i);
-
+
do {
copyPtr += buff.read(copyPtr, rand.nextU() & 15);
} while (copyPtr < copy + sizeof(s));
@@ -64,42 +65,24 @@
test_buffer(reporter);
}
-static void TestWStream(skiatest::Reporter* reporter)
-{
- if (false) {
- SkDebugWStream s;
-
- s.writeText("compare: 0 "); s.writeDecAsText(0); s.newline();
- s.writeText("compare: 591 "); s.writeDecAsText(591); s.newline();
- s.writeText("compare: -9125 "); s.writeDecAsText(-9125); s.newline();
- s.writeText("compare: 0 "); s.writeHexAsText(0, 0); s.newline();
- s.writeText("compare: 03FA "); s.writeHexAsText(0x3FA, 4); s.newline();
- s.writeText("compare: DEADBEEF "); s.writeHexAsText(0xDEADBEEF, 4); s.newline();
- s.writeText("compare: 0 "); s.writeScalarAsText(SkIntToScalar(0)); s.newline();
- s.writeText("compare: 27 "); s.writeScalarAsText(SkIntToScalar(27)); s.newline();
- s.writeText("compare: -119 "); s.writeScalarAsText(SkIntToScalar(-119)); s.newline();
- s.writeText("compare: 851.3333 "); s.writeScalarAsText(SkIntToScalar(851) + SK_Scalar1/3); s.newline();
- s.writeText("compare: -0.08 "); s.writeScalarAsText(-SK_Scalar1*8/100); s.newline();
+static void TestWStream(skiatest::Reporter* reporter) {
+ SkDynamicMemoryWStream ds;
+ const char s[] = "abcdefghijklmnopqrstuvwxyz";
+ int i;
+ for (i = 0; i < 100; i++) {
+ REPORTER_ASSERT(reporter, ds.write(s, 26));
}
-
- {
- SkDynamicMemoryWStream ds;
- const char s[] = "abcdefghijklmnopqrstuvwxyz";
- int i;
- for (i = 0; i < 100; i++) {
- REPORTER_ASSERT(reporter, ds.write(s, 26));
- }
- REPORTER_ASSERT(reporter, ds.getOffset() == 100 * 26);
- char* dst = new char[100 * 26 + 1];
- dst[100*26] = '*';
- ds.copyTo(dst);
- REPORTER_ASSERT(reporter, dst[100*26] == '*');
- // char* p = dst;
- for (i = 0; i < 100; i++)
- REPORTER_ASSERT(reporter, memcmp(&dst[i * 26], s, 26) == 0);
- REPORTER_ASSERT(reporter, memcmp(dst, ds.getStream(), 100*26) == 0);
- delete[] dst;
+ REPORTER_ASSERT(reporter, ds.getOffset() == 100 * 26);
+ char* dst = new char[100 * 26 + 1];
+ dst[100*26] = '*';
+ ds.copyTo(dst);
+ REPORTER_ASSERT(reporter, dst[100*26] == '*');
+// char* p = dst;
+ for (i = 0; i < 100; i++) {
+ REPORTER_ASSERT(reporter, memcmp(&dst[i * 26], s, 26) == 0);
}
+ REPORTER_ASSERT(reporter, memcmp(dst, ds.getStream(), 100*26) == 0);
+ delete[] dst;
}
static void TestStreams(skiatest::Reporter* reporter) {