Skip to content

Provide object-level packages[].platforms[].boards[] package index da… #196

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 22, 2021
Merged

Provide object-level packages[].platforms[].boards[] package index da… #196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions internal/project/projectdata/packageindex.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ func InitializeForPackageIndex() {

packageIndexPackages = nil
packageIndexPlatforms = nil
packageIndexBoards = nil
packageIndexTools = nil
packageIndexSystems = nil
packageIndexSchemaValidationResult = nil
Expand All @@ -51,6 +52,10 @@ func InitializeForPackageIndex() {
packageIndexPlatforms = append(packageIndexPlatforms, getPackageIndexData(packageData.Object, packageData.JSONPointer, "platforms", packageData.ID+":", "architecture", "version")...)
}

for _, platformData := range PackageIndexPlatforms() {
packageIndexBoards = append(packageIndexBoards, getPackageIndexData(platformData.Object, platformData.JSONPointer, "boards", platformData.ID+" - ", "name", "")...)
}

for _, packageData := range PackageIndexPackages() {
packageIndexTools = append(packageIndexTools, getPackageIndexData(packageData.Object, packageData.JSONPointer, "tools", packageData.ID+":", "name", "version")...)
}
Expand Down Expand Up @@ -98,6 +103,13 @@ func PackageIndexPlatforms() []PackageIndexData {
return packageIndexPlatforms
}

var packageIndexBoards []PackageIndexData

// PackageIndexBoards returns the slice of board data for the package index.
func PackageIndexBoards() []PackageIndexData {
return packageIndexBoards
}

var packageIndexTools []PackageIndexData

// PackageIndexTools returns the slice of tool data for the package index.
Expand Down
141 changes: 141 additions & 0 deletions internal/project/projectdata/packageindex_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ func TestInitializeForPackageIndex(t *testing.T) {
packageIndexPackagesDataAssertion []PackageIndexData
packageIndexPlatformsAssertion assert.ValueAssertionFunc
packageIndexPlatformsDataAssertion []PackageIndexData
packageIndexBoardsAssertion assert.ValueAssertionFunc
packageIndexBoardsDataAssertion []PackageIndexData
packageIndexToolsAssertion assert.ValueAssertionFunc
packageIndexToolsDataAssertion []PackageIndexData
packageIndexSystemsAssertion assert.ValueAssertionFunc
Expand Down Expand Up @@ -87,6 +89,41 @@ func TestInitializeForPackageIndex(t *testing.T) {
JSONPointer: "/packages/1/platforms/1",
},
},
packageIndexBoardsAssertion: assert.NotNil,
packageIndexBoardsDataAssertion: []PackageIndexData{
{
ID: "foopackager1:[email protected] - My Board",
JSONPointer: "/packages/0/platforms/0/boards/0",
},
{
ID: "foopackager1:[email protected] - My Board Pro",
JSONPointer: "/packages/0/platforms/0/boards/1",
},
{
ID: "foopackager1:[email protected] - My Board",
JSONPointer: "/packages/0/platforms/1/boards/0",
},
{
ID: "foopackager1:[email protected] - My Board Pro",
JSONPointer: "/packages/0/platforms/1/boards/1",
},
{
ID: "foopackager2:[email protected] - My Board",
JSONPointer: "/packages/1/platforms/0/boards/0",
},
{
ID: "foopackager2:[email protected] - My Board Pro",
JSONPointer: "/packages/1/platforms/0/boards/1",
},
{
ID: "foopackager2:[email protected] - My Board",
JSONPointer: "/packages/1/platforms/1/boards/0",
},
{
ID: "foopackager2:[email protected] - My Board Pro",
JSONPointer: "/packages/1/platforms/1/boards/1",
},
},
packageIndexToolsAssertion: assert.NotNil,
packageIndexToolsDataAssertion: []PackageIndexData{
{
Expand Down Expand Up @@ -154,6 +191,53 @@ func TestInitializeForPackageIndex(t *testing.T) {
ID: "/packages/1/platforms/1",
JSONPointer: "/packages/1/platforms/1",
},
{
ID: "foopackager2:[email protected]",
JSONPointer: "/packages/1/platforms/2",
},
},
packageIndexBoardsAssertion: assert.NotNil,
packageIndexBoardsDataAssertion: []PackageIndexData{
{
ID: "/packages/0/platforms/0/boards/0",
JSONPointer: "/packages/0/platforms/0/boards/0",
},
{
ID: "/packages/0/platforms/0/boards/1",
JSONPointer: "/packages/0/platforms/0/boards/1",
},
{
ID: "/packages/0/platforms/1/boards/0",
JSONPointer: "/packages/0/platforms/1/boards/0",
},
{
ID: "/packages/0/platforms/1/boards/1",
JSONPointer: "/packages/0/platforms/1/boards/1",
},
{
ID: "/packages/1/platforms/0/boards/0",
JSONPointer: "/packages/1/platforms/0/boards/0",
},
{
ID: "/packages/1/platforms/0/boards/1",
JSONPointer: "/packages/1/platforms/0/boards/1",
},
{
ID: "/packages/1/platforms/1/boards/0",
JSONPointer: "/packages/1/platforms/1/boards/0",
},
{
ID: "/packages/1/platforms/1/boards/1",
JSONPointer: "/packages/1/platforms/1/boards/1",
},
{
ID: "/packages/1/platforms/2/boards/0",
JSONPointer: "/packages/1/platforms/2/boards/0",
},
{
ID: "foopackager2:[email protected] - My Board Pro",
JSONPointer: "/packages/1/platforms/2/boards/1",
},
},
packageIndexToolsAssertion: assert.NotNil,
packageIndexToolsDataAssertion: []PackageIndexData{
Expand Down Expand Up @@ -230,6 +314,53 @@ func TestInitializeForPackageIndex(t *testing.T) {
ID: "/packages/1/platforms/1",
JSONPointer: "/packages/1/platforms/1",
},
{
ID: "foopackager2:[email protected]",
JSONPointer: "/packages/1/platforms/2",
},
},
packageIndexBoardsAssertion: assert.NotNil,
packageIndexBoardsDataAssertion: []PackageIndexData{
{
ID: "/packages/0/platforms/0/boards/0",
JSONPointer: "/packages/0/platforms/0/boards/0",
},
{
ID: "/packages/0/platforms/0/boards/1",
JSONPointer: "/packages/0/platforms/0/boards/1",
},
{
ID: "/packages/0/platforms/1/boards/0",
JSONPointer: "/packages/0/platforms/1/boards/0",
},
{
ID: "/packages/0/platforms/1/boards/1",
JSONPointer: "/packages/0/platforms/1/boards/1",
},
{
ID: "/packages/1/platforms/0/boards/0",
JSONPointer: "/packages/1/platforms/0/boards/0",
},
{
ID: "/packages/1/platforms/0/boards/1",
JSONPointer: "/packages/1/platforms/0/boards/1",
},
{
ID: "/packages/1/platforms/1/boards/0",
JSONPointer: "/packages/1/platforms/1/boards/0",
},
{
ID: "/packages/1/platforms/1/boards/1",
JSONPointer: "/packages/1/platforms/1/boards/1",
},
{
ID: "/packages/1/platforms/2/boards/0",
JSONPointer: "/packages/1/platforms/2/boards/0",
},
{
ID: "foopackager2:[email protected] - My Board Pro",
JSONPointer: "/packages/1/platforms/2/boards/1",
},
},
packageIndexToolsAssertion: assert.NotNil,
packageIndexToolsDataAssertion: []PackageIndexData{
Expand Down Expand Up @@ -279,6 +410,7 @@ func TestInitializeForPackageIndex(t *testing.T) {
packageIndexCLILoadErrorAssertion: assert.NotNil,
packageIndexPackagesAssertion: assert.Nil,
packageIndexPlatformsAssertion: assert.Nil,
packageIndexBoardsAssertion: assert.Nil,
packageIndexToolsAssertion: assert.Nil,
packageIndexSystemsAssertion: assert.Nil,
packageIndexSchemaValidationResultAssertion: assert.Nil,
Expand All @@ -291,6 +423,7 @@ func TestInitializeForPackageIndex(t *testing.T) {
packageIndexCLILoadErrorAssertion: assert.NotNil,
packageIndexPackagesAssertion: assert.Nil,
packageIndexPlatformsAssertion: assert.Nil,
packageIndexBoardsAssertion: assert.Nil,
packageIndexToolsAssertion: assert.Nil,
packageIndexSystemsAssertion: assert.Nil,
packageIndexSchemaValidationResultAssertion: assert.Nil,
Expand Down Expand Up @@ -328,6 +461,14 @@ func TestInitializeForPackageIndex(t *testing.T) {
}
}

testTable.packageIndexBoardsAssertion(t, PackageIndexBoards(), testTable.testName)
if PackageIndexBoards() != nil {
for index, packageIndexBoard := range PackageIndexBoards() {
assert.Equal(t, testTable.packageIndexBoardsDataAssertion[index].ID, packageIndexBoard.ID, testTable.testName)
assert.Equal(t, testTable.packageIndexBoardsDataAssertion[index].JSONPointer, packageIndexBoard.JSONPointer, testTable.testName)
}
}

testTable.packageIndexToolsAssertion(t, PackageIndexTools(), testTable.testName)
if PackageIndexTools() != nil {
for index, packageIndexTool := range PackageIndexTools() {
Expand Down
26 changes: 26 additions & 0 deletions internal/project/projectdata/testdata/packageindexes/empty-ids/package_foo_index.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,32 @@
"version": "6.0.1-arduino5"
}
]
},
{
"name": "My Board",
"architecture": "megaavr",
"version": "1.0.0",
"category": "Contributed",
"help": {
"online": "http://example.com/forum/myboard"
},
"url": "https://janedeveloper.github.io/myboard/myboard-1.0.1.zip",
"archiveFileName": "myboard-1.0.1.zip",
"checksum": "SHA-256:9c86ee28a7ce9fe33e8b07ec643316131e0031b0d22e63bb398902a5fdadbca9",
"size": "15125",
"boards": [{ "name": "" }, { "name": "My Board Pro" }],
"toolsDependencies": [
{
"packager": "arduino",
"name": "avr-gcc",
"version": "4.8.1-arduino5"
},
{
"packager": "arduino",
"name": "avrdude",
"version": "6.0.1-arduino5"
}
]
}
],
"tools": [
Expand Down
26 changes: 26 additions & 0 deletions internal/project/projectdata/testdata/packageindexes/missing-ids/package_foo_index.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,32 @@
"version": "6.0.1-arduino5"
}
]
},
{
"name": "My Board",
"architecture": "megaavr",
"version": "1.0.0",
"category": "Contributed",
"help": {
"online": "http://example.com/forum/myboard"
},
"url": "https://janedeveloper.github.io/myboard/myboard-1.0.1.zip",
"archiveFileName": "myboard-1.0.1.zip",
"checksum": "SHA-256:9c86ee28a7ce9fe33e8b07ec643316131e0031b0d22e63bb398902a5fdadbca9",
"size": "15125",
"boards": [{ "foo": "My Board" }, { "name": "My Board Pro" }],
"toolsDependencies": [
{
"packager": "arduino",
"name": "avr-gcc",
"version": "4.8.1-arduino5"
},
{
"packager": "arduino",
"name": "avrdude",
"version": "6.0.1-arduino5"
}
]
}
],
"tools": [
Expand Down