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.

Sign up for GitHub

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

Use proper matchers in ScalaTest #123

Merged
merged 1 commit into from
Jan 26, 2024
Merged

Use proper matchers in ScalaTest #123

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 7 additions & 9 deletions src/test/scala/com/typesafe/sbt/osgi/OsgiSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ class OsgiSpec extends Specification {
"return None for an empty Seq" in {
seqToStrOpt(Nil)(id) must be(None)
}
"return Some wrapping a properly consturcted String for a non-empty Seq" in {
seqToStrOpt(Seq("foo", "bar", "baz"))(id) must beEqualTo(Some("foo,bar,baz"))
seqToStrOpt(Seq(1, 2, 3))(_.toString) must beEqualTo(Some("1,2,3"))
"return Some wrapping a properly constructed String for a non-empty Seq" in {
seqToStrOpt(Seq("foo", "bar", "baz"))(id) must beSome("foo,bar,baz")
seqToStrOpt(Seq(1, 2, 3))(_.toString) must beSome("1,2,3")
}
}

Expand Down Expand Up @@ -70,7 +70,7 @@ class OsgiSpec extends Specification {
EXPORT_PACKAGE -> "exportPackage1,exportPackage2,exportPackage3",
IMPORT_PACKAGE -> "importPackage",
PRIVATE_PACKAGE -> "privatePackage",
REQUIRE_CAPABILITY → "requireCapability"
REQUIRE_CAPABILITY -> "requireCapability"
)
properties.asScala must not(haveKey(FRAGMENT_HOST))
properties.asScala must not(haveKey(REQUIRE_BUNDLE))
Expand All @@ -95,22 +95,20 @@ class OsgiSpec extends Specification {
val jar = new File("/aJar.jar")
val anotherJar = new File("/anotherJar.jar")
val actual = includeResourceProperty(Seq(resourceDir), Seq(jar), Seq(anotherJar))
actual must beEqualTo(
Some(resourceDir.getAbsolutePath + "," + jar.getAbsolutePath + ",@" + anotherJar.getAbsolutePath)
)
actual must beSome(resourceDir.getAbsolutePath + "," + jar.getAbsolutePath + ",@" + anotherJar.getAbsolutePath)
}
}

"Calling bundleClasspathProperty" should {
"add bundle classes and embedded jars to classpath" in {
val embeddedJars = Seq(new File("/aJar.jar"), new File("/bJar.jar"))
val actual = bundleClasspathProperty(embeddedJars)
actual must beEqualTo(Some(".,aJar.jar,bJar.jar"))
actual must beSome(".,aJar.jar,bJar.jar")
}
"remain default if no embedded jars are specified" in {
val embeddedJars = Seq()
val actual = bundleClasspathProperty(embeddedJars)
actual must beEqualTo(None)
actual must beNone
}
}
}
Loading