klaar

[ap2015.git] / a10 / charlie / matcher_shallow.icl

diff --git a/a10/charlie/matcher_shallow.icl b/a10/charlie/matcher_shallow.icl
index 00894ae..c439f86 100644 (file)
--- a/a10/charlie/matcher_shallow.icl
+++ b/a10/charlie/matcher_shallow.icl
@@ -1,10 +1,15 @@
 module matcher_shallow\r
 \r
+import qualified Text\r
+from Text import class Text, instance Text String\r
 import StdEnv\r
 \r
 Contains :: a [a] -> Bool | == a\r
 Contains x xs = foldl (\b y . b || x == y) False xs\r
 \r
+ContainsString :: String String -> Bool\r
+ContainsString x y = 'Text'.indexOf x y <> -1\r
+\r
 EqualTo :: a a -> Bool | == a\r
 EqualTo x y = x == y\r
 \r
@@ -36,8 +41,11 @@ a3 = AssertThat "(length [0..3]) is not 4" (length [0..3]) (Not(EqualTo 4))
 a4 = AssertThat "[0..3] (Contains 2)" [0..3] (Contains 2)\r
 a5 = AssertThat "[0..3] (Contains 7)" [0..3] (Contains 7)\r
 a6 = AssertThat "[0..3] (Either (EqualTo [1]) (Contains 7))" [0..3] (EqualTo [1] Or (Contains 7))\r
+a7 = AssertThat  "'hello world' (ContainsString 'hello')" "hello world" (ContainsString "hello")\r
+a8 = AssertThat  "'hello world' (ContainsString 'world')" "hello world" (ContainsString "world")\r
+a9 = AssertThat  "Red, yellow and blue" "Who is afraid of red, yellow and blue" (ContainsString "Red")\r
 \r
-report = test (a1*a2*a3*a4*a5*a6)\r
+report = test (a1*a2*a3*a4*a5*a6*a7*a8*a9)\r
 \r
 instance <<< [String] where\r
        (<<<) file [] = file\r