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

Skip cleanup hook if there are no tests. More verbose logging. Moved to package. #4

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Skip cleanup hook if there are no tests. More verbose logging. Moved to package. #4

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e69d784
Move plugin to sbt.scct package.
ezh May 19, 2013
dbda903
Skip cleanup hook if there are no tests. More verbose logging.
ezh May 19, 2013
34d1ca7
Fix typo, add hooks description.
ezh May 19, 2013
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
67 changes: 45 additions & 22 deletions src/main/scala/ScctPlugin.scala → src/main/scala/sbt/scct/ScctPlugin.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
package sbt.scct

import java.util.Properties
import sbt._
import sbt.Keys._
Expand Down Expand Up @@ -49,27 +51,8 @@ object ScctPlugin extends Plugin {
scctDeps ++ testDeps.filter(_.data != oldClassDir)
},

testOptions in ScctTest <+= (name in Scct, baseDirectory in Scct, scalaSource in Scct, classDirectory in ScctTest, scctReportDir) map { (n, base, src, testClassesDir, reportDir) =>
Tests.Setup { () =>
val props = new Properties()
props.setProperty("scct.basedir", base.getAbsolutePath)
props.setProperty("scct.report.hook", "system.property")
props.setProperty("scct.project.name", n)
props.setProperty("scct.report.dir", reportDir.getAbsolutePath)
props.setProperty("scct.source.dir", src.getAbsolutePath)
val out = testClassesDir / "scct.properties"
IO.write(props, "Env for scct test run and report generation", out)
}
},
testOptions in ScctTest <+= (state, name in Scct) map { (s, n) =>
Tests.Cleanup { () =>
val reportProperty = "scct.%s.fire.report".format(n)
System.setProperty(reportProperty, "true")
val maxSleep = compat.Platform.currentTime + 60L*1000L
while (sys.props(reportProperty) != "done" && compat.Platform.currentTime < maxSleep) Thread.sleep(200L)
if (sys.props(reportProperty) != "done") println("scct: ["+n+"] Timed out waiting for coverage report.")
}
},
testOptions in ScctTest <+= testSetup,
testOptions in ScctTest <+= testCleanup,

// Sugar: copy test from ScctTest to Scct so you can use scct:test
Keys.test in Scct <<= (Keys.test in ScctTest),
Expand Down Expand Up @@ -130,5 +113,45 @@ object ScctPlugin extends Plugin {
ref.project +: aggregated(ref, structure)
}
}

/** Generate hook that is invoked before each tests execution. */
def testSetup() =
(name in Scct, baseDirectory in Scct, scalaSource in Scct, classDirectory in ScctTest, definedTests in ScctTest, scctReportDir, streams) map {
(name, baseDirectory, scalaSource, classDirectory, definedTests, scctReportDir, streams) =>
if (definedTests.isEmpty) {
streams.log.debug(logPrefix(name) + "No tests found. Skip SCCT setup hook.")
Tests.Setup { () => {} }
} else
Tests.Setup { () =>
val out = classDirectory / "scct.properties"
streams.log.debug(logPrefix(name) + "Prepare SCCT environment at %s".format(out.getCanonicalPath()))
val props = new Properties()
props.setProperty("scct.basedir", baseDirectory.getAbsolutePath)
props.setProperty("scct.report.hook", "system.property")
props.setProperty("scct.project.name", name)
props.setProperty("scct.report.dir", scctReportDir.getAbsolutePath)
props.setProperty("scct.source.dir", scalaSource.getAbsolutePath)
IO.write(props, "Env for scct test run and report generation", out)
}
}
/** Generate hook that is invoked after each tests execution. */
def testCleanup() =
(name in Scct, classDirectory in ScctTest, definedTests in ScctTest, streams) map {
(name, classDirectory, definedTests, streams) =>
if (definedTests.isEmpty) {
streams.log.debug(logPrefix(name) + "No tests found. Skip SCCT cleanup hook.")
Tests.Cleanup { () => {} }
} else
Tests.Cleanup { () =>
streams.log.debug(logPrefix(name) + "Waiting for coverage report generation.")
val out = classDirectory / "scct.properties"
val reportProperty = "scct.%s.fire.report".format(name)
System.setProperty(reportProperty, "true")
val maxSleep = compat.Platform.currentTime + 60L * 1000L
while (sys.props(reportProperty) != "done" && compat.Platform.currentTime < maxSleep) Thread.sleep(200L)
if (sys.props(reportProperty) != "done") streams.log.debug(logPrefix(name) + "Timed out waiting for coverage report.")
out.delete
streams.log.debug(logPrefix(name) + "Cleanup SCCT environment")
}
}
def logPrefix(name: String) = "scct: [" + name + "] "
}