Add swap memory to the compact memory info parser

Change-Id: I5f6bbf8ee41311ef7dfb3d60fd76c7d902c187f8

1 files changed, 35 insertions, 16 deletions

diff --git a/tests/src/com/android/loganalysis/parser/CompactMemInfoParserTest.java b/tests/src/com/android/loganalysis/parser/CompactMemInfoParserTest.java
index 6400aca..009af1d 100644
--- a/tests/src/com/android/loganalysis/parser/CompactMemInfoParserTest.java
+++ b/tests/src/com/android/loganalysis/parser/CompactMemInfoParserTest.java
@@ -28,7 +28,20 @@ import java.util.List;
 
 public class CompactMemInfoParserTest extends TestCase {
 
-    public void testSingleProcLine() {
+    public void testSingleProcLineWithSwap() {
+        List<String> input = Arrays.asList("proc,cached,com.google.android.youtube1,2964,19345,1005,e");
+
+        CompactMemInfoItem item = new CompactMemInfoParser().parse(input);
+
+        assertEquals(1, item.getPids().size());
+        assertEquals("com.google.android.youtube1", item.getName(2964));
+        assertEquals(19345, item.getPss(2964));
+        assertEquals(1005, item.getSwap(2964));
+        assertEquals("cached", item.getType(2964));
+        assertEquals(false, item.hasActivities(2964));
+    }
+
+    public void testSingleProcLineWithoutSwap() {
         List<String> input = Arrays.asList("proc,cached,com.google.android.youtube,2964,19345,e");
 
         CompactMemInfoItem item = new CompactMemInfoParser().parse(input);
@@ -36,6 +49,7 @@ public class CompactMemInfoParserTest extends TestCase {
         assertEquals(1, item.getPids().size());
         assertEquals("com.google.android.youtube", item.getName(2964));
         assertEquals(19345, item.getPss(2964));
+        assertEquals(0, item.getSwap(2964));
         assertEquals("cached", item.getType(2964));
         assertEquals(false, item.hasActivities(2964));
     }
@@ -49,6 +63,9 @@ public class CompactMemInfoParserTest extends TestCase {
     public void testSomeMalformedLines() {
         List<String> input = Arrays.asList(
                 "proc,cached,com.google.android.youtube,a,b,e",
+                "proc,cached,com.google.android.youtube,2964,c,e",
+                "proc,cached,com.google.android.youtube,2964,e",
+                "proc,cached,com.google.android.youtube,2964,19345,a,e",
                 "lostram,a,1000",
                 "lostram,1000,a");
 
@@ -59,11 +76,11 @@ public class CompactMemInfoParserTest extends TestCase {
 
     public void testMultipleLines() {
         List<String> input = Arrays.asList(
-                "proc,cached,com.google.android.youtube,2964,19345,e",
-                "proc,cached,com.google.android.apps.plus,2877,9604,e",
-                "proc,cached,com.google.android.apps.magazines,2009,20111,e",
-                "proc,cached,com.google.android.apps.walletnfcrel,10790,11164,e",
-                "proc,cached,com.google.android.incallui,3410,9491,e",
+                "proc,cached,com.google.android.youtube,2964,19345,123,e",
+                "proc,cached,com.google.android.apps.plus,2877,9604,N/A,e",
+                "proc,cached,com.google.android.apps.magazines,2009,20111,N/A,e",
+                "proc,cached,com.google.android.apps.walletnfcrel,10790,11164,100,e",
+                "proc,cached,com.google.android.incallui,3410,9491,N/A,e",
                 "lostram,1005");
 
         CompactMemInfoItem item = new CompactMemInfoParser().parse(input);
@@ -71,6 +88,7 @@ public class CompactMemInfoParserTest extends TestCase {
         assertEquals(5, item.getPids().size());
         assertEquals("com.google.android.youtube", item.getName(2964));
         assertEquals(19345, item.getPss(2964));
+        assertEquals(123, item.getSwap(2964));
         assertEquals("cached", item.getType(2964));
         assertEquals(false, item.hasActivities(2964));
 
@@ -82,11 +100,11 @@ public class CompactMemInfoParserTest extends TestCase {
 
         List<String> input = Arrays.asList(
                 "oom,cached,141357",
-                "proc,cached,com.google.android.youtube,2964,19345,e",
-                "proc,cached,com.google.android.apps.plus,2877,9604,e",
-                "proc,cached,com.google.android.apps.magazines,2009,20111,e",
-                "proc,cached,com.google.android.apps.walletnfcrel,10790,11164,e",
-                "proc,cached,com.google.android.incallui,3410,9491,e",
+                "proc,cached,com.google.android.youtube,2964,19345,54321,e",
+                "proc,cached,com.google.android.apps.plus,2877,9604,4321,e",
+                "proc,cached,com.google.android.apps.magazines,2009,20111,321,e",
+                "proc,cached,com.google.android.apps.walletnfcrel,10790,11164,21,e",
+                "proc,cached,com.google.android.incallui,3410,9491,1,e",
                 "cat,Native,63169");
 
         CompactMemInfoItem item = new CompactMemInfoParser().parse(input);
@@ -94,6 +112,7 @@ public class CompactMemInfoParserTest extends TestCase {
         assertEquals(5, item.getPids().size());
         assertEquals("com.google.android.youtube", item.getName(2964));
         assertEquals(19345, item.getPss(2964));
+        assertEquals(54321, item.getSwap(2964));
         assertEquals("cached", item.getType(2964));
         assertEquals(false, item.hasActivities(2964));
     }
@@ -101,11 +120,11 @@ public class CompactMemInfoParserTest extends TestCase {
     public void testJson() throws JSONException {
         List<String> input = Arrays.asList(
                 "oom,cached,141357",
-                "proc,cached,com.google.android.youtube,2964,19345,e",
-                "proc,cached,com.google.android.apps.plus,2877,9604,e",
-                "proc,cached,com.google.android.apps.magazines,2009,20111,e",
-                "proc,cached,com.google.android.apps.walletnfcrel,10790,11164,e",
-                "proc,cached,com.google.android.incallui,3410,9491,e",
+                "proc,cached,com.google.android.youtube,2964,19345,N/A,e",
+                "proc,cached,com.google.android.apps.plus,2877,9604,50,e",
+                "proc,cached,com.google.android.apps.magazines,2009,20111,100,e",
+                "proc,cached,com.google.android.apps.walletnfcrel,10790,11164,0,e",
+                "proc,cached,com.google.android.incallui,3410,9491,500,e",
                 "lostram,1005",
                 "cat,Native,63169");