Merge "Don't expect an error on log to proto" into main (666c6eb4) · Commits · e / os / android_frameworks_base

tests/Internal/src/com/android/internal/protolog/PerfettoProtoLogImplTest.java

+4 −21

Original line number	Diff line number	Diff line
		@@ -399,16 +399,12 @@ public class PerfettoProtoLogImplTest {
		TestProtoLogGroup.TEST_GROUP.setLogToLogcat(true);
		TestProtoLogGroup.TEST_GROUP.setLogToProto(false);

		var assertion = assertThrows(RuntimeException.class, () -> implSpy.log(
		LogLevel.INFO, TestProtoLogGroup.TEST_GROUP, 1234, 4321,
		new Object[]{5}));
		implSpy.log(LogLevel.INFO, TestProtoLogGroup.TEST_GROUP, 1234, 4321,
		new Object[]{5});

		verify(implSpy, never()).passToLogcat(eq(TestProtoLogGroup.TEST_GROUP.getTag()), eq(
		LogLevel.INFO), any());
		verify(implSpy).passToLogcat(eq(TestProtoLogGroup.TEST_GROUP.getTag()), eq(
		LogLevel.INFO), eq("UNKNOWN MESSAGE args = (5)"));
		verify(sReader).getViewerString(eq(1234L));

		Truth.assertThat(assertion).hasMessageThat()
		.contains("Failed to get log message with hash 1234 and args (5)");
		}

		@Test
		@@ -866,19 +862,6 @@ public class PerfettoProtoLogImplTest {
		.isEqualTo("This message should also be logged 567");
		}

		@Test
		public void throwsOnLogToLogcatForProcessedMessageMissingLoadedDefinition() {
		TestProtoLogGroup.TEST_GROUP.setLogToLogcat(true);
		var protolog = new PerfettoProtoLogImpl(TestProtoLogGroup.values());

		var exception = assertThrows(RuntimeException.class, () -> {
		protolog.log(LogLevel.DEBUG, TestProtoLogGroup.TEST_GROUP, 123, 0, new Object[0]);
		});

		Truth.assertThat(exception).hasMessageThat()
		.contains("Failed to get log message with hash 123");
		}

		private enum TestProtoLogGroup implements IProtoLogGroup {
		TEST_GROUP(true, true, false, "TEST_TAG");