Improved test for publish-local

src/sbt-test/dependency-management/publish-local/project/build.properties

@@ -1,2 +1,3 @@
 project.name=Publish Test
+project.organization=test
 project.version=1.0

src/sbt-test/dependency-management/publish-local/project/build/MultiPublishTest.scala

@@ -7,7 +7,11 @@ class MultiPublishTest(info: ProjectInfo) extends ParentProject(info)
 			ManagedStyle.Maven
 		else
 			ManagedStyle.Auto
-	override def ivyCacheDirectory = Some(outputPath / "ivy" / "cache")
+
+	override def deliverProjectDependencies = if(managedStyle == sub.managedStyle) super.deliverProjectDependencies else Nil
+
+	override def ivyCacheDirectory = Some("ivy" / "cache")
+	override def ivyRepositories = Resolver.file("local", "ivy" / "local" asFile)(Resolver.ivyStylePatterns) :: Nil
 	
 	lazy val sub = project("sub", "Sub Project", new SubProject(_))
 	class SubProject(info: ProjectInfo) extends DefaultProject(info)

src/sbt-test/dependency-management/publish-local/project/changes/RetrieveTest.scala

@@ -0,0 +1,15 @@
+import sbt._
+
+class Retrieve(info: ProjectInfo) extends ParentProject(info)
+{
+	override def ivyCacheDirectory = Some(outputPath / "ivy" / "cache")
+	override def ivyRepositories = Resolver.file("local", "ivy" / "local" asFile)(Resolver.ivyStylePatterns) :: Nil
+
+	override def libraryDependencies = Set() ++( if("mavenStyle".asFile.exists) mavenStyleDependencies else autoStyleDependencies )
+
+	def autoStyleDependencies = parentDep("A") :: subDep("A") :: subDep("B") ::parentDep("D") :: Nil
+	def mavenStyleDependencies = parentDep("B") :: parentDep("C") :: subDep("C") :: subDep("D") :: Nil
+
+	def parentDep(org: String) =  org %% "publish-test" % "1.0"
+	def subDep(org: String) = org %% "sub-project" % "1.0"
+}

src/sbt-test/dependency-management/publish-local/test

@@ -1,16 +1,34 @@
+> set project.organization A
+> reload
 > publish-local
 
-> clean 
-$ touch mavenStyle 
-> reload 
+> set project.organization B
+$ touch mavenStyle
+> reload
 > publish-local
 
-> clean 
-$ touch sub/mavenStyle 
-> reload 
+> set project.organization C
+$ touch sub/mavenStyle
+> reload
 > publish-local
 
-> clean 
-$ delete mavenStyle 
-> reload 
+> set project.organization D
+$ delete mavenStyle
+> reload
 > publish-local
+
+
+> set project.name Retrieve Test
+> clean
+$ delete project/build/
+$ copy-file project/changes/RetrieveTest.scala project/build/RetrieveTest.scala
+> reload
+
+> clean-lib
+>debug
+> update
+
+$ touch mavenStyle
+> reload
+> clean-lib
+> update