Fix bug: lock wrong dependency when installing

gogradle · Mar 23, 2017 · 7e4a552 · 7e4a552
1 parent fbc569a
commit 7e4a552
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/...com/github/blindpirate/gogradle/core/dependency/resolve/AbstractVcsDependencyManager.java b/...com/github/blindpirate/gogradle/core/dependency/resolve/AbstractVcsDependencyManager.java
@@ -99,7 +99,8 @@ private ResolvedDependency resolveVcs(NotationDependency dependency, File vcsRoo
     @Override
     public void install(ResolvedDependency dependency, File targetDirectory) {
         try {
-            globalCacheManager.runWithGlobalCacheLock(dependency, () -> {
+            ResolvedDependency realDependency = determineResolvedDependency(dependency);
+            globalCacheManager.runWithGlobalCacheLock(realDependency, () -> {
                 installUnderLock(dependency, targetDirectory);
                 return null;
             });
@@ -108,7 +109,6 @@ public void install(ResolvedDependency dependency, File targetDirectory) {
         }
     }
 
-
     private void installUnderLock(ResolvedDependency dependency, File targetDirectory) {
         ResolvedDependency realDependency = determineResolvedDependency(dependency);
         Path globalCachePath = globalCacheManager.getGlobalPackageCachePath(realDependency.getName());

diff --git a/...thub/blindpirate/gogradle/core/dependency/resolve/AbstractVcsDependencyManagerTest.groovy b/...thub/blindpirate/gogradle/core/dependency/resolve/AbstractVcsDependencyManagerTest.groovy
@@ -12,6 +12,7 @@ import com.github.blindpirate.gogradle.util.IOUtils
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
+import org.mockito.ArgumentCaptor
 import org.mockito.Mock
 import org.mockito.invocation.InvocationOnMock
 import org.mockito.stubbing.Answer
@@ -170,6 +171,17 @@ class AbstractVcsDependencyManagerTest {
         verify(cacheManager).updateCurrentDependencyLock()
     }
 
+    @Test
+    void 'host dependency should be locked when installing'() {
+        // when
+        when(cacheManager.runWithGlobalCacheLock(any(GolangDependency), any(Callable))).thenReturn(null)
+        manager.install(vendorResolvedDependency, resource)
+        ArgumentCaptor<GolangDependency> captor = ArgumentCaptor.forClass(GolangDependency)
+        // then
+        verify(cacheManager).runWithGlobalCacheLock(captor.capture(), any(Callable))
+        assert captor.getValue().is(hostResolvedDependency)
+    }
+
 
     class TestAbstractVcsDependencyManager extends AbstractVcsDependencyManager {