|
1 | 1 | package github |
2 | 2 |
|
3 | 3 | import ( |
4 | | - "fmt" |
5 | 4 | "testing" |
6 | 5 |
|
7 | 6 | "sqlpkg.org/cli/httpx" |
@@ -29,41 +28,36 @@ func TestGetLatestTag(t *testing.T) { |
29 | 28 |
|
30 | 29 | func TestParseRepoUrl(t *testing.T) { |
31 | 30 | type test struct { |
32 | | - num int |
| 31 | + url string |
33 | 32 | owner, repo string |
34 | 33 | } |
35 | | - valid := map[string]test{ |
36 | | - "https://github.com/nalgeon/sqlean": {0, "nalgeon", "sqlean"}, |
37 | | - "https://github.com/nalgeon/sqlean/": {1, "nalgeon", "sqlean"}, |
38 | | - "https://github.com/asg017/sqlite-vss": {2, "asg017", "sqlite-vss"}, |
| 34 | + valid := []test{ |
| 35 | + {"https://github.com/nalgeon/sqlean", "nalgeon", "sqlean"}, |
| 36 | + {"https://github.com/nalgeon/sqlean/", "nalgeon", "sqlean"}, |
| 37 | + {"https://github.com/asg017/sqlite-vss", "asg017", "sqlite-vss"}, |
39 | 38 | } |
40 | | - for url, test := range valid { |
41 | | - name := fmt.Sprintf("valid_%d", test.num) |
42 | | - t.Run(name, func(t *testing.T) { |
43 | | - owner, repo, err := ParseRepoUrl(url) |
44 | | - if err != nil { |
45 | | - t.Fatalf("ParseRepoUrl: unexpected error %v", err) |
46 | | - } |
47 | | - if owner != test.owner { |
48 | | - t.Errorf("ParseRepoUrl: unexpected owner %v", test.owner) |
49 | | - } |
50 | | - if repo != test.repo { |
51 | | - t.Errorf("ParseRepoUrl: unexpected name %v", test.repo) |
52 | | - } |
53 | | - }) |
| 39 | + for _, test := range valid { |
| 40 | + owner, repo, err := ParseRepoUrl(test.url) |
| 41 | + if err != nil { |
| 42 | + t.Errorf("ParseRepoUrl(%s): unexpected error %v", test.url, err) |
| 43 | + continue |
| 44 | + } |
| 45 | + if owner != test.owner { |
| 46 | + t.Errorf("ParseRepoUrl(%s): unexpected owner %v", test.url, test.owner) |
| 47 | + } |
| 48 | + if repo != test.repo { |
| 49 | + t.Errorf("ParseRepoUrl(%s): unexpected name %v", test.url, test.repo) |
| 50 | + } |
54 | 51 | } |
55 | 52 |
|
56 | 53 | invalid := []string{ |
57 | 54 | "https://github.com/nalgeon", |
58 | 55 | "https://antonz.org", |
59 | 56 | } |
60 | | - for idx, url := range invalid { |
61 | | - name := fmt.Sprintf("valid_%d", idx) |
62 | | - t.Run(name, func(t *testing.T) { |
63 | | - _, _, err := ParseRepoUrl(url) |
64 | | - if err == nil { |
65 | | - t.Fatal("ParseRepoUrl: expected error, got nil") |
66 | | - } |
67 | | - }) |
| 57 | + for _, url := range invalid { |
| 58 | + _, _, err := ParseRepoUrl(url) |
| 59 | + if err == nil { |
| 60 | + t.Errorf("ParseRepoUrl(%s): expected error, got nil", url) |
| 61 | + } |
68 | 62 | } |
69 | 63 | } |
0 commit comments