ref(helm): refactor test index files for search

cmd/helm/search_test.go

@@ -1,9 +1,9 @@
 package main
 
 import (
-	"github.com/kubernetes/helm/pkg/repo"
-
 	"testing"
+
+	"github.com/kubernetes/helm/pkg/repo"
 )
 
 const testDir = "testdata/"

cmd/helm/testdata/foobar-index.yaml

@@ -1,18 +1,24 @@
 foobar-0.1.0:
   url: http://storage.googleapis.com/kubernetes-charts/nginx-0.1.0.tgz
   name: foobar
-  description: string
-  version: 0.1.0
-  home: https://github.com/foo
-  keywords:
-    - dummy
-    - hokey
+  removed: false
+  chartfile:
+    name: foobar
+    description: string
+    version: 0.1.0
+    home: https://github.com/foo
+    keywords:
+      - dummy
+      - hokey
 oddness-1.2.3:
   url: http://storage.googleapis.com/kubernetes-charts/alpine-1.0.0.tgz
   name: oddness
-  description: string
-  version: 1.2.3
-  home: https://github.com/something
-  keywords:
-    - duck
-    - sumtin
+  removed: false
+  chartfile:
+    name: oddness
+    description: string
+    version: 1.2.3
+    home: https://github.com/something
+    keywords:
+      - duck
+      - sumtin

cmd/helm/testdata/local-index.yaml

@@ -1,22 +1,28 @@
 nginx-0.1.0:
   url: http://storage.googleapis.com/kubernetes-charts/nginx-0.1.0.tgz
   name: nginx
-  description: string
-  version: 0.1.0
-  home: https://github.com/something
-  keywords:
-    - popular
-    - web server
-    - proxy
+  removed: false
+  chartfile:
+    name: nginx
+    description: string
+    version: 0.1.0
+    home: https://github.com/something
+    keywords:
+      - popular
+      - web server
+      - proxy
 alpine-1.0.0:
   url: http://storage.googleapis.com/kubernetes-charts/alpine-1.0.0.tgz
   name: alpine
-  description: string
-  version: 1.0.0
-  home: https://github.com/something
-  keywords:
-    - linux
-    - alpine
-    - small
-    - sumtin
+  removed: false
+  chartfile:
+    name: alpine
+    description: string
+    version: 1.0.0
+    home: https://github.com/something
+    keywords:
+      - linux
+      - alpine
+      - small
+      - sumtin
 

pkg/repo/index_test.go

@@ -12,6 +12,8 @@ import (
 	"gopkg.in/yaml.v2"
 )
 
+const testfile = "testdata/local-index.yaml"
+
 var (
 	testRepo = "test-repo"
 )
@@ -55,3 +57,37 @@ func TestDownloadIndexFile(t *testing.T) {
 	os.Remove(dirName)
 
 }
+
+func TestLoadIndexFile(t *testing.T) {
+	cf, err := LoadIndexFile(testfile)
+	if err != nil {
+		t.Errorf("Failed to load index file: %s", err)
+	}
+	if len(cf.Entries) != 2 {
+		t.Errorf("Expected 2 entries in the index file, but got %d", len(cf.Entries))
+	}
+	nginx := false
+	alpine := false
+	for k, e := range cf.Entries {
+		if k == "nginx-0.1.0" {
+			if e.Name == "nginx" {
+				if len(e.Chartfile.Keywords) == 3 {
+					nginx = true
+				}
+			}
+		}
+		if k == "alpine-1.0.0" {
+			if e.Name == "alpine" {
+				if len(e.Chartfile.Keywords) == 4 {
+					alpine = true
+				}
+			}
+		}
+	}
+	if !nginx {
+		t.Errorf("nginx entry was not decoded properly")
+	}
+	if !alpine {
+		t.Errorf("alpine entry was not decoded properly")
+	}
+}

pkg/repo/repo_test.go

@@ -8,71 +8,10 @@ import (
 	"time"
 )
 
-const testfile = "testdata/local-index.yaml"
 const testRepositoriesFile = "testdata/repositories.yaml"
 const testRepository = "testdata/repository"
 const testURL = "http://example-charts.com"
 
-func TestLoadIndexFile(t *testing.T) {
-	cf, err := LoadIndexFile(testfile)
-	if err != nil {
-		t.Errorf("Failed to load index file: %s", err)
-	}
-	if len(cf.Entries) != 2 {
-		t.Errorf("Expected 2 entries in the index file, but got %d", len(cf.Entries))
-	}
-	nginx := false
-	alpine := false
-	for k, e := range cf.Entries {
-		if k == "nginx-0.1.0" {
-			if e.Name == "nginx" {
-				if len(e.Chartfile.Keywords) == 3 {
-					nginx = true
-				}
-			}
-		}
-		if k == "alpine-1.0.0" {
-			if e.Name == "alpine" {
-				if len(e.Chartfile.Keywords) == 4 {
-					alpine = true
-				}
-			}
-		}
-	}
-	if !nginx {
-		t.Errorf("nginx entry was not decoded properly")
-	}
-	if !alpine {
-		t.Errorf("alpine entry was not decoded properly")
-	}
-}
-
-func TestLoadRepositoriesFile(t *testing.T) {
-	rf, err := LoadRepositoriesFile(testRepositoriesFile)
-	if err != nil {
-		t.Errorf(testRepositoriesFile + " could not be loaded: " + err.Error())
-	}
-	expected := map[string]string{"best-charts-ever": "http://best-charts-ever.com",
-		"okay-charts": "http://okay-charts.org", "example123": "http://examplecharts.net/charts/123"}
-
-	numOfRepositories := len(rf.Repositories)
-	expectedNumOfRepositories := 3
-	if numOfRepositories != expectedNumOfRepositories {
-		t.Errorf("Expected %v repositories but only got %v", expectedNumOfRepositories, numOfRepositories)
-	}
-
-	for expectedRepo, expectedURL := range expected {
-		actual, ok := rf.Repositories[expectedRepo]
-		if !ok {
-			t.Errorf("Expected repository: %v but was not found", expectedRepo)
-		}
-
-		if expectedURL != actual {
-			t.Errorf("Expected url %s for the %s repository but got %s ", expectedURL, expectedRepo, actual)
-		}
-	}
-}
-
 func TestLoadChartRepository(t *testing.T) {
 	cr, err := LoadChartRepository(testRepository, testURL)
 	if err != nil {
@@ -153,3 +92,29 @@ func TestIndex(t *testing.T) {
 		}
 	}
 }
+
+func TestLoadRepositoriesFile(t *testing.T) {
+	rf, err := LoadRepositoriesFile(testRepositoriesFile)
+	if err != nil {
+		t.Errorf(testRepositoriesFile + " could not be loaded: " + err.Error())
+	}
+	expected := map[string]string{"best-charts-ever": "http://best-charts-ever.com",
+		"okay-charts": "http://okay-charts.org", "example123": "http://examplecharts.net/charts/123"}
+
+	numOfRepositories := len(rf.Repositories)
+	expectedNumOfRepositories := 3
+	if numOfRepositories != expectedNumOfRepositories {
+		t.Errorf("Expected %v repositories but only got %v", expectedNumOfRepositories, numOfRepositories)
+	}
+
+	for expectedRepo, expectedURL := range expected {
+		actual, ok := rf.Repositories[expectedRepo]
+		if !ok {
+			t.Errorf("Expected repository: %v but was not found", expectedRepo)
+		}
+
+		if expectedURL != actual {
+			t.Errorf("Expected url %s for the %s repository but got %s ", expectedURL, expectedRepo, actual)
+		}
+	}
+}