Skip to content

Commit

Permalink
EASY-2179: update scalatra (DANS-KNAW#157)
Browse files Browse the repository at this point in the history
  • Loading branch information
pfrolke authored Apr 3, 2020
1 parent 6fadb1b commit b906e36
Show file tree
Hide file tree
Showing 8 changed files with 25 additions and 14 deletions.
2 changes: 1 addition & 1 deletion command/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>nl.knaw.dans.shared</groupId>
<artifactId>dans-scala-app-project</artifactId>
<version>6.0.1</version>
<version>6.0.2</version>
<relativePath />
</parent>

Expand Down
2 changes: 1 addition & 1 deletion lib/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>nl.knaw.dans.shared</groupId>
<artifactId>dans-scala-project</artifactId>
<version>6.0.1</version>
<version>6.0.2</version>
<relativePath />
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,11 @@
package nl.knaw.dans.easy.stage

import nl.knaw.dans.easy.stage.dataset.AdditionalLicense._
import org.scalatest.{ FlatSpec, Inside, Matchers }
import org.scalatest.Inside
import org.scalatest.flatspec.AnyFlatSpec
import org.scalatest.matchers.should.Matchers

class AdditionalLicenseSpec extends FlatSpec with Matchers with Inside {
class AdditionalLicenseSpec extends AnyFlatSpec with Matchers with Inside {

"hasXsiType" should
"""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,15 @@ import nl.knaw.dans.easy.stage.lib.Constants.DATASET_SDO
import org.apache.commons.io.FileUtils
import org.apache.commons.io.FileUtils.readFileToString
import org.scalatest.Inside._
import org.scalatest.{ FlatSpec, Matchers, OneInstancePerTest }
import org.scalatest.OneInstancePerTest
import org.scalatest.flatspec.AnyFlatSpec
import org.scalatest.matchers.should.Matchers

import scala.io.Source
import scala.util.{ Failure, Success }
import scala.xml.XML

class EasyStageDatasetSpec extends FlatSpec with Matchers with OneInstancePerTest with CanConnectFixture {
class EasyStageDatasetSpec extends AnyFlatSpec with Matchers with OneInstancePerTest with CanConnectFixture {
private val testDir = Paths.get("target/test", getClass.getSimpleName)
FileUtils.deleteQuietly(testDir.toFile)
Files.createDirectories(testDir)
Expand Down
5 changes: 3 additions & 2 deletions lib/src/test/scala/nl.knaw.dans.easy.stage/RunSpec.scala
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,15 @@ import java.nio.file.{ Files, Path, Paths }
import nl.knaw.dans.easy.stage.lib.Constants
import org.apache.commons.configuration.PropertiesConfiguration
import org.apache.commons.io.FileUtils
import org.scalatest.{ FlatSpec, Matchers }
import resource._
import Constants.DATASET_SDO
import org.scalatest.flatspec.AnyFlatSpec
import org.scalatest.matchers.should.Matchers

import scala.collection.JavaConverters._
import scala.util.Success

class RunSpec extends FlatSpec with Matchers with CanConnectFixture {
class RunSpec extends AnyFlatSpec with Matchers with CanConnectFixture {
private val testDir = Paths.get("target/test", getClass.getSimpleName)
FileUtils.deleteQuietly(testDir.toFile)
Files.createDirectories(testDir)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,11 @@ import java.nio.file.Files
import nl.knaw.dans.easy.stage.{ CanConnectFixture, Settings }
import org.apache.commons.io.FileUtils
import org.joda.time.{ DateTime, DateTimeUtils }
import org.scalatest.{ BeforeAndAfterEach, FlatSpec, Inside, Inspectors, Matchers }
import org.scalatest.flatspec.AnyFlatSpec
import org.scalatest.matchers.should.Matchers
import org.scalatest.{ BeforeAndAfterEach, Inside, Inspectors }

class MdFixture extends FlatSpec with Matchers with Inside with CanConnectFixture with BeforeAndAfterEach with Inspectors {
class MdFixture extends AnyFlatSpec with Matchers with Inside with CanConnectFixture with BeforeAndAfterEach with Inspectors {

val testDir = new File(s"target/test/${ getClass.getSimpleName }")
val sdoSetDir = new File(s"$testDir/sdoSet")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,14 @@ import java.net.URL
import nl.knaw.dans.easy.stage.ExistingAncestor
import nl.knaw.dans.easy.stage.lib.Util.loadXML
import nl.knaw.dans.easy.stage.lib.{ Fedora, FedoraRelationObject }
import org.scalatest._
import org.scalatest.flatspec.AnyFlatSpec
import org.scalatest.matchers.should.Matchers
import org.scalatest.{ BeforeAndAfterEach, Inside }

import scala.collection.immutable.HashMap
import scala.util.{ Failure, Success, Try }

class EasyStageFileItemSpec extends FlatSpec with Matchers with Inside with BeforeAndAfterEach {
class EasyStageFileItemSpec extends AnyFlatSpec with Matchers with Inside with BeforeAndAfterEach {

"run" should "report a missing size" in {
val result = EasyStageFileItem.run(new FileItemSettings(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,11 @@
package nl.knaw.dans.easy.stage.fileitem

import nl.knaw.dans.common.lang.dataset.AccessCategory
import org.scalatest.{ FlatSpec, Matchers, OptionValues }
import org.scalatest.OptionValues
import org.scalatest.flatspec.AnyFlatSpec
import org.scalatest.matchers.should.Matchers

class FileAccesRightsSpec extends FlatSpec with Matchers with OptionValues {
class FileAccesRightsSpec extends AnyFlatSpec with Matchers with OptionValues {
/*
according to ddm.xsd there are 5 options for the dataset AccessRights
<xs:enumeration value="OPEN_ACCESS">
Expand Down

0 comments on commit b906e36

Please sign in to comment.