Merge pull request #3 from jamesshade/apply-spec

Fixed failing tests

src/test/scala/uk/gov/voa/valuetype/IntOptionsSpec.scala

@@ -19,29 +19,6 @@ package uk.gov.voa.valuetype
 import org.scalatest.{Matchers, WordSpec}
 
 class IntOptionsSpec extends WordSpec with Matchers {
-
-  sealed trait TestIntOption extends IntValue
-
-  object TestIntOption extends IntOptions[TestIntOption] {
-
-    case object TestOption5 extends TestIntOption {
-      val value = 5
-    }
-
-    case object TestOption6 extends TestIntOption {
-      val value = 6
-    }
-
-    case object TestOption7 extends TestIntOption {
-      val value = 7
-    }
-
-    val all = Seq(
-      TestOption5,
-      TestOption6,
-      TestOption7
-    )
-  }
 
   import TestIntOption._
 

src/test/scala/uk/gov/voa/valuetype/StringOptionsSpec.scala

@@ -20,24 +20,6 @@ import org.scalatest.{Matchers, WordSpec}
 
 class StringOptionsSpec extends WordSpec with Matchers {
 
-  sealed trait TestStringOption extends StringValue
-
-  object TestStringOption extends StringOptions[TestStringOption] {
-
-    case object TestOption1 extends TestStringOption {
-      val value = "1"
-    }
-
-    case object TestOption2 extends TestStringOption {
-      val value = "2"
-    }
-
-    val all = Seq(
-      TestOption1,
-      TestOption2
-    )
-  }
-
   import TestStringOption._
 
   "all" should {

src/test/scala/uk/gov/voa/valuetype/testOptions.scala

@@ -0,0 +1,59 @@
+/*
+ * Copyright 2016 HM Revenue & Customs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package uk.gov.voa.valuetype
+
+sealed trait TestStringOption extends StringValue
+
+object TestStringOption extends StringOptions[TestStringOption] {
+
+  case object TestOption1 extends TestStringOption {
+    val value = "1"
+  }
+
+  case object TestOption2 extends TestStringOption {
+    val value = "2"
+  }
+
+  val all = Seq(
+    TestOption1,
+    TestOption2
+  )
+}
+
+
+sealed trait TestIntOption extends IntValue
+
+object TestIntOption extends IntOptions[TestIntOption] {
+
+  case object TestOption5 extends TestIntOption {
+    val value = 5
+  }
+
+  case object TestOption6 extends TestIntOption {
+    val value = 6
+  }
+
+  case object TestOption7 extends TestIntOption {
+    val value = 7
+  }
+
+  val all = Seq(
+    TestOption5,
+    TestOption6,
+    TestOption7
+  )
+}