Merge branch 'master' into answers

Author: Chris Myers

src/main/scala/com/rea/typesafety/OptionExercises.scala

@@ -18,17 +18,6 @@ object OptionalExercises1 {
 }
 
 object OptionalExercises2 {
-  def main(args: Array[String]) {
-    println("Environment for host1 is " + getEnvForHost("host1") + " expecting 'prod'")
-    println("Environment for host2 is " + getEnvForHost("host2") + " expecting 'test'")
-    println("Environment for host3 is " + getEnvForHost("host3") + " expecting 'couldn't resolve'")
-    println("Environment for host4 is " + getEnvForHost("host4") + " expecting 'couldn't resolve'")
-
-    println("Should be connected to rea.com: " + connectToReaHostsOnly("host1"))
-    println("Should be connected to test.rea.com: " + connectToReaHostsOnly("host2"))
-    println("Should not be connected to netflix.com: " + connectToReaHostsOnly("host3"))
-    println("Should not be connected to unknown host: " + connectToReaHostsOnly("host4"))
-  }
 
   val hosts = Map("host1" -> "rea.com", "host2" -> "test.rea.com", "host3" -> "netflix.com")
   val envs = Map("rea.com" -> "prod", "test.rea.com" -> "test", "amazon.com" -> "stage")

src/test/scala/com/rea/typesafety/OptionalExercises1Spec.scala

@@ -0,0 +1,7 @@
+package com.rea.typesafety
+
+import org.specs2.mutable.Specification
+
+class OptionalExercises1Spec extends Specification {
+
+}

src/test/scala/com/rea/typesafety/OptionalExercises2Spec.scala

@@ -0,0 +1,39 @@
+package com.rea.typesafety
+
+import org.specs2.mutable.Specification
+import OptionalExercises2._
+
+class OptionalExercises2Spec extends Specification {
+  "Get Environment for Host" should {
+    "be prod for host1" in {
+      getEnvForHost("host1") === "prod"
+    }
+    "be test for host2" in {
+      getEnvForHost("host2") === "test"
+    }
+
+    "be couldn't resolve for host3 and host 4" in {
+      getEnvForHost("host3") === "couldn't resolve"
+      getEnvForHost("host4") === "couldn't resolve"
+    }
+
+  }
+
+  "Connect to ReaHostsOnly" should {
+    "connected to rea.com for host1" in {
+      connectToReaHostsOnly("host1") === "connected to rea.com"
+    }
+    "connected to test.rea.com for host2" in {
+      connectToReaHostsOnly("host2") === "connected to test.rea.com"
+    }
+
+    "not be connected to netflix.com for host3" in {
+      connectToReaHostsOnly("host3") === "not connected to netflix.com"
+    }
+
+    "not be connected to unknown for host4" in {
+      connectToReaHostsOnly("host4") === "not connected to unknown host"
+    }
+  }
+
+}