Skip to content

Commit d4e58a5

Browse files
adamretteradamretter
committed
Switch to running Specs2 using Specs2's JUnitRunner and maven-surefire-plugin instead of the specs2-maven-plugin
1 parent b5f6900 commit d4e58a5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+222
-55
lines changed

‎csv-validator-cmd/pom.xml‎

Lines changed: 31 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@
2929
<configuration>
3030
<recompileMode>incremental</recompileMode> <!-- NOTE: incremental compilation although faster requires passing to MAVEN_OPTS="-XX:MaxPermSize=128m" -->
3131
<useZincServer>true</useZincServer> <!-- NOTE: if you have Zinc server installed and running, you can get faster compilation by enabling this -->
32+
<args>
33+
<arg>-Yrangepos</arg> <!-- recommended for Specs2 -->
34+
</args>
3235
<javacArgs>
3336
<javacArg>-Xlint:unchecked</javacArg>
3437
<javacArg>-Xlint:deprecation</javacArg>
@@ -52,17 +55,13 @@
5255
</executions>
5356
</plugin>
5457
<plugin>
55-
<groupId>com.mmakowski</groupId>
56-
<artifactId>maven-specs2-plugin</artifactId>
57-
<executions>
58-
<execution>
59-
<id>verify</id>
60-
<phase>verify</phase>
61-
<goals>
62-
<goal>run-specs</goal>
63-
</goals>
64-
</execution>
65-
</executions>
58+
<groupId>org.apache.maven.plugins</groupId>
59+
<artifactId>maven-surefire-plugin</artifactId>
60+
<configuration>
61+
<includes>
62+
<include>**/*Spec.*</include>
63+
</includes>
64+
</configuration>
6665
</plugin>
6766
<plugin>
6867
<groupId>org.codehaus.mojo</groupId>
@@ -135,7 +134,27 @@
135134
</dependency>
136135
<dependency>
137136
<groupId>org.specs2</groupId>
138-
<artifactId>specs2_${scala.version}</artifactId>
137+
<artifactId>specs2-core_${scala.version}</artifactId>
138+
<scope>test</scope>
139+
</dependency>
140+
<dependency>
141+
<groupId>org.specs2</groupId>
142+
<artifactId>specs2-common_${scala.version}</artifactId>
143+
<scope>test</scope>
144+
</dependency>
145+
<dependency>
146+
<groupId>org.specs2</groupId>
147+
<artifactId>specs2-matcher_${scala.version}</artifactId>
148+
<scope>test</scope>
149+
</dependency>
150+
<dependency>
151+
<groupId>org.specs2</groupId>
152+
<artifactId>specs2-junit_${scala.version}</artifactId>
153+
<scope>test</scope>
154+
</dependency>
155+
<dependency>
156+
<groupId>junit</groupId>
157+
<artifactId>junit</artifactId>
139158
<scope>test</scope>
140159
</dependency>
141160
</dependencies>

‎csv-validator-cmd/src/test/scala/uk/gov/nationalarchives/csv/validator/cmd/CsvValidatorCmdAppSpec.scala‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,11 @@
88
*/
99
package uk.gov.nationalarchives.csv.validator.cmd
1010

11+
import org.junit.runner.RunWith
1112
import org.specs2.mutable.Specification
13+
import org.specs2.runner.JUnitRunner
1214

15+
@RunWith(classOf[JUnitRunner])
1316
class CsvValidatorCmdAppSpec extends Specification with TestResources {
1417

1518
val schemaPath = relResourcePath("schema.csvs")

‎csv-validator-core/pom.xml‎

Lines changed: 31 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@
3030
<configuration>
3131
<recompileMode>incremental</recompileMode> <!-- NOTE: incremental compilation although faster requires passing to MAVEN_OPTS="-XX:MaxPermSize=128m" -->
3232
<useZincServer>true</useZincServer> <!-- NOTE: if you have Zinc server installed and running, you can get faster compilation by enabling this -->
33+
<args>
34+
<arg>-Yrangepos</arg> <!-- recommended for Specs2 -->
35+
</args>
3336
<javacArgs>
3437
<javacArg>-Xlint:unchecked</javacArg>
3538
<javacArg>-Xlint:deprecation</javacArg>
@@ -68,17 +71,13 @@
6871
</executions>
6972
</plugin>
7073
<plugin>
71-
<groupId>com.mmakowski</groupId>
72-
<artifactId>maven-specs2-plugin</artifactId>
73-
<executions>
74-
<execution>
75-
<id>verify</id>
76-
<phase>verify</phase>
77-
<goals>
78-
<goal>run-specs</goal>
79-
</goals>
80-
</execution>
81-
</executions>
74+
<groupId>org.apache.maven.plugins</groupId>
75+
<artifactId>maven-surefire-plugin</artifactId>
76+
<configuration>
77+
<includes>
78+
<include>**/*Spec.*</include>
79+
</includes>
80+
</configuration>
8281
</plugin>
8382
</plugins>
8483
</build>
@@ -156,7 +155,27 @@
156155
</dependency>
157156
<dependency>
158157
<groupId>org.specs2</groupId>
159-
<artifactId>specs2_${scala.version}</artifactId>
158+
<artifactId>specs2-core_${scala.version}</artifactId>
159+
<scope>test</scope>
160+
</dependency>
161+
<dependency>
162+
<groupId>org.specs2</groupId>
163+
<artifactId>specs2-common_${scala.version}</artifactId>
164+
<scope>test</scope>
165+
</dependency>
166+
<dependency>
167+
<groupId>org.specs2</groupId>
168+
<artifactId>specs2-matcher_${scala.version}</artifactId>
169+
<scope>test</scope>
170+
</dependency>
171+
<dependency>
172+
<groupId>org.specs2</groupId>
173+
<artifactId>specs2-junit_${scala.version}</artifactId>
174+
<scope>test</scope>
175+
</dependency>
176+
<dependency>
177+
<groupId>junit</groupId>
178+
<artifactId>junit</artifactId>
160179
<scope>test</scope>
161180
</dependency>
162181
</dependencies>

‎csv-validator-core/src/test/scala/uk/gov/nationalarchives/csv/validator/MetaDataValidatorAcceptanceSpec.scala‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,17 @@
88
*/
99
package uk.gov.nationalarchives.csv.validator
1010

11+
import org.junit.runner.RunWith
1112
import org.specs2.mutable.Specification
13+
import org.specs2.runner.JUnitRunner
1214
import scalaz._
1315
import uk.gov.nationalarchives.csv.validator.schema.Schema
1416
import uk.gov.nationalarchives.csv.validator.api.{TextFile, CsvValidator}
1517
import scalax.file.Path
1618
import java.io.StringReader
1719
import java.io
1820

19-
21+
@RunWith(classOf[JUnitRunner])
2022
class MetaDataValidatorAcceptanceSpec extends Specification with TestResources {
2123

2224
val base = acceptancePath

‎csv-validator-core/src/test/scala/uk/gov/nationalarchives/csv/validator/MetaDataValidatorBigFileSpec.scala‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,16 @@
88
*/
99
package uk.gov.nationalarchives.csv.validator
1010

11+
import org.junit.runner.RunWith
1112
import org.specs2.mutable.Specification
13+
import org.specs2.runner.JUnitRunner
1214
import scalaz._
1315
import uk.gov.nationalarchives.csv.validator.schema.Schema
1416
import uk.gov.nationalarchives.csv.validator.api.{TextFile, CsvValidator}
1517
import scalax.file.Path
1618
import uk.gov.nationalarchives.csv.validator.api.CsvValidator.SubstitutePath
1719

20+
@RunWith(classOf[JUnitRunner])
1821
class MetaDataValidatorBigFileSpec extends Specification with TestResources {
1922

2023
val base = acceptancePath

‎csv-validator-core/src/test/scala/uk/gov/nationalarchives/csv/validator/MetaDataValidatorBusinessAcceptanceSpec.scala‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,15 @@
88
*/
99
package uk.gov.nationalarchives.csv.validator
1010

11+
import org.junit.runner.RunWith
1112
import org.specs2.mutable.Specification
13+
import org.specs2.runner.JUnitRunner
1214
import scalaz._
1315
import uk.gov.nationalarchives.csv.validator.schema.Schema
1416
import uk.gov.nationalarchives.csv.validator.api.{TextFile, CsvValidator}
1517
import scalax.file.Path
1618

19+
@RunWith(classOf[JUnitRunner])
1720
class MetaDataValidatorBusinessAcceptanceSpec extends Specification with TestResources {
1821

1922
val base = resourcePath("acceptance/dp")

‎csv-validator-core/src/test/scala/uk/gov/nationalarchives/csv/validator/MetaDataValidatorChecksumSpec.scala‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,17 @@
99
package uk.gov.nationalarchives.csv.validator
1010

1111

12+
import org.junit.runner.RunWith
1213
import org.specs2.mutable.Specification
14+
import org.specs2.runner.JUnitRunner
1315
import uk.gov.nationalarchives.csv.validator.schema._
1416
import java.io.{Reader, StringReader}
1517

1618
import scalaz.{Success => SuccessZ, Failure => FailureZ, ValidationNel}
1719
import uk.gov.nationalarchives.csv.validator.schema.Schema
1820
import uk.gov.nationalarchives.csv.validator.Util.TypedPath
1921

22+
@RunWith(classOf[JUnitRunner])
2023
class MetaDataValidatorChecksumSpec extends Specification with TestResources {
2124

2225
implicit def stringToStringReader(s: String): StringReader = new StringReader(s.replaceAll("\n\\s+", "\n"))

‎csv-validator-core/src/test/scala/uk/gov/nationalarchives/csv/validator/MetaDataValidatorFileCountSpec.scala‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,16 @@
88
*/
99
package uk.gov.nationalarchives.csv.validator
1010

11+
import org.junit.runner.RunWith
1112
import org.specs2.mutable.Specification
13+
import org.specs2.runner.JUnitRunner
1214
import uk.gov.nationalarchives.csv.validator.schema._
1315
import java.io.{Reader, StringReader}
1416
import scalaz.Success
1517
import scalaz.Failure
1618
import uk.gov.nationalarchives.csv.validator.Util.TypedPath
1719

20+
@RunWith(classOf[JUnitRunner])
1821
class MetaDataValidatorFileCountSpec extends Specification with TestResources {
1922

2023
implicit def stringToStringReader(s: String): StringReader = new StringReader(s.replaceAll("\n\\s+", "\n"))

‎csv-validator-core/src/test/scala/uk/gov/nationalarchives/csv/validator/MetaDataValidatorIntegrityCheckSpec.scala‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,17 @@
77
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
88
*/
99
package uk.gov.nationalarchives.csv.validator
10+
11+
import org.junit.runner.RunWith
1012
import org.specs2.mutable.Specification
13+
import org.specs2.runner.JUnitRunner
1114
import uk.gov.nationalarchives.csv.validator.api.{CsvValidator, TextFile}
1215
import uk.gov.nationalarchives.csv.validator.schema.{TraceableParsers, Schema}
1316

1417
import scalax.file.Path
1518
import scalaz.{Failure, Success}
1619

17-
20+
@RunWith(classOf[JUnitRunner])
1821
class MetaDataValidatorIntegrityCheckSpec extends Specification with TestResources {
1922

2023
def buildValidator(substitutionPath: List[(String,String)]) : CsvValidator = new CsvValidator with AllErrorsMetaDataValidator {

‎csv-validator-core/src/test/scala/uk/gov/nationalarchives/csv/validator/MetaDataValidatorSpec.scala‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,16 @@
88
*/
99
package uk.gov.nationalarchives.csv.validator
1010

11+
import org.junit.runner.RunWith
1112
import org.specs2.mutable.Specification
13+
import org.specs2.runner.JUnitRunner
1214
import uk.gov.nationalarchives.csv.validator.schema._
1315
import java.io.{Reader, StringReader}
1416
import uk.gov.nationalarchives.csv.validator.schema.Schema
1517
import scalaz.Success
1618
import scalaz.Failure
1719

20+
@RunWith(classOf[JUnitRunner])
1821
class MetaDataValidatorSpec extends Specification with TestResources {
1922

2023
implicit def stringToStringReader(s: String): StringReader = new StringReader(s.replaceAll("\n\\s+", "\n"))

0 commit comments

Comments
 (0)