refactor(serverHandler/sort): implement standard methods for sort

Author: marjune163

src/serverHandler/filter_test.go

@@ -10,7 +10,7 @@ import (
 func TestHandler_FilterItems(t *testing.T) {
 	now := time.Now()
 	var h *handler
-	var infos []os.FileInfo
+	var items []os.FileInfo
 	var ok bool
 
 	re2 := regexp.MustCompile("2")
@@ -24,76 +24,76 @@ func TestHandler_FilterItems(t *testing.T) {
 	file2 := dummyFileInfo{"file2", 0, now, false}
 	file3 := dummyFileInfo{"file3", 0, now, false}
 
-	originInfos := []os.FileInfo{dir1, dir2, dir3, file1, file2, file3}
+	originalItems := []os.FileInfo{dir1, dir2, dir3, file1, file2, file3}
 
 	h = &handler{shows: re2}
-	infos = h.FilterItems(originInfos)
-	ok = expectInfos(infos, dir2, file2)
+	items = h.FilterItems(originalItems)
+	ok = expectItems(items, dir2, file2)
 	if !ok {
-		t.Errorf("%+v\n", infos)
+		t.Errorf("%+v\n", items)
 	}
 
 	h = &handler{showDirs: re2}
-	infos = h.FilterItems(originInfos)
-	ok = expectInfos(infos, dir2, file1, file2, file3)
+	items = h.FilterItems(originalItems)
+	ok = expectItems(items, dir2, file1, file2, file3)
 	if !ok {
-		t.Errorf("%+v\n", infos)
+		t.Errorf("%+v\n", items)
 	}
 
 	h = &handler{showFiles: re2}
-	infos = h.FilterItems(originInfos)
-	ok = expectInfos(infos, dir1, dir2, dir3, file2)
+	items = h.FilterItems(originalItems)
+	ok = expectItems(items, dir1, dir2, dir3, file2)
 	if !ok {
-		t.Errorf("%+v\n", infos)
+		t.Errorf("%+v\n", items)
 	}
 
 	h = &handler{hides: re2}
-	infos = h.FilterItems(originInfos)
-	ok = expectInfos(infos, dir1, dir3, file1, file3)
+	items = h.FilterItems(originalItems)
+	ok = expectItems(items, dir1, dir3, file1, file3)
 	if !ok {
-		t.Errorf("%+v\n", infos)
+		t.Errorf("%+v\n", items)
 	}
 
 	h = &handler{hideDirs: re2}
-	infos = h.FilterItems(originInfos)
-	ok = expectInfos(infos, dir1, dir3, file1, file2, file3)
+	items = h.FilterItems(originalItems)
+	ok = expectItems(items, dir1, dir3, file1, file2, file3)
 	if !ok {
-		t.Errorf("%+v\n", infos)
+		t.Errorf("%+v\n", items)
 	}
 
 	h = &handler{hideFiles: re2}
-	infos = h.FilterItems(originInfos)
-	ok = expectInfos(infos, dir1, dir2, dir3, file1, file3)
+	items = h.FilterItems(originalItems)
+	ok = expectItems(items, dir1, dir2, dir3, file1, file3)
 	if !ok {
-		t.Errorf("%+v\n", infos)
+		t.Errorf("%+v\n", items)
 	}
 
 	h = &handler{shows: re2, hides: re3}
-	infos = h.FilterItems(originInfos)
-	ok = expectInfos(infos, dir2, file2)
+	items = h.FilterItems(originalItems)
+	ok = expectItems(items, dir2, file2)
 	if !ok {
-		t.Errorf("%+v\n", infos)
+		t.Errorf("%+v\n", items)
 	}
 
 	h = &handler{shows: re2, hides: re2}
-	infos = h.FilterItems(originInfos)
-	ok = expectInfos(infos)
+	items = h.FilterItems(originalItems)
+	ok = expectItems(items)
 	if !ok {
-		t.Errorf("%+v\n", infos)
+		t.Errorf("%+v\n", items)
 	}
 
 	h = &handler{shows: re2, hideDirs: re2}
-	infos = h.FilterItems(originInfos)
-	ok = expectInfos(infos, file2)
+	items = h.FilterItems(originalItems)
+	ok = expectItems(items, file2)
 	if !ok {
-		t.Errorf("%+v\n", infos)
+		t.Errorf("%+v\n", items)
 	}
 
 	h = &handler{shows: re2, hideFiles: re2}
-	infos = h.FilterItems(originInfos)
-	ok = expectInfos(infos, dir2)
+	items = h.FilterItems(originalItems)
+	ok = expectItems(items, dir2)
 	if !ok {
-		t.Errorf("%+v\n", infos)
+		t.Errorf("%+v\n", items)
 	}
 
 }