Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update scalatest to 3.2.18 #1600

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ libraryDependencies ++= Seq(
"org.apache.ant" % "ant" % "1.10.14",
// workaround for the command line size limit
"com.github.eldis" % "tool-launcher" % "0.2.2",
"org.scalatest" %% "scalatest" % "3.0.9" % Test
"org.scalatest" %% "scalatest" % "3.2.18" % Test
)

// sbt dependent libraries
Expand Down
4 changes: 3 additions & 1 deletion src/test/scala/com/typesafe/sbt/packager/FileUtilSpec.scala
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@ package com.typesafe.sbt.packager

import org.scalatest._
import java.nio.file.attribute.PosixFilePermission._
import org.scalatest.flatspec.AnyFlatSpec
import org.scalatest.matchers.should.Matchers

class FileUtilSpec extends FlatSpec with Matchers {
class FileUtilSpec extends AnyFlatSpec with Matchers {

"permissions" should "convert octal to symbolic correctly" taggedAs (LinuxTag, WindowsTag) in {
permissions convert "0000" should be("---------")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@ package com.typesafe.sbt.packager

import com.typesafe.sbt.packager.archetypes.scripts._
import org.scalatest._
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpec

class StartScriptMainClassConfigSpec extends WordSpec with Matchers {
class StartScriptMainClassConfigSpec extends AnyWordSpec with Matchers {

"StartScriptMainClassConfig" should {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@ package com.typesafe.sbt.packager.archetypes.jlink
import java.nio.charset.StandardCharsets
import java.nio.file.{Files, Paths}

import org.scalatest.{FlatSpec, Matchers}
import JlinkPlugin.Ignore.byPackagePrefix
import JlinkPlugin.javaVersionPattern
import org.scalatest.flatspec.AnyFlatSpec
import org.scalatest.matchers.should.Matchers

class JlinkSpec extends FlatSpec with Matchers {
class JlinkSpec extends AnyFlatSpec with Matchers {
"Ignore.byPackagePrefix()" should "match as expected for sample examples" in {
byPackagePrefix("" -> "")("foo" -> "bar") should be(true)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
package com.typesafe.sbt.packager.archetypes.scripts

import org.scalatest.{FlatSpec, Matchers}
import org.scalatest.flatspec.AnyFlatSpec
import org.scalatest.matchers.should.Matchers

class ScriptUtilsTest extends FlatSpec with Matchers {
class ScriptUtilsTest extends AnyFlatSpec with Matchers {
"toLowerCase()" should "convert regular names" in {
ScriptUtils.toLowerCase("package.TestClass") should be("package.test-class")
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
package com.typesafe.sbt.packager.docker

import org.scalatest._
import org.scalatest.diagrams.Diagrams
import org.scalatest.flatspec.AnyFlatSpec

class DockerApiVersionSpec extends FlatSpec with DiagrammedAssertions {
class DockerApiVersionSpec extends AnyFlatSpec with Diagrams {
"DockerApiVersion" should "parse 1.40" in {
val v = DockerApiVersion.parse("1.40")
assert(v == Some(DockerApiVersion(1, 40)))
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
package com.typesafe.sbt.packager.docker

import org.scalatest._
import org.scalatest.diagrams.Diagrams
import org.scalatest.flatspec.AnyFlatSpec

class DockerVersionSpec extends FlatSpec with DiagrammedAssertions {
class DockerVersionSpec extends AnyFlatSpec with Diagrams {
"DockerVersion" should "parse 18.09.2" in {
val v = DockerVersion.parse("18.09.2")
assert(v == Some(DockerVersion(18, 9, 2, None)))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@ package com.typesafe.sbt.packager.linux

import java.io.File

import org.scalatest.{Matchers, WordSpec}
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpec

class LinuxMappingDSLSpec extends WordSpec with Matchers with LinuxMappingDSL {
class LinuxMappingDSLSpec extends AnyWordSpec with Matchers with LinuxMappingDSL {

"The LinuxMappingDSL" should {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,10 @@ import java.io.File
import java.nio.file.{Files, Path, Paths}
import java.nio.file.attribute.PosixFilePermission._
import scala.collection.JavaConversions._
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpec

class ZipHelperSpec extends WordSpec with Matchers with BeforeAndAfterEach with BeforeAndAfterAll {
class ZipHelperSpec extends AnyWordSpec with Matchers with BeforeAndAfterEach with BeforeAndAfterAll {

var tmp: Path = _
val toDelete = scala.collection.mutable.ListBuffer[Path]()
Expand Down
Loading