internal/testing/sample: remove LegacyAddPackage

LegacyAddPackage is removed. AddPackage is used instead where
applicable.

For golang/go#39629

Change-Id: I61741f8c5c55fb173521b2fdd06259064d77270b
Reviewed-on: https://go-review.googlesource.com/c/pkgsite/+/265003
Trust: Julie Qiu <julie@golang.org>
Reviewed-by: Jonathan Amsterdam <jba@google.com>

1 files changed, 5 insertions, 15 deletions

diff --git a/internal/testing/sample/sample.go b/internal/testing/sample/sample.go
index 45b3e88a..b0a16068 100644
--- a/internal/testing/sample/sample.go
+++ b/internal/testing/sample/sample.go
@@ -114,27 +114,17 @@ func UnitForPackage(path, modulePath, version, name string, isRedistributable bo
 	}
 }
 
-func AddPackage(m *internal.Module, fullPath string) *internal.Module {
-	if m.ModulePath != stdlib.ModulePath && !strings.HasPrefix(fullPath, m.ModulePath) {
+func AddPackage(m *internal.Module, pkg *internal.Unit) *internal.Module {
+	if m.ModulePath != stdlib.ModulePath && !strings.HasPrefix(pkg.Path, m.ModulePath) {
 		panic(fmt.Sprintf("package path %q not a prefix of module path %q",
-			fullPath, m.ModulePath))
+			pkg.Path, m.ModulePath))
 	}
-	AddUnit(m, &internal.Unit{
-		UnitMeta:        *UnitMeta(fullPath, m.ModulePath, m.Version, path.Base(fullPath), true),
-		Imports:         Imports,
-		LicenseContents: Licenses,
-		Documentation: &internal.Documentation{
-			Synopsis: Synopsis,
-			HTML:     DocumentationHTML,
-			GOOS:     GOOS,
-			GOARCH:   GOARCH,
-		},
-	})
+	AddUnit(m, UnitForPackage(pkg.Path, m.ModulePath, m.Version, pkg.Name, pkg.IsRedistributable))
 	minLen := len(m.ModulePath)
 	if m.ModulePath == stdlib.ModulePath {
 		minLen = 1
 	}
-	for pth := fullPath; len(pth) > minLen; pth = path.Dir(pth) {
+	for pth := pkg.Path; len(pth) > minLen; pth = path.Dir(pth) {
 		found := false
 		for _, u := range m.Units {
 			if u.Path == pth {