Skip to content

Commit fde0df1

Browse files
etorreborreetorreborre
committed
moved the test classes to the test directory
1 parent 410bb41 commit fde0df1

File tree

13 files changed

+48
-50
lines changed

13 files changed

+48
-50
lines changed

‎mundane-testing-extra/src/main/scala/com/ambiata/mundane/testing/ExamplesTimeout.scala ‎mundane-testing-extra/src/test/scala/com/ambiata/mundane/testing/ExamplesTimeout.scala

+5-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
package com.ambiata.mundane.testing
22

3-
import org.specs2._
4-
import specification._
5-
import matcher._
6-
import execute._
7-
import main._
8-
import time._
3+
import org.specs2.execute._
4+
import org.specs2.main._
5+
import org.specs2.matcher._
6+
import org.specs2.specification._
7+
import org.specs2.time._
98

109
/**
1110
* This trait can be used to add a global time out to each example or for a specific one:

‎mundane-testing/src/main/scala/com/ambiata/mundane/testing/Arbitraries.scala ‎mundane-testing/src/test/scala/com/ambiata/mundane/testing/Arbitraries.scala

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
package com.ambiata.mundane.testing
22

3-
import org.scalacheck._
4-
import Arbitrary._
5-
import scalaz._, Scalaz._, effect.IO
63
import com.ambiata.mundane.control._
4+
import org.scalacheck.Arbitrary._
5+
import org.scalacheck._
6+
7+
import scalaz._
78

89
object Arbitraries {
910
implicit def ResultArbitrary[A: Arbitrary]: Arbitrary[Result[A]] =

‎mundane-testing/src/main/scala/com/ambiata/mundane/testing/ArchiveFiles.scala ‎mundane-testing/src/test/scala/com/ambiata/mundane/testing/ArchiveFiles.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.ambiata.mundane.testing
22

3-
import java.io.{PrintStream, FileOutputStream, File}
3+
import java.io.{File, FileOutputStream, PrintStream}
44

55
// FIX this should be production code
66
trait ArchiveFiles {

‎mundane-testing/src/main/scala/com/ambiata/mundane/testing/Dirs.scala ‎mundane-testing/src/test/scala/com/ambiata/mundane/testing/Dirs.scala

File renamed without changes.

‎mundane-testing/src/main/scala/com/ambiata/mundane/testing/Keys.scala ‎mundane-testing/src/test/scala/com/ambiata/mundane/testing/Keys.scala

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.ambiata.mundane.testing
22

3-
import org.scalacheck._, Arbitrary._
3+
import org.scalacheck._
4+
45
import scala.collection.JavaConversions._
56

67
case class KeyEntry(path: String, value: Int) {

‎mundane-testing/src/main/scala/com/ambiata/mundane/testing/Laws.scala ‎mundane-testing/src/test/scala/com/ambiata/mundane/testing/Laws.scala

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
package com.ambiata.mundane.testing
22

3+
import org.scalacheck.Arbitrary._
4+
import org.scalacheck.Prop._
35
import org.scalacheck._
4-
import Prop._
5-
import Arbitrary._
6-
import scalaz._, Scalaz._
6+
7+
import scalaz._
78

89
/**
910
* WARNING: can't use scalaz-scalacheck-binding because of specs/scalacheck/scalaz compatibility at the moment

‎mundane-testing/src/main/scala/com/ambiata/mundane/testing/LocalFiles.scala ‎mundane-testing/src/test/scala/com/ambiata/mundane/testing/LocalFiles.scala

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.ambiata.mundane.testing
22

3-
import java.io.{FileOutputStream, File, PrintStream}
4-
import java.util.UUID
3+
import java.io.{File, PrintStream}
54

65
// FIX this is messy and should not exists
76

‎mundane-testing/src/main/scala/com/ambiata/mundane/testing/RIOMatcher.scala ‎mundane-testing/src/test/scala/com/ambiata/mundane/testing/RIOMatcher.scala

+7-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
1-
package com.ambiata.mundane
2-
package testing
1+
package com.ambiata.mundane.testing
32

43
import com.ambiata.mundane.control._
5-
import org.specs2._, matcher._, execute.{Result => SpecsResult, Error => SpecsError, _}
64
import org.scalacheck.Prop
7-
import scalaz.{Success => _, Failure => _, _}, effect.IO, \&/._
5+
import org.specs2._
6+
import org.specs2.execute.{Error => SpecsError, Result => SpecsResult, _}
7+
import org.specs2.matcher._
8+
9+
import scalaz.\&/._
10+
import scalaz.{Failure => _, Success => _, _}
811

912
object RIOMatcher extends ThrownExpectations with ScalaCheckMatchers {
1013
implicit def RIOAsResult[A: AsResult]: AsResult[RIO[A]] = new AsResult[RIO[A]] {

‎mundane-testing/src/main/scala/com/ambiata/mundane/testing/ResultMatcher.scala ‎mundane-testing/src/test/scala/com/ambiata/mundane/testing/ResultMatcher.scala

+4-6
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
package com.ambiata.mundane
2-
package testing
1+
package com.ambiata.mundane.testing
32

4-
import control._
5-
import org.specs2._
6-
import matcher._
7-
import execute.{Result => SpecsResult, Error => SpecsError, _}
3+
import com.ambiata.mundane.control.{Error, Ok, Result}
4+
import org.specs2.execute.{Result => SpecsResult, _}
5+
import org.specs2.matcher._
86

97
import scalaz.\&/
108
import scalaz.\&/.This

‎mundane-testing/src/main/scala/com/ambiata/mundane/testing/TextEscapingSpec.scala ‎mundane-testing/src/test/scala/com/ambiata/mundane/testing/TextEscapingSpec.scala

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
1-
package com.ambiata.mundane
2-
package testing
1+
package com.ambiata.mundane.testing
32

43
import com.ambiata.mundane.parse._
54
import org.specs2._
65

7-
import scalaz._, Scalaz._
8-
96
class TextEscapingSpec extends Specification with ScalaCheck { def is = s2"""
107

118
Escaping

‎mundane-testing/src/main/scala/com/ambiata/mundane/testing/package.scala ‎mundane-testing/src/test/scala/com/ambiata/mundane/testing/package.scala

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package com.ambiata.mundane
22

3-
import scalaz.effect.IO
43
import org.specs2.execute.AsResult
54

5+
import scalaz.effect.IO
6+
67
package object testing {
78

89
/**

‎project/build.scala

+15-15
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ object build extends Build {
3737
, base = file("mundane-bytes")
3838
, settings = standardSettings ++ lib("bytes") ++ Seq[Settings](
3939
name := "mundane-bytes"
40-
) ++ Seq[Settings](libraryDependencies ++= depend.scalaz ++ depend.testing ++ depend.disorder)
40+
) ++ Seq[Settings](libraryDependencies ++= depend.scalaz ++ depend.specs2 ++ depend.disorder)
4141
)
4242

4343
lazy val cli = Project(
@@ -53,7 +53,7 @@ object build extends Build {
5353
, base = file("mundane-control")
5454
, settings = standardSettings ++ lib("control") ++ Seq[Settings](
5555
name := "mundane-control"
56-
) ++ Seq[Settings](libraryDependencies ++= depend.scalaz ++ depend.testing)
56+
) ++ Seq[Settings](libraryDependencies ++= depend.scalaz ++ depend.specs2)
5757
)
5858
.dependsOn(error)
5959

@@ -62,15 +62,15 @@ object build extends Build {
6262
, base = file("mundane-data")
6363
, settings = standardSettings ++ lib("data") ++ Seq[Settings](
6464
name := "mundane-data"
65-
) ++ Seq[Settings](libraryDependencies ++= depend.scalaz ++ depend.rng ++ depend.testing ++ depend.kiama)
65+
) ++ Seq[Settings](libraryDependencies ++= depend.scalaz ++ depend.rng ++ depend.specs2 ++ depend.kiama)
6666
)
6767

6868
lazy val csv = Project(
6969
id = "csv"
7070
, base = file("mundane-csv")
7171
, settings = standardSettings ++ lib("csv") ++ Seq[Settings](
7272
name := "mundane-csv"
73-
) ++ Seq[Settings](libraryDependencies <++= scalaVersion(sv => depend.simpleCsv ++ depend.parboiled(sv) ++ depend.testing ++ depend.disorder ++ depend.caliper)) ++
73+
) ++ Seq[Settings](libraryDependencies <++= scalaVersion(sv => depend.simpleCsv ++ depend.parboiled(sv) ++ depend.specs2 ++ depend.disorder ++ depend.caliper)) ++
7474
// enable forking in run
7575
Seq(fork in run := true,
7676
// we need to add the runtime classpath as a "-cp" argument to the `javaOptions in run`, otherwise caliper
@@ -92,18 +92,18 @@ object build extends Build {
9292
, settings = standardSettings ++ lib("io") ++ Seq[Settings](
9393
name := "mundane-io"
9494
) ++ Seq[Settings](
95-
libraryDependencies ++= depend.scalaz ++ depend.joda ++ depend.testing ++
95+
libraryDependencies ++= depend.scalaz ++ depend.joda ++ depend.specs2 ++
9696
depend.reflect(scalaVersion.value) ++ depend.disorder
9797
)
9898
)
99-
.dependsOn(control, data, reflect, testing % "test")
99+
.dependsOn(control, data, reflect, testing % "test->test")
100100

101101
lazy val parse = Project(
102102
id = "parse"
103103
, base = file("mundane-parse")
104104
, settings = standardSettings ++ lib("parse") ++ Seq[Settings](
105105
name := "mundane-parse"
106-
) ++ Seq[Settings](libraryDependencies <++= scalaVersion(sv => depend.parboiled(sv) ++ depend.joda ++ depend.testing))
106+
) ++ Seq[Settings](libraryDependencies <++= scalaVersion(sv => depend.parboiled(sv) ++ depend.joda ++ depend.specs2))
107107
)
108108
.dependsOn(control, csv)
109109

@@ -112,7 +112,7 @@ object build extends Build {
112112
, base = file("mundane-reflect")
113113
, settings = standardSettings ++ lib("reflect") ++ Seq[Settings](
114114
name := "mundane-reflect"
115-
, libraryDependencies ++= depend.reflect(scalaVersion.value) ++ depend.testing
115+
, libraryDependencies ++= depend.reflect(scalaVersion.value) ++ depend.specs2
116116
)
117117
)
118118

@@ -121,9 +121,9 @@ object build extends Build {
121121
, base = file("mundane-store")
122122
, settings = standardSettings ++ lib("store") ++ Seq[Settings](
123123
name := "mundane-store"
124-
) ++ Seq[Settings](libraryDependencies ++= depend.scalaz ++ depend.testing ++ depend.bits ++ depend.stream)
124+
) ++ Seq[Settings](libraryDependencies ++= depend.scalaz ++ depend.specs2 ++ depend.bits ++ depend.stream)
125125
)
126-
.dependsOn(control, data, io, testing % "test", io % "test->test")
126+
.dependsOn(control, data, io, testing % "test->test", io % "test->test")
127127

128128
lazy val testing = Project(
129129
id = "testing"
@@ -140,24 +140,24 @@ object build extends Build {
140140
, settings = standardSettings ++ lib("testing") ++ Seq[Settings](
141141
name := "mundane-testing-extra"
142142
) ++ Seq[Settings](libraryDependencies ++= depend.specs2 ++ depend.specs2Extra)
143-
).dependsOn(testing)
143+
)
144144

145145
lazy val time = Project(
146146
id = "time"
147147
, base = file("mundane-time")
148148
, settings = standardSettings ++ lib("time") ++ Seq[Settings](
149149
name := "mundane-time"
150-
) ++ Seq[Settings](libraryDependencies ++= depend.scalaz ++ depend.joda ++ depend.testing)
150+
) ++ Seq[Settings](libraryDependencies ++= depend.scalaz ++ depend.joda ++ depend.specs2)
151151
).dependsOn(data)
152152

153153
lazy val trace = Project(
154154
id = "trace"
155155
, base = file("mundane-trace")
156156
, settings = standardSettings ++ lib("trace") ++ Seq[Settings](
157157
name := "mundane-trace"
158-
) ++ Seq[Settings](libraryDependencies ++= depend.scalaz ++ depend.testing)
158+
) ++ Seq[Settings](libraryDependencies ++= depend.scalaz ++ depend.specs2)
159159
)
160-
.dependsOn(data, control, io, testing % "test")
160+
.dependsOn(data, control, io, testing % "test->test")
161161

162162
lazy val compilationSettings: Seq[Settings] = Seq(
163163
javacOptions ++= Seq("-Xmx3G", "-Xms512m", "-Xss4m"),
@@ -174,7 +174,7 @@ object build extends Build {
174174
promulgate.library(s"com.ambiata.mundane.$name", "ambiata-oss")
175175

176176
lazy val testingSettings: Seq[Settings] = Seq(
177-
initialCommands in console := "import org.specs2._",
177+
initialCommands in (Test, console) := "import org.specs2._",
178178
logBuffered := false,
179179
cancelable := true,
180180
javaOptions += "-Xmx3G"

‎project/depend.scala

+2-4
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,9 @@ object depend {
1414

1515
val specs2 = Seq( "org.specs2" %% "specs2-core"
1616
, "org.specs2" %% "specs2-scalacheck"
17-
, "org.specs2" %% "specs2-junit").map(_ % "2.4.5")
17+
, "org.specs2" %% "specs2-junit").map(_ % "2.4.5" % "test")
1818

19-
val specs2Extra = Seq("org.specs2" %% "specs2-matcher-extra" % "2.4.5" excludeAll ExclusionRule(organization = "org.scalamacros"))
20-
21-
val testing = specs2.map(_ % "test")
19+
val specs2Extra = Seq("org.specs2" %% "specs2-matcher-extra" % "2.4.5" % "test" excludeAll ExclusionRule(organization = "org.scalamacros"))
2220

2321
val caliper = Seq("com.google.caliper" % "caliper" % "0.5-rc1",
2422
"com.google.guava" % "guava" % "14.0.1" force())

0 commit comments

Comments
 (0)