X-Git-Url: https://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FOctet.hs;h=04caae54fa6bcefab22d28415f5e2e8f6aa81064;hb=a626afee0e8a4d5a8e1b9a22c150073be6a00cc3;hp=bdada65ab1b8e11bb52d95bdf33a7a25d4ce751c;hpb=7d9a55cb4f217bada3c66f585cd1ce35dc564fb1;p=hath.git diff --git a/src/Octet.hs b/src/Octet.hs index bdada65..04caae5 100644 --- a/src/Octet.hs +++ b/src/Octet.hs @@ -1,5 +1,7 @@ module Octet where +import Test.HUnit + import Bit -- An Octet consists of eight bits. For our purposes, the most @@ -42,7 +44,7 @@ octet_from_int x | (x < 0) || (x > 255) = Octet.None | otherwise = (Octet a1 a2 a3 a4 a5 a6 a7 a8) where - a1 = if (x > 128) then One else Zero + a1 = if (x >= 128) then One else Zero a2 = if ((x `mod` 128) >= 64) then One else Zero a3 = if ((x `mod` 64) >= 32) then One else Zero a4 = if ((x `mod` 32) >= 16) then One else Zero @@ -67,3 +69,16 @@ min_octet = Octet Zero Zero Zero Zero Zero Zero Zero Zero -- The octet with the greatest possible value. max_octet :: Octet max_octet = Octet One One One One One One One One + + + +-- HUnit Tests +test_octet_from_int1 :: Test +test_octet_from_int1 = + TestCase $ assertEqual "octet_from_int 128 should parse as 10000000" oct1 (octet_from_int 128) + where + oct1 = Octet One Zero Zero Zero Zero Zero Zero Zero + + +octet_tests :: [Test] +octet_tests = [ test_octet_from_int1 ]