Skip to content

Fix Aether stub downloader test isolation #2496

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hutiefang76 wants to merge 1 commit into
base: main
Choose a base branch
from
+8 −5
Open

Fix Aether stub downloader test isolation #2496

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions ...test/groovy/org/springframework/cloud/contract/stubrunner/AetherStubDownloaderSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,12 @@ import org.eclipse.aether.RepositorySystemSession
import org.eclipse.aether.repository.Authentication
import org.junit.Rule
import org.junit.rules.TemporaryFolder
import spock.lang.Ignore
import spock.lang.Specification
import spock.util.environment.RestoreSystemProperties

import org.springframework.cloud.contract.stubrunner.spring.StubRunnerProperties
import org.springframework.util.ResourceUtils

@Ignore("see https://github.com/spring-cloud/spring-cloud-contract/issues/2478")
class AetherStubDownloaderSpec extends Specification {

@Rule
Expand All @@ -48,22 +46,27 @@ class AetherStubDownloaderSpec extends Specification {
entry == null
}

@RestoreSystemProperties
def 'should throw an exception when local m2 gets replaced with a temp dir and a jar is not found in remote'() {
given:
StubRunnerOptions stubRunnerOptions = new StubRunnerOptionsBuilder()
.withStubsMode(StubRunnerProperties.StubsMode.REMOTE)
.withStubRepositoryRoot("file://" + folder.newFolder().absolutePath)
.build()
and:
String localRepo = AetherFactories.localRepositoryDirectory(true)
new File(localRepo, "org/springframework/cloud/spring-cloud-contract-spec"
def m2repoFolder = 'm2repo' + File.separator + 'repository'
File localRepo = ResourceUtils.getFile(ResourceUtils.CLASSPATH_URL_PREFIX + m2repoFolder)
System.setProperty("maven.repo.local", localRepo.getAbsolutePath())
new File(localRepo, "org/springframework/cloud/contract/verifier/stubs/bootService"
.replace("/", File.separator)).list().size() > 0

and:
AetherStubDownloader aetherStubDownloader = new AetherStubDownloader(stubRunnerOptions)

when:
def entry = aetherStubDownloader.downloadAndUnpackStubJar(new StubConfiguration("org.springframework.cloud", "spring-cloud-contract-spec", "+", ""))
def entry = aetherStubDownloader.downloadAndUnpackStubJar(
new StubConfiguration("org.springframework.cloud.contract.verifier.stubs",
"bootService", "+", ""))

then:
entry == null
Expand Down