From dbc606f85486e48f57b626af51e64aabe7e1eea1 Mon Sep 17 00:00:00 2001 From: Juan Pedro Moreno Date: Mon, 11 Jul 2016 18:58:11 +0200 Subject: [PATCH 1/2] Removes Test.scala and updates references --- build.sbt | 2 +- src/test/scala/exercises/Test.scala | 57 ------------------- .../scala/exercises/stdlib/AssertsSpec.scala | 1 + .../stdlib/ByNameParameterSpec.scala | 1 + .../exercises/stdlib/CaseClassesSpec.scala | 1 + .../scala/exercises/stdlib/ClassesSpec.scala | 1 + .../exercises/stdlib/EmptyValuesSpec.scala | 1 + .../exercises/stdlib/ExtractorsSpec.scala | 1 + ...onsSpec.scala => ForExpressionsSpec.scala} | 1 + .../exercises/stdlib/FormattingSpec.scala | 1 + .../stdlib/HigherOrderFunctionsSpec.scala | 1 + .../exercises/stdlib/ImplicitsSpec.scala | 1 + .../InfixPrefixAndPostfixOperatorsSpec.scala | 3 +- .../exercises/stdlib/InfixTypesSpec.scala | 1 + .../exercises/stdlib/IterablesSpec.scala | 1 + .../scala/exercises/stdlib/ListsSpec.scala | 1 + .../stdlib/LiteralBooleansSpec.scala | 1 + .../exercises/stdlib/LiteralNumbersSpec.scala | 1 + .../exercises/stdlib/LiteralStringsSpec.scala | 1 + .../stdlib/{MapSpec.scala => MapsSpec.scala} | 5 +- .../stdlib/NamedAndDefaultArgumentsSpec.scala | 7 +-- .../scala/exercises/stdlib/ObjectsSpec.scala | 1 + .../scala/exercises/stdlib/OptionsSpec.scala | 1 + .../exercises/stdlib/ParentClassesSpec.scala | 1 + .../stdlib/PartialFunctionsSpec.scala | 1 + ...la => PartiallyAppliedFunctionsSpec.scala} | 1 + .../stdlib/PatternMatchingSpec.scala | 1 + .../scala/exercises/stdlib/RangesSpec.scala | 1 + .../stdlib/RepeatedParametersSpec.scala | 1 + .../stdlib/SequencesAndArraysSpec.scala | 7 +-- .../scala/exercises/stdlib/SetsSpec.scala | 1 + .../scala/exercises/stdlib/TraitsSpec.scala | 1 + .../exercises/stdlib/TraversablesSpec.scala | 1 + .../scala/exercises/stdlib/TuplesSpec.scala | 1 + .../exercises/stdlib/TypeSignaturesSpec.scala | 1 + .../exercises/stdlib/TypeVarianceSpec.scala | 1 + .../stdlib/UniformAccessPrincipleSpec.scala | 1 + 37 files changed, 42 insertions(+), 70 deletions(-) delete mode 100644 src/test/scala/exercises/Test.scala rename src/test/scala/exercises/stdlib/{ForExpresssionsSpec.scala => ForExpressionsSpec.scala} (94%) rename src/test/scala/exercises/stdlib/{MapSpec.scala => MapsSpec.scala} (97%) rename src/test/scala/exercises/stdlib/{PartiallyAppliedFunctions.scala => PartiallyAppliedFunctionsSpec.scala} (97%) 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/AssertsSpec.scala b/src/test/scala/exercises/stdlib/AssertsSpec.scala index 3d8de499..b1793ff8 100644 --- a/src/test/scala/exercises/stdlib/AssertsSpec.scala +++ b/src/test/scala/exercises/stdlib/AssertsSpec.scala @@ -5,6 +5,7 @@ import shapeless.HNil import org.scalatest.Spec import org.scalatest.prop.Checkers +import org.scalaexercises.Test import org.scalacheck.Shapeless._ diff --git a/src/test/scala/exercises/stdlib/ByNameParameterSpec.scala b/src/test/scala/exercises/stdlib/ByNameParameterSpec.scala index f07be328..6244bfe0 100644 --- a/src/test/scala/exercises/stdlib/ByNameParameterSpec.scala +++ b/src/test/scala/exercises/stdlib/ByNameParameterSpec.scala @@ -5,6 +5,7 @@ import shapeless.HNil import org.scalatest.Spec import org.scalatest.prop.Checkers +import org.scalaexercises.Test import org.scalacheck.Shapeless._ diff --git a/src/test/scala/exercises/stdlib/CaseClassesSpec.scala b/src/test/scala/exercises/stdlib/CaseClassesSpec.scala index c1b0d7ec..3ad3b436 100644 --- a/src/test/scala/exercises/stdlib/CaseClassesSpec.scala +++ b/src/test/scala/exercises/stdlib/CaseClassesSpec.scala @@ -5,6 +5,7 @@ import shapeless.HNil import org.scalatest.Spec import org.scalatest.prop.Checkers +import org.scalaexercises.Test import org.scalacheck.Shapeless._ diff --git a/src/test/scala/exercises/stdlib/ClassesSpec.scala b/src/test/scala/exercises/stdlib/ClassesSpec.scala index 358f6d99..4ceab66a 100644 --- a/src/test/scala/exercises/stdlib/ClassesSpec.scala +++ b/src/test/scala/exercises/stdlib/ClassesSpec.scala @@ -5,6 +5,7 @@ import shapeless.HNil import org.scalatest.Spec import org.scalatest.prop.Checkers +import org.scalaexercises.Test import org.scalacheck.Shapeless._ diff --git a/src/test/scala/exercises/stdlib/EmptyValuesSpec.scala b/src/test/scala/exercises/stdlib/EmptyValuesSpec.scala index d27bb005..8749eec1 100644 --- a/src/test/scala/exercises/stdlib/EmptyValuesSpec.scala +++ b/src/test/scala/exercises/stdlib/EmptyValuesSpec.scala @@ -5,6 +5,7 @@ import shapeless.HNil import org.scalatest.Spec import org.scalatest.prop.Checkers +import org.scalaexercises.Test import org.scalacheck.Shapeless._ diff --git a/src/test/scala/exercises/stdlib/ExtractorsSpec.scala b/src/test/scala/exercises/stdlib/ExtractorsSpec.scala index b35b8abb..aa8bc8ab 100644 --- a/src/test/scala/exercises/stdlib/ExtractorsSpec.scala +++ b/src/test/scala/exercises/stdlib/ExtractorsSpec.scala @@ -5,6 +5,7 @@ import shapeless.HNil import org.scalatest.Spec import org.scalatest.prop.Checkers +import org.scalaexercises.Test import org.scalacheck.Shapeless._ diff --git a/src/test/scala/exercises/stdlib/ForExpresssionsSpec.scala b/src/test/scala/exercises/stdlib/ForExpressionsSpec.scala similarity index 94% rename from src/test/scala/exercises/stdlib/ForExpresssionsSpec.scala rename to src/test/scala/exercises/stdlib/ForExpressionsSpec.scala index 566ab0be..94035763 100644 --- a/src/test/scala/exercises/stdlib/ForExpresssionsSpec.scala +++ b/src/test/scala/exercises/stdlib/ForExpressionsSpec.scala @@ -5,6 +5,7 @@ import shapeless.HNil import org.scalatest.Spec import org.scalatest.prop.Checkers +import org.scalaexercises.Test import org.scalacheck.Shapeless._ diff --git a/src/test/scala/exercises/stdlib/FormattingSpec.scala b/src/test/scala/exercises/stdlib/FormattingSpec.scala index 0d41a5c9..0ccdd8fa 100644 --- a/src/test/scala/exercises/stdlib/FormattingSpec.scala +++ b/src/test/scala/exercises/stdlib/FormattingSpec.scala @@ -5,6 +5,7 @@ import shapeless.HNil import org.scalatest.Spec import org.scalatest.prop.Checkers +import org.scalaexercises.Test import org.scalacheck.Shapeless._ diff --git a/src/test/scala/exercises/stdlib/HigherOrderFunctionsSpec.scala b/src/test/scala/exercises/stdlib/HigherOrderFunctionsSpec.scala index 89b8fd30..3faa349c 100644 --- a/src/test/scala/exercises/stdlib/HigherOrderFunctionsSpec.scala +++ b/src/test/scala/exercises/stdlib/HigherOrderFunctionsSpec.scala @@ -5,6 +5,7 @@ import shapeless.HNil import org.scalatest.Spec import org.scalatest.prop.Checkers +import org.scalaexercises.Test import org.scalacheck.Shapeless._ diff --git a/src/test/scala/exercises/stdlib/ImplicitsSpec.scala b/src/test/scala/exercises/stdlib/ImplicitsSpec.scala index d863ba93..fb801ce2 100644 --- a/src/test/scala/exercises/stdlib/ImplicitsSpec.scala +++ b/src/test/scala/exercises/stdlib/ImplicitsSpec.scala @@ -5,6 +5,7 @@ import shapeless.HNil import org.scalatest.Spec import org.scalatest.prop.Checkers +import org.scalaexercises.Test import org.scalacheck.Shapeless._ diff --git a/src/test/scala/exercises/stdlib/InfixPrefixAndPostfixOperatorsSpec.scala b/src/test/scala/exercises/stdlib/InfixPrefixAndPostfixOperatorsSpec.scala index a55ef667..0588028a 100644 --- a/src/test/scala/exercises/stdlib/InfixPrefixAndPostfixOperatorsSpec.scala +++ b/src/test/scala/exercises/stdlib/InfixPrefixAndPostfixOperatorsSpec.scala @@ -5,11 +5,12 @@ import shapeless.HNil import org.scalatest.Spec import org.scalatest.prop.Checkers +import org.scalaexercises.Test // 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/exercises/stdlib/InfixTypesSpec.scala index ecdee217..1931f084 100644 --- a/src/test/scala/exercises/stdlib/InfixTypesSpec.scala +++ b/src/test/scala/exercises/stdlib/InfixTypesSpec.scala @@ -5,6 +5,7 @@ import shapeless.HNil import org.scalatest.Spec import org.scalatest.prop.Checkers +import org.scalaexercises.Test import org.scalacheck.Shapeless._ diff --git a/src/test/scala/exercises/stdlib/IterablesSpec.scala b/src/test/scala/exercises/stdlib/IterablesSpec.scala index 57290e5f..88003b8e 100644 --- a/src/test/scala/exercises/stdlib/IterablesSpec.scala +++ b/src/test/scala/exercises/stdlib/IterablesSpec.scala @@ -5,6 +5,7 @@ import shapeless.HNil import org.scalatest.Spec import org.scalatest.prop.Checkers +import org.scalaexercises.Test import org.scalacheck.Shapeless._ diff --git a/src/test/scala/exercises/stdlib/ListsSpec.scala b/src/test/scala/exercises/stdlib/ListsSpec.scala index fa527a2f..6429429e 100644 --- a/src/test/scala/exercises/stdlib/ListsSpec.scala +++ b/src/test/scala/exercises/stdlib/ListsSpec.scala @@ -5,6 +5,7 @@ import shapeless.HNil import org.scalatest.Spec import org.scalatest.prop.Checkers +import org.scalaexercises.Test import org.scalacheck.Shapeless._ diff --git a/src/test/scala/exercises/stdlib/LiteralBooleansSpec.scala b/src/test/scala/exercises/stdlib/LiteralBooleansSpec.scala index 05bd32ed..78df8821 100644 --- a/src/test/scala/exercises/stdlib/LiteralBooleansSpec.scala +++ b/src/test/scala/exercises/stdlib/LiteralBooleansSpec.scala @@ -5,6 +5,7 @@ import shapeless.HNil import org.scalatest.Spec import org.scalatest.prop.Checkers +import org.scalaexercises.Test import org.scalacheck.Shapeless._ diff --git a/src/test/scala/exercises/stdlib/LiteralNumbersSpec.scala b/src/test/scala/exercises/stdlib/LiteralNumbersSpec.scala index b1a3a444..d1941e75 100644 --- a/src/test/scala/exercises/stdlib/LiteralNumbersSpec.scala +++ b/src/test/scala/exercises/stdlib/LiteralNumbersSpec.scala @@ -5,6 +5,7 @@ import shapeless.HNil import org.scalatest.Spec import org.scalatest.prop.Checkers +import org.scalaexercises.Test import org.scalacheck.Shapeless._ diff --git a/src/test/scala/exercises/stdlib/LiteralStringsSpec.scala b/src/test/scala/exercises/stdlib/LiteralStringsSpec.scala index 6fb74bb8..38f86965 100644 --- a/src/test/scala/exercises/stdlib/LiteralStringsSpec.scala +++ b/src/test/scala/exercises/stdlib/LiteralStringsSpec.scala @@ -5,6 +5,7 @@ import shapeless.HNil import org.scalatest.Spec import org.scalatest.prop.Checkers +import org.scalaexercises.Test import org.scalacheck.Shapeless._ diff --git a/src/test/scala/exercises/stdlib/MapSpec.scala b/src/test/scala/exercises/stdlib/MapsSpec.scala similarity index 97% rename from src/test/scala/exercises/stdlib/MapSpec.scala rename to src/test/scala/exercises/stdlib/MapsSpec.scala index 268e0d74..f19f426e 100644 --- a/src/test/scala/exercises/stdlib/MapSpec.scala +++ b/src/test/scala/exercises/stdlib/MapsSpec.scala @@ -1,11 +1,10 @@ package exercises -import stdlib._ +import stdlib.{_} import shapeless.HNil - import org.scalatest.Spec import org.scalatest.prop.Checkers - +import org.scalaexercises.Test import org.scalacheck.Shapeless._ class MapsSpec extends Spec with Checkers { diff --git a/src/test/scala/exercises/stdlib/NamedAndDefaultArgumentsSpec.scala b/src/test/scala/exercises/stdlib/NamedAndDefaultArgumentsSpec.scala index e0b1ffb4..326902b3 100644 --- a/src/test/scala/exercises/stdlib/NamedAndDefaultArgumentsSpec.scala +++ b/src/test/scala/exercises/stdlib/NamedAndDefaultArgumentsSpec.scala @@ -1,14 +1,13 @@ package exercises -import stdlib._ +import stdlib.{NamedandDefaultArguments, _} import shapeless.HNil - import org.scalatest.Spec import org.scalatest.prop.Checkers - +import org.scalaexercises.Test 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/exercises/stdlib/ObjectsSpec.scala index 17f020f0..0fb07b1f 100644 --- a/src/test/scala/exercises/stdlib/ObjectsSpec.scala +++ b/src/test/scala/exercises/stdlib/ObjectsSpec.scala @@ -5,6 +5,7 @@ import shapeless.HNil import org.scalatest.Spec import org.scalatest.prop.Checkers +import org.scalaexercises.Test import org.scalacheck.Shapeless._ diff --git a/src/test/scala/exercises/stdlib/OptionsSpec.scala b/src/test/scala/exercises/stdlib/OptionsSpec.scala index af9bbb54..63342f67 100644 --- a/src/test/scala/exercises/stdlib/OptionsSpec.scala +++ b/src/test/scala/exercises/stdlib/OptionsSpec.scala @@ -5,6 +5,7 @@ import shapeless.HNil import org.scalatest.Spec import org.scalatest.prop.Checkers +import org.scalaexercises.Test import org.scalacheck.Shapeless._ diff --git a/src/test/scala/exercises/stdlib/ParentClassesSpec.scala b/src/test/scala/exercises/stdlib/ParentClassesSpec.scala index 0e53056c..f4395fb9 100644 --- a/src/test/scala/exercises/stdlib/ParentClassesSpec.scala +++ b/src/test/scala/exercises/stdlib/ParentClassesSpec.scala @@ -5,6 +5,7 @@ import shapeless.HNil import org.scalatest.Spec import org.scalatest.prop.Checkers +import org.scalaexercises.Test import org.scalacheck.Shapeless._ diff --git a/src/test/scala/exercises/stdlib/PartialFunctionsSpec.scala b/src/test/scala/exercises/stdlib/PartialFunctionsSpec.scala index 5138b5cf..2455ebc5 100644 --- a/src/test/scala/exercises/stdlib/PartialFunctionsSpec.scala +++ b/src/test/scala/exercises/stdlib/PartialFunctionsSpec.scala @@ -5,6 +5,7 @@ import shapeless.HNil import org.scalatest.Spec import org.scalatest.prop.Checkers +import org.scalaexercises.Test import org.scalacheck.Shapeless._ diff --git a/src/test/scala/exercises/stdlib/PartiallyAppliedFunctions.scala b/src/test/scala/exercises/stdlib/PartiallyAppliedFunctionsSpec.scala similarity index 97% rename from src/test/scala/exercises/stdlib/PartiallyAppliedFunctions.scala rename to src/test/scala/exercises/stdlib/PartiallyAppliedFunctionsSpec.scala index e991e0aa..e1cc56d4 100644 --- a/src/test/scala/exercises/stdlib/PartiallyAppliedFunctions.scala +++ b/src/test/scala/exercises/stdlib/PartiallyAppliedFunctionsSpec.scala @@ -5,6 +5,7 @@ import shapeless.HNil import org.scalatest.Spec import org.scalatest.prop.Checkers +import org.scalaexercises.Test import org.scalacheck.Shapeless._ diff --git a/src/test/scala/exercises/stdlib/PatternMatchingSpec.scala b/src/test/scala/exercises/stdlib/PatternMatchingSpec.scala index 85c79f22..4004afb1 100644 --- a/src/test/scala/exercises/stdlib/PatternMatchingSpec.scala +++ b/src/test/scala/exercises/stdlib/PatternMatchingSpec.scala @@ -5,6 +5,7 @@ import shapeless.HNil import org.scalatest.Spec import org.scalatest.prop.Checkers +import org.scalaexercises.Test import org.scalacheck.Shapeless._ diff --git a/src/test/scala/exercises/stdlib/RangesSpec.scala b/src/test/scala/exercises/stdlib/RangesSpec.scala index 138188d0..aee698d6 100644 --- a/src/test/scala/exercises/stdlib/RangesSpec.scala +++ b/src/test/scala/exercises/stdlib/RangesSpec.scala @@ -5,6 +5,7 @@ import shapeless.HNil import org.scalatest.Spec import org.scalatest.prop.Checkers +import org.scalaexercises.Test import org.scalacheck.Shapeless._ diff --git a/src/test/scala/exercises/stdlib/RepeatedParametersSpec.scala b/src/test/scala/exercises/stdlib/RepeatedParametersSpec.scala index bd1b6178..9cb10cfe 100644 --- a/src/test/scala/exercises/stdlib/RepeatedParametersSpec.scala +++ b/src/test/scala/exercises/stdlib/RepeatedParametersSpec.scala @@ -5,6 +5,7 @@ import shapeless.HNil import org.scalatest.Spec import org.scalatest.prop.Checkers +import org.scalaexercises.Test import org.scalacheck.Shapeless._ diff --git a/src/test/scala/exercises/stdlib/SequencesAndArraysSpec.scala b/src/test/scala/exercises/stdlib/SequencesAndArraysSpec.scala index 1dac3d85..3335af2c 100644 --- a/src/test/scala/exercises/stdlib/SequencesAndArraysSpec.scala +++ b/src/test/scala/exercises/stdlib/SequencesAndArraysSpec.scala @@ -1,14 +1,13 @@ package exercises -import stdlib._ +import stdlib.{SequencesandArrays, _} import shapeless.HNil - import org.scalatest.Spec import org.scalatest.prop.Checkers - +import org.scalaexercises.Test 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/exercises/stdlib/SetsSpec.scala index 99c042cf..42987198 100644 --- a/src/test/scala/exercises/stdlib/SetsSpec.scala +++ b/src/test/scala/exercises/stdlib/SetsSpec.scala @@ -5,6 +5,7 @@ import shapeless.HNil import org.scalatest.Spec import org.scalatest.prop.Checkers +import org.scalaexercises.Test import org.scalacheck.Shapeless._ diff --git a/src/test/scala/exercises/stdlib/TraitsSpec.scala b/src/test/scala/exercises/stdlib/TraitsSpec.scala index 6d4a1345..044ae8bd 100644 --- a/src/test/scala/exercises/stdlib/TraitsSpec.scala +++ b/src/test/scala/exercises/stdlib/TraitsSpec.scala @@ -5,6 +5,7 @@ import shapeless.HNil import org.scalatest.Spec import org.scalatest.prop.Checkers +import org.scalaexercises.Test import org.scalacheck.Shapeless._ diff --git a/src/test/scala/exercises/stdlib/TraversablesSpec.scala b/src/test/scala/exercises/stdlib/TraversablesSpec.scala index 26c118f8..01cbf3ff 100644 --- a/src/test/scala/exercises/stdlib/TraversablesSpec.scala +++ b/src/test/scala/exercises/stdlib/TraversablesSpec.scala @@ -5,6 +5,7 @@ import shapeless.HNil import org.scalatest.Spec import org.scalatest.prop.Checkers +import org.scalaexercises.Test import org.scalacheck.Shapeless._ diff --git a/src/test/scala/exercises/stdlib/TuplesSpec.scala b/src/test/scala/exercises/stdlib/TuplesSpec.scala index fa3eed28..f9076765 100644 --- a/src/test/scala/exercises/stdlib/TuplesSpec.scala +++ b/src/test/scala/exercises/stdlib/TuplesSpec.scala @@ -5,6 +5,7 @@ import shapeless.HNil import org.scalatest.Spec import org.scalatest.prop.Checkers +import org.scalaexercises.Test import org.scalacheck.Shapeless._ diff --git a/src/test/scala/exercises/stdlib/TypeSignaturesSpec.scala b/src/test/scala/exercises/stdlib/TypeSignaturesSpec.scala index 221c4213..9acb7e9d 100644 --- a/src/test/scala/exercises/stdlib/TypeSignaturesSpec.scala +++ b/src/test/scala/exercises/stdlib/TypeSignaturesSpec.scala @@ -5,6 +5,7 @@ import shapeless.HNil import org.scalatest.Spec import org.scalatest.prop.Checkers +import org.scalaexercises.Test import org.scalacheck.Shapeless._ diff --git a/src/test/scala/exercises/stdlib/TypeVarianceSpec.scala b/src/test/scala/exercises/stdlib/TypeVarianceSpec.scala index 51e59701..9fd40d89 100644 --- a/src/test/scala/exercises/stdlib/TypeVarianceSpec.scala +++ b/src/test/scala/exercises/stdlib/TypeVarianceSpec.scala @@ -5,6 +5,7 @@ import shapeless.HNil import org.scalatest.Spec import org.scalatest.prop.Checkers +import org.scalaexercises.Test import org.scalacheck.Shapeless._ diff --git a/src/test/scala/exercises/stdlib/UniformAccessPrincipleSpec.scala b/src/test/scala/exercises/stdlib/UniformAccessPrincipleSpec.scala index 77e1b8cf..b938a823 100644 --- a/src/test/scala/exercises/stdlib/UniformAccessPrincipleSpec.scala +++ b/src/test/scala/exercises/stdlib/UniformAccessPrincipleSpec.scala @@ -5,6 +5,7 @@ import shapeless.HNil import org.scalatest.Spec import org.scalatest.prop.Checkers +import org.scalaexercises.Test import org.scalacheck.Shapeless._ From d64cdca0e6d0facde119de06494418aff36434dc Mon Sep 17 00:00:00 2001 From: Juan Pedro Moreno Date: Mon, 11 Jul 2016 19:11:44 +0200 Subject: [PATCH 2/2] Updates the test package --- .../scala/exercises/stdlib/EnumerationsSpec.scala | 10 ---------- .../scala/{exercises => }/stdlib/AssertsSpec.scala | 11 ++++------- .../{exercises => }/stdlib/ByNameParameterSpec.scala | 11 ++++------- .../{exercises => }/stdlib/CaseClassesSpec.scala | 11 ++++------- .../scala/{exercises => }/stdlib/ClassesSpec.scala | 11 ++++------- .../{exercises => }/stdlib/EmptyValuesSpec.scala | 11 ++++------- src/test/scala/stdlib/EnumerationsSpec.scala | 2 ++ .../scala/{exercises => }/stdlib/ExtractorsSpec.scala | 11 ++++------- .../{exercises => }/stdlib/ForExpressionsSpec.scala | 11 ++++------- .../scala/{exercises => }/stdlib/FormattingSpec.scala | 11 ++++------- .../stdlib/HigherOrderFunctionsSpec.scala | 11 ++++------- .../scala/{exercises => }/stdlib/ImplicitsSpec.scala | 11 ++++------- .../stdlib/InfixPrefixAndPostfixOperatorsSpec.scala | 8 +++----- .../scala/{exercises => }/stdlib/InfixTypesSpec.scala | 11 ++++------- .../scala/{exercises => }/stdlib/IterablesSpec.scala | 11 ++++------- src/test/scala/{exercises => }/stdlib/ListsSpec.scala | 11 ++++------- .../{exercises => }/stdlib/LiteralBooleansSpec.scala | 11 ++++------- .../{exercises => }/stdlib/LiteralNumbersSpec.scala | 11 ++++------- .../{exercises => }/stdlib/LiteralStringsSpec.scala | 11 ++++------- src/test/scala/{exercises => }/stdlib/MapsSpec.scala | 9 ++++----- .../stdlib/NamedAndDefaultArgumentsSpec.scala | 9 ++++----- .../scala/{exercises => }/stdlib/ObjectsSpec.scala | 11 ++++------- .../scala/{exercises => }/stdlib/OptionsSpec.scala | 11 ++++------- .../{exercises => }/stdlib/ParentClassesSpec.scala | 11 ++++------- .../{exercises => }/stdlib/PartialFunctionsSpec.scala | 11 ++++------- .../stdlib/PartiallyAppliedFunctionsSpec.scala | 11 ++++------- .../{exercises => }/stdlib/PatternMatchingSpec.scala | 11 ++++------- .../scala/{exercises => }/stdlib/RangesSpec.scala | 11 ++++------- .../stdlib/RepeatedParametersSpec.scala | 11 ++++------- .../stdlib/SequencesAndArraysSpec.scala | 9 ++++----- src/test/scala/{exercises => }/stdlib/SetsSpec.scala | 11 ++++------- .../scala/{exercises => }/stdlib/TraitsSpec.scala | 11 ++++------- .../{exercises => }/stdlib/TraversablesSpec.scala | 11 ++++------- .../scala/{exercises => }/stdlib/TuplesSpec.scala | 11 ++++------- .../{exercises => }/stdlib/TypeSignaturesSpec.scala | 11 ++++------- .../{exercises => }/stdlib/TypeVarianceSpec.scala | 11 ++++------- .../stdlib/UniformAccessPrincipleSpec.scala | 11 ++++------- 37 files changed, 141 insertions(+), 247 deletions(-) delete mode 100644 src/test/scala/exercises/stdlib/EnumerationsSpec.scala rename src/test/scala/{exercises => }/stdlib/AssertsSpec.scala (93%) rename src/test/scala/{exercises => }/stdlib/ByNameParameterSpec.scala (95%) rename src/test/scala/{exercises => }/stdlib/CaseClassesSpec.scala (98%) rename src/test/scala/{exercises => }/stdlib/ClassesSpec.scala (91%) rename src/test/scala/{exercises => }/stdlib/EmptyValuesSpec.scala (98%) create mode 100644 src/test/scala/stdlib/EnumerationsSpec.scala rename src/test/scala/{exercises => }/stdlib/ExtractorsSpec.scala (97%) rename src/test/scala/{exercises => }/stdlib/ForExpressionsSpec.scala (94%) rename src/test/scala/{exercises => }/stdlib/FormattingSpec.scala (96%) rename src/test/scala/{exercises => }/stdlib/HigherOrderFunctionsSpec.scala (98%) rename src/test/scala/{exercises => }/stdlib/ImplicitsSpec.scala (97%) rename src/test/scala/{exercises => }/stdlib/InfixPrefixAndPostfixOperatorsSpec.scala (97%) rename src/test/scala/{exercises => }/stdlib/InfixTypesSpec.scala (93%) rename src/test/scala/{exercises => }/stdlib/IterablesSpec.scala (98%) rename src/test/scala/{exercises => }/stdlib/ListsSpec.scala (98%) rename src/test/scala/{exercises => }/stdlib/LiteralBooleansSpec.scala (92%) rename src/test/scala/{exercises => }/stdlib/LiteralNumbersSpec.scala (95%) rename src/test/scala/{exercises => }/stdlib/LiteralStringsSpec.scala (96%) rename src/test/scala/{exercises => }/stdlib/MapsSpec.scala (98%) rename src/test/scala/{exercises => }/stdlib/NamedAndDefaultArgumentsSpec.scala (95%) rename src/test/scala/{exercises => }/stdlib/ObjectsSpec.scala (96%) rename src/test/scala/{exercises => }/stdlib/OptionsSpec.scala (97%) rename src/test/scala/{exercises => }/stdlib/ParentClassesSpec.scala (95%) rename src/test/scala/{exercises => }/stdlib/PartialFunctionsSpec.scala (96%) rename src/test/scala/{exercises => }/stdlib/PartiallyAppliedFunctionsSpec.scala (96%) rename src/test/scala/{exercises => }/stdlib/PatternMatchingSpec.scala (98%) rename src/test/scala/{exercises => }/stdlib/RangesSpec.scala (97%) rename src/test/scala/{exercises => }/stdlib/RepeatedParametersSpec.scala (96%) rename src/test/scala/{exercises => }/stdlib/SequencesAndArraysSpec.scala (96%) rename src/test/scala/{exercises => }/stdlib/SetsSpec.scala (98%) rename src/test/scala/{exercises => }/stdlib/TraitsSpec.scala (95%) rename src/test/scala/{exercises => }/stdlib/TraversablesSpec.scala (99%) rename src/test/scala/{exercises => }/stdlib/TuplesSpec.scala (95%) rename src/test/scala/{exercises => }/stdlib/TypeSignaturesSpec.scala (96%) rename src/test/scala/{exercises => }/stdlib/TypeVarianceSpec.scala (96%) rename src/test/scala/{exercises => }/stdlib/UniformAccessPrincipleSpec.scala (91%) 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 93% rename from src/test/scala/exercises/stdlib/AssertsSpec.scala rename to src/test/scala/stdlib/AssertsSpec.scala index b1793ff8..04eda2c1 100644 --- a/src/test/scala/exercises/stdlib/AssertsSpec.scala +++ b/src/test/scala/stdlib/AssertsSpec.scala @@ -1,13 +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.scalaexercises.Test - -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 95% rename from src/test/scala/exercises/stdlib/ByNameParameterSpec.scala rename to src/test/scala/stdlib/ByNameParameterSpec.scala index 6244bfe0..cb66fa1f 100644 --- a/src/test/scala/exercises/stdlib/ByNameParameterSpec.scala +++ b/src/test/scala/stdlib/ByNameParameterSpec.scala @@ -1,13 +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.scalaexercises.Test - -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 98% rename from src/test/scala/exercises/stdlib/CaseClassesSpec.scala rename to src/test/scala/stdlib/CaseClassesSpec.scala index 3ad3b436..fb98477a 100644 --- a/src/test/scala/exercises/stdlib/CaseClassesSpec.scala +++ b/src/test/scala/stdlib/CaseClassesSpec.scala @@ -1,13 +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.scalaexercises.Test - -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 91% rename from src/test/scala/exercises/stdlib/ClassesSpec.scala rename to src/test/scala/stdlib/ClassesSpec.scala index 4ceab66a..d370a211 100644 --- a/src/test/scala/exercises/stdlib/ClassesSpec.scala +++ b/src/test/scala/stdlib/ClassesSpec.scala @@ -1,13 +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.scalaexercises.Test - -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 98% rename from src/test/scala/exercises/stdlib/EmptyValuesSpec.scala rename to src/test/scala/stdlib/EmptyValuesSpec.scala index 8749eec1..c84b39b1 100644 --- a/src/test/scala/exercises/stdlib/EmptyValuesSpec.scala +++ b/src/test/scala/stdlib/EmptyValuesSpec.scala @@ -1,13 +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.scalaexercises.Test - -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 aa8bc8ab..4d3892d0 100644 --- a/src/test/scala/exercises/stdlib/ExtractorsSpec.scala +++ b/src/test/scala/stdlib/ExtractorsSpec.scala @@ -1,13 +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.scalaexercises.Test - -import org.scalacheck.Shapeless._ +import shapeless.HNil class ExtractorsSpec extends Spec with Checkers { def `extractors` = { diff --git a/src/test/scala/exercises/stdlib/ForExpressionsSpec.scala b/src/test/scala/stdlib/ForExpressionsSpec.scala similarity index 94% rename from src/test/scala/exercises/stdlib/ForExpressionsSpec.scala rename to src/test/scala/stdlib/ForExpressionsSpec.scala index 94035763..df41cf7f 100644 --- a/src/test/scala/exercises/stdlib/ForExpressionsSpec.scala +++ b/src/test/scala/stdlib/ForExpressionsSpec.scala @@ -1,13 +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.scalaexercises.Test - -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 96% rename from src/test/scala/exercises/stdlib/FormattingSpec.scala rename to src/test/scala/stdlib/FormattingSpec.scala index 0ccdd8fa..2bfbf868 100644 --- a/src/test/scala/exercises/stdlib/FormattingSpec.scala +++ b/src/test/scala/stdlib/FormattingSpec.scala @@ -1,13 +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.scalaexercises.Test - -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 98% rename from src/test/scala/exercises/stdlib/HigherOrderFunctionsSpec.scala rename to src/test/scala/stdlib/HigherOrderFunctionsSpec.scala index 3faa349c..67ac2caf 100644 --- a/src/test/scala/exercises/stdlib/HigherOrderFunctionsSpec.scala +++ b/src/test/scala/stdlib/HigherOrderFunctionsSpec.scala @@ -1,13 +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.scalaexercises.Test - -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 97% rename from src/test/scala/exercises/stdlib/ImplicitsSpec.scala rename to src/test/scala/stdlib/ImplicitsSpec.scala index fb801ce2..31066fd6 100644 --- a/src/test/scala/exercises/stdlib/ImplicitsSpec.scala +++ b/src/test/scala/stdlib/ImplicitsSpec.scala @@ -1,13 +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.scalaexercises.Test - -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 97% rename from src/test/scala/exercises/stdlib/InfixPrefixAndPostfixOperatorsSpec.scala rename to src/test/scala/stdlib/InfixPrefixAndPostfixOperatorsSpec.scala index 0588028a..579b1241 100644 --- a/src/test/scala/exercises/stdlib/InfixPrefixAndPostfixOperatorsSpec.scala +++ b/src/test/scala/stdlib/InfixPrefixAndPostfixOperatorsSpec.scala @@ -1,11 +1,9 @@ -package exercises - -import stdlib._ -import shapeless.HNil +package stdlib +import org.scalaexercises.Test import org.scalatest.Spec import org.scalatest.prop.Checkers -import org.scalaexercises.Test +import shapeless.HNil // FIXME: get rid of this if possible import org.scalacheck.Shapeless._ diff --git a/src/test/scala/exercises/stdlib/InfixTypesSpec.scala b/src/test/scala/stdlib/InfixTypesSpec.scala similarity index 93% rename from src/test/scala/exercises/stdlib/InfixTypesSpec.scala rename to src/test/scala/stdlib/InfixTypesSpec.scala index 1931f084..3e42281f 100644 --- a/src/test/scala/exercises/stdlib/InfixTypesSpec.scala +++ b/src/test/scala/stdlib/InfixTypesSpec.scala @@ -1,13 +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.scalaexercises.Test - -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 98% rename from src/test/scala/exercises/stdlib/IterablesSpec.scala rename to src/test/scala/stdlib/IterablesSpec.scala index 88003b8e..d7299a6c 100644 --- a/src/test/scala/exercises/stdlib/IterablesSpec.scala +++ b/src/test/scala/stdlib/IterablesSpec.scala @@ -1,13 +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.scalaexercises.Test - -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 6429429e..7991ae19 100644 --- a/src/test/scala/exercises/stdlib/ListsSpec.scala +++ b/src/test/scala/stdlib/ListsSpec.scala @@ -1,13 +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.scalaexercises.Test - -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 92% rename from src/test/scala/exercises/stdlib/LiteralBooleansSpec.scala rename to src/test/scala/stdlib/LiteralBooleansSpec.scala index 78df8821..af0f6368 100644 --- a/src/test/scala/exercises/stdlib/LiteralBooleansSpec.scala +++ b/src/test/scala/stdlib/LiteralBooleansSpec.scala @@ -1,13 +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.scalaexercises.Test - -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 95% rename from src/test/scala/exercises/stdlib/LiteralNumbersSpec.scala rename to src/test/scala/stdlib/LiteralNumbersSpec.scala index d1941e75..7fb5b7c7 100644 --- a/src/test/scala/exercises/stdlib/LiteralNumbersSpec.scala +++ b/src/test/scala/stdlib/LiteralNumbersSpec.scala @@ -1,13 +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.scalaexercises.Test - -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 96% rename from src/test/scala/exercises/stdlib/LiteralStringsSpec.scala rename to src/test/scala/stdlib/LiteralStringsSpec.scala index 38f86965..20569317 100644 --- a/src/test/scala/exercises/stdlib/LiteralStringsSpec.scala +++ b/src/test/scala/stdlib/LiteralStringsSpec.scala @@ -1,13 +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.scalaexercises.Test - -import org.scalacheck.Shapeless._ +import shapeless.HNil class LiteralStringsSpec extends Spec with Checkers { def `character literals` = { diff --git a/src/test/scala/exercises/stdlib/MapsSpec.scala b/src/test/scala/stdlib/MapsSpec.scala similarity index 98% rename from src/test/scala/exercises/stdlib/MapsSpec.scala rename to src/test/scala/stdlib/MapsSpec.scala index f19f426e..12655872 100644 --- a/src/test/scala/exercises/stdlib/MapsSpec.scala +++ b/src/test/scala/stdlib/MapsSpec.scala @@ -1,11 +1,10 @@ -package exercises +package stdlib -import stdlib.{_} -import shapeless.HNil +import org.scalacheck.Shapeless._ +import org.scalaexercises.Test import org.scalatest.Spec import org.scalatest.prop.Checkers -import org.scalaexercises.Test -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 95% rename from src/test/scala/exercises/stdlib/NamedAndDefaultArgumentsSpec.scala rename to src/test/scala/stdlib/NamedAndDefaultArgumentsSpec.scala index 326902b3..90180e4d 100644 --- a/src/test/scala/exercises/stdlib/NamedAndDefaultArgumentsSpec.scala +++ b/src/test/scala/stdlib/NamedAndDefaultArgumentsSpec.scala @@ -1,11 +1,10 @@ -package exercises +package stdlib -import stdlib.{NamedandDefaultArguments, _} -import shapeless.HNil +import org.scalacheck.Shapeless._ +import org.scalaexercises.Test import org.scalatest.Spec import org.scalatest.prop.Checkers -import org.scalaexercises.Test -import org.scalacheck.Shapeless._ +import shapeless.HNil class NamedAndDefaultArgumentsSpec extends Spec with Checkers { val Arguments = NamedandDefaultArguments diff --git a/src/test/scala/exercises/stdlib/ObjectsSpec.scala b/src/test/scala/stdlib/ObjectsSpec.scala similarity index 96% rename from src/test/scala/exercises/stdlib/ObjectsSpec.scala rename to src/test/scala/stdlib/ObjectsSpec.scala index 0fb07b1f..271fb39f 100644 --- a/src/test/scala/exercises/stdlib/ObjectsSpec.scala +++ b/src/test/scala/stdlib/ObjectsSpec.scala @@ -1,13 +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.scalaexercises.Test - -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 97% rename from src/test/scala/exercises/stdlib/OptionsSpec.scala rename to src/test/scala/stdlib/OptionsSpec.scala index 63342f67..5ae51a5e 100644 --- a/src/test/scala/exercises/stdlib/OptionsSpec.scala +++ b/src/test/scala/stdlib/OptionsSpec.scala @@ -1,13 +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.scalaexercises.Test - -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 95% rename from src/test/scala/exercises/stdlib/ParentClassesSpec.scala rename to src/test/scala/stdlib/ParentClassesSpec.scala index f4395fb9..6098d803 100644 --- a/src/test/scala/exercises/stdlib/ParentClassesSpec.scala +++ b/src/test/scala/stdlib/ParentClassesSpec.scala @@ -1,13 +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.scalaexercises.Test - -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 96% rename from src/test/scala/exercises/stdlib/PartialFunctionsSpec.scala rename to src/test/scala/stdlib/PartialFunctionsSpec.scala index 2455ebc5..2842cd08 100644 --- a/src/test/scala/exercises/stdlib/PartialFunctionsSpec.scala +++ b/src/test/scala/stdlib/PartialFunctionsSpec.scala @@ -1,13 +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.scalaexercises.Test - -import org.scalacheck.Shapeless._ +import shapeless.HNil class PartialFunctionsSpec extends Spec with Checkers { def `partial functions` = { diff --git a/src/test/scala/exercises/stdlib/PartiallyAppliedFunctionsSpec.scala b/src/test/scala/stdlib/PartiallyAppliedFunctionsSpec.scala similarity index 96% rename from src/test/scala/exercises/stdlib/PartiallyAppliedFunctionsSpec.scala rename to src/test/scala/stdlib/PartiallyAppliedFunctionsSpec.scala index e1cc56d4..ee6c290f 100644 --- a/src/test/scala/exercises/stdlib/PartiallyAppliedFunctionsSpec.scala +++ b/src/test/scala/stdlib/PartiallyAppliedFunctionsSpec.scala @@ -1,13 +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.scalaexercises.Test - -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 4004afb1..45f80431 100644 --- a/src/test/scala/exercises/stdlib/PatternMatchingSpec.scala +++ b/src/test/scala/stdlib/PatternMatchingSpec.scala @@ -1,13 +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.scalaexercises.Test - -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 97% rename from src/test/scala/exercises/stdlib/RangesSpec.scala rename to src/test/scala/stdlib/RangesSpec.scala index aee698d6..7977c616 100644 --- a/src/test/scala/exercises/stdlib/RangesSpec.scala +++ b/src/test/scala/stdlib/RangesSpec.scala @@ -1,13 +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.scalaexercises.Test - -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 96% rename from src/test/scala/exercises/stdlib/RepeatedParametersSpec.scala rename to src/test/scala/stdlib/RepeatedParametersSpec.scala index 9cb10cfe..9d00beba 100644 --- a/src/test/scala/exercises/stdlib/RepeatedParametersSpec.scala +++ b/src/test/scala/stdlib/RepeatedParametersSpec.scala @@ -1,13 +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.scalaexercises.Test - -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 96% rename from src/test/scala/exercises/stdlib/SequencesAndArraysSpec.scala rename to src/test/scala/stdlib/SequencesAndArraysSpec.scala index 3335af2c..4832aa4f 100644 --- a/src/test/scala/exercises/stdlib/SequencesAndArraysSpec.scala +++ b/src/test/scala/stdlib/SequencesAndArraysSpec.scala @@ -1,11 +1,10 @@ -package exercises +package stdlib -import stdlib.{SequencesandArrays, _} -import shapeless.HNil +import org.scalacheck.Shapeless._ +import org.scalaexercises.Test import org.scalatest.Spec import org.scalatest.prop.Checkers -import org.scalaexercises.Test -import org.scalacheck.Shapeless._ +import shapeless.HNil class SequencesAndArraysSpec extends Spec with Checkers { def `list to array` = { 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 42987198..1b27e653 100644 --- a/src/test/scala/exercises/stdlib/SetsSpec.scala +++ b/src/test/scala/stdlib/SetsSpec.scala @@ -1,13 +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.scalaexercises.Test - -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 95% rename from src/test/scala/exercises/stdlib/TraitsSpec.scala rename to src/test/scala/stdlib/TraitsSpec.scala index 044ae8bd..fe1c22a3 100644 --- a/src/test/scala/exercises/stdlib/TraitsSpec.scala +++ b/src/test/scala/stdlib/TraitsSpec.scala @@ -1,13 +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.scalaexercises.Test - -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 01cbf3ff..f87149c6 100644 --- a/src/test/scala/exercises/stdlib/TraversablesSpec.scala +++ b/src/test/scala/stdlib/TraversablesSpec.scala @@ -1,13 +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.scalaexercises.Test - -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 95% rename from src/test/scala/exercises/stdlib/TuplesSpec.scala rename to src/test/scala/stdlib/TuplesSpec.scala index f9076765..692c9b5d 100644 --- a/src/test/scala/exercises/stdlib/TuplesSpec.scala +++ b/src/test/scala/stdlib/TuplesSpec.scala @@ -1,13 +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.scalaexercises.Test - -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 96% rename from src/test/scala/exercises/stdlib/TypeSignaturesSpec.scala rename to src/test/scala/stdlib/TypeSignaturesSpec.scala index 9acb7e9d..87af0269 100644 --- a/src/test/scala/exercises/stdlib/TypeSignaturesSpec.scala +++ b/src/test/scala/stdlib/TypeSignaturesSpec.scala @@ -1,13 +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.scalaexercises.Test - -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 9fd40d89..9f1d7197 100644 --- a/src/test/scala/exercises/stdlib/TypeVarianceSpec.scala +++ b/src/test/scala/stdlib/TypeVarianceSpec.scala @@ -1,13 +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.scalaexercises.Test - -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 91% rename from src/test/scala/exercises/stdlib/UniformAccessPrincipleSpec.scala rename to src/test/scala/stdlib/UniformAccessPrincipleSpec.scala index b938a823..e4346a15 100644 --- a/src/test/scala/exercises/stdlib/UniformAccessPrincipleSpec.scala +++ b/src/test/scala/stdlib/UniformAccessPrincipleSpec.scala @@ -1,13 +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.scalaexercises.Test - -import org.scalacheck.Shapeless._ +import shapeless.HNil class UniformAccessPrincipleSpec extends Spec with Checkers { def `uniform access principle` = {