Merge "Add more tests for MemoryStatUtil" into pi-dev (d4033e8e) · Commits · e / os / android_frameworks_base

services/tests/servicestests/src/com/android/server/am/MemoryStatUtilTest.java

+124 −50

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		package com.android.server.am;

		import static com.android.server.am.MemoryStatUtil.parseMemoryStatFromMemcg;
		import static com.android.server.am.MemoryStatUtil.parseMemoryStatFromProcfs;
		import static com.android.server.am.MemoryStatUtil.MemoryStat;

		import static org.junit.Assert.assertEquals;
		@@ -66,9 +67,63 @@ public class MemoryStatUtilTest {
		"total_active_file 81920",
		"total_unevictable 0");

		private String PROC_STAT_CONTENTS = String.join(
		" ",
		"1040",
		"(system_server)",
		"S",
		"544",
		"544",
		"0",
		"0",
		"-1",
		"1077936448",
		"1", // this is pgfault
		"0",
		"2", // this is pgmajfault
		"0",
		"44533",
		"13471",
		"0",
		"0",
		"18",
		"-2",
		"117",
		"0",
		"2206",
		"1257177088",
		"3", // this is rss in bytes
		"4294967295",
		"2936971264",
		"2936991289",
		"3198888320",
		"3198879848",
		"2903927664",
		"0",
		"4612",
		"0",
		"1073775864",
		"4294967295",
		"0",
		"0",
		"17",
		"0",
		"0",
		"0",
		"0",
		"0",
		"0",
		"2936999088",
		"2936999936",
		"2958692352",
		"3198888595",
		"3198888671",
		"3198888671",
		"3198889956",
		"0");

		@Test
		public void testParseMemoryStat_parsesCorrectValues() throws Exception {
		public void testParseMemoryStatFromMemcg_parsesCorrectValues() throws Exception {
		MemoryStat stat = parseMemoryStatFromMemcg(MEMORY_STAT_CONTENTS);
		assertEquals(stat.pgfault, 1);
		assertEquals(stat.pgmajfault, 2);
		@@ -78,11 +133,30 @@ public class MemoryStatUtilTest {
		}

		@Test
		public void testParseMemoryStat_emptyMemoryStatContents() throws Exception {
		public void testParseMemoryStatFromMemcg_emptyMemoryStatContents() throws Exception {
		MemoryStat stat = parseMemoryStatFromMemcg("");
		assertNull(stat);

		stat = parseMemoryStatFromMemcg(null);
		assertNull(stat);
		}

		@Test
		public void testParseMemoryStatFromProcfs_parsesCorrectValues() throws Exception {
		MemoryStat stat = parseMemoryStatFromProcfs(PROC_STAT_CONTENTS);
		assertEquals(1, stat.pgfault);
		assertEquals(2, stat.pgmajfault);
		assertEquals(3, stat.rssInBytes);
		assertEquals(0, stat.cacheInBytes);
		assertEquals(0, stat.swapInBytes);
		}

		@Test
		public void testParseMemoryStatFromProcfs_emptyContents() throws Exception {
		MemoryStat stat = parseMemoryStatFromProcfs("");
		assertNull(stat);

		stat = parseMemoryStatFromProcfs(null);
		assertNull(stat);
		}
		}

services/core/java/com/android/server/am/MemoryStatUtil.java

+1 −1

File changed.

Contains only whitespace changes.