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

Fix some tests and open up some analysis-related classes

This commit is contained in:
Mark Harrah 2009-10-18 18:03:31 -04:00
parent d57e6a8f1a
commit e5b3b577d8
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/scala/sbt/Analysis.scala
View File

@ -34,7 +34,7 @@ import BasicAnalysis._
import impl.MapUtilities.{add, all, read, mark, readOnlyIterable, write}
import scala.collection.mutable.{HashMap, HashSet, ListBuffer, Map, Set}
sealed class BasicAnalysis(analysisPath: Path, projectPath: Path, log: Logger) extends TaskAnalysis[Path, Path, File]
class BasicAnalysis(analysisPath: Path, projectPath: Path, log: Logger) extends TaskAnalysis[Path, Path, File]
{
private val sourceDependencyMap: Map[Path, Set[Path]] = new HashMap
private val productMap: Map[Path, Set[Path]] = new HashMap
@ -161,7 +161,7 @@ object CompileAnalysis
}
import CompileAnalysis._
import Format._ // get implicits for data types
sealed class BasicCompileAnalysis protected (analysisPath: Path, projectPath: Path, log: Logger) extends BasicAnalysis(analysisPath, projectPath, log)
class BasicCompileAnalysis protected (analysisPath: Path, projectPath: Path, log: Logger) extends BasicAnalysis(analysisPath, projectPath, log)
{
/*private */val hashesMap = new HashMap[Path, Array[Byte]]
@ -196,7 +196,7 @@ private[sbt] final class BuilderCompileAnalysis(analysisPath: Path, projectPath:
Backed(projectDefinitionMap, ProjectDefinitionsLabel, ProjectDefinitionsName) ::
super.backedMaps
}
final class CompileAnalysis(analysisPath: Path, projectPath: Path, log: Logger) extends BasicCompileAnalysis(analysisPath, projectPath, log)
class CompileAnalysis(analysisPath: Path, projectPath: Path, log: Logger) extends BasicCompileAnalysis(analysisPath, projectPath, log)
{
private val testMap = new HashMap[Path, Set[TestDefinition]]
private val applicationsMap = new HashMap[Path, Set[String]]

2
src/sbt-test/dependency-management/module-confs/project/build/Test.scala
View File

@ -9,6 +9,6 @@ class Test(info: ProjectInfo) extends DefaultProject(info)
def scalaSnapshots = Resolver.url("Scala Tools Snapshots") artifacts(snapshotPattern) ivys(snapshotPattern) mavenStyle()
val scOnly = ModuleConfiguration("org.scala-lang", "*", "2.8.0-.*", scalaSnapshots)
val uniqueScala = "org.scala-lang" % "scala-compiler" % "2.8.0-20090910.003346-219"
val uniqueScala = "org.scala-lang" % "scala-compiler" % "2.8.0-20091017.011744-240"
val otherDep = "org.scala-tools.sxr" % "sxr_2.7.5" % "0.2.3"
}

5
src/sbt-test/tests/specs-a/changes/BasicTest.scala
View File

@ -27,10 +27,9 @@ abstract class AbstractNotATest extends Specification
}
}
class ClassNotATest extends Specification
class ClassCanBeATest extends Specification
{
// would fail if called
"'hello world' has 11 characters" in {
"hello world".size mustEqual 12
"hello world".size mustEqual 11
}
}

4
src/sbt-test/tests/specs-a/changes/FailTest.scala
View File

@ -27,10 +27,10 @@ object FailTest extends Specification
}
}
class ClassNotATest extends Specification
class ClassCanBeATest extends Specification
{
// would fail if called
"'hello world' has 11 characters" in {
"hello world".size mustEqual 12
"hello world".size mustEqual 11
}
}