Merge pull request #44 from scala-exercises/jp-se-510-dry-test-scala

JP - SE-510 DRY Test.scala
scala-exercises · Jul 11, 2016 · fa4be00 · fa4be00
2 parents b362424 + d64cdca
commit fa4be00
Show file tree

Hide file tree

Showing 39 changed files with 145 additions and 279 deletions.
diff --git a/build.sbt b/build.sbt
@@ -5,7 +5,7 @@ lazy val stdlib = (project in file("."))
   organization := "org.scala-exercises",
   name         := "exercises-stdlib",
   scalaVersion := "2.11.7",
-  version := "0.2.1-SNAPSHOT",
+  version := "0.2.2-SNAPSHOT",
   resolvers ++= Seq(
     Resolver.sonatypeRepo("snapshots"),
     Resolver.sonatypeRepo("releases")

diff --git a/src/test/scala/exercises/Test.scala b/src/test/scala/exercises/Test.scala
diff --git a/src/test/scala/exercises/stdlib/EnumerationsSpec.scala b/src/test/scala/exercises/stdlib/EnumerationsSpec.scala
diff --git a/.../scala/exercises/stdlib/AssertsSpec.scala → src/test/scala/stdlib/AssertsSpec.scala b/.../scala/exercises/stdlib/AssertsSpec.scala → src/test/scala/stdlib/AssertsSpec.scala
@@ -1,12 +1,10 @@
-package exercises
-
-import stdlib._
-import shapeless.HNil
+package stdlib
 
+import org.scalacheck.Shapeless._
+import org.scalaexercises.Test
 import org.scalatest.Spec
 import org.scalatest.prop.Checkers
-
-import org.scalacheck.Shapeless._
+import shapeless.HNil
 
 class AssertsSpec extends Spec with Checkers {
   def `scalatest asserts` = {

diff --git a/...xercises/stdlib/ByNameParameterSpec.scala → ...st/scala/stdlib/ByNameParameterSpec.scala b/...xercises/stdlib/ByNameParameterSpec.scala → ...st/scala/stdlib/ByNameParameterSpec.scala
@@ -1,12 +1,10 @@
-package exercises
-
-import stdlib._
-import shapeless.HNil
+package stdlib
 
+import org.scalacheck.Shapeless._
+import org.scalaexercises.Test
 import org.scalatest.Spec
 import org.scalatest.prop.Checkers
-
-import org.scalacheck.Shapeless._
+import shapeless.HNil
 
 class ByNameParameterSpec extends Spec with Checkers {
   def `takes unit by name parameter` = {

diff --git a/...la/exercises/stdlib/CaseClassesSpec.scala → src/test/scala/stdlib/CaseClassesSpec.scala b/...la/exercises/stdlib/CaseClassesSpec.scala → src/test/scala/stdlib/CaseClassesSpec.scala
@@ -1,12 +1,10 @@
-package exercises
-
-import stdlib._
-import shapeless.HNil
+package stdlib
 
+import org.scalacheck.Shapeless._
+import org.scalaexercises.Test
 import org.scalatest.Spec
 import org.scalatest.prop.Checkers
-
-import org.scalacheck.Shapeless._
+import shapeless.HNil
 
 class CaseClassesSpec extends Spec with Checkers {
   def `case classes comparisons` = {

diff --git a/.../scala/exercises/stdlib/ClassesSpec.scala → src/test/scala/stdlib/ClassesSpec.scala b/.../scala/exercises/stdlib/ClassesSpec.scala → src/test/scala/stdlib/ClassesSpec.scala
@@ -1,12 +1,10 @@
-package exercises
-
-import stdlib._
-import shapeless.HNil
+package stdlib
 
+import org.scalacheck.Shapeless._
+import org.scalaexercises.Test
 import org.scalatest.Spec
 import org.scalatest.prop.Checkers
-
-import org.scalacheck.Shapeless._
+import shapeless.HNil
 
 class ClassesSpec extends Spec with Checkers {
   def `classes with val parameters` = {

diff --git a/...la/exercises/stdlib/EmptyValuesSpec.scala → src/test/scala/stdlib/EmptyValuesSpec.scala b/...la/exercises/stdlib/EmptyValuesSpec.scala → src/test/scala/stdlib/EmptyValuesSpec.scala
@@ -1,12 +1,10 @@
-package exercises
-
-import stdlib._
-import shapeless.HNil
+package stdlib
 
+import org.scalacheck.Shapeless._
+import org.scalaexercises.Test
 import org.scalatest.Spec
 import org.scalatest.prop.Checkers
-
-import org.scalacheck.Shapeless._
+import shapeless.HNil
 
 class EmptyValuesSpec extends Spec with Checkers {
   def `empty values` = {

diff --git a/src/test/scala/stdlib/EnumerationsSpec.scala b/src/test/scala/stdlib/EnumerationsSpec.scala
@@ -0,0 +1,2 @@
+package stdlib
+
diff --git a/...ala/exercises/stdlib/ExtractorsSpec.scala → src/test/scala/stdlib/ExtractorsSpec.scala b/...ala/exercises/stdlib/ExtractorsSpec.scala → src/test/scala/stdlib/ExtractorsSpec.scala
@@ -1,12 +1,10 @@
-package exercises
-
-import stdlib._
-import shapeless.HNil
+package stdlib
 
+import org.scalacheck.Shapeless._
+import org.scalaexercises.Test
 import org.scalatest.Spec
 import org.scalatest.prop.Checkers
-
-import org.scalacheck.Shapeless._
+import shapeless.HNil
 
 class ExtractorsSpec extends Spec with Checkers {
   def `extractors` = {

diff --git a/...xercises/stdlib/ForExpresssionsSpec.scala → ...est/scala/stdlib/ForExpressionsSpec.scala b/...xercises/stdlib/ForExpresssionsSpec.scala → ...est/scala/stdlib/ForExpressionsSpec.scala
@@ -1,12 +1,10 @@
-package exercises
-
-import stdlib._
-import shapeless.HNil
+package stdlib
 
+import org.scalacheck.Shapeless._
+import org.scalaexercises.Test
 import org.scalatest.Spec
 import org.scalatest.prop.Checkers
-
-import org.scalacheck.Shapeless._
+import shapeless.HNil
 
 class ForExpressionsSpec extends Spec with Checkers {
 

diff --git a/...ala/exercises/stdlib/FormattingSpec.scala → src/test/scala/stdlib/FormattingSpec.scala b/...ala/exercises/stdlib/FormattingSpec.scala → src/test/scala/stdlib/FormattingSpec.scala
@@ -1,12 +1,10 @@
-package exercises
-
-import stdlib._
-import shapeless.HNil
+package stdlib
 
+import org.scalacheck.Shapeless._
+import org.scalaexercises.Test
 import org.scalatest.Spec
 import org.scalatest.prop.Checkers
-
-import org.scalacheck.Shapeless._
+import shapeless.HNil
 
 class FormattingSpec extends Spec with Checkers {
   def `strings` = {

diff --git a/...ses/stdlib/HigherOrderFunctionsSpec.scala → ...ala/stdlib/HigherOrderFunctionsSpec.scala b/...ses/stdlib/HigherOrderFunctionsSpec.scala → ...ala/stdlib/HigherOrderFunctionsSpec.scala
@@ -1,12 +1,10 @@
-package exercises
-
-import stdlib._
-import shapeless.HNil
+package stdlib
 
+import org.scalacheck.Shapeless._
+import org.scalaexercises.Test
 import org.scalatest.Spec
 import org.scalatest.prop.Checkers
-
-import org.scalacheck.Shapeless._
+import shapeless.HNil
 
 class HigherOrderFunctionsSpec extends Spec with Checkers {
   def `anonymous function` = {

diff --git a/...cala/exercises/stdlib/ImplicitsSpec.scala → src/test/scala/stdlib/ImplicitsSpec.scala b/...cala/exercises/stdlib/ImplicitsSpec.scala → src/test/scala/stdlib/ImplicitsSpec.scala
@@ -1,12 +1,10 @@
-package exercises
-
-import stdlib._
-import shapeless.HNil
+package stdlib
 
+import org.scalacheck.Shapeless._
+import org.scalaexercises.Test
 import org.scalatest.Spec
 import org.scalatest.prop.Checkers
-
-import org.scalacheck.Shapeless._
+import shapeless.HNil
 
 class ImplicitsSpec extends Spec with Checkers {
   def `implicit parameters` = {

diff --git a/.../InfixPrefixAndPostfixOperatorsSpec.scala → .../InfixPrefixAndPostfixOperatorsSpec.scala b/.../InfixPrefixAndPostfixOperatorsSpec.scala → .../InfixPrefixAndPostfixOperatorsSpec.scala
@@ -1,15 +1,14 @@
-package exercises
-
-import stdlib._
-import shapeless.HNil
+package stdlib
 
+import org.scalaexercises.Test
 import org.scalatest.Spec
 import org.scalatest.prop.Checkers
+import shapeless.HNil
 
 // FIXME: get rid of this if possible
 import org.scalacheck.Shapeless._
 
-class OperatorsSpec extends Spec with Checkers {
+class InfixPrefixAndPostfixOperatorsSpec extends Spec with Checkers {
   val Operators = InfixPrefixandPostfixOperators
 
   def `single parameter infix operators` = {

diff --git a/...ala/exercises/stdlib/InfixTypesSpec.scala → src/test/scala/stdlib/InfixTypesSpec.scala b/...ala/exercises/stdlib/InfixTypesSpec.scala → src/test/scala/stdlib/InfixTypesSpec.scala
@@ -1,12 +1,10 @@
-package exercises
-
-import stdlib._
-import shapeless.HNil
+package stdlib
 
+import org.scalacheck.Shapeless._
+import org.scalaexercises.Test
 import org.scalatest.Spec
 import org.scalatest.prop.Checkers
-
-import org.scalacheck.Shapeless._
+import shapeless.HNil
 
 class InfixTypesSpec extends Spec with Checkers {
   def `infix type` = {

diff --git a/...cala/exercises/stdlib/IterablesSpec.scala → src/test/scala/stdlib/IterablesSpec.scala b/...cala/exercises/stdlib/IterablesSpec.scala → src/test/scala/stdlib/IterablesSpec.scala
@@ -1,12 +1,10 @@
-package exercises
-
-import stdlib._
-import shapeless.HNil
+package stdlib
 
+import org.scalacheck.Shapeless._
+import org.scalaexercises.Test
 import org.scalatest.Spec
 import org.scalatest.prop.Checkers
-
-import org.scalacheck.Shapeless._
+import shapeless.HNil
 
 class IterablesSpec extends Spec with Checkers {
   def `collection iterables` = {

diff --git a/...st/scala/exercises/stdlib/ListsSpec.scala → src/test/scala/stdlib/ListsSpec.scala b/...st/scala/exercises/stdlib/ListsSpec.scala → src/test/scala/stdlib/ListsSpec.scala
@@ -1,12 +1,10 @@
-package exercises
-
-import stdlib._
-import shapeless.HNil
+package stdlib
 
+import org.scalacheck.Shapeless._
+import org.scalaexercises.Test
 import org.scalatest.Spec
 import org.scalatest.prop.Checkers
-
-import org.scalacheck.Shapeless._
+import shapeless.HNil
 
 class ListsSpec extends Spec with Checkers {
   def `are homogeneous` = {

diff --git a/...xercises/stdlib/LiteralBooleansSpec.scala → ...st/scala/stdlib/LiteralBooleansSpec.scala b/...xercises/stdlib/LiteralBooleansSpec.scala → ...st/scala/stdlib/LiteralBooleansSpec.scala
@@ -1,12 +1,10 @@
-package exercises
-
-import stdlib._
-import shapeless.HNil
+package stdlib
 
+import org.scalacheck.Shapeless._
+import org.scalaexercises.Test
 import org.scalatest.Spec
 import org.scalatest.prop.Checkers
-
-import org.scalacheck.Shapeless._
+import shapeless.HNil
 
 class LiteralBooleansSpec extends Spec with Checkers {
   def `are either true or false` = {

diff --git a/...exercises/stdlib/LiteralNumbersSpec.scala → ...est/scala/stdlib/LiteralNumbersSpec.scala b/...exercises/stdlib/LiteralNumbersSpec.scala → ...est/scala/stdlib/LiteralNumbersSpec.scala
@@ -1,12 +1,10 @@
-package exercises
-
-import stdlib._
-import shapeless.HNil
+package stdlib
 
+import org.scalacheck.Shapeless._
+import org.scalaexercises.Test
 import org.scalatest.Spec
 import org.scalatest.prop.Checkers
-
-import org.scalacheck.Shapeless._
+import shapeless.HNil
 
 class LiteralNumbersSpec extends Spec with Checkers {
   def `integer literals` = {

diff --git a/...exercises/stdlib/LiteralStringsSpec.scala → ...est/scala/stdlib/LiteralStringsSpec.scala b/...exercises/stdlib/LiteralStringsSpec.scala → ...est/scala/stdlib/LiteralStringsSpec.scala
@@ -1,12 +1,10 @@
-package exercises
-
-import stdlib._
-import shapeless.HNil
+package stdlib
 
+import org.scalacheck.Shapeless._
+import org.scalaexercises.Test
 import org.scalatest.Spec
 import org.scalatest.prop.Checkers
-
-import org.scalacheck.Shapeless._
+import shapeless.HNil
 
 class LiteralStringsSpec extends Spec with Checkers {
   def `character literals` = {

diff --git a/...test/scala/exercises/stdlib/MapSpec.scala → src/test/scala/stdlib/MapsSpec.scala b/...test/scala/exercises/stdlib/MapSpec.scala → src/test/scala/stdlib/MapsSpec.scala
@@ -1,12 +1,10 @@
-package exercises
-
-import stdlib._
-import shapeless.HNil
+package stdlib
 
+import org.scalacheck.Shapeless._
+import org.scalaexercises.Test
 import org.scalatest.Spec
 import org.scalatest.prop.Checkers
-
-import org.scalacheck.Shapeless._
+import shapeless.HNil
 
 class MapsSpec extends Spec with Checkers {
   def `size` = {