Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename ProtoInputStream.isNextField to nextField.

Browse Source 
ProtoInputStream.isNextField() skips over the current field to read the
next tag. This side effect means that calling isNextField prevents the
caller from reading the field it was just on. The "is" prefix makes it
easy to assume that the method has no side effects. Renaming to
nextField(long) with a parameter should help make it clear that the call
is as dangerous as calling nextField().

Fixes: 137294060
Test: atest android.app.usage.UsageStatsTest
Test: atest android.app.usage.cts.UsageStatsTest
Test: atest com.android.server.usage.UsageStatsDatabaseTest
Test: atest ProtoInputStreamTests
Change-Id: Ibfb8ef741f27a211f076dc0b715b64acbfc0696a
This commit is contained in:
Kweku Adams
2019-07-11 12:33:10 -07:00
parent 3f8cdda049
commit 6acbca3a9a
19 changed files with 214 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/util/proto/ProtoInputStream.java
View File

@@ -253,12 +253,14 @@ public final class ProtoInputStream extends ProtoStream {
}
/**
* Attempt to guess the next field. If there is a match, the field data will be ready to read.
* If there is no match, nextField will need to be called to get the field number
* Reads the tag of the next field from the stream. If previous field value was not read, its
* data will be skipped over. If {@code fieldId} matches the next field ID, the field data will
* be ready to read. If it does not match, {@link #nextField()} or {@link #nextField(long)} will
* need to be called again before the field data can be read.
*
* @return true if fieldId matches the next field, false if not
*/
public boolean isNextField(long fieldId) throws IOException {
public boolean nextField(long fieldId) throws IOException {
if (nextField() == (int) fieldId) {
return true;
}

10
services/usage/java/com/android/server/usage/UsageStatsProto.java
View File

@@ -44,7 +44,7 @@ final class UsageStatsProto {
final long token = proto.start(IntervalStatsProto.STRINGPOOL);
List<String> stringPool;
if (proto.isNextField(IntervalStatsProto.StringPool.SIZE)) {
if (proto.nextField(IntervalStatsProto.StringPool.SIZE)) {
stringPool = new ArrayList(proto.readInt(IntervalStatsProto.StringPool.SIZE));
} else {
stringPool = new ArrayList();
@@ -66,12 +66,12 @@ final class UsageStatsProto {
final long token = proto.start(fieldId);
UsageStats stats;
if (proto.isNextField(IntervalStatsProto.UsageStats.PACKAGE_INDEX)) {
if (proto.nextField(IntervalStatsProto.UsageStats.PACKAGE_INDEX)) {
// Fast path reading the package name index. Most cases this should work since it is
// written first
stats = statsOut.getOrCreateUsageStats(
stringPool.get(proto.readInt(IntervalStatsProto.UsageStats.PACKAGE_INDEX) - 1));
} else if (proto.isNextField(IntervalStatsProto.UsageStats.PACKAGE)) {
} else if (proto.nextField(IntervalStatsProto.UsageStats.PACKAGE)) {
// No package index, try package name instead
stats = statsOut.getOrCreateUsageStats(
proto.readString(IntervalStatsProto.UsageStats.PACKAGE));
@@ -177,7 +177,7 @@ final class UsageStatsProto {
}
String action = null;
ArrayMap<String, Integer> counts;
if (proto.isNextField(IntervalStatsProto.UsageStats.ChooserAction.NAME)) {
if (proto.nextField(IntervalStatsProto.UsageStats.ChooserAction.NAME)) {
// Fast path reading the action name. Most cases this should work since it is written
// first
action = proto.readString(IntervalStatsProto.UsageStats.ChooserAction.NAME);
@@ -244,7 +244,7 @@ final class UsageStatsProto {
boolean configActive = false;
final Configuration config = new Configuration();
ConfigurationStats configStats;
if (proto.isNextField(IntervalStatsProto.Configuration.CONFIG)) {
if (proto.nextField(IntervalStatsProto.Configuration.CONFIG)) {
// Fast path reading the configuration. Most cases this should work since it is
// written first
config.readFromProto(proto, IntervalStatsProto.Configuration.CONFIG);

24
tests/ProtoInputStreamTests/src/com/android/test/protoinputstream/ProtoInputStreamBoolTest.java
View File

@@ -384,55 +384,55 @@ public class ProtoInputStreamBoolTest extends TestCase {
};
ProtoInputStream pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readFloat(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}
pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readDouble(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}
pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readInt(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}
pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readLong(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}
pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readBytes(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}
pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readString(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}

24
tests/ProtoInputStreamTests/src/com/android/test/protoinputstream/ProtoInputStreamBytesTest.java
View File

@@ -306,55 +306,55 @@ public class ProtoInputStreamBytesTest extends TestCase {
};
ProtoInputStream pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readFloat(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}
pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readDouble(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}
pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readInt(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}
pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readLong(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}
pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readBoolean(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}
pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readString(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}

24
tests/ProtoInputStreamTests/src/com/android/test/protoinputstream/ProtoInputStreamDoubleTest.java
View File

@@ -611,55 +611,55 @@ public class ProtoInputStreamDoubleTest extends TestCase {
};
ProtoInputStream pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readFloat(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}
pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readBoolean(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}
pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readInt(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}
pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readLong(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}
pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readBytes(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}
pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readString(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}

24
tests/ProtoInputStreamTests/src/com/android/test/protoinputstream/ProtoInputStreamEnumTest.java
View File

@@ -454,55 +454,55 @@ public class ProtoInputStreamEnumTest extends TestCase {
};
ProtoInputStream pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readFloat(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}
pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readDouble(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}
pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readBoolean(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}
pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readLong(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}
pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readBytes(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}
pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readString(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}

24
tests/ProtoInputStreamTests/src/com/android/test/protoinputstream/ProtoInputStreamFixed32Test.java
View File

@@ -431,55 +431,55 @@ public class ProtoInputStreamFixed32Test extends TestCase {
};
ProtoInputStream pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readFloat(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}
pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readDouble(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}
pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readBoolean(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}
pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readLong(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}
pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readBytes(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}
pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readString(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}

24
tests/ProtoInputStreamTests/src/com/android/test/protoinputstream/ProtoInputStreamFixed64Test.java
View File

@@ -532,55 +532,55 @@ public class ProtoInputStreamFixed64Test extends TestCase {
};
ProtoInputStream pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readFloat(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}
pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readDouble(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}
pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readInt(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}
pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readBoolean(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}
pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readBytes(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}
pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readString(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}

24
tests/ProtoInputStreamTests/src/com/android/test/protoinputstream/ProtoInputStreamFloatTest.java
View File

@@ -563,55 +563,55 @@ public class ProtoInputStreamFloatTest extends TestCase {
};
ProtoInputStream pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readBoolean(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}
pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readDouble(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}
pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readInt(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}
pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readLong(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}
pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readBytes(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}
pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readString(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}

24
tests/ProtoInputStreamTests/src/com/android/test/protoinputstream/ProtoInputStreamInt32Test.java
View File

@@ -449,55 +449,55 @@ public class ProtoInputStreamInt32Test extends TestCase {
};
ProtoInputStream pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readFloat(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}
pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readDouble(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}
pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readBoolean(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}
pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readLong(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}
pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readBytes(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}
pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readString(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}

24
tests/ProtoInputStreamTests/src/com/android/test/protoinputstream/ProtoInputStreamInt64Test.java
View File

@@ -529,55 +529,55 @@ public class ProtoInputStreamInt64Test extends TestCase {
};
ProtoInputStream pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readFloat(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}
pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readDouble(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}
pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readInt(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}
pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readBoolean(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}
pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readBytes(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}
pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readString(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}

24
tests/ProtoInputStreamTests/src/com/android/test/protoinputstream/ProtoInputStreamObjectTest.java
View File

@@ -391,55 +391,55 @@ public class ProtoInputStreamObjectTest extends TestCase {
};
ProtoInputStream pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readFloat(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}
pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readDouble(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}
pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readInt(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}
pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readLong(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}
pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readBoolean(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}
pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readString(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}

24
tests/ProtoInputStreamTests/src/com/android/test/protoinputstream/ProtoInputStreamSFixed32Test.java
View File

@@ -431,55 +431,55 @@ public class ProtoInputStreamSFixed32Test extends TestCase {
};
ProtoInputStream pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readFloat(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}
pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readDouble(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}
pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readBoolean(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}
pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readLong(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}
pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readBytes(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}
pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readString(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}

24
tests/ProtoInputStreamTests/src/com/android/test/protoinputstream/ProtoInputStreamSFixed64Test.java
View File

@@ -531,55 +531,55 @@ public class ProtoInputStreamSFixed64Test extends TestCase {
};
ProtoInputStream pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readFloat(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}
pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readDouble(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}
pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readInt(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}
pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readBoolean(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}
pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readBytes(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}
pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readString(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}

24
tests/ProtoInputStreamTests/src/com/android/test/protoinputstream/ProtoInputStreamSInt32Test.java
View File

@@ -431,55 +431,55 @@ public class ProtoInputStreamSInt32Test extends TestCase {
};
ProtoInputStream pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readFloat(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}
pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readDouble(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}
pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readBoolean(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}
pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readLong(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}
pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readBytes(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}
pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readString(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}

24
tests/ProtoInputStreamTests/src/com/android/test/protoinputstream/ProtoInputStreamSInt64Test.java
View File

@@ -506,55 +506,55 @@ public class ProtoInputStreamSInt64Test extends TestCase {
};
ProtoInputStream pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readFloat(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}
pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readDouble(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}
pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readInt(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}
pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readBoolean(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}
pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readBytes(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}
pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readString(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}

24
tests/ProtoInputStreamTests/src/com/android/test/protoinputstream/ProtoInputStreamStringTest.java
View File

@@ -287,55 +287,55 @@ public class ProtoInputStreamStringTest extends TestCase {
};
ProtoInputStream pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readFloat(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}
pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readDouble(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}
pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readInt(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}
pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readLong(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}
pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readBytes(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}
pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readBoolean(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}

24
tests/ProtoInputStreamTests/src/com/android/test/protoinputstream/ProtoInputStreamUInt32Test.java
View File

@@ -448,55 +448,55 @@ public class ProtoInputStreamUInt32Test extends TestCase {
};
ProtoInputStream pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readFloat(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}
pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readDouble(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}
pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readBoolean(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}
pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readLong(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}
pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readBytes(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}
pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readString(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}

24
tests/ProtoInputStreamTests/src/com/android/test/protoinputstream/ProtoInputStreamUInt64Test.java
View File

@@ -525,55 +525,55 @@ public class ProtoInputStreamUInt64Test extends TestCase {
};
ProtoInputStream pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readFloat(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}
pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readDouble(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}
pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readInt(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}
pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readBoolean(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}
pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readBytes(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}
pi = new ProtoInputStream(protobuf);
pi.isNextField(fieldId1);
pi.nextField();
try {
pi.readString(fieldId1);
fail("Should have throw IllegalArgumentException");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException iae) {
// good
}