fix tests, rename

Author: ipince

internal/nix/nixprofile/item.go

@@ -25,7 +25,7 @@ type NixProfileListItem struct {
 	lockedReference string
 
 	// The store path(s) of the package.
-	nixStorePath []string
+	nixStorePaths []string
 }
 
 // AttributePath parses the package attribute from the NixProfileListItem.lockedReference
@@ -62,6 +62,6 @@ func (item *NixProfileListItem) String() string {
 		item.index,
 		item.unlockedReference,
 		item.lockedReference,
-		item.nixStorePath,
+		item.nixStorePaths,
 	)
 }

internal/nix/nixprofile/profile.go

@@ -58,7 +58,7 @@ func ProfileListItems(
 			index:             index,
 			unlockedReference: element.OriginalURL + "#" + element.AttrPath,
 			lockedReference:   element.URL + "#" + element.AttrPath,
-			nixStorePath:      element.StorePaths,
+			nixStorePaths:     element.StorePaths,
 		})
 	}
 	return items, nil
@@ -133,8 +133,8 @@ func ProfileListIndex(args *ProfileListIndexArgs) (int, error) {
 			return -1, errors.Wrapf(err, "failed to get installable for %s", args.DevPkg.String())
 		}
 		for _, item := range items {
-			if len(item.nixStorePath) == 1 && // this should always be true
-				pathInStore == item.nixStorePath[0] {
+			if len(item.nixStorePaths) == 1 && // this should always be true
+				pathInStore == item.nixStorePaths[0] {
 				return item.index, nil
 			}
 		}
@@ -192,15 +192,15 @@ func parseNixProfileListItem(line string) (*NixProfileListItem, error) {
 	lockedReference := scanner.Text()
 
 	if !scanner.Scan() {
-		return nil, redact.Errorf("error parsing \"nix profile list\" output: line is missing nixStorePath: %s", line)
+		return nil, redact.Errorf("error parsing \"nix profile list\" output: line is missing nixStorePaths: %s", line)
 	}
 	nixStorePath := scanner.Text()
 
 	return &NixProfileListItem{
 		index:             index,
 		unlockedReference: unlockedReference,
 		lockedReference:   lockedReference,
-		nixStorePath:      []string{nixStorePath},
+		nixStorePaths:     []string{nixStorePath},
 	}, nil
 }
 

internal/nix/nixprofile/profile_test.go

@@ -5,6 +5,7 @@ package nixprofile
 
 import (
 	"fmt"
+	"reflect"
 	"testing"
 )
 
@@ -32,7 +33,7 @@ func TestNixProfileListItem(t *testing.T) {
 					index:             0,
 					unlockedReference: "flake:NixOS/nixpkgs/52e3e80afff4b16ccb7c52e9f0f5220552f03d04#legacyPackages.x86_64-darwin.go_1_19",
 					lockedReference:   "github:NixOS/nixpkgs/52e3e80afff4b16ccb7c52e9f0f5220552f03d04#legacyPackages.x86_64-darwin.go_1_19",
-					nixStorePath:      "/nix/store/w0lyimyyxxfl3gw40n46rpn1yjrl3q85-go-1.19.3",
+					nixStorePaths:     []string{"/nix/store/w0lyimyyxxfl3gw40n46rpn1yjrl3q85-go-1.19.3"},
 				},
 				attrPath:    "legacyPackages.x86_64-darwin.go_1_19",
 				packageName: "go_1_19",
@@ -51,7 +52,7 @@ func TestNixProfileListItem(t *testing.T) {
 					2,
 					"github:NixOS/nixpkgs/52e3e80afff4b16ccb7c52e9f0f5220552f03d04#legacyPackages.x86_64-darwin.python39Packages.numpy",
 					"github:NixOS/nixpkgs/52e3e80afff4b16ccb7c52e9f0f5220552f03d04#legacyPackages.x86_64-darwin.python39Packages.numpy",
-					"/nix/store/qly36iy1p4q1h5p4rcbvsn3ll0zsd9pd-python3.9-numpy-1.23.3",
+					[]string{"/nix/store/qly36iy1p4q1h5p4rcbvsn3ll0zsd9pd-python3.9-numpy-1.23.3"},
 				},
 				attrPath:    "legacyPackages.x86_64-darwin.python39Packages.numpy",
 				packageName: "python39Packages.numpy",
@@ -75,7 +76,7 @@ func testItem(t *testing.T, line string, expected expectedTestData) {
 		t.Fatalf("expected NixProfileListItem to be non-nil")
 	}
 
-	if *item != *expected.item {
+	if !reflect.DeepEqual(item, expected.item) {
 		t.Fatalf("expected parsed NixProfileListItem to be %s but got %s",
 			expected.item,
 			item,