Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit f271d5f

Browse files
authored
Merge pull request #190 from per1234/fix-tests
Various minor improvements to unit tests for package index projects
2 parents 3d2ae4c + e8043e1 commit f271d5f

File tree

11 files changed

+38
-38
lines changed

11 files changed

+38
-38
lines changed

‎internal/project/projectdata/packageindex_test.go‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -59,60 +59,60 @@ func TestInitializeForPackageIndex(t *testing.T) {
5959
packageIndexPackagesAssertion: assert.NotNil,
6060
packageIndexPackagesDataAssertion: []PackageIndexData{
6161
{
62-
ID: "myboard1",
62+
ID: "foopackager1",
6363
JSONPointer: "/packages/0",
6464
},
6565
{
66-
ID: "myboard2",
66+
ID: "foopackager2",
6767
JSONPointer: "/packages/1",
6868
},
6969
},
7070
packageIndexPlatformsAssertion: assert.NotNil,
7171
packageIndexPlatformsDataAssertion: []PackageIndexData{
7272
{
73-
ID: "myboard1:avr@1.0.0",
73+
ID: "foopackager1:avr@1.0.0",
7474
JSONPointer: "/packages/0/platforms/0",
7575
},
7676
{
77-
ID: "myboard1:avr@1.0.1",
77+
ID: "foopackager1:avr@1.0.1",
7878
JSONPointer: "/packages/0/platforms/1",
7979
},
8080
{
81-
ID: "myboard2:samd@2.0.0",
81+
ID: "foopackager2:samd@2.0.0",
8282
JSONPointer: "/packages/1/platforms/0",
8383
},
8484
{
85-
ID: "myboard2:mbed@1.1.1",
85+
ID: "foopackager2:mbed@1.1.1",
8686
JSONPointer: "/packages/1/platforms/1",
8787
},
8888
},
8989
packageIndexToolsAssertion: assert.NotNil,
9090
packageIndexToolsDataAssertion: []PackageIndexData{
9191
{
92-
ID: "myboard2:openocd@0.10.0-arduino1-static",
92+
ID: "foopackager2:openocd@0.10.0-arduino1-static",
9393
JSONPointer: "/packages/1/tools/0",
9494
},
9595
{
96-
ID: "myboard2:CMSIS@4.0.0-atmel",
96+
ID: "foopackager2:CMSIS@4.0.0-atmel",
9797
JSONPointer: "/packages/1/tools/1",
9898
},
9999
},
100100
packageIndexSystemsAssertion: assert.NotNil,
101101
packageIndexSystemsDataAssertion: []PackageIndexData{
102102
{
103-
ID: "myboard2:openocd@0.10.0-arduino1-static - i386-apple-darwin11",
103+
ID: "foopackager2:openocd@0.10.0-arduino1-static - i386-apple-darwin11",
104104
JSONPointer: "/packages/1/tools/0/systems/0",
105105
},
106106
{
107-
ID: "myboard2:openocd@0.10.0-arduino1-static - x86_64-linux-gnu",
107+
ID: "foopackager2:openocd@0.10.0-arduino1-static - x86_64-linux-gnu",
108108
JSONPointer: "/packages/1/tools/0/systems/1",
109109
},
110110
{
111-
ID: "myboard2:CMSIS@4.0.0-atmel - arm-linux-gnueabihf",
111+
ID: "foopackager2:CMSIS@4.0.0-atmel - arm-linux-gnueabihf",
112112
JSONPointer: "/packages/1/tools/1/systems/0",
113113
},
114114
{
115-
ID: "myboard2:CMSIS@4.0.0-atmel - i686-mingw32",
115+
ID: "foopackager2:CMSIS@4.0.0-atmel - i686-mingw32",
116116
JSONPointer: "/packages/1/tools/1/systems/1",
117117
},
118118
},
@@ -159,32 +159,32 @@ func TestInitializeForPackageIndex(t *testing.T) {
159159
testTable.packageIndexPackagesAssertion(t, PackageIndexPackages(), testTable.testName)
160160
if PackageIndexPackages() != nil {
161161
for index, packageIndexPackage := range PackageIndexPackages() {
162-
assert.Equal(t, packageIndexPackage.ID, testTable.packageIndexPackagesDataAssertion[index].ID)
163-
assert.Equal(t, packageIndexPackage.JSONPointer, testTable.packageIndexPackagesDataAssertion[index].JSONPointer)
162+
assert.Equal(t, testTable.packageIndexPackagesDataAssertion[index].ID, packageIndexPackage.ID, testTable.testName)
163+
assert.Equal(t, testTable.packageIndexPackagesDataAssertion[index].JSONPointer, packageIndexPackage.JSONPointer, testTable.testName)
164164
}
165165
}
166166

167167
testTable.packageIndexPlatformsAssertion(t, PackageIndexPlatforms(), testTable.testName)
168168
if PackageIndexPlatforms() != nil {
169169
for index, packageIndexPlatform := range PackageIndexPlatforms() {
170-
assert.Equal(t, packageIndexPlatform.ID, testTable.packageIndexPlatformsDataAssertion[index].ID)
171-
assert.Equal(t, packageIndexPlatform.JSONPointer, testTable.packageIndexPlatformsDataAssertion[index].JSONPointer)
170+
assert.Equal(t, testTable.packageIndexPlatformsDataAssertion[index].ID, packageIndexPlatform.ID, testTable.testName)
171+
assert.Equal(t, testTable.packageIndexPlatformsDataAssertion[index].JSONPointer, packageIndexPlatform.JSONPointer, testTable.testName)
172172
}
173173
}
174174

175175
testTable.packageIndexToolsAssertion(t, PackageIndexTools(), testTable.testName)
176176
if PackageIndexTools() != nil {
177177
for index, packageIndexTool := range PackageIndexTools() {
178-
assert.Equal(t, packageIndexTool.ID, testTable.packageIndexToolsDataAssertion[index].ID)
179-
assert.Equal(t, packageIndexTool.JSONPointer, testTable.packageIndexToolsDataAssertion[index].JSONPointer)
178+
assert.Equal(t, testTable.packageIndexToolsDataAssertion[index].ID, packageIndexTool.ID, testTable.testName)
179+
assert.Equal(t, testTable.packageIndexToolsDataAssertion[index].JSONPointer, packageIndexTool.JSONPointer, testTable.testName)
180180
}
181181
}
182182

183183
testTable.packageIndexSystemsAssertion(t, PackageIndexSystems(), testTable.testName)
184184
if PackageIndexSystems() != nil {
185185
for index, packageIndexSystem := range PackageIndexSystems() {
186-
assert.Equal(t, packageIndexSystem.ID, testTable.packageIndexSystemsDataAssertion[index].ID)
187-
assert.Equal(t, packageIndexSystem.JSONPointer, testTable.packageIndexSystemsDataAssertion[index].JSONPointer)
186+
assert.Equal(t, testTable.packageIndexSystemsDataAssertion[index].ID, packageIndexSystem.ID, testTable.testName)
187+
assert.Equal(t, testTable.packageIndexSystemsDataAssertion[index].JSONPointer, packageIndexSystem.JSONPointer, testTable.testName)
188188
}
189189
}
190190
}

‎internal/project/projectdata/testdata/packageindexes/valid-package-index/package_foo_index.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"packages": [
33
{
4-
"name": "myboard1",
4+
"name": "foopackager1",
55
"maintainer": "Jane Developer",
66
"websiteURL": "https://github.com/janedeveloper/myboard",
77
"email": "jane@example.com",
@@ -65,7 +65,7 @@
6565
"tools": []
6666
},
6767
{
68-
"name": "myboard2",
68+
"name": "foopackager2",
6969
"maintainer": "Jane Developer",
7070
"websiteURL": "https://github.com/janedeveloper/myboard",
7171
"email": "jane@example.com",

‎internal/rule/rulefunction/packageindex_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,8 @@ func TestPackageIndexFormat(t *testing.T) {
114114
func TestPackageIndexPackagesWebsiteURLDeadLink(t *testing.T) {
115115
testTables := []packageIndexRuleFunctionTestTable{
116116
{"Invalid JSON", "invalid-JSON", ruleresult.NotRun, ""},
117-
{"Dead URLs", "packages-websiteurl-dead", ruleresult.Fail, "^myboard1, myboard2$"},
118-
{"Invalid URL", "packages-websiteurl-invalid", ruleresult.Fail, "^myboard$"},
117+
{"Dead URLs", "packages-websiteurl-dead", ruleresult.Fail, "^foopackager1, foopackager2$"},
118+
{"Invalid URL", "packages-websiteurl-invalid", ruleresult.Fail, "^foopackager$"},
119119
{"Valid URL", "valid-package-index", ruleresult.Pass, ""},
120120
}
121121

@@ -125,7 +125,7 @@ func TestPackageIndexPackagesWebsiteURLDeadLink(t *testing.T) {
125125
func TestPackageIndexPackagesHelpOnlineDeadLink(t *testing.T) {
126126
testTables := []packageIndexRuleFunctionTestTable{
127127
{"Invalid JSON", "invalid-JSON", ruleresult.NotRun, ""},
128-
{"Dead URLs", "packages-help-online-dead", ruleresult.Fail, "^myboard1, myboard2$"},
128+
{"Dead URLs", "packages-help-online-dead", ruleresult.Fail, "^foopackager1, foopackager2$"},
129129
{"Valid URL", "valid-package-index", ruleresult.Pass, ""},
130130
}
131131

@@ -135,7 +135,7 @@ func TestPackageIndexPackagesHelpOnlineDeadLink(t *testing.T) {
135135
func TestPackageIndexPackagesPlatformsHelpOnlineDeadLink(t *testing.T) {
136136
testTables := []packageIndexRuleFunctionTestTable{
137137
{"Invalid JSON", "invalid-JSON", ruleresult.NotRun, ""},
138-
{"Dead URLs", "packages-platforms-help-online-dead", ruleresult.Fail, "^myboard:avr@1\\.0\\.0, myboard:samd@1\\.0\\.0$"},
138+
{"Dead URLs", "packages-platforms-help-online-dead", ruleresult.Fail, "^foopackager:avr@1\\.0\\.0, foopackager:samd@1\\.0\\.0$"},
139139
{"Valid URL", "valid-package-index", ruleresult.Pass, ""},
140140
}
141141

@@ -145,7 +145,7 @@ func TestPackageIndexPackagesPlatformsHelpOnlineDeadLink(t *testing.T) {
145145
func TestPackageIndexPackagesPlatformsURLDeadLink(t *testing.T) {
146146
testTables := []packageIndexRuleFunctionTestTable{
147147
{"Invalid JSON", "invalid-JSON", ruleresult.NotRun, ""},
148-
{"Dead URLs", "packages-platforms-url-dead", ruleresult.Fail, "^myboard:avr@1\\.0\\.0, myboard:samd@1\\.0\\.0$"},
148+
{"Dead URLs", "packages-platforms-url-dead", ruleresult.Fail, "^foopackager:avr@1\\.0\\.0, foopackager:samd@1\\.0\\.0$"},
149149
{"Valid URL", "valid-package-index", ruleresult.Pass, ""},
150150
}
151151

@@ -155,7 +155,7 @@ func TestPackageIndexPackagesPlatformsURLDeadLink(t *testing.T) {
155155
func TestPackageIndexPackagesToolsSystemsURLDeadLink(t *testing.T) {
156156
testTables := []packageIndexRuleFunctionTestTable{
157157
{"Invalid JSON", "invalid-JSON", ruleresult.NotRun, ""},
158-
{"Dead URLs", "packages-tools-systems-url-dead", ruleresult.Fail, "^myboard:CMSIS@4\\.0\\.0-atmel - arm-linux-gnueabihf, myboard:CMSIS@4\\.0\\.0-atmel - i686-mingw32$"},
158+
{"Dead URLs", "packages-tools-systems-url-dead", ruleresult.Fail, "^foopackager:CMSIS@4\\.0\\.0-atmel - arm-linux-gnueabihf, foopackager:CMSIS@4\\.0\\.0-atmel - i686-mingw32$"},
159159
{"Valid URL", "valid-package-index", ruleresult.Pass, ""},
160160
}
161161

‎internal/rule/rulefunction/testdata/packageindexes/packages-help-online-dead/package_foo_index.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"packages": [
33
{
4-
"name": "myboard1",
4+
"name": "foopackager1",
55
"maintainer": "Jane Developer",
66
"websiteURL": "http://example.com",
77
"email": "jane@example.com",
@@ -12,7 +12,7 @@
1212
"tools": []
1313
},
1414
{
15-
"name": "myboard2",
15+
"name": "foopackager2",
1616
"maintainer": "Jane Developer",
1717
"websiteURL": "http://example.com",
1818
"email": "jane@example.com",

‎internal/rule/rulefunction/testdata/packageindexes/packages-platforms-help-online-dead/package_foo_index.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"packages": [
33
{
4-
"name": "myboard",
4+
"name": "foopackager",
55
"maintainer": "Jane Developer",
66
"websiteURL": "http://example.com",
77
"email": "jane@example.com",

‎internal/rule/rulefunction/testdata/packageindexes/packages-platforms-url-dead/package_foo_index.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"packages": [
33
{
4-
"name": "myboard",
4+
"name": "foopackager",
55
"maintainer": "Jane Developer",
66
"websiteURL": "http://example.com",
77
"email": "jane@example.com",

‎internal/rule/rulefunction/testdata/packageindexes/packages-tools-systems-url-dead/package_foo_index.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"packages": [
33
{
4-
"name": "myboard",
4+
"name": "foopackager",
55
"maintainer": "Jane Developer",
66
"websiteURL": "http://httpstat.us/404",
77
"email": "jane@example.com",

‎internal/rule/rulefunction/testdata/packageindexes/packages-websiteurl-dead/package_foo_index.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"packages": [
33
{
4-
"name": "myboard1",
4+
"name": "foopackager1",
55
"maintainer": "Jane Developer",
66
"websiteURL": "http://httpstat.us/403",
77
"email": "jane@example.com",
@@ -12,7 +12,7 @@
1212
"tools": []
1313
},
1414
{
15-
"name": "myboard2",
15+
"name": "foopackager2",
1616
"maintainer": "Jane Developer",
1717
"websiteURL": "http://httpstat.us/404",
1818
"email": "jane@example.com",

‎internal/rule/rulefunction/testdata/packageindexes/packages-websiteurl-invalid/package_foo_index.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"packages": [
33
{
4-
"name": "myboard",
4+
"name": "foopackager",
55
"maintainer": "Jane Developer",
66
"websiteURL": "invalid",
77
"email": "jane@example.com",

‎internal/rule/rulefunction/testdata/packageindexes/valid-package-index/package_foo_index.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"packages": [
33
{
4-
"name": "myboard",
4+
"name": "foopackager",
55
"maintainer": "Jane Developer",
66
"websiteURL": "http://example.com",
77
"email": "jane@example.com",

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /