From 0425532275ceb7fe5f8d956901ad980f80f938a4 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Wed, 6 Oct 2010 08:24:13 -0400
Subject: [PATCH] fix tests, discovery

updated compile tests for new minimal AnalysisCallback
moved discovery to discovery/ subproject and updated for new approach
fixed discovery to only find public methods when searching for annotated definitions
extracting inherited definitions unimplemented in api/, so some discovery tests fail
moved discovery classes from sbt.inc package to sbt.compile
---
 interface/src/test/scala/TestCallback.scala | 29 +++++++--------------
 util/log/src/test/scala/TestLogger.scala    | 11 ++++++++
 2 files changed, 20 insertions(+), 20 deletions(-)
 create mode 100644 util/log/src/test/scala/TestLogger.scala

diff --git a/interface/src/test/scala/TestCallback.scala b/interface/src/test/scala/TestCallback.scala
index 75e8d77af..d554a9a08 100644
--- a/interface/src/test/scala/TestCallback.scala
+++ b/interface/src/test/scala/TestCallback.scala
@@ -1,34 +1,23 @@
 package xsbti
 
-import java.io.File
-import scala.collection.mutable.ArrayBuffer
+	import java.io.File
+	import scala.collection.mutable.ArrayBuffer
 
-class TestCallback(val superclassNames: Array[String], val annotationNames: Array[String]) extends AnalysisCallback
+class TestCallback extends AnalysisCallback
 {
-	val invalidSuperclasses = new ArrayBuffer[String]
 	val beganSources = new ArrayBuffer[File]
 	val endedSources = new ArrayBuffer[File]
-	val foundSubclasses = new ArrayBuffer[(File, String, String, Boolean)]
-	val foundAnnotated = new ArrayBuffer[(File, String, String, Boolean)]
 	val sourceDependencies = new ArrayBuffer[(File, File)]
-	val jarDependencies = new ArrayBuffer[(File, File)]
-	val classDependencies = new ArrayBuffer[(File, File)]
-	val productDependencies = new ArrayBuffer[(File, File)]
+	val binaryDependencies = new ArrayBuffer[(File, String, File)]
 	val products = new ArrayBuffer[(File, File)]
-	val applications = new ArrayBuffer[(File, String)]
+	val apis = new ArrayBuffer[(File, xsbti.api.Source)]
 
-	def superclassNotFound(superclassName: String) { invalidSuperclasses += superclassName }
 	def beginSource(source: File) { beganSources += source }
-	def foundSubclass(source: File, subclassName: String, superclassName: String, isModule: Boolean): Unit =
-		foundSubclasses += ((source, subclassName, superclassName, isModule))
-	def foundAnnotated(source: File, className: String, annotationName: String, isModule: Boolean): Unit =
-		foundAnnotated += ((source, className, annotationName, isModule))
+
 	def sourceDependency(dependsOn: File, source: File) { sourceDependencies += ((dependsOn, source)) }
-	def jarDependency(jar: File, source: File) { jarDependencies += ((jar, source)) }
-	def classDependency(clazz: File, source: File) { classDependencies += ((clazz, source)) }
-	def productDependency(clazz: File, source: File) { productDependencies += ((clazz, source)) }
+	def binaryDependency(binary: File, name: String, source: File) { binaryDependencies += ((binary, name, source)) }
 	def generatedClass(source: File, module: File) { products += ((source, module)) }
 	def endSource(source: File) { endedSources += source }
-	def foundApplication(source: File, className: String) { applications += ((source, className)) }
-	def api(source: File, sourceAPI: xsbti.api.Source) = ()
+
+	def api(source: File, sourceAPI: xsbti.api.Source) { apis += ((source, sourceAPI)) }
 }
\ No newline at end of file
diff --git a/util/log/src/test/scala/TestLogger.scala b/util/log/src/test/scala/TestLogger.scala
new file mode 100644
index 000000000..edf2b00dd
--- /dev/null
+++ b/util/log/src/test/scala/TestLogger.scala
@@ -0,0 +1,11 @@
+package sbt
+
+object TestLogger
+{
+	def apply[T](f: Logger => T): T =
+	{
+		val log = new BufferedLogger(ConsoleLogger())
+		log.setLevel(Level.Debug)
+		log.bufferQuietly(f(log))
+	}
+}
\ No newline at end of file