cipd: Refactor client to make it more readable.

go/src/infra/tools/cipd/local/reader_test.go

 // Copyright 2014 The Chromium 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 cipd
+package local
 
 import (
         "bytes"
         "io"
         "io/ioutil"
         "os"
         "testing"
 
         . "github.com/smartystreets/goconvey/convey"
+
+        . "infra/tools/cipd/common"
 )
 
 func TestPackageReading(t *testing.T) {
         goodManifest := `{
   "format_version": "1",
   "package_name": "testing"
 }`
 
         Convey("Open empty package works", t, func() {
                 // Build an empty package.
                 out := bytes.Buffer{}
                 err := BuildInstance(BuildInstanceOptions{
                         Output:      &out,
                         PackageName: "testing",
                 })
                 So(err, ShouldBeNil)
 
                 // Open it.
                 inst, err := OpenInstance(bytes.NewReader(out.Bytes()), "")
                 if inst != nil {
                         defer inst.Close()
                 }
                 So(inst, ShouldNotBeNil)
                 So(err, ShouldBeNil)
-                So(inst.PackageName(), ShouldEqual, "testing")
-                So(inst.InstanceID(), ShouldEqual, "23f2c4900785ac8faa2f38e473925b840e574ccc")
+                So(inst.Pin(), ShouldResemble, Pin{"testing", "23f2c4900785ac8faa2f38e473925b840e574ccc"})
                 So(len(inst.Files()), ShouldEqual, 1)
 
                 // Contains single manifest file.
                 f := inst.Files()[0]
                 So(f.Name(), ShouldEqual, ".cipdpkg/manifest.json")
                 So(f.Size(), ShouldEqual, uint64(len(goodManifest)))
                 So(f.Executable(), ShouldBeFalse)
                 r, err := f.Open()
                 if r != nil {
                         defer r.Close()
@@ skipping 48 matching lines @@
                 }
                 So(inst, ShouldNotBeNil)
                 So(err, ShouldBeNil)
         })
 
         Convey("ExtractInstance works", t, func() {
                 // Add a bunch of files to a package.
                 out := bytes.Buffer{}
                 err := BuildInstance(BuildInstanceOptions{
                         Input: []File{
-                                makeTestFile("testing/qwerty", "12345", false),
-                                makeTestFile("abc", "duh", true),
-                                makeTestSymlink("rel_symlink", "abc"),
-                                makeTestSymlink("abs_symlink", "/abc/def"),
+                                NewTestFile("testing/qwerty", "12345", false),
+                                NewTestFile("abc", "duh", true),
+                                NewTestSymlink("rel_symlink", "abc"),
+                                NewTestSymlink("abs_symlink", "/abc/def"),
                         },
                         Output:      &out,
                         PackageName: "testing",
                 })
                 So(err, ShouldBeNil)
 
                 // Extract files.
                 inst, err := OpenInstance(bytes.NewReader(out.Bytes()), "")
                 if inst != nil {
                         defer inst.Close()
@@ skipping 61 matching lines @@
                 symlinkTarget: target,
         }
         d.files = append(d.files, f)
         return nil
 }
 
 func (d *testDestination) End(success bool) error {
         d.endCalls++
         return nil
 }