diff --git a/build.sbt b/build.sbt index 39e3d06a..bf7ad76d 100644 --- 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 deleted file mode 100644 index 509352de..00000000 --- a/src/test/scala/exercises/Test.scala +++ /dev/null @@ -1,57 +0,0 @@ -package exercises - -import cats.data.Xor - -import shapeless._ -import shapeless.ops.function._ - -import org.scalacheck.{ Prop, Arbitrary } -import org.scalacheck.Gen -import Prop.forAll - -import org.scalatest.Spec -import org.scalatest.exceptions._ -import org.scalatest.prop.Checkers - -import org.scalacheck.Shapeless._ - -object Test { - - def testSuccess[F, R, L <: HList](method: F, answer: L)( - implicit - A: Arbitrary[L], - fntop: FnToProduct.Aux[F, L ⇒ R] - ): Prop = { - val rightGen = genRightAnswer(answer) - val rightProp = forAll(rightGen)({ p ⇒ - - val result = Xor.catchOnly[GeneratorDrivenPropertyCheckFailedException]({ fntop(method)(p) }) - result match { - case Xor.Left(exc) ⇒ exc.cause match { - case Some(originalException) ⇒ throw originalException - case _ ⇒ false - } - case _ ⇒ true - } - }) - - val wrongGen = genWrongAnswer(answer) - val wrongProp = forAll(wrongGen)({ p ⇒ - Xor.catchNonFatal({ fntop(method)(p) }).isLeft - }) - - Prop.all(rightProp, wrongProp) - } - - def genRightAnswer[L <: HList](answer: L): Gen[L] = { - Gen.const(answer) - } - - def genWrongAnswer[L <: HList](l: L)( - implicit - A: Arbitrary[L] - ): Gen[L] = { - A.arbitrary.suchThat(_ != l) - } -} - diff --git a/src/test/scala/exercises/stdlib/EnumerationsSpec.scala b/src/test/scala/exercises/stdlib/EnumerationsSpec.scala deleted file mode 100644 index f636ae43..00000000 --- a/src/test/scala/exercises/stdlib/EnumerationsSpec.scala +++ /dev/null @@ -1,10 +0,0 @@ -package exercises - -import stdlib._ -import shapeless.HNil - -import org.scalatest.Spec -import org.scalatest.prop.Checkers - -import org.scalacheck.Shapeless._ - diff --git a/src/test/scala/exercises/stdlib/AssertsSpec.scala b/src/test/scala/stdlib/AssertsSpec.scala similarity index 91% rename from src/test/scala/exercises/stdlib/AssertsSpec.scala rename to src/test/scala/stdlib/AssertsSpec.scala index 3d8de499..04eda2c1 100644 --- a/src/test/scala/exercises/stdlib/AssertsSpec.scala +++ b/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/src/test/scala/exercises/stdlib/ByNameParameterSpec.scala b/src/test/scala/stdlib/ByNameParameterSpec.scala similarity index 94% rename from src/test/scala/exercises/stdlib/ByNameParameterSpec.scala rename to src/test/scala/stdlib/ByNameParameterSpec.scala index f07be328..cb66fa1f 100644 --- a/src/test/scala/exercises/stdlib/ByNameParameterSpec.scala +++ b/src/test/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/src/test/scala/exercises/stdlib/CaseClassesSpec.scala b/src/test/scala/stdlib/CaseClassesSpec.scala similarity index 97% rename from src/test/scala/exercises/stdlib/CaseClassesSpec.scala rename to src/test/scala/stdlib/CaseClassesSpec.scala index c1b0d7ec..fb98477a 100644 --- a/src/test/scala/exercises/stdlib/CaseClassesSpec.scala +++ b/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/src/test/scala/exercises/stdlib/ClassesSpec.scala b/src/test/scala/stdlib/ClassesSpec.scala similarity index 87% rename from src/test/scala/exercises/stdlib/ClassesSpec.scala rename to src/test/scala/stdlib/ClassesSpec.scala index 358f6d99..d370a211 100644 --- a/src/test/scala/exercises/stdlib/ClassesSpec.scala +++ b/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/src/test/scala/exercises/stdlib/EmptyValuesSpec.scala b/src/test/scala/stdlib/EmptyValuesSpec.scala similarity index 97% rename from src/test/scala/exercises/stdlib/EmptyValuesSpec.scala rename to src/test/scala/stdlib/EmptyValuesSpec.scala index d27bb005..c84b39b1 100644 --- a/src/test/scala/exercises/stdlib/EmptyValuesSpec.scala +++ b/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 new file mode 100644 index 00000000..b812d101 --- /dev/null +++ b/src/test/scala/stdlib/EnumerationsSpec.scala @@ -0,0 +1,2 @@ +package stdlib + diff --git a/src/test/scala/exercises/stdlib/ExtractorsSpec.scala b/src/test/scala/stdlib/ExtractorsSpec.scala similarity index 97% rename from src/test/scala/exercises/stdlib/ExtractorsSpec.scala rename to src/test/scala/stdlib/ExtractorsSpec.scala index b35b8abb..4d3892d0 100644 --- a/src/test/scala/exercises/stdlib/ExtractorsSpec.scala +++ b/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/src/test/scala/exercises/stdlib/ForExpresssionsSpec.scala b/src/test/scala/stdlib/ForExpressionsSpec.scala similarity index 92% rename from src/test/scala/exercises/stdlib/ForExpresssionsSpec.scala rename to src/test/scala/stdlib/ForExpressionsSpec.scala index 566ab0be..df41cf7f 100644 --- a/src/test/scala/exercises/stdlib/ForExpresssionsSpec.scala +++ b/src/test/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/src/test/scala/exercises/stdlib/FormattingSpec.scala b/src/test/scala/stdlib/FormattingSpec.scala similarity index 95% rename from src/test/scala/exercises/stdlib/FormattingSpec.scala rename to src/test/scala/stdlib/FormattingSpec.scala index 0d41a5c9..2bfbf868 100644 --- a/src/test/scala/exercises/stdlib/FormattingSpec.scala +++ b/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/src/test/scala/exercises/stdlib/HigherOrderFunctionsSpec.scala b/src/test/scala/stdlib/HigherOrderFunctionsSpec.scala similarity index 97% rename from src/test/scala/exercises/stdlib/HigherOrderFunctionsSpec.scala rename to src/test/scala/stdlib/HigherOrderFunctionsSpec.scala index 89b8fd30..67ac2caf 100644 --- a/src/test/scala/exercises/stdlib/HigherOrderFunctionsSpec.scala +++ b/src/test/scala/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/src/test/scala/exercises/stdlib/ImplicitsSpec.scala b/src/test/scala/stdlib/ImplicitsSpec.scala similarity index 96% rename from src/test/scala/exercises/stdlib/ImplicitsSpec.scala rename to src/test/scala/stdlib/ImplicitsSpec.scala index d863ba93..31066fd6 100644 --- a/src/test/scala/exercises/stdlib/ImplicitsSpec.scala +++ b/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/src/test/scala/exercises/stdlib/InfixPrefixAndPostfixOperatorsSpec.scala b/src/test/scala/stdlib/InfixPrefixAndPostfixOperatorsSpec.scala similarity index 90% rename from src/test/scala/exercises/stdlib/InfixPrefixAndPostfixOperatorsSpec.scala rename to src/test/scala/stdlib/InfixPrefixAndPostfixOperatorsSpec.scala index a55ef667..579b1241 100644 --- a/src/test/scala/exercises/stdlib/InfixPrefixAndPostfixOperatorsSpec.scala +++ b/src/test/scala/stdlib/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/src/test/scala/exercises/stdlib/InfixTypesSpec.scala b/src/test/scala/stdlib/InfixTypesSpec.scala similarity index 91% rename from src/test/scala/exercises/stdlib/InfixTypesSpec.scala rename to src/test/scala/stdlib/InfixTypesSpec.scala index ecdee217..3e42281f 100644 --- a/src/test/scala/exercises/stdlib/InfixTypesSpec.scala +++ b/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/src/test/scala/exercises/stdlib/IterablesSpec.scala b/src/test/scala/stdlib/IterablesSpec.scala similarity index 97% rename from src/test/scala/exercises/stdlib/IterablesSpec.scala rename to src/test/scala/stdlib/IterablesSpec.scala index 57290e5f..d7299a6c 100644 --- a/src/test/scala/exercises/stdlib/IterablesSpec.scala +++ b/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/src/test/scala/exercises/stdlib/ListsSpec.scala b/src/test/scala/stdlib/ListsSpec.scala similarity index 98% rename from src/test/scala/exercises/stdlib/ListsSpec.scala rename to src/test/scala/stdlib/ListsSpec.scala index fa527a2f..7991ae19 100644 --- a/src/test/scala/exercises/stdlib/ListsSpec.scala +++ b/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/src/test/scala/exercises/stdlib/LiteralBooleansSpec.scala b/src/test/scala/stdlib/LiteralBooleansSpec.scala similarity index 89% rename from src/test/scala/exercises/stdlib/LiteralBooleansSpec.scala rename to src/test/scala/stdlib/LiteralBooleansSpec.scala index 05bd32ed..af0f6368 100644 --- a/src/test/scala/exercises/stdlib/LiteralBooleansSpec.scala +++ b/src/test/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/src/test/scala/exercises/stdlib/LiteralNumbersSpec.scala b/src/test/scala/stdlib/LiteralNumbersSpec.scala similarity index 94% rename from src/test/scala/exercises/stdlib/LiteralNumbersSpec.scala rename to src/test/scala/stdlib/LiteralNumbersSpec.scala index b1a3a444..7fb5b7c7 100644 --- a/src/test/scala/exercises/stdlib/LiteralNumbersSpec.scala +++ b/src/test/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/src/test/scala/exercises/stdlib/LiteralStringsSpec.scala b/src/test/scala/stdlib/LiteralStringsSpec.scala similarity index 95% rename from src/test/scala/exercises/stdlib/LiteralStringsSpec.scala rename to src/test/scala/stdlib/LiteralStringsSpec.scala index 6fb74bb8..20569317 100644 --- a/src/test/scala/exercises/stdlib/LiteralStringsSpec.scala +++ b/src/test/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/src/test/scala/exercises/stdlib/MapSpec.scala b/src/test/scala/stdlib/MapsSpec.scala similarity index 97% rename from src/test/scala/exercises/stdlib/MapSpec.scala rename to src/test/scala/stdlib/MapsSpec.scala index 268e0d74..12655872 100644 --- a/src/test/scala/exercises/stdlib/MapSpec.scala +++ b/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` = { diff --git a/src/test/scala/exercises/stdlib/NamedAndDefaultArgumentsSpec.scala b/src/test/scala/stdlib/NamedAndDefaultArgumentsSpec.scala similarity index 92% rename from src/test/scala/exercises/stdlib/NamedAndDefaultArgumentsSpec.scala rename to src/test/scala/stdlib/NamedAndDefaultArgumentsSpec.scala index e0b1ffb4..90180e4d 100644 --- a/src/test/scala/exercises/stdlib/NamedAndDefaultArgumentsSpec.scala +++ b/src/test/scala/stdlib/NamedAndDefaultArgumentsSpec.scala @@ -1,14 +1,12 @@ -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 shapeless.HNil -import org.scalacheck.Shapeless._ - -class NamedandDefaultArgumentsSpec extends Spec with Checkers { +class NamedAndDefaultArgumentsSpec extends Spec with Checkers { val Arguments = NamedandDefaultArguments def `class without parameters` = { diff --git a/src/test/scala/exercises/stdlib/ObjectsSpec.scala b/src/test/scala/stdlib/ObjectsSpec.scala similarity index 95% rename from src/test/scala/exercises/stdlib/ObjectsSpec.scala rename to src/test/scala/stdlib/ObjectsSpec.scala index 17f020f0..271fb39f 100644 --- a/src/test/scala/exercises/stdlib/ObjectsSpec.scala +++ b/src/test/scala/stdlib/ObjectsSpec.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 ObjectsSpec extends Spec with Checkers { def `singleton` = { diff --git a/src/test/scala/exercises/stdlib/OptionsSpec.scala b/src/test/scala/stdlib/OptionsSpec.scala similarity index 96% rename from src/test/scala/exercises/stdlib/OptionsSpec.scala rename to src/test/scala/stdlib/OptionsSpec.scala index af9bbb54..5ae51a5e 100644 --- a/src/test/scala/exercises/stdlib/OptionsSpec.scala +++ b/src/test/scala/stdlib/OptionsSpec.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 OptionsSpec extends Spec with Checkers { def `none and some` = { diff --git a/src/test/scala/exercises/stdlib/ParentClassesSpec.scala b/src/test/scala/stdlib/ParentClassesSpec.scala similarity index 93% rename from src/test/scala/exercises/stdlib/ParentClassesSpec.scala rename to src/test/scala/stdlib/ParentClassesSpec.scala index 0e53056c..6098d803 100644 --- a/src/test/scala/exercises/stdlib/ParentClassesSpec.scala +++ b/src/test/scala/stdlib/ParentClassesSpec.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 ParentClassesSpec extends Spec with Checkers { def `all values are objects` = { diff --git a/src/test/scala/exercises/stdlib/PartialFunctionsSpec.scala b/src/test/scala/stdlib/PartialFunctionsSpec.scala similarity index 94% rename from src/test/scala/exercises/stdlib/PartialFunctionsSpec.scala rename to src/test/scala/stdlib/PartialFunctionsSpec.scala index 5138b5cf..2842cd08 100644 --- a/src/test/scala/exercises/stdlib/PartialFunctionsSpec.scala +++ b/src/test/scala/stdlib/PartialFunctionsSpec.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 PartialFunctionsSpec extends Spec with Checkers { def `partial functions` = { diff --git a/src/test/scala/exercises/stdlib/PartiallyAppliedFunctions.scala b/src/test/scala/stdlib/PartiallyAppliedFunctionsSpec.scala similarity index 95% rename from src/test/scala/exercises/stdlib/PartiallyAppliedFunctions.scala rename to src/test/scala/stdlib/PartiallyAppliedFunctionsSpec.scala index e991e0aa..ee6c290f 100644 --- a/src/test/scala/exercises/stdlib/PartiallyAppliedFunctions.scala +++ b/src/test/scala/stdlib/PartiallyAppliedFunctionsSpec.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 PartiallyAppliedFunctionsSpec extends Spec with Checkers { def `partially applied functions` = { diff --git a/src/test/scala/exercises/stdlib/PatternMatchingSpec.scala b/src/test/scala/stdlib/PatternMatchingSpec.scala similarity index 98% rename from src/test/scala/exercises/stdlib/PatternMatchingSpec.scala rename to src/test/scala/stdlib/PatternMatchingSpec.scala index 85c79f22..45f80431 100644 --- a/src/test/scala/exercises/stdlib/PatternMatchingSpec.scala +++ b/src/test/scala/stdlib/PatternMatchingSpec.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 PatternMatchingSpec extends Spec with Checkers { def `pattern matching` = { diff --git a/src/test/scala/exercises/stdlib/RangesSpec.scala b/src/test/scala/stdlib/RangesSpec.scala similarity index 96% rename from src/test/scala/exercises/stdlib/RangesSpec.scala rename to src/test/scala/stdlib/RangesSpec.scala index 138188d0..7977c616 100644 --- a/src/test/scala/exercises/stdlib/RangesSpec.scala +++ b/src/test/scala/stdlib/RangesSpec.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 RangesSpec extends Spec with Checkers { def `upper bounds are not inclusive` = { diff --git a/src/test/scala/exercises/stdlib/RepeatedParametersSpec.scala b/src/test/scala/stdlib/RepeatedParametersSpec.scala similarity index 95% rename from src/test/scala/exercises/stdlib/RepeatedParametersSpec.scala rename to src/test/scala/stdlib/RepeatedParametersSpec.scala index bd1b6178..9d00beba 100644 --- a/src/test/scala/exercises/stdlib/RepeatedParametersSpec.scala +++ b/src/test/scala/stdlib/RepeatedParametersSpec.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 RepeatedParametersSpec extends Spec with Checkers { def `multiple last parameters` = { diff --git a/src/test/scala/exercises/stdlib/SequencesAndArraysSpec.scala b/src/test/scala/stdlib/SequencesAndArraysSpec.scala similarity index 93% rename from src/test/scala/exercises/stdlib/SequencesAndArraysSpec.scala rename to src/test/scala/stdlib/SequencesAndArraysSpec.scala index 1dac3d85..4832aa4f 100644 --- a/src/test/scala/exercises/stdlib/SequencesAndArraysSpec.scala +++ b/src/test/scala/stdlib/SequencesAndArraysSpec.scala @@ -1,14 +1,12 @@ -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 shapeless.HNil -import org.scalacheck.Shapeless._ - -class SequencesandArraysSpec extends Spec with Checkers { +class SequencesAndArraysSpec extends Spec with Checkers { def `list to array` = { check( Test.testSuccess( diff --git a/src/test/scala/exercises/stdlib/SetsSpec.scala b/src/test/scala/stdlib/SetsSpec.scala similarity index 98% rename from src/test/scala/exercises/stdlib/SetsSpec.scala rename to src/test/scala/stdlib/SetsSpec.scala index 99c042cf..1b27e653 100644 --- a/src/test/scala/exercises/stdlib/SetsSpec.scala +++ b/src/test/scala/stdlib/SetsSpec.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 SetsSpec extends Spec with Checkers { def `have no duplicates` = { diff --git a/src/test/scala/exercises/stdlib/TraitsSpec.scala b/src/test/scala/stdlib/TraitsSpec.scala similarity index 94% rename from src/test/scala/exercises/stdlib/TraitsSpec.scala rename to src/test/scala/stdlib/TraitsSpec.scala index 6d4a1345..fe1c22a3 100644 --- a/src/test/scala/exercises/stdlib/TraitsSpec.scala +++ b/src/test/scala/stdlib/TraitsSpec.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 TraitsSpec extends Spec with Checkers { def `are similar to interfaces` = { diff --git a/src/test/scala/exercises/stdlib/TraversablesSpec.scala b/src/test/scala/stdlib/TraversablesSpec.scala similarity index 99% rename from src/test/scala/exercises/stdlib/TraversablesSpec.scala rename to src/test/scala/stdlib/TraversablesSpec.scala index 26c118f8..f87149c6 100644 --- a/src/test/scala/exercises/stdlib/TraversablesSpec.scala +++ b/src/test/scala/stdlib/TraversablesSpec.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 TraversablesSpec extends Spec with Checkers { def `are at the top of collection hierarchy` = { diff --git a/src/test/scala/exercises/stdlib/TuplesSpec.scala b/src/test/scala/stdlib/TuplesSpec.scala similarity index 94% rename from src/test/scala/exercises/stdlib/TuplesSpec.scala rename to src/test/scala/stdlib/TuplesSpec.scala index fa3eed28..692c9b5d 100644 --- a/src/test/scala/exercises/stdlib/TuplesSpec.scala +++ b/src/test/scala/stdlib/TuplesSpec.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 TuplesSpec extends Spec with Checkers { def `are indexed` = { diff --git a/src/test/scala/exercises/stdlib/TypeSignaturesSpec.scala b/src/test/scala/stdlib/TypeSignaturesSpec.scala similarity index 95% rename from src/test/scala/exercises/stdlib/TypeSignaturesSpec.scala rename to src/test/scala/stdlib/TypeSignaturesSpec.scala index 221c4213..87af0269 100644 --- a/src/test/scala/exercises/stdlib/TypeSignaturesSpec.scala +++ b/src/test/scala/stdlib/TypeSignaturesSpec.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 TypeSignaturesSpec extends Spec with Checkers { def `type signatures` = { diff --git a/src/test/scala/exercises/stdlib/TypeVarianceSpec.scala b/src/test/scala/stdlib/TypeVarianceSpec.scala similarity index 96% rename from src/test/scala/exercises/stdlib/TypeVarianceSpec.scala rename to src/test/scala/stdlib/TypeVarianceSpec.scala index 51e59701..9f1d7197 100644 --- a/src/test/scala/exercises/stdlib/TypeVarianceSpec.scala +++ b/src/test/scala/stdlib/TypeVarianceSpec.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 TypeVarianceSpec extends Spec with Checkers { def `type variance` = { diff --git a/src/test/scala/exercises/stdlib/UniformAccessPrincipleSpec.scala b/src/test/scala/stdlib/UniformAccessPrincipleSpec.scala similarity index 89% rename from src/test/scala/exercises/stdlib/UniformAccessPrincipleSpec.scala rename to src/test/scala/stdlib/UniformAccessPrincipleSpec.scala index 77e1b8cf..e4346a15 100644 --- a/src/test/scala/exercises/stdlib/UniformAccessPrincipleSpec.scala +++ b/src/test/scala/stdlib/UniformAccessPrincipleSpec.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 UniformAccessPrincipleSpec extends Spec with Checkers { def `uniform access principle` = {