Skip to content

Commit fa4be00

Browse files
author
Alejandro Gómez
authored
Merge pull request #44 from scala-exercises/jp-se-510-dry-test-scala
JP - SE-510 DRY Test.scala
2 parents b362424 + d64cdca commit fa4be00

39 files changed

+145
-279
lines changed

‎build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ lazy val stdlib = (project in file("."))
55
organization := "org.scala-exercises",
66
name := "exercises-stdlib",
77
scalaVersion := "2.11.7",
8-
version := "0.2.1-SNAPSHOT",
8+
version := "0.2.2-SNAPSHOT",
99
resolvers ++= Seq(
1010
Resolver.sonatypeRepo("snapshots"),
1111
Resolver.sonatypeRepo("releases")

‎src/test/scala/exercises/Test.scala

Lines changed: 0 additions & 57 deletions
This file was deleted.

‎src/test/scala/exercises/stdlib/EnumerationsSpec.scala

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎src/test/scala/exercises/stdlib/AssertsSpec.scala renamed to ‎src/test/scala/stdlib/AssertsSpec.scala

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
package exercises
2-
3-
import stdlib._
4-
import shapeless.HNil
1+
package stdlib
52

3+
import org.scalacheck.Shapeless._
4+
import org.scalaexercises.Test
65
import org.scalatest.Spec
76
import org.scalatest.prop.Checkers
8-
9-
import org.scalacheck.Shapeless._
7+
import shapeless.HNil
108

119
class AssertsSpec extends Spec with Checkers {
1210
def `scalatest asserts` = {

‎src/test/scala/exercises/stdlib/ByNameParameterSpec.scala renamed to ‎src/test/scala/stdlib/ByNameParameterSpec.scala

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
package exercises
2-
3-
import stdlib._
4-
import shapeless.HNil
1+
package stdlib
52

3+
import org.scalacheck.Shapeless._
4+
import org.scalaexercises.Test
65
import org.scalatest.Spec
76
import org.scalatest.prop.Checkers
8-
9-
import org.scalacheck.Shapeless._
7+
import shapeless.HNil
108

119
class ByNameParameterSpec extends Spec with Checkers {
1210
def `takes unit by name parameter` = {

‎src/test/scala/exercises/stdlib/CaseClassesSpec.scala renamed to ‎src/test/scala/stdlib/CaseClassesSpec.scala

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
package exercises
2-
3-
import stdlib._
4-
import shapeless.HNil
1+
package stdlib
52

3+
import org.scalacheck.Shapeless._
4+
import org.scalaexercises.Test
65
import org.scalatest.Spec
76
import org.scalatest.prop.Checkers
8-
9-
import org.scalacheck.Shapeless._
7+
import shapeless.HNil
108

119
class CaseClassesSpec extends Spec with Checkers {
1210
def `case classes comparisons` = {

‎src/test/scala/exercises/stdlib/ClassesSpec.scala renamed to ‎src/test/scala/stdlib/ClassesSpec.scala

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
package exercises
2-
3-
import stdlib._
4-
import shapeless.HNil
1+
package stdlib
52

3+
import org.scalacheck.Shapeless._
4+
import org.scalaexercises.Test
65
import org.scalatest.Spec
76
import org.scalatest.prop.Checkers
8-
9-
import org.scalacheck.Shapeless._
7+
import shapeless.HNil
108

119
class ClassesSpec extends Spec with Checkers {
1210
def `classes with val parameters` = {

‎src/test/scala/exercises/stdlib/EmptyValuesSpec.scala renamed to ‎src/test/scala/stdlib/EmptyValuesSpec.scala

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
package exercises
2-
3-
import stdlib._
4-
import shapeless.HNil
1+
package stdlib
52

3+
import org.scalacheck.Shapeless._
4+
import org.scalaexercises.Test
65
import org.scalatest.Spec
76
import org.scalatest.prop.Checkers
8-
9-
import org.scalacheck.Shapeless._
7+
import shapeless.HNil
108

119
class EmptyValuesSpec extends Spec with Checkers {
1210
def `empty values` = {

‎src/test/scala/stdlib/EnumerationsSpec.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
package stdlib
2+

‎src/test/scala/exercises/stdlib/ExtractorsSpec.scala renamed to ‎src/test/scala/stdlib/ExtractorsSpec.scala

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
package exercises
2-
3-
import stdlib._
4-
import shapeless.HNil
1+
package stdlib
52

3+
import org.scalacheck.Shapeless._
4+
import org.scalaexercises.Test
65
import org.scalatest.Spec
76
import org.scalatest.prop.Checkers
8-
9-
import org.scalacheck.Shapeless._
7+
import shapeless.HNil
108

119
class ExtractorsSpec extends Spec with Checkers {
1210
def `extractors` = {

‎src/test/scala/exercises/stdlib/ForExpresssionsSpec.scala renamed to ‎src/test/scala/stdlib/ForExpressionsSpec.scala

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
package exercises
2-
3-
import stdlib._
4-
import shapeless.HNil
1+
package stdlib
52

3+
import org.scalacheck.Shapeless._
4+
import org.scalaexercises.Test
65
import org.scalatest.Spec
76
import org.scalatest.prop.Checkers
8-
9-
import org.scalacheck.Shapeless._
7+
import shapeless.HNil
108

119
class ForExpressionsSpec extends Spec with Checkers {
1210

‎src/test/scala/exercises/stdlib/FormattingSpec.scala renamed to ‎src/test/scala/stdlib/FormattingSpec.scala

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
package exercises
2-
3-
import stdlib._
4-
import shapeless.HNil
1+
package stdlib
52

3+
import org.scalacheck.Shapeless._
4+
import org.scalaexercises.Test
65
import org.scalatest.Spec
76
import org.scalatest.prop.Checkers
8-
9-
import org.scalacheck.Shapeless._
7+
import shapeless.HNil
108

119
class FormattingSpec extends Spec with Checkers {
1210
def `strings` = {

‎src/test/scala/exercises/stdlib/HigherOrderFunctionsSpec.scala renamed to ‎src/test/scala/stdlib/HigherOrderFunctionsSpec.scala

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
package exercises
2-
3-
import stdlib._
4-
import shapeless.HNil
1+
package stdlib
52

3+
import org.scalacheck.Shapeless._
4+
import org.scalaexercises.Test
65
import org.scalatest.Spec
76
import org.scalatest.prop.Checkers
8-
9-
import org.scalacheck.Shapeless._
7+
import shapeless.HNil
108

119
class HigherOrderFunctionsSpec extends Spec with Checkers {
1210
def `anonymous function` = {

‎src/test/scala/exercises/stdlib/ImplicitsSpec.scala renamed to ‎src/test/scala/stdlib/ImplicitsSpec.scala

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
package exercises
2-
3-
import stdlib._
4-
import shapeless.HNil
1+
package stdlib
52

3+
import org.scalacheck.Shapeless._
4+
import org.scalaexercises.Test
65
import org.scalatest.Spec
76
import org.scalatest.prop.Checkers
8-
9-
import org.scalacheck.Shapeless._
7+
import shapeless.HNil
108

119
class ImplicitsSpec extends Spec with Checkers {
1210
def `implicit parameters` = {

‎src/test/scala/exercises/stdlib/InfixPrefixAndPostfixOperatorsSpec.scala renamed to ‎src/test/scala/stdlib/InfixPrefixAndPostfixOperatorsSpec.scala

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
1-
package exercises
2-
3-
import stdlib._
4-
import shapeless.HNil
1+
package stdlib
52

3+
import org.scalaexercises.Test
64
import org.scalatest.Spec
75
import org.scalatest.prop.Checkers
6+
import shapeless.HNil
87

98
// FIXME: get rid of this if possible
109
import org.scalacheck.Shapeless._
1110

12-
class OperatorsSpec extends Spec with Checkers {
11+
class InfixPrefixAndPostfixOperatorsSpec extends Spec with Checkers {
1312
val Operators = InfixPrefixandPostfixOperators
1413

1514
def `single parameter infix operators` = {

‎src/test/scala/exercises/stdlib/InfixTypesSpec.scala renamed to ‎src/test/scala/stdlib/InfixTypesSpec.scala

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
package exercises
2-
3-
import stdlib._
4-
import shapeless.HNil
1+
package stdlib
52

3+
import org.scalacheck.Shapeless._
4+
import org.scalaexercises.Test
65
import org.scalatest.Spec
76
import org.scalatest.prop.Checkers
8-
9-
import org.scalacheck.Shapeless._
7+
import shapeless.HNil
108

119
class InfixTypesSpec extends Spec with Checkers {
1210
def `infix type` = {

‎src/test/scala/exercises/stdlib/IterablesSpec.scala renamed to ‎src/test/scala/stdlib/IterablesSpec.scala

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
package exercises
2-
3-
import stdlib._
4-
import shapeless.HNil
1+
package stdlib
52

3+
import org.scalacheck.Shapeless._
4+
import org.scalaexercises.Test
65
import org.scalatest.Spec
76
import org.scalatest.prop.Checkers
8-
9-
import org.scalacheck.Shapeless._
7+
import shapeless.HNil
108

119
class IterablesSpec extends Spec with Checkers {
1210
def `collection iterables` = {

‎src/test/scala/exercises/stdlib/ListsSpec.scala renamed to ‎src/test/scala/stdlib/ListsSpec.scala

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
package exercises
2-
3-
import stdlib._
4-
import shapeless.HNil
1+
package stdlib
52

3+
import org.scalacheck.Shapeless._
4+
import org.scalaexercises.Test
65
import org.scalatest.Spec
76
import org.scalatest.prop.Checkers
8-
9-
import org.scalacheck.Shapeless._
7+
import shapeless.HNil
108

119
class ListsSpec extends Spec with Checkers {
1210
def `are homogeneous` = {

‎src/test/scala/exercises/stdlib/LiteralBooleansSpec.scala renamed to ‎src/test/scala/stdlib/LiteralBooleansSpec.scala

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
package exercises
2-
3-
import stdlib._
4-
import shapeless.HNil
1+
package stdlib
52

3+
import org.scalacheck.Shapeless._
4+
import org.scalaexercises.Test
65
import org.scalatest.Spec
76
import org.scalatest.prop.Checkers
8-
9-
import org.scalacheck.Shapeless._
7+
import shapeless.HNil
108

119
class LiteralBooleansSpec extends Spec with Checkers {
1210
def `are either true or false` = {

‎src/test/scala/exercises/stdlib/LiteralNumbersSpec.scala renamed to ‎src/test/scala/stdlib/LiteralNumbersSpec.scala

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
package exercises
2-
3-
import stdlib._
4-
import shapeless.HNil
1+
package stdlib
52

3+
import org.scalacheck.Shapeless._
4+
import org.scalaexercises.Test
65
import org.scalatest.Spec
76
import org.scalatest.prop.Checkers
8-
9-
import org.scalacheck.Shapeless._
7+
import shapeless.HNil
108

119
class LiteralNumbersSpec extends Spec with Checkers {
1210
def `integer literals` = {

‎src/test/scala/exercises/stdlib/LiteralStringsSpec.scala renamed to ‎src/test/scala/stdlib/LiteralStringsSpec.scala

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
package exercises
2-
3-
import stdlib._
4-
import shapeless.HNil
1+
package stdlib
52

3+
import org.scalacheck.Shapeless._
4+
import org.scalaexercises.Test
65
import org.scalatest.Spec
76
import org.scalatest.prop.Checkers
8-
9-
import org.scalacheck.Shapeless._
7+
import shapeless.HNil
108

119
class LiteralStringsSpec extends Spec with Checkers {
1210
def `character literals` = {

‎src/test/scala/exercises/stdlib/MapSpec.scala renamed to ‎src/test/scala/stdlib/MapsSpec.scala

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
package exercises
2-
3-
import stdlib._
4-
import shapeless.HNil
1+
package stdlib
52

3+
import org.scalacheck.Shapeless._
4+
import org.scalaexercises.Test
65
import org.scalatest.Spec
76
import org.scalatest.prop.Checkers
8-
9-
import org.scalacheck.Shapeless._
7+
import shapeless.HNil
108

119
class MapsSpec extends Spec with Checkers {
1210
def `size` = {

0 commit comments

Comments
 (0)