code review 5343042: goinstall: support googlecode subrepos and add repo mat...

src/cmd/goinstall/download_test.go

 // Copyright 2011 The Go Authors.  All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
 package main
 
 import (
         "bytes"
         "errors"
-        "http"
         "io/ioutil"
+        "net/http"
         "testing"
 )
 
 var FindPublicRepoTests = []struct {
-        pkg               string
-        vcs, prefix, repo string
-        transport         *testTransport
+        pkg            string
+        vcs, root, url string
+        transport      *testTransport
 }{
         {
                 "repo.googlecode.com/hg/path/foo",
                 "hg",
                 "repo.googlecode.com/hg",
                 "https://repo.googlecode.com/hg",
                 nil,
         },
         {
                 "repo.googlecode.com/svn/path",
@@ skipping 61 matching lines @@
                 nil,
         },
 }
 
 func TestFindPublicRepo(t *testing.T) {
         for _, test := range FindPublicRepoTests {
                 client := http.DefaultClient
                 if test.transport != nil {
                         client = &http.Client{Transport: test.transport}
                 }
-                m, err := findPublicRepo(test.pkg, client)
+                repo, err := findPublicRepo(test.pkg)
                 if err != nil {
-                        t.Errorf("%s: got error: %v", test.pkg, err)
+                        t.Errorf("findPublicRepo(%s): error: %v", test.pkg, err)
                         continue
                 }
-                if m == nil {
+                if repo == nil {
                         t.Errorf("%s: got nil match", test.pkg)
                         continue
                 }
-
-                if v := vcsMap[test.vcs]; m.vcs != v {
-                        t.Errorf("%s: got vcs=%v, want %v", test.pkg, m.vcs, v)
+                url, root, vcs, err := repo.Repo(client)
+                if err != nil {
+                        t.Errorf("%s: repo.Repo error: %v", test.pkg, err)
+                        continue
                 }
-                if m.prefix != test.prefix {
-                        t.Errorf("%s: got prefix=%v, want %v", test.pkg, m.prefix, test.prefix)
+                if v := vcsMap[test.vcs]; vcs != v {
+                        t.Errorf("%s: got vcs=%v, want %v", test.pkg, vcs, v)
                 }
-                if m.repo != test.repo {
-                        t.Errorf("%s: got repo=%v, want %v", test.pkg, m.repo, test.repo)
+                if root != test.root {
+                        t.Errorf("%s: got root=%v, want %v", test.pkg, root, test.root)
+                }
+                if url != test.url {
+                        t.Errorf("%s: got url=%v, want %v", test.pkg, url, test.url)
                 }
         }
 }
 
 type testTransport struct {
         expectURL    string
         responseBody string
 }
 
 func (t *testTransport) RoundTrip(req *http.Request) (*http.Response, error) {
         if g, e := req.URL.String(), t.expectURL; g != e {
                 return nil, errors.New("want " + e)
         }
         body := ioutil.NopCloser(bytes.NewBufferString(t.responseBody))
         return &http.Response{
                 StatusCode: http.StatusOK,
                 Body:       body,
         }, nil
 }