Merge pull request #41 from sbt/wip/testmixup

Don't depend on other projects' tests

build.sbt

@@ -33,7 +33,7 @@ def commonSettings: Seq[Setting[_]] = Seq(
     "-Ywarn-value-discard"),
   previousArtifact := None, // Some(organization.value %% moduleName.value % "1.0.0"),
   publishArtifact in Compile := true,
-  publishArtifact in Test := true
+  publishArtifact in Test := false
 )
 
 lazy val root = (project in file(".")).
@@ -59,19 +59,12 @@ lazy val root = (project in file(".")).
 lazy val lm = (project in file("librarymanagement")).
   settings(
     commonSettings,
+    name := "librarymanagement",
     libraryDependencies ++= Seq(
-      utilLogging.artifacts(
-        Artifact("util-logging", "jar", "jar", classifier = None, configurations = List(Compile), url = None),
-        Artifact("util-logging", "jar", "jar", classifier = Some("tests"), configurations = List(Test), url = None)
-      ),
-      sbtIO.artifacts(
-        Artifact("io", "jar", "jar", classifier = None, configurations = List(Compile), url = None),
-        Artifact("io", "jar", "jar", classifier = Some("tests"), configurations = List(Test), url = None)
-      ),
-      utilTesting % Test,
+      utilLogging, sbtIO, utilTesting % Test,
       utilCollection, utilCompletion, ivy, jsch, sbtSerialization, scalaReflect.value, launcherInterface),
     resourceGenerators in Compile <+= (version, resourceManaged, streams, compile in Compile) map Util.generateVersionFile,
-    name := "librarymanagement",
+    publishArtifact in Test := false,
     binaryIssueFilters ++= Seq()
   )
 

librarymanagement/src/test/scala/BaseIvySpecification.scala

@@ -6,7 +6,6 @@ import java.io.File
 import cross.CrossVersionUtil
 import sbt.util.Logger
 import sbt.internal.util.ConsoleLogger
-import sbt.internal.util.UnitSpec
 import sbt.librarymanagement._
 import ivyint.SbtChainResolver
 import Configurations._

librarymanagement/src/test/scala/ComponentManagerTest.scala

@@ -8,7 +8,6 @@ import org.apache.ivy.util.ChecksumHelper
 import IfMissing.Fail
 import xsbti.ComponentProvider
 import sbt.util.Logger
-import sbt.internal.util.{ UnitSpec, TestLogger }
 
 // TODO - We need to re-enable this test.  Right now, we dont' have a "stub" launcher for this.
 //        This is testing something which uses a launcher interface, but was grabbing the underlying class directly

librarymanagement/src/test/scala/CustomPomParserTest.scala

@@ -8,7 +8,6 @@ import sbt.librarymanagement._
 import sbt.io.IO.withTemporaryDirectory
 import sbt.util.Logger
 import sbt.internal.util.ConsoleLogger
-import sbt.internal.util.UnitSpec
 
 class CustomPomParserTest extends UnitSpec {
   "CustomPomParser" should "resolve an artifact with packaging 'scala-jar' as a regular jar file." in {

librarymanagement/src/test/scala/InconsistentDuplicateSpec.scala

@@ -1,6 +1,5 @@
 package sbt.internal.librarymanagement
 
-import sbt.internal.util.UnitSpec
 import sbt.librarymanagement._
 
 // This is a specification to check the inconsistent duplicate warnings

librarymanagement/src/test/scala/MakePomSpec.scala

@@ -3,7 +3,6 @@ package sbt.internal.librarymanagement
 import java.io.File
 import sbt.util.Logger
 import sbt.internal.util.ConsoleLogger
-import sbt.internal.util.UnitSpec
 
 // http://ant.apache.org/ivy/history/2.3.0/ivyfile/dependency.html
 // http://maven.apache.org/enforcer/enforcer-rules/versionRanges.html

librarymanagement/src/test/scala/sbt/internal/librarymanagement/RepositoriesParserSpecification.scala

@@ -2,8 +2,6 @@ package sbt
 package internal
 package librarymanagement
 
-import sbt.internal.util.UnitSpec
-
 import java.net.URL
 
 /**

librarymanagement/src/test/scala/sbt/internal/librarymanagement/TestLogger.scala

@@ -0,0 +1,15 @@
+package sbt
+package internal
+package librarymanagement
+
+import sbt.util._
+import sbt.internal.util._
+
+object TestLogger {
+  def apply[T](f: Logger => T): T =
+    {
+      val log = new BufferedLogger(ConsoleLogger())
+      log.setLevel(Level.Debug)
+      log.bufferQuietly(f(log))
+    }
+}

librarymanagement/src/test/scala/sbt/internal/librarymanagement/UnitSpec.scala

@@ -0,0 +1,7 @@
+package sbt
+package internal
+package librarymanagement
+
+import org.scalatest._
+
+abstract class UnitSpec extends FlatSpec with Matchers

project/Dependencies.scala

@@ -5,8 +5,8 @@ object Dependencies {
   lazy val scala210 = "2.10.6"
   lazy val scala211 = "2.11.8"
 
-  val ioVersion = "1.0.0-M5"
-  val utilVersion = "0.1.0-M12"
+  val ioVersion = "1.0.0-M6"
+  val utilVersion = "0.1.0-M13"
   lazy val sbtIO = "org.scala-sbt" %% "io" % ioVersion
   lazy val utilCollection = "org.scala-sbt" %% "util-collection" % utilVersion
   lazy val utilLogging = "org.scala-sbt" %% "util-logging" % utilVersion