Skip to content

fix unit test now that coverage files are in a dir #29

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

Merged
merged 1 commit into from
Mar 31, 2014
Merged

fix unit test now that coverage files are in a dir #29

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
13 changes: 7 additions & 6 deletions src/test/scala/scoverage/InvokerConcurrencyTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,11 @@ import scala.collection.breakOut
*/
class InvokerConcurrencyTest extends FunSuite with BeforeAndAfter {

val measurementFile = new File("invoker-test.measurement")
val measurementDir = new File("invoker-test.measurement")

before {
deleteMeasurementFiles()
measurementDir.mkdirs()
}

test("calling Invoker.invoked on multiple threads does not corrupt the measurement file") {
Expand All @@ -27,25 +28,25 @@ class InvokerConcurrencyTest extends FunSuite with BeforeAndAfter {
// the method
val futures: List[Future[Unit]] = testIds.map { i: Int =>
future {
Invoker.invoked(i, measurementFile.toString)
Invoker.invoked(i, measurementDir.toString)
}
}(breakOut)

futures.foreach(Await.result(_, 1.second))

// Now verify that the measurement file is not corrupted by loading it
val idsFromFile = IOUtils.invoked(measurementFile).toSet
val idsFromFile = IOUtils.invoked(measurementDir).toSet

idsFromFile === testIds
}

after {
deleteMeasurementFiles()
measurementDir.delete()
}

private def deleteMeasurementFiles(): Unit = {
measurementFile.getAbsoluteFile.getParentFile.listFiles()
.filter(_.getName.startsWith(measurementFile.getName))
.foreach(_.delete())
if (measurementDir.isDirectory)
measurementDir.listFiles().foreach(_.delete())
}
}