luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename testFingerprints to fingerprints and TestFingerprints to Fingerprints

This commit is contained in:
Mark Harrah 2010-04-03 14:10:13 -04:00
parent 48b5b5d7dc
commit 19c70cf9d3
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sbt/src/main/scala/sbt/Conditional.scala
View File

@ -205,9 +205,9 @@ abstract class AbstractCompileConfiguration extends NotNull
}
abstract class CompileConfiguration extends AbstractCompileConfiguration
{
def testFingerprints: TestFingerprints
def fingerprints: Fingerprints
}
final case class TestFingerprints(superclassNames: Iterable[String], annotationNames: Iterable[String]) extends NotNull
final case class Fingerprints(superclassNames: Iterable[String], annotationNames: Iterable[String]) extends NotNull
import java.io.File
class CompileConditional(override val config: CompileConfiguration, compiler: AnalyzingCompiler) extends AbstractCompileConditional(config, compiler)
@ -219,9 +219,9 @@ class CompileConditional(override val config: CompileConfiguration, compiler: An
protected def analysisCallback = new CompileAnalysisCallback
protected class CompileAnalysisCallback extends BasicCompileAnalysisCallback(projectPath, analysis)
{
private[this] val fingerprints = testFingerprints
def superclassNames = fingerprints.superclassNames
def annotationNames = fingerprints.annotationNames
private[this] val fingerprints0 = fingerprints
def superclassNames = fingerprints0.superclassNames
def annotationNames = fingerprints0.annotationNames
def foundSubclass(sourcePath: Path, subclassName: String, superclassName: String, isModule: Boolean): Unit =
analysis.addTest(sourcePath, DiscoveredSubclass(isModule, subclassName, superclassName))
def foundAnnotated(sourcePath: Path, className: String, annotationName: String, isModule: Boolean): Unit =

8
sbt/src/main/scala/sbt/DefaultProject.scala
View File

@ -201,7 +201,7 @@ abstract class BasicScalaProject extends ScalaProject with BasicDependencyProjec
def options = optionsAsString(baseCompileOptions.filter(!_.isInstanceOf[MaxCompileErrors]))
def maxErrors = maximumErrors(baseCompileOptions)
def compileOrder = BasicScalaProject.this.compileOrder
protected def fingerprints(frameworks: Seq[TestFramework]): TestFingerprints =
protected def getFingerprints(frameworks: Seq[TestFramework]): Fingerprints =
{
import org.scalatools.testing.{SubclassFingerprint, AnnotatedFingerprint}
val loader = TestFramework.createTestLoader(classpath.get, buildScalaInstance.loader)
@ -212,7 +212,7 @@ abstract class BasicScalaProject extends ScalaProject with BasicDependencyProjec
case a: AnnotatedFingerprint => annotations += a.annotationName
case _ => ()
}
TestFingerprints(superclasses.toList, annotations.toList)
Fingerprints(superclasses.toList, annotations.toList)
}
}
class MainCompileConfig extends BaseCompileConfig
@ -224,7 +224,7 @@ abstract class BasicScalaProject extends ScalaProject with BasicDependencyProjec
def outputDirectory = mainCompilePath
def classpath = compileClasspath
def analysisPath = mainAnalysisPath
def testFingerprints = TestFingerprints(Nil, Nil)
def fingerprints = Fingerprints(Nil, Nil)
def javaOptions = javaOptionsAsString(javaCompileOptions)
}
class TestCompileConfig extends BaseCompileConfig
@ -236,7 +236,7 @@ abstract class BasicScalaProject extends ScalaProject with BasicDependencyProjec
def outputDirectory = testCompilePath
def classpath = testClasspath
def analysisPath = testAnalysisPath
def testFingerprints = fingerprints(testFrameworks)
def fingerprints = getFingerprints(testFrameworks)
def javaOptions = javaOptionsAsString(testJavaCompileOptions)
}

2
sbt/src/main/scala/sbt/IntegrationTesting.scala
View File

@ -83,7 +83,7 @@ trait BasicIntegrationTesting extends ScalaIntegrationTesting with IntegrationTe
def analysisPath = integrationTestAnalysisPath
def baseCompileOptions = integrationTestCompileOptions
def javaOptions = javaOptionsAsString(javaCompileOptions)
def testFingerprints = fingerprints(integrationTestFrameworks)
def fingerprints = getFingerprints(integrationTestFrameworks)
}
}