Put all connecting to Maven logic in DefaultModelResolver

Making the other classes much more testable!

--
MOS_MIGRATED_REVID=118203206

3 files changed, 28 insertions, 1 deletions

diff --git a/src/tools/generate_workspace/src/test/java/com/google/devtools/build/workspace/WorkspaceFileGeneratorTest.java b/src/tools/generate_workspace/src/test/java/com/google/devtools/build/workspace/WorkspaceFileGeneratorTest.java
index 3ff548c078..77ac7828b0 100644
--- a/src/tools/generate_workspace/src/test/java/com/google/devtools/build/workspace/WorkspaceFileGeneratorTest.java
+++ b/src/tools/generate_workspace/src/test/java/com/google/devtools/build/workspace/WorkspaceFileGeneratorTest.java
@@ -18,6 +18,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import com.google.devtools.build.lib.events.StoredEventHandler;
+import com.google.devtools.build.workspace.maven.DefaultModelResolver;
 import com.google.devtools.build.workspace.maven.Resolver;
 
 import org.junit.Test;
@@ -65,7 +66,7 @@ public class WorkspaceFileGeneratorTest {
     pomWriter.close();
 
     StoredEventHandler handler = new StoredEventHandler();
-    Resolver resolver = new Resolver(handler);
+    Resolver resolver = new Resolver(handler, new DefaultModelResolver());
     String outputFile = tmpdir + "/output";
     PrintStream outputStream = new PrintStream(outputFile);
     resolver.resolvePomDependencies(tmpdir.getAbsolutePath());
diff --git a/src/tools/generate_workspace/src/test/java/com/google/devtools/build/workspace/maven/BUILD b/src/tools/generate_workspace/src/test/java/com/google/devtools/build/workspace/maven/BUILD
index edce307ff2..d4df1085e3 100644
--- a/src/tools/generate_workspace/src/test/java/com/google/devtools/build/workspace/maven/BUILD
+++ b/src/tools/generate_workspace/src/test/java/com/google/devtools/build/workspace/maven/BUILD
@@ -17,6 +17,7 @@ java_test(
         "//src/main/java/com/google/devtools/build/lib:events",
         "//src/tools/generate_workspace/src/main/java/com/google/devtools/build/workspace/maven",
         "//third_party:junit4",
+        "//third_party:mockito",
         "//third_party:truth",
     ],
 )
diff --git a/src/tools/generate_workspace/src/test/java/com/google/devtools/build/workspace/maven/ResolverTest.java b/src/tools/generate_workspace/src/test/java/com/google/devtools/build/workspace/maven/ResolverTest.java
index 20318ec802..b830bcad8f 100644
--- a/src/tools/generate_workspace/src/test/java/com/google/devtools/build/workspace/maven/ResolverTest.java
+++ b/src/tools/generate_workspace/src/test/java/com/google/devtools/build/workspace/maven/ResolverTest.java
@@ -16,9 +16,15 @@ package com.google.devtools.build.workspace.maven;
 
 import static com.google.common.truth.Truth.assertThat;
 
+import com.google.devtools.build.lib.events.StoredEventHandler;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
+import org.mockito.Mockito;
+
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+import java.nio.charset.Charset;
 
 /**
  * Tests for {@link Resolver}.
@@ -38,4 +44,23 @@ public class ResolverTest {
     assertThat(Resolver.getSha1Url("http://example.pom/foo.pom", "jar"))
         .isEqualTo("http://example.pom/foo.jar.sha1");
   }
+
+  @Test
+  public void testArtifactResolution() throws Exception {
+    StoredEventHandler handler = new StoredEventHandler();
+    DefaultModelResolver modelResolver = Mockito.mock(DefaultModelResolver.class);
+    Resolver resolver = new Resolver(handler, modelResolver);
+    resolver.resolveArtifact("x:y:1.2.3");
+
+    ByteArrayOutputStream baos = new ByteArrayOutputStream();
+    PrintStream ps = new PrintStream(baos);
+    resolver.writeWorkspace(ps);
+    String content = baos.toString(String.valueOf(Charset.defaultCharset()));
+    assertThat(content).contains("maven_jar(\n"
+        + "    name = \"x_y\",\n"
+        + "    artifact = \"x:y:1.2.3\",\n"
+        + ")"
+    );
+    assertThat(handler.hasErrors()).isFalse();
+  }
 }