Merge pull request #16 from adetokunbo/bugfix-valid-test-data-generation

Ensure generated siName does not contain newlines

src/System/MemInfo/Proc.hs

@@ -55,7 +55,8 @@ data StatusInfo = StatusInfo
 instance Validity StatusInfo where
   validate StatusInfo {siName, siParent} =
     let name' = Text.strip siName
-        nameOk = Text.length name' > 0 && siName == name'
+        noNewlines = not $ Text.any (== '\n') siName
+        nameOk = noNewlines && Text.length name' > 0 && siName == name'
      in mconcat
           [ check nameOk "the process name"
           , delve "the process ID" $ toInteger siParent
@@ -121,7 +122,7 @@ instance Validity ExeInfo where
 
 -- | Combine @'ProcUsage'@, grouping them by the effective program name
 amass ::
-  Ord a =>
+  (Ord a) =>
   Bool ->
   [(a, ProcUsage)] ->
   Map a MemUsage
@@ -158,7 +159,7 @@ data MemUsage = MemUsage
 
 
 incrSubTotals ::
-  Ord a =>
+  (Ord a) =>
   Bool ->
   Map a SubTotal ->
   (a, ProcUsage) ->
@@ -335,19 +336,19 @@ incrSharedHuge ms = maybe ms $ \n -> ms {ssSharedHuge = n + ssSharedHuge ms}
 incrSmapStats :: SmapStats -> Text -> SmapStats
 incrSmapStats acc l =
   if
-      | Text.isPrefixOf "Private_Hugetlb:" l -> incrPrivateHuge acc $ smapValMb l
-      | Text.isPrefixOf "Shared_Hugetlb:" l -> incrSharedHuge acc $ smapValMb l
-      | Text.isPrefixOf "Shared" l -> incrShared acc $ smapValMb l
-      | Text.isPrefixOf "Private" l -> incrPrivate acc $ smapValMb l
-      | Text.isPrefixOf "Pss:" l ->
-          let acc' = acc {ssHasPss = True, ssPssCount = 1 + ssPssCount acc}
-           in incrPss acc' $ smapValMb l
-      | Text.isPrefixOf "Swap:" l -> incrSwap acc $ smapValMb l
-      | Text.isPrefixOf "SwapPss:" l -> incrSwapPss (acc {ssHasSwapPss = True}) $ smapValMb l
-      | otherwise -> acc
-
-
-smapValMb :: Read a => Text -> Maybe a
+    | Text.isPrefixOf "Private_Hugetlb:" l -> incrPrivateHuge acc $ smapValMb l
+    | Text.isPrefixOf "Shared_Hugetlb:" l -> incrSharedHuge acc $ smapValMb l
+    | Text.isPrefixOf "Shared" l -> incrShared acc $ smapValMb l
+    | Text.isPrefixOf "Private" l -> incrPrivate acc $ smapValMb l
+    | Text.isPrefixOf "Pss:" l ->
+        let acc' = acc {ssHasPss = True, ssPssCount = 1 + ssPssCount acc}
+         in incrPss acc' $ smapValMb l
+    | Text.isPrefixOf "Swap:" l -> incrSwap acc $ smapValMb l
+    | Text.isPrefixOf "SwapPss:" l -> incrSwapPss (acc {ssHasSwapPss = True}) $ smapValMb l
+    | otherwise -> acc
+
+
+smapValMb :: (Read a) => Text -> Maybe a
 smapValMb l =
   let memWords = Text.words l
       readVal (_ : x : _) = readMaybe $ Text.unpack x